Browse Source

1.优化代码

王鹏鹏 2 years ago
parent
commit
933a56fe23

+ 1 - 1
healthconsultation/src/main/res/layout/activity_consultation_request.xml

@@ -261,7 +261,7 @@
                     android:layout_marginBottom="@dimen/divider_36px"
                     android:background="@drawable/bg_submit"
                     android:gravity="center"
-                    android:text="@string/submit"
+                    android:text="@string/consultation"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_32px"
                     android:textStyle="bold"

+ 1 - 1
healthconsultation/src/main/res/layout/activity_payment.xml

@@ -244,7 +244,7 @@
                     android:layout_marginBottom="@dimen/divider_36px"
                     android:background="@drawable/bg_button_submit"
                     android:gravity="center"
-                    android:text="@string/submit"
+                    android:text="@string/payment"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_32px"
                     app:layout_constraintBottom_toBottomOf="parent"

+ 2 - 0
healthconsultation/src/main/res/values/strings.xml

@@ -60,4 +60,6 @@
     <string name="mark" tools:ignore="ResourceName">评分</string>
     <string name="cancel" tools:ignore="ResourceName">取消</string>
     <string name="complete" tools:ignore="ResourceName">完成</string>
+    <string name="consultation" tools:ignore="ResourceName">问诊</string>
+    <string name="payment" tools:ignore="ResourceName">支付</string>
 </resources>

+ 27 - 17
workbenches/src/main/res/layout/fragment_data_monitor.xml

@@ -136,27 +136,11 @@
             app:layout_constraintStart_toEndOf="@id/calendarLayout"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle">
 
-            <com.scwang.smartrefresh.layout.SmartRefreshLayout
-                android:id="@+id/swipeWeek"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rvWeek"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scrollbarStyle="insideOverlay"
-                    android:scrollbars="vertical"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/divider_55px"
                 android:layout_marginStart="@dimen/divider_20px"
-                android:layout_marginTop="@dimen/divider_26px"
+                android:layout_marginTop="@dimen/divider_16px"
                 android:layout_marginEnd="@dimen/divider_20px"
                 android:background="@drawable/bg_total_training_duration"
                 android:gravity="center"
@@ -178,6 +162,32 @@
                 android:textStyle="bold"
                 app:drawableStartCompat="@mipmap/icon_duration" />
 
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/swipeWeek"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rvWeek"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scrollbarStyle="insideOverlay"
+                    android:scrollbars="vertical"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+            <Button
+                android:id="@+id/btnTrainingDaily"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/divider_55px"
+                android:layout_marginStart="@dimen/divider_22px"
+                android:layout_marginEnd="@dimen/divider_18px"
+                android:text="@string/training_daily"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_28px" />
+
         </LinearLayout>