修改UI

baselib/build.gradle

@@ -37,8 +37,8 @@ android {
             buildConfigField "String", "TENCENT_LICENCEKEY", "\"0258811f9d756fea82c9a2d2cbd439bd\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
 //            buildConfigField "String", "BUGLY_APPID", "\"d400f20398\""
-            buildConfigField "String", "API_URL", "\"http://192.168.0.109:8110\""
-//            buildConfigField "String", "API_URL", "\"https://yaorong.yaorongmedical.com/hcp-app-api\""
+//            buildConfigField "String", "API_URL", "\"http://192.168.0.109:8110\""
+            buildConfigField "String", "API_URL", "\"https://yaorong.yaorongmedical.com/hcp-app-api\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -37,6 +37,7 @@ import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.player.VoicePlayer
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.*
+import com.yingyangfly.home.adapter.ExclusiveGameAdapter
 import com.yingyangfly.home.adapter.GameAdapter
 import com.yingyangfly.home.component.ShowFunTimeViewComponent
 import com.yingyangfly.home.component.ShowHealthCounselingViewComponent
@@ -77,6 +78,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
 
     private var hertzAudioUrl:String = ""
 
+    // 专属任务
+    private val exclusiveGameAdapter by lazy { ExclusiveGameAdapter() }
+
     override fun initViews() {
         voicePlayer = VoicePlayer.getInstance(mContext)
         binding {
@@ -93,6 +97,14 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                     jumpWebView(it)
                 }
             }
+            //专属训练
+            rvExclusiveGame.layoutManager = LinearLayoutManager(this@HomeActivity, RecyclerView.HORIZONTAL, false)
+            rvExclusiveGame.adapter = exclusiveGameAdapter
+            exclusiveGameAdapter.onExclusiveGameImageClickListener = {
+                if (TextUtils.equals("1",it.status)){
+                    gameLoading(it)
+                }
+            }
         }
     }
 
@@ -131,13 +143,15 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
             //查看
             btnCheck.setOnTouchListener(this@HomeActivity)
             //开始专属训练
-            btnTask.setOnTouchListener(this@HomeActivity)
+//            btnTask.setOnTouchListener(this@HomeActivity)
             //开始训练蒙版
             opneBtn.setOnTouchListener(this@HomeActivity)
             // 认知训练
             renzhixunlian.setOnTouchListener(this@HomeActivity)
             // 40HZ
             hzAudioId.setOnTouchListener(this@HomeActivity)
+            // 返回上一级
+            returnToUpperLevel.setOnTouchListener(this@HomeActivity)
         }
     }
 
@@ -274,6 +288,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                         val index = it.currentTaskNum - 1
                         currentTaskRecord = it.details[index]
                         taskList.addAll(it.details)
+                        exclusiveGameAdapter.setData(it.details)
                     }
                     if (it.currentTaskNum == it.totalTaskNum) {
                         if (TextUtils.equals("0", it.status)) {
@@ -287,13 +302,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                                 showLayout(true)
                                 getGameList()
                             }
-                            binding.btnTask.text = "继续专属训练"
                         } else {
-                            binding.btnTask.text = if (it.currentTaskNum == 1) {
-                                "开始专属训练"
-                            } else {
-                                "继续专属训练"
-                            }
                             showLayout(false)
                             if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
                                     .not()
@@ -302,11 +311,6 @@ 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())
                         }
@@ -461,7 +465,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
-                if (v.id == R.id.hzAudioId ||v.id == R.id.renzhixunlian ||v.id == R.id.imageSetting || v.id == R.id.layoutLiveBroadcast || v.id == R.id.layoutHelp || v.id == R.id.layoutNotify || v.id == R.id.layoutServicePackage || v.id == R.id.tvPlayPorpoise || v.id == R.id.tvProfessionalEvaluation || v.id == R.id.tvHealthCounseling || v.id == R.id.tvfunTime || v.id == R.id.btnCheck || v.id == R.id.btnTask || v.id == R.id.opneBtn) {
+                if (v.id == R.id.returnToUpperLevel || v.id == R.id.hzAudioId ||v.id == R.id.renzhixunlian ||v.id == R.id.imageSetting || v.id == R.id.layoutLiveBroadcast || v.id == R.id.layoutHelp || v.id == R.id.layoutNotify || v.id == R.id.layoutServicePackage || v.id == R.id.tvPlayPorpoise || v.id == R.id.tvProfessionalEvaluation || v.id == R.id.tvHealthCounseling || v.id == R.id.tvfunTime || v.id == R.id.btnCheck || v.id == R.id.opneBtn) {
                     v.startAnimation(getScaleAnimation())
                 }
             }
