1.添加直播统计是和否接口

.idea/misc.xml

@@ -140,7 +140,7 @@
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/activity_evaluation.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/activity_evaluation_history.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/activity_evaluation_result.xml" value="0.23697916666666666" />
-        <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/activity_home.xml" value="0.2" />
+        <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/activity_home.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/fragment_down_load_app.xml" value="0.21064814814814814" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/item_evaluation_history.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/item_evaluation_result.xml" value="0.23697916666666666" />

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

@@ -115,6 +115,8 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
             btnNextPage.setOnTouchListener(this@HomeActivity)
             //开始专属训练
             btnTask.setOnTouchListener(this@HomeActivity)
+            //开始训练蒙版
+            opneBtn.setOnTouchListener(this@HomeActivity)
         }
     }
 
@@ -410,7 +412,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      */
     private fun showLayout(isShow: Boolean) {
         binding {
-            gameLayout.show(isShow)
+            effectLayout.show(isShow)
             taskLayout.show(isShow.not())
         }
     }
@@ -531,7 +533,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                 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.btnNextPage || v.id == R.id.btnTask
+                    v.id == R.id.btnCheck || v.id == R.id.btnNextPage || v.id == R.id.btnTask || v.id == R.id.opneBtn
                 ) {
                     v.startAnimation(getScaleAnimation())
                 }
@@ -607,13 +609,20 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                             }
                         }
                     }
+                    //开始训练蒙版
+                    R.id.opneBtn -> {
+                        binding {
+                            gameLayout.show(true)
+                            effectLayout.show(false)
+                        }
+                    }
                 }
             }
             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.btnNextPage || v.id == R.id.btnTask
+                    v.id == R.id.btnCheck || v.id == R.id.btnNextPage || v.id == R.id.btnTask || v.id == R.id.opneBtn
                 ) {
                     v.startAnimation(getEndAnimation())
                 }

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

@@ -28,17 +28,17 @@
             android:id="@+id/titleLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/headLayout"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                app:layout_constraintEnd_toStartOf="@id/functionLayout"
                 app:layout_constraintHorizontal_weight="1"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/functionLayout"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -54,8 +54,8 @@
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -76,9 +76,9 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_weight="1.6"
                 app:layout_constraintStart_toEndOf="@id/headLayout"
-                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <LinearLayout
@@ -86,8 +86,8 @@
                     style="@style/workbenches_operate_btn"
                     android:layout_gravity="center_horizontal"
                     android:gravity="center_horizontal"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/layoutHelp"
+                    app:layout_constraintStart_toStartOf="parent"
                     tools:ignore="MissingConstraints">
 
                     <androidx.appcompat.widget.AppCompatImageView
@@ -109,8 +109,8 @@
                     android:id="@+id/layoutHelp"
                     style="@style/workbenches_operate_btn"
                     android:gravity="center_horizontal"
-                    app:layout_constraintStart_toEndOf="@+id/layoutLiveBroadcast"
                     app:layout_constraintEnd_toStartOf="@+id/layoutNotify"
+                    app:layout_constraintStart_toEndOf="@+id/layoutLiveBroadcast"
                     tools:ignore="MissingConstraints">
 
                     <androidx.appcompat.widget.AppCompatImageView
@@ -130,8 +130,8 @@
                     android:id="@+id/layoutNotify"
                     style="@style/workbenches_operate_btn"
                     android:gravity="center_horizontal"
-                    app:layout_constraintStart_toEndOf="@+id/layoutHelp"
                     app:layout_constraintEnd_toStartOf="@+id/layoutServicePackage"
+                    app:layout_constraintStart_toEndOf="@+id/layoutHelp"
                     tools:ignore="MissingConstraints">
 
                     <androidx.appcompat.widget.AppCompatImageView
@@ -141,8 +141,8 @@
                         android:layout_marginTop="@dimen/divider_37px"
                         android:background="@mipmap/icon_notify"
                         android:scaleType="centerInside"
-                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <View
@@ -153,16 +153,16 @@
                         android:layout_marginTop="@dimen/divider_37px"
                         android:background="@drawable/shape_ract_gold"
                         android:visibility="gone"
-                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <androidx.appcompat.widget.AppCompatTextView
                         style="@style/workbenches_home_text"
                         android:layout_marginTop="@dimen/divider_8px"
                         android:text="@string/notify"
-                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/notifyImage" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -170,8 +170,8 @@
                     android:id="@+id/layoutServicePackage"
                     style="@style/workbenches_operate_btn"
                     android:gravity="center_horizontal"
-                    app:layout_constraintStart_toEndOf="@+id/layoutNotify"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/layoutNotify"
                     tools:ignore="MissingConstraints">
 
                     <androidx.appcompat.widget.AppCompatImageView
@@ -199,9 +199,9 @@
             android:layout_marginBottom="@dimen/divider_48px"
             app:cardCornerRadius="@dimen/divider_28px"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/rightLayout"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/rightLayout"
             app:layout_constraintTop_toBottomOf="@+id/titleLayout">
 
             <LinearLayout
