Merge remote-tracking branch 'origin/master'

杨帅
2 parents 699f447d 0a92a0d0
Showing 8 changed files with 17 additions and 5 deletions
moudle_pedometer/src/main/res/drawable-hdpi/sport_location.png
moudle_pedometer/src/main/res/drawable-hdpi/sport_time.png
moudle_pedometer/src/main/res/drawable-xhdpi/sport_location.png
moudle_pedometer/src/main/res/drawable-xhdpi/sport_time.png
moudle_pedometer/src/main/res/drawable-xxhdpi/sport_location.png
moudle_pedometer/src/main/res/drawable-xxhdpi/sport_time.png
moudle_pedometer/src/main/res/layout/item_my_record.xml
moudle_pedometer/src/main/res/values/strings.xml
@@ -13,15 +13,14 @@
         android:id="@+id/has_report"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/yplx_registered"
         android:layout_alignParentRight="true"
-        />
+        android:src="@drawable/yplx_registered" />
  
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="10dp">
  
         <TextView
             android:id="@+id/line_name"
@@ -91,11 +90,22 @@
                 FivePersonIconView:showRightFlag="false" />
  
             <TextView
+                android:id="@+id/people_part"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
-                android:text="123人参与" />
+                android:text="@string/_123"
+                android:textColor="#333333"
+                android:textSize="15sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/has_part"
+                android:textColor="#333333"
+                android:textSize="12sp" />
  
         </LinearLayout>
  
@@ -50,5 +50,7 @@
     <string name="beijing">北京</string>
     <string name="goline">约跑线路</string>
     <string name="myactivity">我的活动</string>
+    <string name="_123">123</string>
+    <string name="has_part">人已参与</string>
     <!---->
 </resources>