hurixing 1 سال پیش
والد
کامیت
92615f3447

+ 6 - 6
home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -304,12 +304,12 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                                 showLayout(true)
                                 getGameList()
                             }
-                            binding.btnTask.text = "继续专属训练"
+                            binding.btnTask.text = "继续专属任务"
                         } else {
                             binding.btnTask.text = if (it.currentTaskNum == 1) {
-                                "开始专属训练"
+                                "开始专属任务"
                             } else {
-                                "继续专属训练"
+                                "继续专属任务"
                             }
                             showLayout(false)
                             if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
@@ -320,9 +320,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                         }
                     } else {
                         binding.btnTask.text = if (it.currentTaskNum == 1) {
-                            "开始专属训练"
+                            "开始专属任务"
                         } else {
-                            "继续专属训练"
+                            "继续专属任务"
                         }
                         if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus()).not()) {
                             User.saveTaskDialogStatus(User.getNowDay())
@@ -341,7 +341,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
      */
     private fun showTipDialog() {
         TipsDialog.TipDialogBuilder().title("恭喜您")
-            .content("您完成了今天的专属训练!今天的训练报告已生成,快去查看吧!")
+            .content("您完成了今天的专属任务!今天的训练报告已生成,快去查看吧!")
             .leftBtnText("稍后再看").rightBtnText("立即查看").leftClick({
                 showLayout(true)
                 getGameList()

+ 19 - 19
home/src/main/res/layout/activity_home.xml

@@ -94,24 +94,24 @@
                     app:layout_constraintStart_toStartOf="parent"
                     tools:ignore="MissingConstraints">
 
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:layout_width="@dimen/divider_68px"
-                        android:layout_height="@dimen/divider_65px"
-                        android:layout_marginTop="@dimen/divider_18px"
-                        android:scaleType="centerInside"
-                        android:src="@mipmap/icon_live_broadcast" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="@dimen/divider_122px"
-                        android:layout_height="@dimen/divider_42px"
-                        android:layout_marginTop="@dimen/divider_18px"
-                        android:background="@mipmap/icon_home_text"
-                        android:gravity="center"
-                        android:lineHeight="@dimen/divider_33px"
-                        android:text="@string/live_broadcast"
-                        android:textColor="@android:color/white"
-                        android:textSize="@dimen/divider_24px"
-                        android:textStyle="bold" />
+<!--                    <androidx.appcompat.widget.AppCompatImageView-->
+<!--                        android:layout_width="@dimen/divider_68px"-->
+<!--                        android:layout_height="@dimen/divider_65px"-->
+<!--                        android:layout_marginTop="@dimen/divider_18px"-->
+<!--                        android:scaleType="centerInside"-->
+<!--                        android:src="@mipmap/icon_live_broadcast" />-->
+
+<!--                    <androidx.appcompat.widget.AppCompatTextView-->
+<!--                        android:layout_width="@dimen/divider_122px"-->
+<!--                        android:layout_height="@dimen/divider_42px"-->
+<!--                        android:layout_marginTop="@dimen/divider_18px"-->
+<!--                        android:background="@mipmap/icon_home_text"-->
+<!--                        android:gravity="center"-->
+<!--                        android:lineHeight="@dimen/divider_33px"-->
+<!--                        android:text="@string/live_broadcast"-->
+<!--                        android:textColor="@android:color/white"-->
+<!--                        android:textSize="@dimen/divider_24px"-->
+<!--                        android:textStyle="bold" />-->
 
                 </LinearLayout>
 
@@ -393,7 +393,7 @@
                     android:layout_marginEnd="@dimen/divider_104px"
                     android:layout_marginBottom="@dimen/divider_58px"
                     android:background="@drawable/bg_home_task_btn"
-                    android:text="@string/start_exclusive_training"
+                    android:text="@string/start_exclusive_training_2"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_28px"
                     android:textStyle="bold" />

+ 3 - 2
home/src/main/res/values/strings.xml

@@ -17,10 +17,10 @@
     <string name="training_weekly_report" tools:ignore="ResourceName">训练周报</string>
     <string name="report_number" tools:ignore="ResourceName">报告编号</string>
     <string name="play_with_blue_porpoise" tools:ignore="ResourceName">畅游蓝豚</string>
-    <string name="professional_evaluation" tools:ignore="ResourceName">专业测评</string>
+    <string name="professional_evaluation" tools:ignore="ResourceName">量表测评</string>
     <string name="health_counseling" tools:ignore="ResourceName">健康咨询</string>
     <string name="fun_time" tools:ignore="ResourceName">轻松一刻</string>
-    <string name="start_exclusive_training" tools:ignore="ResourceName">开始专属训练</string>
+    <string name="start_exclusive_training" tools:ignore="ResourceName">开始专属任务</string>
     <string name="next_page" tools:ignore="ResourceName">下一页</string>
     <string name="previous_page" tools:ignore="ResourceName">上一页</string>
     <string name="rehabilitation_classroom" tools:ignore="ResourceName">康复课堂</string>
@@ -86,4 +86,5 @@
     <string name="exclusive_training" tools:ignore="ResourceName">理疗任务</string>
     <string name="training_report_score" tools:ignore="ResourceName">训练报告</string>
     <string name="professional_evaluation_new" tools:ignore="ResourceName">量表测评</string>
+    <string name="start_exclusive_training_2" tools:ignore="ResourceName">开始专属任务</string>
 </resources>

+ 26 - 0
login/src/main/res/layout/activity_login.xml

@@ -35,6 +35,7 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/qiangnao"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_20px"
@@ -46,6 +47,31 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/appImage" />
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/xinghao"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/divider_20px"
+                android:text="@string/app_model"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_28px"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/qiangnao" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/divider_20px"
+                android:text="@string/app_version"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_26px"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/xinghao" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout

+ 1 - 1
workbenches/src/main/res/values/strings.xml

@@ -56,7 +56,7 @@
     <string name="game_duration_info" tools:ignore="ResourceName">游戏时长(秒)</string>
     <string name="game_level" tools:ignore="ResourceName">游戏级别</string>
     <string name="status" tools:ignore="ResourceName">状态</string>
-    <string name="exclusive_training" tools:ignore="ResourceName">理疗任务</string>
+    <string name="exclusive_training" tools:ignore="ResourceName">专属任务</string>
     <string name="trends_changes_primary_brain_abilities" tools:ignore="ResourceName">一级脑能力变化趋势</string>
     <string name="pay_countdown" tools:ignore="ResourceName">支付倒计时:15分钟</string>
     <string name="physical_therapy_details" tools:ignore="ResourceName">理疗详情</string>