1.添加游戏结算页面

.idea/misc.xml

@@ -503,8 +503,15 @@
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_consultation_request.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_doctor_details.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_payment.xml" value="0.23697916666666666" />
-        <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/activity_evaluation_result.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/home/src/main/res/drawable/bg_results_content.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/activity_binding_evaluation.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/activity_evaluation.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/activity_evaluation_history.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/activity_evaluation_result.xml" value="0.5309218203033839" />
         <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/activity_home.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/activity_review_result_detail.xml" value="0.4" />
+        <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/item_evaluation_history.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/item_evaluation_result.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/item_game.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_item_live_broadcast.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_live_status.xml" value="0.1715" />

baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt

@@ -190,6 +190,11 @@ object RouterUrlCommon {
      */
     const val bindingEvaluation = "/binding/evaluation"
 
+    /**
+     * 测评报告
+     */
+    const val reviewResultDetail = "/reviewresultdetail/reviewresultdetail"
+
     /**
      * 游戏引导页
      */

home/src/main/AndroidManifest.xml

@@ -46,6 +46,13 @@
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
 
+        <activity
+            android:name="com.yingyangfly.home.evaluation.ReviewResultDetailActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
+
         <service
             android:name="com.yingyangfly.home.updater.service.DownloadService"
             android:exported="false" />

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

@@ -3,6 +3,7 @@ package com.yingyangfly.home.adapter
 import com.yingyang.home.R
 import com.yingyang.home.databinding.ItemEvaluationResultBinding
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.home.entity.EvaluationResultBean
 
 /**
@@ -10,11 +11,17 @@ import com.yingyangfly.home.entity.EvaluationResultBean
  */
 class EvaluationResultAdapter(override val layoutId: Int = R.layout.item_evaluation_result) :
     BaseDataBindingAdapter<EvaluationResultBean, ItemEvaluationResultBinding>() {
+
+    var onClickListener: ((bean: String) -> Unit)? = null
+
     override fun onBindViewHolder(
         binding: ItemEvaluationResultBinding,
         item: EvaluationResultBean,
         position: Int
     ) {
         binding.data = item
+        binding.tvViewDetails.setOnSingleClickListener {
+            onClickListener?.invoke("")
+        }
     }
 }

home/src/main/java/com/yingyangfly/home/evaluation/EvaluationResultActivity.kt

@@ -12,6 +12,7 @@ import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.home.adapter.EvaluationResultAdapter
 import com.yingyangfly.home.entity.EvaluationResultBean
 
@@ -36,6 +37,13 @@ class EvaluationResultActivity :
         binding {
             rvResult.adapter = adapter
             adapter.setData(results)
+            adapter.onClickListener = {
+                JumpUtil.jumpActivityWithUrl(
+                    RouterUrlCommon.reviewResultDetail,
+                    reviewTaskId,
+                    mContext
+                )
+            }
         }
     }
 

home/src/main/java/com/yingyangfly/home/evaluation/ReviewResultDetailActivity.kt

