1.修改bug

.idea/misc.xml

@@ -556,9 +556,15 @@
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/dialog_game_tasks.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/item_live_broadcast.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pads/login/src/main/res/layout/activity_login.xml" value="0.4" />
+        <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/item_choice.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/item_number.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_identify_picture.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_listen_record.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_memorize_result.xml" value="0.536" />
+        <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_single_choice.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_timepiece.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/item_moca_choice.xml" value="0.72" />
+        <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/item_speak_result.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_common_head_layout.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_comprehensive_evaluation.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_diagnosis.xml" value="0.151" />

game/src/main/java/com/yingyangfly/game/introduction/GameIntroductionActivity.kt

@@ -179,29 +179,34 @@ class GameIntroductionActivity :
 
                 } else if (v.id == R.id.btnStartGame) {
                     runOnUiThread {
-                        isEnterGame = true
-                        val url =
-                            gameBean!!.gameUrl + "?startLv=" + gameBean!!.gameLevel + "&maxLv=" +
-                                    gameBean!!.totalNum + "&gameSetTime=" + gameBean!!.gameDuration +
-                                    "&difficultyRate=" + gameBean!!.gameDifficultyRate + "&totalTime=" +
-                                    gameBean!!.gameTotalTime + "&totalScore=" + gameBean!!.gameTotalScore +
-                                    "&playClass=" + playClass
-                        Log.e("wpp", "url------------->          "+url)
-                        Log.e("wpp", "url------------->          "+GsonUtil.GsonString(gameBean))
-                        ARouter.getInstance().build(RouterUrlCommon.playGame)
-                            .withString("gameCode", gameCode)
-                            .withString("playClass", playClass)
-                            .withString("url", url)
-                            .withString("gameType", gameBean!!.gameType)
-                            .withString("gameTotalScore", gameBean!!.gameTotalScore)
-                            .withString("gameInbetweenImage", gameBean!!.gameInbetweenImage)
-                            .withString("gameBackgroundImage", gameBean!!.gameBackgroundImage)
-                            .withString("gameShortDesn", gameBean!!.gameShortDesn)
-                            .withString("fullFlag", gameBean!!.fullFlag)
-                            .withString("frameImg", gameBean!!.frameImg)
-                            .withString("gameName", gameBean!!.gameName)
-                            .withTransition(R.anim.leftin, R.anim.leftout)
-                            .navigation(mContext)
+                        if (gameBean != null) {
+                            isEnterGame = true
+                            val url =
+                                gameBean!!.gameUrl + "?startLv=" + gameBean!!.gameLevel + "&maxLv=" +
+                                        gameBean!!.totalNum + "&gameSetTime=" + gameBean!!.gameDuration +
+                                        "&difficultyRate=" + gameBean!!.gameDifficultyRate + "&totalTime=" +
+                                        gameBean!!.gameTotalTime + "&totalScore=" + gameBean!!.gameTotalScore +
+                                        "&playClass=" + playClass
+                            Log.e("wpp", "url------------->          " + url)
+                            Log.e(
+                                "wpp",
+                                "url------------->          " + GsonUtil.GsonString(gameBean)
+                            )
+                            ARouter.getInstance().build(RouterUrlCommon.playGame)
+                                .withString("gameCode", gameCode)
+                                .withString("playClass", playClass)
+                                .withString("url", url)
+                                .withString("gameType", gameBean!!.gameType)
+                                .withString("gameTotalScore", gameBean!!.gameTotalScore)
+                                .withString("gameInbetweenImage", gameBean!!.gameInbetweenImage)
+                                .withString("gameBackgroundImage", gameBean!!.gameBackgroundImage)
+                                .withString("gameShortDesn", gameBean!!.gameShortDesn)
+                                .withString("fullFlag", gameBean!!.fullFlag)
+                                .withString("frameImg", gameBean!!.frameImg)
+                                .withString("gameName", gameBean!!.gameName)
+                                .withTransition(R.anim.leftin, R.anim.leftout)
+                                .navigation(mContext)
+                        }
                     }
                 }
             }

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

@@ -119,7 +119,7 @@ class EvaluationActivity : BaseMVVMActivity<ActivityEvaluationBinding, Evaluatio
                     }
                     loadData(type)
                 } else {
-                    "您当前没有测评热任务，无需测评".toast()
+                    "您当前没有测评任务，无需测评".toast()
                 }
             }
         })

mmse/src/main/java/com/yingyangfly/mmse/adapter/ChoiceAdapter.kt

