量表开发

baselib/build.gradle

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

game/src/main/java/com/yingyangfly/game/play/PlayGameActivity.kt

@@ -124,7 +124,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         ImgUtil.loadGameBackground(mContext, gameInbetweenImage, binding.imageBg)
         ImgUtil.loadGameBackground(mContext, frameImg, binding.gameFrameImage)
         if (TextUtils.isEmpty(gameShortDesn).not()) {
-            binding.tvPlay.text = gameShortDesn
+            binding.tvPlay.text = gameName
             binding.tvIntroduce.text = gameShortDesn
         }
         binding.tvGameLevel.show(TextUtils.equals("D", playClass).not())
@@ -520,7 +520,11 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                 if (it.isNullOrEmpty().not()) {
                     val msg = it.split("voice:")
                     if (msg.isNullOrEmpty().not()) {
-                        binding.tvIntroduce.text = msg[1]
+                        if (msg[1].isNullOrEmpty().not()){
+                            binding.tvIntroduce.text = msg[1]
+                        }else {
+                            binding.tvIntroduce.text = gameShortDesn
+                        }
                         if (voicePlayer != null) {
                             speak(msg[1])
                         }

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

@@ -5,6 +5,7 @@ import com.yingyang.home.R
 import com.yingyang.home.databinding.ItemEvaluationHistoryItemBinding
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.home.entity.EvaluationHistoryBeanSubListItem
 
 /**
@@ -21,25 +22,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 {

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

@@ -12,7 +12,7 @@ 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
+    var onClickListener: ((bean: EvaluationResultBean) -> Unit)? = null
 
     override fun onBindViewHolder(
         binding: ItemEvaluationResultBinding,
@@ -20,8 +20,11 @@ class EvaluationResultAdapter(override val layoutId: Int = R.layout.item_evaluat
         position: Int
     ) {
         binding.data = item
+        if("AD8".equals(item.type)){
+            binding.tvViewDetails.text = ""
+        }
         binding.tvViewDetails.setOnSingleClickListener {
-            onClickListener?.invoke("")
+            onClickListener?.invoke(item)
         }
     }
 }

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

@@ -8,5 +8,6 @@ data class EvaluationResultBean(
     val referenceValue: String,
     val result: String,
     val reviewContent: String,
-    val reviewScore: String
+    val reviewScore: String,
+    val type: String
 )

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

@@ -13,11 +13,14 @@ 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 if (!TextUtils.isEmpty(scaleType)) {
+            scoreRange
         } else {
             "0-$scoreRange"
         }

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

@@ -54,7 +54,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
                     )

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

@@ -38,11 +38,13 @@ class EvaluationResultActivity :
             rvResult.adapter = adapter
             adapter.setData(results)
             adapter.onClickListener = {
-                JumpUtil.jumpActivityWithUrl(
-                    RouterUrlCommon.reviewResultDetail,
-                    reviewTaskId,
-                    mContext
-                )
+                if (!"AD8".equals(it.type)) {
+                    JumpUtil.jumpActivityWithUrl(
+                        RouterUrlCommon.reviewResultDetail,
+                        reviewTaskId,
+                        mContext
+                    )
+                }
             }
         }
     }

home/src/main/java/com/yingyangfly/home/evaluation/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 = {

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

@@ -5,6 +5,7 @@ import com.yingyangfly.baselib.net.XUtils
 import com.yingyangfly.baselib.utils.GsonUtil
 import com.yingyangfly.home.entity.FindReviewResultBean
 import com.yingyangfly.home.entity.ReviewResultDetailBean
+import com.yingyangfly.home.entity.ReviewTask
 import com.yingyangfly.home.net.HOME_API
 
 class ReviewResultDetailViewModel : BaseViewModel() {
@@ -26,4 +27,23 @@ class ReviewResultDetailViewModel : BaseViewModel() {
         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))
+        HOME_API.selectReviewTask(body)
+    }.runUI(
+        success,
+        fail
+    )
 }

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

@@ -113,4 +113,7 @@ interface HomeApiService {
     @POST("department/list")
     suspend fun getDepartmentList(): BaseResp<List<DepartmentBean>>
 
+    @POST("/app/reviewTask/selectReviewTask")
+    suspend fun selectReviewTask(@Body requestBody: RequestBody): BaseResp<ReviewTask>
+
 }

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

@@ -171,6 +171,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"
@@ -181,6 +182,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!!)
         }
     }

personalcenter/src/main/java/com/yingyang/personalcenter/setting/SettingActivity.kt

@@ -41,7 +41,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(), View.OnTouchList
             //移动网络
             mobileNetworkLayout.setOnTouchListener(this@SettingActivity)
             //显示与亮度
-            brightnessLayout.setOnTouchListener(this@SettingActivity)
+//            brightnessLayout.setOnTouchListener(this@SettingActivity)
             //声音
             soundLayout.setOnTouchListener(this@SettingActivity)
             //版本记录
@@ -61,7 +61,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(), View.OnTouchList
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
                 if (v.id == R.id.backLayout || v.id == R.id.wifiLayout || v.id == R.id.mobileNetworkLayout ||
-                    v.id == R.id.brightnessLayout || v.id == R.id.soundLayout || v.id == R.id.versionLayout
+                     v.id == R.id.soundLayout || v.id == R.id.versionLayout
                 ) {
                     v.startAnimation(getScaleAnimation())
                 }
@@ -87,11 +87,11 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(), View.OnTouchList
                         startActivity(intent)
                     }
 
-                    R.id.brightnessLayout -> {
-                        //显示与亮度
-                        val intent = Intent(Settings.ACTION_DISPLAY_SETTINGS)
-                        startActivity(intent)
-                    }
+//                    R.id.brightnessLayout -> {
+//                        //显示与亮度
+//                        val intent = Intent(Settings.ACTION_DISPLAY_SETTINGS)
+//                        startActivity(intent)
+//                    }
 
                     R.id.soundLayout -> {
                         //声音
@@ -108,7 +108,7 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(), View.OnTouchList
 
             MotionEvent.ACTION_CANCEL -> {
                 if (v.id == R.id.backLayout || v.id == R.id.wifiLayout || v.id == R.id.mobileNetworkLayout ||
-                    v.id == R.id.brightnessLayout || v.id == R.id.soundLayout || v.id == R.id.versionLayout
+                     v.id == R.id.soundLayout || v.id == R.id.versionLayout
                 ) {
                     v.startAnimation(getEndAnimation())
                 }

personalcenter/src/main/res/layout/activity_setting.xml

@@ -79,15 +79,15 @@
                 app:setting_image="@mipmap/icon_network"
                 app:setting_text="@string/mobile_network" />
 
-            <com.yingyang.personalcenter.widget.SettingItemView
-                android:id="@+id/brightnessLayout"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_97px"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/mobileNetworkLayout"
-                app:setting_image="@mipmap/icon_brightness"
-                app:setting_text="@string/brightness" />
+<!--            <com.yingyang.personalcenter.widget.SettingItemView-->
+<!--                android:id="@+id/brightnessLayout"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="@dimen/divider_97px"-->
+<!--                app:layout_constraintStart_toStartOf="parent"-->
+<!--                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                app:layout_constraintTop_toBottomOf="@+id/mobileNetworkLayout"-->
+<!--                app:setting_image="@mipmap/icon_brightness"-->
+<!--                app:setting_text="@string/brightness" />-->
 
             <com.yingyang.personalcenter.widget.SettingItemView
                 android:id="@+id/soundLayout"
@@ -95,7 +95,7 @@
                 android:layout_height="@dimen/divider_97px"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/brightnessLayout"
+                app:layout_constraintTop_toBottomOf="@+id/mobileNetworkLayout"
                 app:setting_image="@mipmap/icon_sound"
                 app:setting_text="@string/sound" />