@@ -470,6 +474,12 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                 v.startAnimation(getEndAnimation())
                 voicePlayer?.stop()
                 when (v.id) {
+                    // 返回上一级
+                    R.id.returnToUpperLevel ->{
+                        binding {
+                            effectLayout.show(true)
+                            interstellarLayout.show(false) }
+                    }
                     // 认知训练
                     R.id.renzhixunlian ->{
                         binding {
@@ -547,12 +557,12 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                         JumpUtil.jumpActivity(RouterUrlCommon.trainData, mContext)
                     }
 
-                    R.id.btnTask -> {
-                        //开始专属训练
-                        if (currentTaskRecord != null) {
-                            gameLoading(currentTaskRecord!!)
-                        }
-                    }
+//                    R.id.btnTask -> {
+//                        //开始专属训练
+//                        if (currentTaskRecord != null) {
+//                            gameLoading(currentTaskRecord!!)
+//                        }
+//                    }
                     //开始训练蒙版
                     R.id.opneBtn -> {
                         binding {
@@ -570,7 +580,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
             }
 
             MotionEvent.ACTION_CANCEL -> {
-                if (v.id == R.id.imageSetting || v.id == R.id.layoutLiveBroadcast || v.id == R.id.layoutHelp || v.id == R.id.layoutNotify || v.id == R.id.layoutServicePackage || v.id == R.id.tvPlayPorpoise || v.id == R.id.tvProfessionalEvaluation || v.id == R.id.tvHealthCounseling || v.id == R.id.tvfunTime || v.id == R.id.btnCheck  || v.id == R.id.btnTask || v.id == R.id.opneBtn) {
+                if (v.id == R.id.imageSetting || v.id == R.id.layoutLiveBroadcast || v.id == R.id.layoutHelp || v.id == R.id.layoutNotify || v.id == R.id.layoutServicePackage || v.id == R.id.tvPlayPorpoise || v.id == R.id.tvProfessionalEvaluation || v.id == R.id.tvHealthCounseling || v.id == R.id.tvfunTime || v.id == R.id.btnCheck || v.id == R.id.opneBtn) {
                     v.startAnimation(getEndAnimation())
                 }
             }

home/src/main/java/com/yingyangfly/home/adapter/ExclusiveGameAdapter.kt

@@ -0,0 +1,49 @@
+package com.yingyangfly.home.adapter
+
+import android.annotation.SuppressLint
+import android.text.TextUtils
+import com.yingyang.home.R
+import com.yingyang.home.databinding.ItemExclusiveGameBinding
+import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
+import com.yingyangfly.baselib.bean.Record
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+
+class ExclusiveGameAdapter (override val layoutId: Int = R.layout.item_exclusive_game) :
+    BaseDataBindingAdapter<Record, ItemExclusiveGameBinding>() {
+
+    var onExclusiveGameImageClickListener: ((bean: Record) -> Unit)? = null
+
+    @SuppressLint("NotifyDataSetChanged")
+    override fun onBindViewHolder(binding: ItemExclusiveGameBinding, item: Record, position: Int) {
+        binding.data = item
+        if (TextUtils.equals("0",item.status)){
+            binding.gameImage.setAlpha(0.3f)
+        }
+        if (TextUtils.equals("A",item.gameType)){
+            binding.gameTypeId.setText("定向力")
+        }
+        if (TextUtils.equals("B",item.gameType)){
+            binding.gameTypeId.setText("记忆力")
+        }
+        if (TextUtils.equals("C",item.gameType)){
+            binding.gameTypeId.setText("执行能力")
+        }
+        if (TextUtils.equals("D",item.gameType)){
+            binding.gameTypeId.setText("注意力")
+        }
+        if (TextUtils.equals("E",item.gameType)){
+            binding.gameTypeId.setText("语言能力")
+        }
+        if (TextUtils.equals("F",item.gameType)){
+            binding.gameTypeId.setText("计算力")
+        }
+        if (TextUtils.equals("G",item.gameType)){
+            binding.gameTypeId.setText("感知觉")
+        }
+        binding.gameLayout.setOnSingleClickListener {
+            onExclusiveGameImageClickListener?.invoke(item)
+        }
+    }
+
+
+}

home/src/main/res/layout/activity_home.xml

@@ -5,7 +5,6 @@
     tools:ignore="ResourceName">
 
     <data>
-
         <import type="com.yingyangfly.baselib.utils.User" />
 
         <variable
@@ -46,11 +45,10 @@
                     android:id="@+id/tvUserName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/divider_111px"
+                    android:layout_marginStart="@dimen/divider_140px"
                     android:layout_marginEnd="@dimen/divider_31px"
                     android:background="@mipmap/icon_text_bg"
                     android:gravity="center"
-                    android:paddingStart="@dimen/divider_28px"
                     android:paddingTop="@dimen/divider_12px"
                     android:paddingBottom="@dimen/divider_16px"
                     android:textColor="@color/color_FFFFFF"
@@ -93,15 +91,13 @@
                 android:layout_marginTop="@dimen/divider_30px"
                 android:layout_height="wrap_content"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_weight="1.6"
+                app:layout_constraintHorizontal_weight="1.3"
                 app:layout_constraintStart_toEndOf="@id/headLayout"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <LinearLayout
                     android:id="@+id/layoutLiveBroadcast"
                     style="@style/workbenches_operate_btn"
-                    android:layout_gravity="center_horizontal"
-                    android:gravity="center_horizontal"
                     app:layout_constraintEnd_toStartOf="@+id/layoutHelp"
                     app:layout_constraintStart_toStartOf="parent"
                     tools:ignore="MissingConstraints">
@@ -112,7 +108,6 @@
                     android:id="@+id/layoutHelp"
                     android:layout_width="@dimen/divider_111px"
                     android:layout_height="@dimen/divider_96px"
-                    android:gravity="center_horizontal"
                     android:background="@mipmap/icon_help"
                     app:layout_constraintEnd_toStartOf="@+id/layoutNotify"
                     app:layout_constraintStart_toEndOf="@+id/layoutLiveBroadcast"
@@ -123,7 +118,6 @@
                     android:id="@+id/layoutNotify"
                     android:layout_width="@dimen/divider_111px"
                     android:layout_height="@dimen/divider_96px"
-                    android:gravity="center_horizontal"
                     android:background="@mipmap/icon_notify"
                     app:layout_constraintEnd_toStartOf="@+id/layoutServicePackage"
                     app:layout_constraintStart_toEndOf="@+id/layoutHelp"
@@ -134,7 +128,6 @@
                     android:id="@+id/layoutServicePackage"
                     android:layout_width="@dimen/divider_111px"
                     android:layout_height="@dimen/divider_96px"
-                    android:gravity="center_horizontal"
                     android:background="@mipmap/icon_service_package"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/layoutNotify"
@@ -178,9 +171,10 @@
                         android:background="@mipmap/icon_tittle_bg">
 
                         <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/returnToUpperLevel"
                             style="@style/home_right_tools_text"
                             android:layout_marginTop="@dimen/divider_10px"
-                            android:text="@string/cognitive_training"
+                            android:text="@string/return_to_upper_level"
                             android:textColor="@color/color_E8FBFF"
                             android:textSize="@dimen/divider_25px"
                             android:textStyle="bold"
@@ -339,52 +333,78 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_horizontal"
                 android:background="@mipmap/icon_effect"
-                android:gravity="center_horizontal"
                 android:orientation="vertical"
                 android:visibility="gone">
 
-                <androidx.cardview.widget.CardView
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="@dimen/divider_200px"
+                    android:layout_height="@dimen/divider_55px"
+                    android:layout_marginTop="@dimen/divider_23px"
+                    android:layout_marginStart="@dimen/divider_60px"
+                    android:background="@mipmap/icon_tittle_bg">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/home_right_tools_text"
+                        android:layout_marginTop="@dimen/divider_10px"
+                        android:text="@string/exclusive_training"
+                        android:textColor="@color/color_E8FBFF"
+                        android:textSize="@dimen/divider_25px"
+                        android:textStyle="bold"
+                        tools:ignore="MissingConstraints" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rvExclusiveGame"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_marginStart="@dimen/divider_65px"
-                    android:layout_marginTop="@dimen/divider_63px"
-                    android:layout_marginEnd="@dimen/divider_65px"
-                    android:layout_weight="1"
-                    app:cardCornerRadius="@dimen/divider_28px">
-
-                    <ImageView
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        app:loadImg="@{task.getGameImage()}" />
-
-                    <androidx.appcompat.widget.AppCompatButton
-                        android:layout_width="@dimen/divider_264px"
-                        android:layout_height="@dimen/divider_50px"
-                        android:layout_gravity="center_horizontal|bottom"
-                        android:layout_marginBottom="@dimen/divider_16px"
-                        android:background="@drawable/bg_home_task_progress"
-                        android:gravity="center"
-                        android:text='@{"当前游戏"+task.currentTaskNum+"/"+task.totalTaskNum}'
-                        android:textColor="@android:color/white"
-                        android:textSize="@dimen/divider_28px"
-                        android:textStyle="bold" />
-
-                </androidx.cardview.widget.CardView>
-
-                <Button
-                    android:id="@+id/btnTask"
-                    android:layout_width="@dimen/divider_315px"
-                    android:layout_height="@dimen/divider_73px"
-                    android:layout_marginStart="@dimen/divider_105px"
-                    android:layout_marginTop="@dimen/divider_25px"
-                    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:textColor="@android:color/white"
-                    android:textSize="@dimen/divider_28px"
-                    android:textStyle="bold" />
+                    android:layout_marginStart="@dimen/divider_52px"
+                    android:layout_marginTop="@dimen/divider_50px"
+                    android:layout_marginEnd="@dimen/divider_52px"
+                    android:layout_weight="1" />
+
+<!--                <androidx.cardview.widget.CardView-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="0dp"-->
+<!--                    android:layout_marginStart="@dimen/divider_65px"-->
+<!--                    android:layout_marginTop="@dimen/divider_63px"-->
+<!--                    android:layout_marginEnd="@dimen/divider_65px"-->
+<!--                    android:layout_weight="1"-->
+<!--                    app:cardCornerRadius="@dimen/divider_28px">-->
+
+<!--                    <ImageView-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="match_parent"-->
+<!--                        android:scaleType="centerCrop"-->
+<!--                        app:loadImg="@{task.getGameImage()}" />-->
+
+<!--                    <androidx.appcompat.widget.AppCompatButton-->
+<!--                        android:layout_width="@dimen/divider_264px"-->
+<!--                        android:layout_height="@dimen/divider_50px"-->
+<!--                        android:layout_gravity="center_horizontal|bottom"-->
+<!--                        android:layout_marginBottom="@dimen/divider_16px"-->
+<!--                        android:background="@drawable/bg_home_task_progress"-->
+<!--                        android:gravity="center"-->
+<!--                        android:text='@{"当前游戏"+task.currentTaskNum+"/"+task.totalTaskNum}'-->
+<!--                        android:textColor="@android:color/white"-->
+<!--                        android:textSize="@dimen/divider_28px"-->
+<!--                        android:textStyle="bold" />-->
+
+<!--                </androidx.cardview.widget.CardView>-->
+
+<!--                <Button-->
+<!--                    android:id="@+id/btnTask"-->
+<!--                    android:layout_width="@dimen/divider_315px"-->
+<!--                    android:layout_height="@dimen/divider_73px"-->
+<!--                    android:layout_marginStart="@dimen/divider_105px"-->
+<!--                    android:layout_marginTop="@dimen/divider_25px"-->
+<!--                    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:textColor="@android:color/white"-->
+<!--                    android:textSize="@dimen/divider_28px"-->
+<!--                    android:textStyle="bold" />-->
 
             </LinearLayout>
         </FrameLayout>

home/src/main/res/layout/item_exclusive_game.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <data>
+
+        <variable
+            name="data"
+            type="com.yingyangfly.baselib.bean.Record" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/gameLayout"
+        android:layout_width="@dimen/divider_190px"
+        android:layout_height="@dimen/divider_325px"
+        android:layout_marginStart="@dimen/divider_14px"
+        android:layout_marginTop="@dimen/divider_26px"
+        android:layout_marginEnd="@dimen/divider_14px">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/gameImage"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:loadImg="@{data.gameCoverImage}"
+             />
+
+        <TextView
+            android:id="@+id/gameTypeId"
+            android:layout_width="@dimen/divider_108px"
+            android:layout_height="@dimen/divider_46px"
+            android:gravity="center"
+            android:textColor="@color/color_F4792B"
+            android:textSize="@dimen/divider_20px"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:layout_width="@dimen/divider_183px"
+            android:layout_height="@dimen/divider_65px"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/divider_5px"
+                android:text="@{data.gameName}"
+                android:textColor="@color/color_ADF1FE"
+                android:textSize="@dimen/divider_24px"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

home/src/main/res/values/dimens.xml

@@ -108,6 +108,7 @@
     <dimen name="divider_128px" tools:ignore="ResourceName">128px</dimen>
     <dimen name="divider_127px" tools:ignore="ResourceName">127px</dimen>
     <dimen name="divider_126px" tools:ignore="ResourceName">126px</dimen>
+    <dimen name="divider_125px" tools:ignore="ResourceName">122px</dimen>
     <dimen name="divider_122px" tools:ignore="ResourceName">122px</dimen>
     <dimen name="divider_120px" tools:ignore="ResourceName">120px</dimen>
     <dimen name="divider_119px" tools:ignore="ResourceName">119px</dimen>

home/src/main/res/values/strings.xml

@@ -82,4 +82,6 @@
     <string name="correct_options" tools:ignore="ResourceName">正确答案</string>
     <string name="is_correct" tools:ignore="ResourceName">是否正确</string>
     <string name="hz_audio" tools:ignore="ResourceName">40HZ音频</string>
+    <string name="return_to_upper_level" tools:ignore="ResourceName">返回上一级</string>
+    <string name="exclusive_training" tools:ignore="ResourceName">专属训练</string>
 </resources>

mmse/src/main/res/layout/activity_questions.xml

@@ -13,9 +13,16 @@
             style="@style/back_layout"
             tools:ignore="MissingConstraints">
 
-            <androidx.appcompat.widget.AppCompatImageView style="@style/back_image" />
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="@dimen/divider_110px"
+                android:layout_height="@dimen/divider_48px"
+                android:layout_marginTop="@dimen/divider_40px"
+                android:layout_marginStart="@dimen/divider_40px"
+                android:background="@mipmap/icon_back_1"/>
 
-            <androidx.appcompat.widget.AppCompatTextView style="@style/back_text" />
+<!--            <androidx.appcompat.widget.AppCompatImageView style="@style/back_image" />-->
+
+<!--            <androidx.appcompat.widget.AppCompatTextView style="@style/back_text" />-->
         </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView

moca/src/main/res/layout/activity_moca.xml

@@ -13,9 +13,16 @@
             style="@style/back_layout"
             tools:ignore="MissingConstraints">
 
-            <androidx.appcompat.widget.AppCompatImageView style="@style/back_image" />
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="@dimen/divider_110px"
+                android:layout_height="@dimen/divider_48px"
+                android:layout_marginTop="@dimen/divider_40px"
+                android:layout_marginStart="@dimen/divider_40px"
+                android:background="@mipmap/icon_back_1"/>
 
-            <androidx.appcompat.widget.AppCompatTextView style="@style/back_text" />
+<!--            <androidx.appcompat.widget.AppCompatImageView style="@style/back_image" />-->
+
+<!--            <androidx.appcompat.widget.AppCompatTextView style="@style/back_text" />-->
         </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView

workbenches/src/main/res/layout/fragment_train_content.xml

@@ -13,6 +13,21 @@
         android:layout_height="match_parent"
         android:background="@mipmap/tongyong_bg">
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/divider_80px"
+            android:layout_marginTop="@dimen/divider_32px"
+            android:background="@mipmap/tittle_bg_1"
+            android:gravity="center"
+            android:text="@string/tab3"
+            android:textColor="@color/white"
+            android:textSize="@dimen/divider_42px"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/contentTitleLayout"
             android:layout_width="match_parent"

workbenches/src/main/res/layout/fragment_train_report.xml

@@ -14,6 +14,21 @@
         android:layout_height="match_parent"
         android:background="@mipmap/tongyong_bg">
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/divider_80px"
+            android:layout_marginTop="@dimen/divider_32px"
+            android:background="@mipmap/tittle_bg_1"
+            android:gravity="center"
+            android:text="@string/tab4"
+            android:textColor="@color/white"
+            android:textSize="@dimen/divider_42px"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <LinearLayout
             android:id="@+id/layoutTitle"
             android:layout_width="match_parent"