CNLive Android Team / ModulePedometer · Commits

Commit 8cd7bf5000b633e470149191c344c37bb38bfc47

Authored by 杨帅
2 parents bf3f5578 afa347fd

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	moudle_pedometer/src/main/res/values/strings.xml
Inline Side-by-side
Showing 16 changed files with 165 additions and 90 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunLineFragment.java
  View file @8cd7bf5
@@ -44,11 +44,9 @@ public class RunLineFragment extends Fragment { @@ -44,11 +44,9 @@ public class RunLineFragment extends Fragment {
44 @Override 44 @Override
45 public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { 45 public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
46 super.onViewCreated(view, savedInstanceState); 46 super.onViewCreated(view, savedInstanceState);
47 - binding.topbar.setTitle("约跑路线");  
48 - binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {  
49 - getActivity().finish();  
50 - });  
51 - binding.topbar.addRightTextButton("我的活动",R.id.rightBtn).setOnClickListener(v -> MyRecordActivity.newInstance(getActivity())); 47 +
  48 + binding.backBtn.setOnClickListener(v -> getActivity().finish());
  49 + binding.myActivity.setOnClickListener(v -> MyRecordActivity.newInstance(getActivity()));
52 List<String> list = new ArrayList<>(); 50 List<String> list = new ArrayList<>();
53 list.add("fff"); 51 list.add("fff");
54 list.add("fff"); 52 list.add("fff");
moudle_pedometer/src/main/res/drawable-hdpi/sport_dropdown.png 0 → 100644
View file @8cd7bf5

322 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/sport_location.png 0 → 100644
View file @8cd7bf5

637 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/sport_time.png 0 → 100644
View file @8cd7bf5

661 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/yplx_registered.png 0 → 100644
View file @8cd7bf5

5.84 KB
moudle_pedometer/src/main/res/drawable-xhdpi/sport_dropdown.png 0 → 100644
View file @8cd7bf5

370 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/sport_location.png 0 → 100644
View file @8cd7bf5

737 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/sport_time.png 0 → 100644
View file @8cd7bf5

782 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/yplx_registered.png 0 → 100644
View file @8cd7bf5

3.96 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/sport_dropdown.png 0 → 100644
View file @8cd7bf5

725 Bytes
moudle_pedometer/src/main/res/drawable-xxhdpi/sport_location.png 0 → 100644
View file @8cd7bf5

1.2 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/sport_time.png 0 → 100644
View file @8cd7bf5

1.32 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/yplx_registered.png 0 → 100644
View file @8cd7bf5

17.1 KB
moudle_pedometer/src/main/res/layout/fragment_run_line.xml
  View file @8cd7bf5
@@ -5,6 +5,54 @@ @@ -5,6 +5,54 @@
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 android:orientation="vertical"> 6 android:orientation="vertical">
7 7
  8 + <RelativeLayout
  9 + android:layout_width="match_parent"
  10 + android:layout_height="48dp">
  11 +
  12 + <ImageView
  13 + android:id="@+id/back_btn"
  14 + android:layout_width="wrap_content"
  15 + android:layout_height="wrap_content"
  16 + android:src="@drawable/top_back_black"
  17 + android:layout_centerVertical="true"
  18 + android:padding="10dp"
  19 + />
  20 +
  21 + <TextView
  22 + android:id="@+id/beijing"
  23 + android:layout_width="wrap_content"
  24 + android:layout_height="wrap_content"
  25 + android:layout_toRightOf="@id/back_btn"
  26 + android:text="@string/beijing"
  27 + android:layout_marginLeft="10dp"
  28 + android:layout_centerVertical="true"
  29 + android:drawableRight="@drawable/sport_dropdown"
  30 + android:drawablePadding="7dp"
  31 + android:textSize="15sp"
  32 + android:textColor="#333333"
  33 + />
  34 +
  35 + <TextView
  36 + android:layout_width="wrap_content"
  37 + android:layout_height="wrap_content"
  38 + android:text="@string/goline"
  39 + android:textSize="18sp"
  40 + android:textColor="#333333"
  41 + android:layout_centerInParent="true"
  42 + />
  43 +
  44 + <TextView
  45 + android:id="@+id/my_activity"
  46 + android:layout_width="wrap_content"
  47 + android:layout_height="wrap_content"
  48 + android:layout_centerVertical="true"
  49 + android:layout_alignParentRight="true"
  50 + android:padding="10dp"
  51 + android:text="@string/myactivity"
  52 + android:textSize="15sp"
  53 + android:textColor="#333333"
  54 + />
  55 + </RelativeLayout>
8 <com.qmuiteam.qmui.widget.QMUITopBar 56 <com.qmuiteam.qmui.widget.QMUITopBar
9 android:id="@+id/topbar" 57 android:id="@+id/topbar"
10 android:layout_width="match_parent" 58 android:layout_width="match_parent"
moudle_pedometer/src/main/res/layout/item_my_record.xml
  View file @8cd7bf5
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"  
3 - xmlns:app="http://schemas.android.com/apk/res-auto" 2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
4 xmlns:FivePersonIconView="http://schemas.android.com/apk/res-auto" 3 xmlns:FivePersonIconView="http://schemas.android.com/apk/res-auto"
  4 + xmlns:app="http://schemas.android.com/apk/res-auto"
  5 + android:id="@+id/item_ly"
5 android:layout_width="match_parent" 6 android:layout_width="match_parent"
6 android:layout_height="wrap_content" 7 android:layout_height="wrap_content"
7 android:layout_margin="10dp" 8 android:layout_margin="10dp"
8 android:background="@color/white" 9 android:background="@color/white"
9 - android:orientation="vertical"  
10 - android:id="@+id/item_ly"  
11 - android:padding="10dp"> 10 + android:orientation="vertical">
12 11
13 - <TextView 12 + <ImageView
  13 + android:id="@+id/has_report"
14 android:layout_width="wrap_content" 14 android:layout_width="wrap_content"
15 android:layout_height="wrap_content" 15 android:layout_height="wrap_content"
16 - android:text="首都师范大学田径场" /> 16 + android:src="@drawable/yplx_registered"
  17 + android:layout_alignParentRight="true"
  18 + />
17 19
18 <LinearLayout 20 <LinearLayout
19 android:layout_width="match_parent" 21 android:layout_width="match_parent"
20 android:layout_height="wrap_content" 22 android:layout_height="wrap_content"
21 - android:layout_marginTop="10dp"> 23 + android:padding="10dp"
  24 + android:orientation="vertical">
22 25
23 <TextView 26 <TextView
  27 + android:id="@+id/line_name"
24 android:layout_width="wrap_content" 28 android:layout_width="wrap_content"
25 android:layout_height="wrap_content" 29 android:layout_height="wrap_content"
26 - android:drawableLeft="@drawable/icon_search"  
27 - android:drawablePadding="5dp"  
28 - android:text="@string/record_time" /> 30 + android:text="首都师范大学田径场"
  31 + android:textColor="#333333"
  32 + android:textSize="18sp" />
29 33
30 - <TextView  
31 - android:layout_width="wrap_content" 34 + <LinearLayout
  35 + android:layout_width="match_parent"
32 android:layout_height="wrap_content" 36 android:layout_height="wrap_content"
33 - android:layout_marginLeft="10dp"  
34 - android:text="2019.05.01--2019.09.01" />  
35 - </LinearLayout>  
36 -  
37 - <LinearLayout  
38 - android:layout_width="match_parent"  
39 - android:layout_height="wrap_content"  
40 - android:layout_marginTop="10dp">  
41 -  
42 - <TextView  
43 - android:layout_width="wrap_content" 37 + android:layout_marginTop="10dp">
  38 +
  39 + <TextView
  40 + android:layout_width="wrap_content"
  41 + android:layout_height="wrap_content"
  42 + android:drawableLeft="@drawable/sport_time"
  43 + android:drawablePadding="5dp"
  44 + android:text="@string/record_time"
  45 + android:textColor="#999999"
  46 + android:textSize="12sp" />
  47 +
  48 + <TextView
  49 + android:layout_width="wrap_content"
  50 + android:layout_height="wrap_content"
  51 + android:layout_marginLeft="10dp"
  52 + android:text="2019.05.01--2019.09.01"
  53 + android:textColor="#999999"
  54 + android:textSize="12sp" />
  55 + </LinearLayout>
  56 +
  57 + <LinearLayout
  58 + android:layout_width="match_parent"
44 android:layout_height="wrap_content" 59 android:layout_height="wrap_content"
45 - android:drawableLeft="@drawable/icon_search"  
46 - android:drawablePadding="5dp"  
47 - android:text="@string/record_place" />  
48 -  
49 - <TextView  
50 - android:layout_width="wrap_content" 60 + android:layout_marginTop="10dp">
  61 +
  62 + <TextView
  63 + android:layout_width="wrap_content"
  64 + android:layout_height="wrap_content"
  65 + android:drawableLeft="@drawable/sport_location"
  66 + android:drawablePadding="5dp"
  67 + android:text="@string/record_place"
  68 + android:textColor="#999999"
  69 + android:textSize="12sp" />
  70 +
  71 + <TextView
  72 + android:layout_width="wrap_content"
  73 + android:layout_height="wrap_content"
  74 + android:layout_marginLeft="10dp"
  75 + android:text="北京 首都师范大学 全长4.42公里"
  76 + android:textColor="#999999"
  77 + android:textSize="12sp" />
  78 + </LinearLayout>
  79 +
  80 + <LinearLayout
  81 + android:layout_width="match_parent"
51 android:layout_height="wrap_content" 82 android:layout_height="wrap_content"
52 - android:layout_marginLeft="10dp"  
53 - android:text="北京 首都师范大学 全长4.42公里" />  
54 - </LinearLayout>  
55 -  
56 - <LinearLayout  
57 - android:layout_width="match_parent"  
58 - android:layout_height="wrap_content"  
59 - android:orientation="horizontal"  
60 - android:layout_marginTop="10dp">  
61 -  
62 - <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView  
63 - android:id="@+id/join_person"  
64 - android:layout_width="150dp"  
65 - android:layout_height="40dp"  
66 - android:layout_marginRight="10dp"  
67 - FivePersonIconView:showRightFlag="false"/>  
68 -  
69 - <TextView 83 + android:layout_marginTop="10dp"
  84 + android:orientation="horizontal">
  85 +
  86 + <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView
  87 + android:id="@+id/join_person"
  88 + android:layout_width="150dp"
  89 + android:layout_height="40dp"
  90 + android:layout_marginRight="10dp"
  91 + FivePersonIconView:showRightFlag="false" />
  92 +
  93 + <TextView
  94 + android:layout_width="wrap_content"
  95 + android:layout_height="wrap_content"
  96 + android:layout_gravity="center"
  97 + android:layout_marginLeft="10dp"
  98 + android:text="123人参与" />
  99 +
  100 + </LinearLayout>
  101 +
  102 + <RelativeLayout
  103 + android:id="@+id/my_record_ry"
70 android:layout_width="wrap_content" 104 android:layout_width="wrap_content"
71 android:layout_height="wrap_content" 105 android:layout_height="wrap_content"
72 - android:text="123人参与"  
73 - android:layout_marginLeft="10dp"  
74 - android:layout_gravity="center"/> 106 + android:layout_marginTop="10dp">
  107 +
  108 + <TextView
  109 + android:layout_width="wrap_content"
  110 + android:layout_height="wrap_content"
  111 + android:layout_centerVertical="true"
  112 + android:text="3天后结束" />
  113 +
  114 + <TextView
  115 + android:id="@+id/check_raking"
  116 + android:layout_width="wrap_content"
  117 + android:layout_height="wrap_content"
  118 + android:layout_alignParentRight="true"
  119 + android:padding="10dp"
  120 + android:text="查看排行榜"
  121 + android:textColor="#23D41E" />
  122 +
  123 + <TextView
  124 + android:id="@+id/my_record"
  125 + android:layout_width="wrap_content"
  126 + android:layout_height="wrap_content"
  127 + android:layout_marginRight="10dp"
  128 + android:layout_toLeftOf="@id/check_raking"
  129 + android:padding="10dp"
  130 + android:text="我的成绩"
  131 + android:textColor="#23D41E" />
  132 +
  133 + </RelativeLayout>
75 134
76 </LinearLayout> 135 </LinearLayout>
77 136
78 - <RelativeLayout  
79 - android:id="@+id/my_record_ry"  
80 - android:layout_width="wrap_content"  
81 - android:layout_height="wrap_content"  
82 - android:layout_marginTop="10dp">  
83 -  
84 - <TextView  
85 - android:layout_width="wrap_content"  
86 - android:layout_height="wrap_content"  
87 - android:layout_centerVertical="true"  
88 - android:text="3天后结束" />  
89 -  
90 - <TextView  
91 - android:id="@+id/check_raking"  
92 - android:layout_width="wrap_content"  
93 - android:layout_height="wrap_content"  
94 - android:layout_alignParentRight="true"  
95 - android:padding="10dp"  
96 - android:text="查看排行榜"  
97 - android:textColor="#23D41E" />  
98 -  
99 - <TextView  
100 - android:id="@+id/my_record"  
101 - android:layout_width="wrap_content"  
102 - android:layout_height="wrap_content"  
103 - android:layout_marginRight="10dp"  
104 - android:layout_toLeftOf="@id/check_raking"  
105 - android:padding="10dp"  
106 - android:text="我的成绩"  
107 - android:textColor="#23D41E" />  
108 -  
109 - </RelativeLayout>  
110 -  
111 -</LinearLayout>  
112 \ No newline at end of file 137 \ No newline at end of file
  138 +</RelativeLayout>
113 \ No newline at end of file 139 \ No newline at end of file
moudle_pedometer/src/main/res/values/strings.xml
  View file @8cd7bf5
@@ -47,5 +47,8 @@ @@ -47,5 +47,8 @@
47 <string name="loc_check_internet">定位失败，请您检查您的网络状态!</string> 47 <string name="loc_check_internet">定位失败，请您检查您的网络状态!</string>
48 <string name="loc_open_gps">定位失败，建议您打开GPS!</string> 48 <string name="loc_open_gps">定位失败，建议您打开GPS!</string>
49 <string name="loc_open_wifi">定位失败，建议您打开Wi-Fi!</string> 49 <string name="loc_open_wifi">定位失败，建议您打开Wi-Fi!</string>
  50 + <string name="beijing">北京</string>
  51 + <string name="goline">约跑线路</string>
  52 + <string name="myactivity">我的活动</string>
50 <!----> 53 <!---->
51 </resources> 54 </resources>