量表开发

evaluation/src/main/java/com/yingyangfly/evaluation/adapter/EvaluationHistoryItemAdapter.kt

@@ -21,25 +21,15 @@ class EvaluationHistoryItemAdapter(override val layoutId: Int = R.layout.item_ev
         position: Int
     ) {
         binding.data = item
-//        binding.tvReferenceValue.text =
-//            if (item.result != null && TextUtils.isEmpty(item.result.referenceValue).not()) {
-//                item.result.referenceValue
-//            } else {
-//                ""
-//            }
         binding.tvReviewScore.text =
             if (item.result != null && TextUtils.isEmpty(item.result.reviewScore).not()) {
                 item.result.reviewScore
             } else {
                 ""
             }
-
-//        binding.tvResult.text =
-//            if (item.result != null && TextUtils.isEmpty(item.result.result).not()) {
-//                item.result.result
-//            } else {
-//                ""
-//            }
+        if ("AD8".equals(item.type)) {
+            binding.tvDetails.text = ""
+        }
         if (position % 2 == 0) {
             binding.evaluationLayout.setBackgroundResource(R.drawable.bg_evaluation_result)
         } else {

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

@@ -59,6 +59,23 @@ class ReviewResultDetailActivity :
      * 获取测评报告详情
      */
     private fun loadData() {
+        viewModel.selectReviewTask(reviewTaskId, fail = {
+            it.toast()
+        },success = {
+            if (it != null) {
+                if ("STROOP".equals(it.type)){
+                    binding {
+                        score.text = "正确数"
+                        scoreRange.text = "耗时数/秒"
+                    }
+                }else {
+                    binding {
+                        score.text = "得分"
+                        scoreRange.text = "得分范围"
+                    }
+                }
+            }
+        })
         viewModel.findReviewResultDetail(reviewTaskId, fail = {
             it.toast()
         }, success = {

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

@@ -5,6 +5,7 @@ import com.yingyangfly.baselib.net.XUtils
 import com.yingyangfly.baselib.utils.GsonUtil
 import com.yingyangfly.evaluation.entity.FindReviewResultBean
 import com.yingyangfly.evaluation.entity.ReviewResultDetailBean
+import com.yingyangfly.evaluation.entity.ReviewTask
 import com.yingyangfly.evaluation.net.EVALUATION_API
 
 class ReviewResultDetailViewModel : BaseViewModel() {
@@ -25,4 +26,23 @@ class ReviewResultDetailViewModel : BaseViewModel() {
     }.runUI(
         success, fail
     )
+
+
+    /**
+     *
+     */
+    fun selectReviewTask(
+        id: String,
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: ReviewTask?) -> Unit)? = null,
+    ) = launchFlow(true) {
+        val requestBean = FindReviewResultBean().apply {
+            reviewTaskId = id
+        }
+        val body = XUtils.createJson(GsonUtil.GsonString(requestBean))
+        EVALUATION_API.selectReviewTask(body)
+    }.runUI(
+        success,
+        fail
+    )
 }

evaluation/src/main/java/com/yingyangfly/evaluation/entity/ReviewResultDetailBean.kt

@@ -13,12 +13,15 @@ data class ReviewResultDetailBean(
 class ResultDetailBean(
     val reviewType: String,
     val score: String,
-    val scoreRange: String
+    val scoreRange: String,
+    val scaleType: String
 ) {
     fun getScoreRangeInfo(): String {
         return if (TextUtils.isEmpty(scoreRange)) {
             ""
-        } else {
+        } else if (!TextUtils.isEmpty(scaleType)) {
+            scoreRange
+        }else {
             "0-$scoreRange"
         }
     }

evaluation/src/main/java/com/yingyangfly/evaluation/history/EvaluationHistoryActivity.kt

@@ -67,7 +67,7 @@ class EvaluationHistoryActivity :
             adapter.onClickListener = {
                 if (TextUtils.equals("0", it.status)) {
                     "请完成测评，再查看报告详情哦！".toast()
-                } else {
+                } else if(!"AD8".equals(it.type)) {
                     JumpUtil.jumpActivityWithUrl(
                         RouterUrlCommon.reviewResultDetail, it.id, mContext
                     )

evaluation/src/main/java/com/yingyangfly/evaluation/net/EvaluationApiService.kt

@@ -105,4 +105,7 @@ interface EvaluationApiService {
      */
     @POST("app/review/findReviewResult")
     suspend fun findReviewResult(@Body requestBody: RequestBody): BaseResp<EvaluationResultBean>
+
+    @POST("/app/reviewTask/selectReviewTask")
+    suspend fun selectReviewTask(@Body requestBody: RequestBody): BaseResp<ReviewTask>
 }

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

@@ -151,6 +151,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/score"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
@@ -161,6 +162,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/scoreRange"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"

moca/src/main/java/com/yingyangfly/moca/fragment/StroopInitializeFragment.kt

@@ -155,7 +155,7 @@ class StroopInitializeFragment : BaseFragment<FragmentStroopInitializeBinding>()
         usedTime = 0;
         rxTimer.interval(m) {
             time = it + 1
-            val seconds = time % 60
+            val seconds = time
             binding.rvTimes.text = if (seconds > 0) {
                 "答题用时 $seconds 秒"
             } else {
@@ -242,8 +242,9 @@ class StroopInitializeFragment : BaseFragment<FragmentStroopInitializeBinding>()
             if (usedTime > 0 ) {
                 questionsBean!!.usedTime = (usedTime).toString()
             }else {
-                questionsBean!!.usedTime = (time % 60).toString()
+                questionsBean!!.usedTime = (time).toString()
             }
+            questionsBean!!.correct = "1"
             questionsDao?.update(questionsBean!!)
         }
     }

moca/src/main/java/com/yingyangfly/moca/numberrecords/NumberRecordsFragment.kt

@@ -109,7 +109,9 @@ class NumberRecordsFragment : BaseFragment<FragmentNumberRecordsBinding>(),
                     question!!.inputString = binding.editTime.text.toString().trim()
                     question!!.reviewId = question!!.id
                     question!!.reviewAnswer = binding.editTime.text.toString().trim()
-                    question!!.correct = ""
+                    if (questionId < 280) {
+                        question!!.correct = ""
+                    }
                     questionsDao?.update(question!!)
                     nextPage(v)
                 }
@@ -214,7 +216,9 @@ class NumberRecordsFragment : BaseFragment<FragmentNumberRecordsBinding>(),
         if (question != null) {
             question!!.inputString = binding.editTime.text.toString().trim()
             question!!.reviewAnswer = binding.editTime.text.toString().trim()
-            question!!.correct = ""
+            if (questionId < 280) {
+                question!!.correct = ""
+            }
             questionsDao?.update(question!!)
         }
     }