@@ -17,8 +17,10 @@ class ChoiceAdapter(override val layoutId: Int = R.layout.item_choice) :
     override fun onBindViewHolder(binding: ItemChoiceBinding, item: QuestionsBean, position: Int) {
         binding.data = item
         binding.radioChoice.clearCheck()
-        binding.radioCorrect.isChecked = TextUtils.equals(item.inputString, "是")
-        binding.radioDeny.isChecked = TextUtils.equals(item.inputString, "否")
+        if (TextUtils.isEmpty(item.inputString).not()) {
+            binding.radioCorrect.isChecked = TextUtils.equals(item.inputString, "是")
+            binding.radioDeny.isChecked = TextUtils.equals(item.inputString, "否")
+        }
         binding.radioChoice.setOnCheckedChangeListener { group, checkedId ->
             item.reviewId = item.id
             item.reviewAnswer = ""

moca/src/main/java/com/yingyangfly/moca/adapter/ChoiceAdapter.kt

@@ -17,8 +17,10 @@ class ChoiceAdapter(override val layoutId: Int = R.layout.item_moca_choice) :
     override fun onBindViewHolder(binding: ItemMocaChoiceBinding, item: QuestionsBean, position: Int) {
         binding.data = item
         binding.radioChoice.clearCheck()
-        binding.radioCorrect.isChecked = TextUtils.equals(item.inputString, "是")
-        binding.radioDeny.isChecked = TextUtils.equals(item.inputString, "否")
+        if(TextUtils.isEmpty(item.inputString).not()) {
+            binding.radioCorrect.isChecked = TextUtils.equals(item.inputString, "是")
+            binding.radioDeny.isChecked = TextUtils.equals(item.inputString, "否")
+        }
         binding.radioChoice.setOnCheckedChangeListener { group, checkedId ->
             item.reviewId = item.id
             item.reviewAnswer = ""

moca/src/main/java/com/yingyangfly/moca/adapter/TipsAdapter.kt

@@ -6,7 +6,7 @@ import com.yingyang.moca.databinding.ItemTipsBinding
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
 import com.yingyangfly.baselib.db.QuestionsBean
 
-class TipsAdapter (override val layoutId: Int = R.layout.item_tips) :
+class TipsAdapter(override val layoutId: Int = R.layout.item_tips) :
     BaseDataBindingAdapter<QuestionsBean, ItemTipsBinding>() {
 
     var onCheckClickListener: ((bean: QuestionsBean) -> Unit)? = null
@@ -14,8 +14,10 @@ class TipsAdapter (override val layoutId: Int = R.layout.item_tips) :
     override fun onBindViewHolder(binding: ItemTipsBinding, item: QuestionsBean, position: Int) {
         binding.data = item
         binding.radioChoice.clearCheck()
-        binding.radioCorrect.isChecked = TextUtils.equals(item.inputString, "是")
-        binding.radioDeny.isChecked = TextUtils.equals(item.inputString, "否")
+        if (TextUtils.isEmpty(item.inputString).not()) {
+            binding.radioCorrect.isChecked = TextUtils.equals(item.inputString, "是")
+            binding.radioDeny.isChecked = TextUtils.equals(item.inputString, "否")
+        }
         binding.radioChoice.setOnCheckedChangeListener { group, checkedId ->
             item.reviewId = item.id
             item.reviewAnswer = ""

moca/src/main/java/com/yingyangfly/moca/listenspeak/ListenSpeakResultFragment.kt

@@ -87,6 +87,7 @@ class ListenSpeakResultFragment : BaseFragment<FragmentListenSpeakResultBinding>
         return true
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {

moca/src/main/java/com/yingyangfly/moca/singlechoice/SingleChoiceFragment.kt

@@ -140,11 +140,11 @@ class SingleChoiceFragment : BaseFragment<FragmentSingleChoiceBinding>(),
         val controller = Navigation.findNavController(v)
         when (questionId) {
             76 -> {
-                questionId++
+                questionId = 77
                 loadData()
             }
             77 -> {
-                val bundle = bundleOf("questionId" to questionId)
+                val bundle = bundleOf("questionId" to 75)
                 controller.navigate(
                     R.id.action_singleChoiceFragment_to_weekFragment,
                     bundle
@@ -171,11 +171,11 @@ class SingleChoiceFragment : BaseFragment<FragmentSingleChoiceBinding>(),
         if (judge()) {
             when (questionId) {
                 60 -> {
-                    questionId++
+                    questionId = 61
                     loadData()
                 }
                 77 -> {
-                    questionId--
+                    questionId = 76
                     loadData()
                 }
                 76 -> {

moca/src/main/java/com/yingyangfly/moca/week/WeekFragment.kt

@@ -15,6 +15,7 @@ import com.yingyangfly.baselib.base.BaseFragment
 import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
+import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.moca.adapter.SelectedItemAdapter
 
 /**
@@ -139,7 +140,12 @@ class WeekFragment : BaseFragment<FragmentWeekBinding>(),
                 if (v.id == R.id.btnPrevious) {
                     previousPage(v)
                 } else if (v.id == R.id.btnNext) {
-                    nextPage(v)
+                    if (question!!.inputString.isNullOrEmpty()) {
+                        val str = "请选择" + question!!.reviewItem
+                        str.toast()
+                    } else {
+                        nextPage(v)
+                    }
                 }
             }
             MotionEvent.ACTION_CANCEL -> {

moca/src/main/res/layout/fragment_single_choice.xml

@@ -23,7 +23,6 @@
             android:layout_marginTop="@dimen/divider_53px"
             android:layout_marginEnd="@dimen/divider_202px"
             android:gravity="center"
-            android:text="@string/here_are_some_words_please_tell_me_what_similarities_they_have"
             android:textColor="@color/color_FF222222"
             android:textSize="@dimen/divider_34px"
             android:textStyle="bold"