@@ -0,0 +1,46 @@
+package com.yingyangfly.home.evaluation
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.MotionEvent
+import android.view.View
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyang.home.databinding.ActivityReviewResultDetailBinding
+import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
+import com.yingyangfly.baselib.router.RouterUrlCommon
+
+/**
+ * 测评报告
+ */
+@Route(path = RouterUrlCommon.reviewResultDetail)
+class ReviewResultDetailActivity :
+    BaseMVVMActivity<ActivityReviewResultDetailBinding, ReviewResultDetailViewModel>(),
+    View.OnTouchListener {
+
+    private var reviewTaskId = ""
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        reviewTaskId = intent.getStringExtra("url") ?: ""
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun initViews() {
+
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun initListener() {
+        binding {
+            layoutHead.setOnTouchListener(this@ReviewResultDetailActivity)
+        }
+    }
+
+    override fun initData() {
+
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onTouch(v: View, event: MotionEvent): Boolean {
+        TODO("Not yet implemented")
+    }
+}

home/src/main/java/com/yingyangfly/home/evaluation/ReviewResultDetailViewModel.kt

@@ -0,0 +1,14 @@
+package com.yingyangfly.home.evaluation
+
+import com.yingyangfly.baselib.bean.UserInfoBean
+import com.yingyangfly.baselib.mvvm.BaseViewModel
+import com.yingyangfly.baselib.net.XUtils
+import com.yingyangfly.baselib.utils.GsonUtil
+import com.yingyangfly.home.entity.EvaluationResultBean
+import com.yingyangfly.home.entity.FindReviewResultBean
+import com.yingyangfly.home.net.HOME_API
+
+class ReviewResultDetailViewModel : BaseViewModel() {
+
+
+}

home/src/main/manifest/AndroidManifest.xml

@@ -46,6 +46,13 @@
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
 
+        <activity
+            android:name="com.yingyangfly.home.evaluation.ReviewResultDetailActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
+
         <service android:name="com.yingyangfly.home.updater.service.DownloadService"
             android:exported="false"/>
 

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

@@ -172,6 +172,16 @@
                         android:textSize="@dimen/divider_24px"
                         android:textStyle="bold" />
 
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@string/view_details"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_24px"
+                        android:textStyle="bold" />
+
                 </LinearLayout>
 
                 <LinearLayout

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

@@ -0,0 +1,139 @@
+<?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.UserInfoBean" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        style="@style/layout_properties_specify_width_geight"
+        android:background="@mipmap/icon_uniform_background">
+
+        <LinearLayout
+            android:id="@+id/layoutHead"
+            style="@style/back_layout"
+            tools:ignore="MissingConstraints">
+
+            <androidx.appcompat.widget.AppCompatImageView style="@style/back_image" />
+
+            <androidx.appcompat.widget.AppCompatTextView style="@style/back_text" />
+        </LinearLayout>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_32px"
+            android:text="@string/evaluation_report"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_34px"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/divider_34px"
+            android:layout_marginTop="@dimen/divider_29px"
+            android:layout_marginEnd="@dimen/divider_37px"
+            android:layout_marginBottom="@dimen/divider_36px"
+            android:theme="@style/Theme.MaterialComponents.NoActionBar"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardCornerRadius="@dimen/divider_28px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvName"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_38px"
+                    android:layout_marginTop="@dimen/divider_33px"
+                    android:text='@{"姓名："+data.name}'
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_24px"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/tvSex"
+                    app:layout_constraintHorizontal_chainStyle="spread"
+                    app:layout_constraintHorizontal_weight="1"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvSex"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/divider_33px"
+                    android:text='@{"性别："+data.getSex()}'
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_24px"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/tvAge"
+                    app:layout_constraintHorizontal_chainStyle="spread"
+                    app:layout_constraintHorizontal_weight="1"
+                    app:layout_constraintStart_toEndOf="@+id/tvName"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvAge"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/divider_33px"
+                    android:text='@{"年龄："+data.getAgeInfo()}'
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_24px"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/tvNumber"
+                    app:layout_constraintHorizontal_chainStyle="spread"
+                    app:layout_constraintHorizontal_weight="1"
+                    app:layout_constraintStart_toEndOf="@+id/tvSex"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvNumber"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/divider_33px"
+                    android:layout_marginEnd="@dimen/divider_37px"
+                    android:text='@{"编号："+data.id}'
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_24px"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_chainStyle="spread"
+                    app:layout_constraintHorizontal_weight="1"
+                    app:layout_constraintStart_toEndOf="@+id/tvAge"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rvResult"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/divider_38px"
+                    android:layout_marginTop="@dimen/divider_23px"
+                    android:layout_marginEnd="@dimen/divider_37px"
+                    android:layout_marginBottom="@dimen/divider_36px"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvName" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

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

@@ -56,5 +56,16 @@
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvViewDetails"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@string/view_details"
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/divider_24px"
+            android:textStyle="bold" />
+
     </LinearLayout>
 </layout>

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

@@ -56,5 +56,6 @@
     <string name="assessment_type" tools:ignore="ResourceName">测评类型</string>
     <string name="whether_evaluate" tools:ignore="ResourceName">是否测评</string>
     <string name="start_training" tools:ignore="ResourceName">开始训练</string>
+    <string name="evaluation_report" tools:ignore="ResourceName">测评报告</string>
     <string name="start_training_info" tools:ignore="ResourceName">欢迎使用未来海豚认知训练平台平台为您提供针对脑认知的各种类型的训练，您也可以根据您的训练数据优化训练方向。</string>
 </resources>