1.添加测评结果接口

home/src/main/AndroidManifest.xml

@@ -25,6 +25,13 @@
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
 
+        <activity
+            android:name="com.yingyangfly.home.evaluation.EvaluationResultActivity"
+            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/entity/EvaluationResultBean.kt

@@ -0,0 +1,12 @@
+package com.yingyangfly.home.entity
+
+/**
+ * 测评结果
+ */
+data class EvaluationResultBean(
+    val createTime: String,
+    val referenceValue: String,
+    val result: String,
+    val reviewContent: String,
+    val reviewScore: Int
+)

home/src/main/java/com/yingyangfly/home/entity/FindReviewResultBean.kt

@@ -0,0 +1,8 @@
+package com.yingyangfly.home.entity
+
+/**
+ * 查询测评结果
+ */
+class FindReviewResultBean {
+    var reviewTaskId = ""
+}

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

@@ -1,6 +1,7 @@
 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
@@ -8,8 +9,10 @@ import com.yingyang.home.R
 import com.yingyang.home.databinding.ActivityEvaluationResultBinding
 import com.yingyangfly.baselib.ext.getEndAnimation
 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.home.entity.EvaluationResultBean
 
 /**
  * 测评结果
@@ -19,6 +22,14 @@ class EvaluationResultActivity :
     BaseMVVMActivity<ActivityEvaluationResultBinding, EvaluationResultViewModel>(),
     View.OnTouchListener {
 
+    private var reviewTaskId = ""
+    private var evaluationResultBeans = mutableListOf<EvaluationResultBean>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        reviewTaskId = intent.getStringExtra("url") ?: ""
+        super.onCreate(savedInstanceState)
+    }
+
     override fun initViews() {
 
     }
@@ -34,6 +45,22 @@ class EvaluationResultActivity :
 
     }
 
+    override fun onResume() {
+        super.onResume()
+        loadData()
+    }
+
+    private fun loadData() {
+        viewModel.findReviewResult(reviewTaskId, fail = {
+            it.toast()
+        }, success = {
+            if (it != null) {
+                evaluationResultBeans.clear()
+                evaluationResultBeans.add(it)
+            }
+        })
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {

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

@@ -1,8 +1,29 @@
 package com.yingyangfly.home.evaluation
 
 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 EvaluationResultViewModel : BaseViewModel() {
 
-
+    /**
+     * 获取mmse试题
+     */
+    fun findReviewResult(
+        id: String,
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: EvaluationResultBean?) -> Unit)? = null,
+    ) = launchFlow(true) {
+        val requestBean = FindReviewResultBean().apply {
+            reviewTaskId = id
+        }
+        val body = XUtils.createJson(GsonUtil.GsonString(requestBean))
+        HOME_API.findReviewResult(body)
+    }.runUI(
+        success,
+        fail
+    )
 }

home/src/main/java/com/yingyangfly/home/net/HomeApiService.kt

@@ -71,4 +71,10 @@ interface HomeApiService {
     @POST("app/reviewTask/list")
     suspend fun getReviewTaskList(@Body requestBody: RequestBody): BaseResp<ReviewTaskListBean>
 
+    /**
+     * 获取报告
+     */
+    @POST("app/review/findReviewResult")
+    suspend fun findReviewResult(@Body requestBody: RequestBody): BaseResp<EvaluationResultBean>
+
 }

home/src/main/manifest/AndroidManifest.xml

@@ -25,6 +25,13 @@
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
 
+        <activity
+            android:name="com.yingyangfly.home.evaluation.EvaluationResultActivity"
+            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"/>
 

mmse/src/main/java/com/yingyangfly/mmse/activity/QuestionsActivity.kt

@@ -12,10 +12,12 @@ 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.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.RxTimer
 import gorden.rxbus2.Subscribe
 import gorden.rxbus2.ThreadMode
+import java.util.*
 
 /**
  * MMSE测评
@@ -24,6 +26,7 @@ import gorden.rxbus2.ThreadMode
 class QuestionsActivity : BaseMVVMActivity<ActivityQuestionsBinding, QuestionsViewModel>(),
     View.OnTouchListener {
 
+    private var reviewTaskId = ""
     lateinit var rxTimer: RxTimer
     var time: Long = 0
 
@@ -60,6 +63,7 @@ class QuestionsActivity : BaseMVVMActivity<ActivityQuestionsBinding, QuestionsVi
             val questionsBeans = questionsDao?.getAllQuestions()
             if (questionsBeans.isNullOrEmpty().not()) {
                 questionsBeans?.forEach {
+                    reviewTaskId = it.reviewTaskId
                     it.reviewId = it.id
                     it.usedTime = time.toString()
                     if (TextUtils.equals("0", it.correct)) {
@@ -72,8 +76,19 @@ class QuestionsActivity : BaseMVVMActivity<ActivityQuestionsBinding, QuestionsVi
             viewModel.submitQuestions(questionsBeans!!, fail = {
                 it.toast()
             }, success = {
-                "提交成功".toast()
-                finish()
+                showLoading()
+                val timer = Timer()
+                timer.schedule(object : TimerTask() {
+                    override fun run() {
+                        dismissLoading()
+                        JumpUtil.jumpActivityWithUrl(
+                            RouterUrlCommon.evaluationResult,
+                            reviewTaskId,
+                            mContext
+                        )
+                        finish()
+                    }
+                }, 2000)
             })
         }
     }

moca/src/main/java/com/yingyangfly/moca/activity/MocaActivity.kt

@@ -12,10 +12,12 @@ 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.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.RxTimer
 import gorden.rxbus2.Subscribe
 import gorden.rxbus2.ThreadMode
+import java.util.*
 
 /**
  * moca试题库
@@ -24,6 +26,7 @@ import gorden.rxbus2.ThreadMode
 class MocaActivity : BaseMVVMActivity<ActivityMocaBinding, MocaViewModel>(),
     View.OnTouchListener {
 
+    private var reviewTaskId = ""
     lateinit var rxTimer: RxTimer
     var time: Long = 0
 
@@ -60,6 +63,7 @@ class MocaActivity : BaseMVVMActivity<ActivityMocaBinding, MocaViewModel>(),
             val questionsBeans = questionsDao?.getAllQuestions()
             if (questionsBeans.isNullOrEmpty().not()) {
                 questionsBeans?.forEach {
+                    reviewTaskId = it.reviewTaskId
                     it.usedTime = time.toString()
                     it.reviewId = it.id
                     if (TextUtils.equals("0", it.correct)) {
@@ -72,8 +76,19 @@ class MocaActivity : BaseMVVMActivity<ActivityMocaBinding, MocaViewModel>(),
             viewModel.submitQuestions(questionsBeans!!, fail = {
                 it.toast()
             }, success = {
-                "提交成功".toast()
-                finish()
+                showLoading()
+                val timer = Timer()
+                timer.schedule(object : TimerTask() {
+                    override fun run() {
+                        dismissLoading()
+                        JumpUtil.jumpActivityWithUrl(
+                            RouterUrlCommon.evaluationResult,
+                            reviewTaskId,
+                            mContext
+                        )
+                        finish()
+                    }
+                }, 2000)
             })
         }
     }