@@ -211,6 +211,7 @@
                 android:layout_gravity="center_horizontal"
                 android:background="@mipmap/icon_occupy_bitmap"
                 android:gravity="center_horizontal"
+                android:visibility="gone"
                 android:orientation="vertical">
 
                 <androidx.recyclerview.widget.RecyclerView
@@ -235,6 +236,41 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/effectLayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_horizontal"
+                android:background="@mipmap/icon_effect"
+                android:orientation="vertical">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginStart="@dimen/divider_43px"
+                    android:layout_marginTop="@dimen/divider_316px"
+                    android:layout_marginEnd="@dimen/divider_49px"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="欢迎使用未来海豚认知训练平台平台为您提供针对脑认知的各种类型的训练，您也可以根据您的训练数据优化训练方向。"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_24px" />
+
+                <androidx.appcompat.widget.AppCompatButton
+                    android:id="@+id/opneBtn"
+                    android:layout_width="@dimen/divider_315px"
+                    android:layout_height="@dimen/divider_88px"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="@dimen/divider_29px"
+                    android:background="@mipmap/icon_rectangle_button"
+                    android:gravity="center"
+                    android:text="开始训练"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/taskLayout"
                 android:layout_width="match_parent"
@@ -257,8 +293,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
                         app:loadImg="@{task.getGameImage()}"
                         app:roundRadius="@{8}" />
@@ -274,8 +310,8 @@
                         android:textSize="@dimen/divider_28px"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent" />
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -303,17 +339,17 @@
             android:layout_marginEnd="@dimen/divider_40px"
             android:layout_marginBottom="@dimen/divider_48px"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_weight="1.3"
             app:layout_constraintStart_toEndOf="@id/leftLayout"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/titleLayout">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/tvPlayPorpoise"
                 style="@style/home_right_tools_layout"
                 android:background="@drawable/bg_play_porpoise"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/tvProfessionalEvaluation"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -323,8 +359,8 @@
                     android:layout_marginTop="@dimen/divider_47px"
                     android:background="@mipmap/icon_enjoy"
                     android:scaleType="centerInside"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -339,8 +375,8 @@
                 android:id="@+id/tvProfessionalEvaluation"
                 style="@style/home_right_tools_layout"
                 android:background="@drawable/bg_professional_evaluation"
-                app:layout_constraintStart_toEndOf="@id/tvPlayPorpoise"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tvPlayPorpoise"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -365,8 +401,8 @@
                 style="@style/home_right_tools_layout"
                 android:layout_marginTop="@dimen/divider_28px"
                 android:background="@drawable/bg_health_counseling"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/tvfunTime"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvPlayPorpoise">
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -392,8 +428,8 @@
                 android:layout_marginTop="@dimen/divider_28px"
                 android:background="@drawable/bg_fun_time"
                 android:gravity="center"
-                app:layout_constraintStart_toEndOf="@id/tvHealthCounseling"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tvHealthCounseling"
                 app:layout_constraintTop_toBottomOf="@+id/tvPlayPorpoise">
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -419,8 +455,8 @@
                 android:layout_marginTop="@dimen/divider_28px"
                 android:background="@drawable/bg_data_content"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvHealthCounseling">
 
                 <LinearLayout
@@ -430,9 +466,9 @@
                     android:gravity="center"
                     android:orientation="vertical"
                     app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/accumulatedTrainingDurationLayout"
                     app:layout_constraintHorizontal_weight="1"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toStartOf="@id/accumulatedTrainingDurationLayout"
                     app:layout_constraintTop_toTopOf="parent">
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -460,9 +496,9 @@
                     android:gravity="center"
                     android:orientation="vertical"
                     app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/checkLayout"
                     app:layout_constraintHorizontal_weight="1"
                     app:layout_constraintStart_toEndOf="@id/brainPowerValueLayout"
-                    app:layout_constraintEnd_toStartOf="@id/checkLayout"
                     app:layout_constraintTop_toTopOf="parent">
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -489,9 +525,9 @@
                     android:layout_height="match_parent"
                     android:gravity="center"
                     app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_weight="1"
                     app:layout_constraintStart_toEndOf="@id/accumulatedTrainingDurationLayout"
-                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
 
                     <Button

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

@@ -36,6 +36,8 @@
     <dimen name="divider_329px" tools:ignore="ResourceName">329px</dimen>
     <dimen name="divider_327px" tools:ignore="ResourceName">327px</dimen>
     <dimen name="divider_320px" tools:ignore="ResourceName">320px</dimen>
+    <dimen name="divider_316px" tools:ignore="ResourceName">316px</dimen>
+    <dimen name="divider_315px" tools:ignore="ResourceName">315px</dimen>
     <dimen name="divider_313px" tools:ignore="ResourceName">313px</dimen>
     <dimen name="divider_307px" tools:ignore="ResourceName">307px</dimen>
     <dimen name="divider_289px" tools:ignore="ResourceName">289px</dimen>