修改走路、喝水ui

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/MainActivity.kt

@@ -100,12 +100,6 @@ class MainActivity : BaseActivity(), MainView, View.OnClickListener {
             R.id.tab_rl_pan -> clickTab2Layout()
             R.id.tab_rl_friends -> {
                 clickTab3Layout()
-//                readyGo(AwardActivity::class.java)
-//                readyGo(WalkActivity::class.java)
-//                readyGo(EraseActivity::class.java)
-//                readyGo(WaterActivity::class.java)
-//                readyGo(LoginActivity::class.java)
-//                readyGo(DrawcashActivity::class.java)
             }
             R.id.tab_rl_my -> clickTab4Layout()
         }

GoodMoney/app/src/main/res/layout/activity_walk.xml

@@ -14,8 +14,8 @@
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="400dp"
-            android:background="@mipmap/bg_main_top">
+            android:layout_height="330dp"
+            android:background="@mipmap/bg_walk">
 
             <ImageView
                 android:id="@+id/ivWalkBack"
@@ -28,9 +28,9 @@
             <com.mints.goodmoney.ui.widgets.StepView
                 android:id="@+id/svWalk"
                 android:layout_width="375dp"
-                android:layout_height="230dp"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="110dp" />
+                android:layout_marginTop="70dp" />
 
         </FrameLayout>
     </LinearLayout>

GoodMoney/app/src/main/res/layout/activity_water.xml

@@ -14,8 +14,8 @@
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="400dp"
-            android:background="@mipmap/bg_main_top">
+            android:layout_height="330dp"
+            android:background="@mipmap/bg_water">
 
             <ImageView
                 android:id="@+id/ivWaterBack"
@@ -30,7 +30,7 @@
                 android:layout_width="375dp"
                 android:layout_height="230dp"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="110dp" />
+                android:layout_marginTop="80dp" />
         </FrameLayout>
     </LinearLayout>
 </ScrollView>

GoodMoney/app/src/main/res/layout/view_step.xml

@@ -2,24 +2,14 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="375dp"
-    android:layout_height="230dp"
+    android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:text="今日步数"
-        android:textColor="@color/white"
-        android:textSize="16sp" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
         android:layout_marginLeft="60dp"
         android:layout_marginRight="60dp"
-        android:layout_marginBottom="40dp"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
@@ -28,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="0"
-            android:textColor="@color/white"
+            android:textColor="#00895B"
             android:textSize="24sp" />
 
         <com.mints.goodmoney.ui.widgets.seekbar.BubbleSeekBar
@@ -77,7 +67,7 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="230dp">
+        android:layout_height="240dp">
 
         <LinearLayout
             android:id="@+id/ll_water_one"
@@ -104,6 +94,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="3dp"
                 android:text="金币奖励"
+                android:visibility="gone"
                 android:textColor="@color/white"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -133,6 +124,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="3dp"
+                android:visibility="gone"
                 android:text="金币奖励"
                 android:textColor="@color/white"
                 android:textSize="12sp" />
@@ -162,6 +154,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="3dp"
+                android:visibility="gone"
                 android:text="金币奖励"
                 android:textColor="@color/white"
                 android:textSize="12sp" />
@@ -193,9 +186,16 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="3dp"
                 android:text="金币奖励"
+                android:visibility="gone"
                 android:textColor="@color/white"
                 android:textSize="12sp" />
         </LinearLayout>
     </FrameLayout>
 
+    <ImageView
+        android:layout_width="wrap_content"
+        android:src="@mipmap/ic_walk"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="100dp"
+        android:layout_height="wrap_content"/>
 </FrameLayout>
\ No newline at end of file

GoodMoney/app/src/main/res/layout/view_water.xml

@@ -40,7 +40,7 @@
             android:layout_marginTop="5dp"
             android:layout_marginBottom="2dp"
             android:text="今日喝水目标"
-            android:textColor="@color/water_hint_color"
+            android:textColor="@color/main_yellow"
             android:textSize="12sp" />
 
         <TextView
@@ -57,7 +57,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="后喝水领金币"
-            android:textColor="@color/water_hint_color"
+            android:textColor="@color/grayc"
             android:textSize="12sp"
             android:visibility="invisible" />
     </LinearLayout>