1.添加获取mmse试题库UI跳转

baselib/schemas/com.yingyangfly.baselib.db.AppDataBase/1.json

@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "02082d11359290a404de0f5de5a9193f",
+    "identityHash": "ad6a89569e113dcddb338d8e7989c320",
     "entities": [
       {
         "tableName": "Questions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `isJudge` TEXT, `orgCode` TEXT, `orgName` TEXT, `reviewDesc` TEXT, `reviewItem` TEXT, `reviewScore` TEXT, `reviewType` TEXT, `type` TEXT, `updateBy` TEXT, `viewType` TEXT, `inputString` TEXT, `review_id` INTEGER NOT NULL, `review_answer` TEXT, `correct` TEXT, `score` TEXT, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `isJudge` TEXT, `orgCode` TEXT, `orgName` TEXT, `reviewDesc` TEXT, `reviewItem` TEXT, `reviewScore` TEXT, `reviewType` TEXT, `type` TEXT, `updateBy` TEXT, `viewType` TEXT, `inputString` TEXT, `reviewId` INTEGER NOT NULL, `reviewAnswer` TEXT, `correct` TEXT, `score` TEXT, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -81,14 +81,14 @@
             "notNull": false
           },
           {
-            "fieldPath": "review_id",
-            "columnName": "review_id",
+            "fieldPath": "reviewId",
+            "columnName": "reviewId",
             "affinity": "INTEGER",
             "notNull": true
           },
           {
-            "fieldPath": "review_answer",
-            "columnName": "review_answer",
+            "fieldPath": "reviewAnswer",
+            "columnName": "reviewAnswer",
             "affinity": "TEXT",
             "notNull": false
           },
@@ -118,7 +118,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '02082d11359290a404de0f5de5a9193f')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ad6a89569e113dcddb338d8e7989c320')"
     ]
   }
 }

baselib/src/main/java/com/yingyangfly/baselib/db/QuestionsBean.java

@@ -41,8 +41,8 @@ public class QuestionsBean implements Serializable {
     @JSONField(serialize = false)
     private String inputString;
 
-    private int review_id;
-    private String review_answer;
+    private int reviewId;
+    private String reviewAnswer;
     private String correct;//0错误 1正确
     private String score;
 
@@ -175,23 +175,23 @@ public class QuestionsBean implements Serializable {
         this.inputString = inputString;
     }
 
-    public int getReview_id() {
-        return review_id;
+    public int getReviewId() {
+        return reviewId;
     }
 
-    public void setReview_id(int review_id) {
-        this.review_id = review_id;
+    public void setReviewId(int reviewId) {
+        this.reviewId = reviewId;
     }
 
-    public String getReview_answer() {
-        if (TextUtils.isEmpty(review_answer)) {
+    public String getReviewAnswer() {
+        if (TextUtils.isEmpty(reviewAnswer)) {
             return "";
         }
-        return review_answer;
+        return reviewAnswer;
     }
 
-    public void setReview_answer(String review_answer) {
-        this.review_answer = review_answer;
+    public void setReviewAnswer(String reviewAnswer) {
+        this.reviewAnswer = reviewAnswer;
     }
 
     public String getCorrect() {

baselib/src/main/java/com/yingyangfly/baselib/utils/RxBusCodes.kt

@@ -13,4 +13,7 @@ object RxBusCodes {
 
     //获取训练内容
     const val GetTrainContent = 9002
+
+    //结束答题
+    const val EndQuestion = 9003
 }

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

@@ -5,6 +5,9 @@ import com.yingyang.mmse.databinding.ActivityQuestionsBinding
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.RxBusCodes
+import gorden.rxbus2.Subscribe
+import gorden.rxbus2.ThreadMode
 
 /**
  * MMSE测评
@@ -25,4 +28,12 @@ class QuestionsActivity : BaseMVVMActivity<ActivityQuestionsBinding, QuestionsVi
     override fun initData() {
 
     }
+
+    /**
+     * 结束答题
+     */
+    @Subscribe(code = RxBusCodes.EndQuestion, threadMode = ThreadMode.MAIN)
+    fun loadData() {
+        finish()
+    }
 }

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

@@ -19,8 +19,8 @@ class ChoiceAdapter(override val layoutId: Int = R.layout.item_choice) :
         binding.radioCorrect.isChecked = TextUtils.equals(item.inputString, "是")
         binding.radioDeny.isChecked = TextUtils.equals(item.inputString, "否")
         binding.radioChoice.setOnCheckedChangeListener { group, checkedId ->
-            item.review_id = item.id
-            item.review_answer = ""
+            item.reviewId = item.id
+            item.reviewAnswer = ""
             if (checkedId == R.id.radioCorrect) {
                 item.inputString = "是"
                 item.correct = "1"

mmse/src/main/java/com/yingyangfly/mmse/fragment/CountFragment.kt

@@ -242,8 +242,8 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
             } else {
                 if (firstquestion != null) {
                     firstquestion?.inputString = binding.editResultOne.text.toString().trim()
-                    firstquestion!!.review_id = firstquestion!!.id
-                    firstquestion!!.review_answer = binding.editResultOne.text.toString().trim()
+                    firstquestion!!.reviewId = firstquestion!!.id
+                    firstquestion!!.reviewAnswer = binding.editResultOne.text.toString().trim()
                     firstquestion!!.correct = ""
                     dao?.update(firstquestion!!)
                 }
@@ -261,8 +261,8 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
             } else {
                 if (secondQuestion != null) {
                     secondQuestion?.inputString = binding.editResultTwo.text.toString().trim()
-                    secondQuestion!!.review_id = secondQuestion!!.id
-                    secondQuestion!!.review_answer = binding.editResultTwo.text.toString().trim()
+                    secondQuestion!!.reviewId = secondQuestion!!.id
+                    secondQuestion!!.reviewAnswer = binding.editResultTwo.text.toString().trim()
                     secondQuestion!!.correct = ""
                     dao?.update(secondQuestion!!)
                 }
@@ -282,8 +282,8 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
             } else {
                 if (thirdQuestion != null) {
                     thirdQuestion?.inputString = binding.editResultThree.text.toString().trim()
-                    thirdQuestion!!.review_id = thirdQuestion!!.id
-                    thirdQuestion!!.review_answer = binding.editResultThree.text.toString().trim()
+                    thirdQuestion!!.reviewId = thirdQuestion!!.id
+                    thirdQuestion!!.reviewAnswer = binding.editResultThree.text.toString().trim()
                     thirdQuestion!!.correct = ""
                     dao?.update(thirdQuestion!!)
                 }
@@ -303,8 +303,8 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
             } else {
                 if (fourthQuestion != null) {
                     fourthQuestion?.inputString = binding.editResultFour.text.toString().trim()
-                    fourthQuestion!!.review_id = fourthQuestion!!.id
-                    fourthQuestion!!.review_answer =  binding.editResultFour.text.toString().trim()
+                    fourthQuestion!!.reviewId = fourthQuestion!!.id
+                    fourthQuestion!!.reviewAnswer =  binding.editResultFour.text.toString().trim()
                     fourthQuestion!!.correct = ""
                     dao?.update(fourthQuestion!!)
                 }
@@ -324,8 +324,8 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
             } else {
                 if (fifthQuestion != null) {
                     fifthQuestion?.inputString = binding.editResultFive.text.toString().trim()
-                    fifthQuestion!!.review_id = fifthQuestion!!.id
-                    fifthQuestion!!.review_answer = binding.editResultFive.text.toString().trim()
+                    fifthQuestion!!.reviewId = fifthQuestion!!.id
+                    fifthQuestion!!.reviewAnswer = binding.editResultFive.text.toString().trim()
                     fifthQuestion!!.correct = ""
                     dao?.update(fifthQuestion!!)
                 }
@@ -439,8 +439,8 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
             if (questionOne) {
                 if (firstquestion != null) {
                     firstquestion!!.inputString = binding.editResultOne.toString().trim()
-                    firstquestion!!.review_id = firstquestion!!.id
-                    firstquestion!!.review_answer = binding.editResultOne.toString().trim()
+                    firstquestion!!.reviewId = firstquestion!!.id
+                    firstquestion!!.reviewAnswer = binding.editResultOne.toString().trim()
                     firstquestion!!.correct = ""
                     dao?.update(firstquestion!!)
                 }
@@ -448,8 +448,8 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
             if (questionTwo) {
                 if (secondQuestion != null) {
                     secondQuestion!!.inputString = binding.editResultTwo.toString().trim()
-                    secondQuestion!!.review_id = secondQuestion!!.id
-                    secondQuestion!!.review_answer = binding.editResultTwo.toString().trim()
+                    secondQuestion!!.reviewId = secondQuestion!!.id
+                    secondQuestion!!.reviewAnswer = binding.editResultTwo.toString().trim()
                     secondQuestion!!.correct = ""
                     dao?.update(secondQuestion!!)
                 }
@@ -457,8 +457,8 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
             if (questionThree) {
                 if (thirdQuestion != null) {
                     thirdQuestion!!.inputString = binding.editResultThree.toString().trim()
-                    thirdQuestion!!.review_id = thirdQuestion!!.id
-                    thirdQuestion!!.review_answer = binding.editResultThree.toString().trim()
+                    thirdQuestion!!.reviewId = thirdQuestion!!.id
+                    thirdQuestion!!.reviewAnswer = binding.editResultThree.toString().trim()
                     thirdQuestion!!.correct = ""
                     dao?.update(thirdQuestion!!)
                 }
@@ -466,8 +466,8 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
             if (questionFour) {
                 if (fourthQuestion != null) {
                     fourthQuestion!!.inputString = binding.editResultFour.toString().trim()
-                    fourthQuestion!!.review_id = fourthQuestion!!.id
-                    fourthQuestion!!.review_answer = binding.editResultFour.toString().trim()
+                    fourthQuestion!!.reviewId = fourthQuestion!!.id
+                    fourthQuestion!!.reviewAnswer = binding.editResultFour.toString().trim()
                     fourthQuestion!!.correct = ""
                     dao?.update(fourthQuestion!!)
                 }
@@ -475,8 +475,8 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
             if (questionFive) {
                 if (fifthQuestion != null) {
                     fifthQuestion!!.inputString = binding.editResultFive.toString().trim()
-                    fifthQuestion!!.review_id = fifthQuestion!!.id
-                    fifthQuestion!!.review_answer = binding.editResultFive.toString().trim()
+                    fifthQuestion!!.reviewId = fifthQuestion!!.id
+                    fifthQuestion!!.reviewAnswer = binding.editResultFive.toString().trim()
                     fifthQuestion!!.correct = ""
                     dao?.update(fifthQuestion!!)
                 }

mmse/src/main/java/com/yingyangfly/mmse/fragment/InputFragment.kt

@@ -67,8 +67,8 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
                     if (dao != null) {
                         if (question != null) {
                             question!!.inputString = binding.editYear.text.toString().trim()
-                            question!!.review_id = question!!.id
-                            question!!.review_answer = binding.editYear.text.toString().trim()
+                            question!!.reviewId = question!!.id
+                            question!!.reviewAnswer = binding.editYear.text.toString().trim()
                             question!!.correct = ""
                             dao?.update(question!!)
                         }
@@ -99,8 +99,8 @@ class InputFragment : BaseFragment<FragmentInputBinding>() {
                 } else {
                     if (question != null) {
                         question!!.inputString = binding.editYear.text.toString().trim()
-                        question!!.review_id = question!!.id
-                        question!!.review_answer = binding.editYear.text.toString().trim()
+                        question!!.reviewId = question!!.id
+                        question!!.reviewAnswer = binding.editYear.text.toString().trim()
                         question!!.correct = ""
                         dao?.update(question!!)
                     }

mmse/src/main/java/com/yingyangfly/mmse/fragment/JudgmentFragment.kt

@@ -86,8 +86,8 @@ class JudgmentFragment : BaseFragment<FragmentJudgmentBinding>() {
             }
 
             judgeRadio.setOnCheckedChangeListener { group, checkedId ->
-                question!!.review_id = question!!.id
-                question!!.review_answer = ""
+                question!!.reviewId = question!!.id
+                question!!.reviewAnswer = ""
                 if (checkedId == R.id.btnDeny) {
                     if (question != null && dao != null) {
                         question!!.inputString = "否"

mmse/src/main/java/com/yingyangfly/mmse/fragment/JudgmentRecordFragment.kt

@@ -43,8 +43,8 @@ class JudgmentRecordFragment : BaseFragment<FragmentJudgmentRecordBinding>() {
                 }
             }
             judgeRadio.setOnCheckedChangeListener { group, checkedId ->
-                question?.review_id = question?.id!!
-                question?.review_answer = ""
+                question?.reviewId = question?.id!!
+                question?.reviewAnswer = ""
                 if (question != null) {
                     if (checkedId == R.id.btnDeny) {
                         question?.inputString = "否"

mmse/src/main/java/com/yingyangfly/mmse/fragment/MultipleChoiceFragment.kt

@@ -11,7 +11,9 @@ import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMFragment
+import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.mmse.adapter.ChoiceAdapter
+import gorden.rxbus2.RxBus
 
 /**
  * 多选
@@ -175,7 +177,8 @@ class MultipleChoiceFragment :
             viewModel.submitQuestions(questionsBeans!!, fail = {
                 it.toast()
             }, success = {
-
+                "提交成功".toast()
+                RxBus.get().send(RxBusCodes.EndQuestion)
             })
         }
     }

mmse/src/main/java/com/yingyangfly/mmse/fragment/ReadFragment.kt

@@ -58,8 +58,8 @@ class ReadFragment : BaseFragment<FragmentReadBinding>() {
 
             judgeRadio.setOnCheckedChangeListener { group, checkedId ->
                 if (question != null && dao != null) {
-                    question?.review_id = question!!.id
-                    question?.review_answer = ""
+                    question?.reviewId = question!!.id
+                    question?.reviewAnswer = ""
                     if (checkedId == R.id.btnDeny) {
                         question!!.inputString = "否"
                         question?.correct = "0"

mmse/src/main/java/com/yingyangfly/mmse/fragment/SelectedItemFragment.kt

@@ -44,8 +44,8 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
             selectedAdapter.onSelectedItemClickListener = { bean ->
                 if (question != null && dao != null) {
                     question!!.inputString = bean
-                    question!!.review_id = question!!.id
-                    question!!.review_answer = getWeekInfo(bean)
+                    question!!.reviewId = question!!.id
+                    question!!.reviewAnswer = getWeekInfo(bean)
                     question!!.correct = ""
                     dao?.update(question!!)
                 }

mmse/src/main/java/com/yingyangfly/mmse/fragment/YearFragment.kt

@@ -57,8 +57,8 @@ class YearFragment : BaseFragment<FragmentYearBinding>() {
                     if (dao != null) {
                         if (question != null) {
                             question!!.inputString = binding.editYear.text.toString().trim()
-                            question!!.review_id = question!!.id
-                            question!!.review_answer = binding.editYear.text.toString().trim()
+                            question!!.reviewId = question!!.id
+                            question!!.reviewAnswer = binding.editYear.text.toString().trim()
                             question!!.correct = ""
                             dao?.update(question!!)
                         }
@@ -78,8 +78,8 @@ class YearFragment : BaseFragment<FragmentYearBinding>() {
                 } else {
                     if (question != null) {
                         question!!.inputString = binding.editYear.text.toString().trim()
-                        question!!.review_id = question!!.id
-                        question!!.review_answer = binding.editYear.text.toString().trim()
+                        question!!.reviewId = question!!.id
+                        question!!.reviewAnswer = binding.editYear.text.toString().trim()
                         question!!.correct = ""
                         dao?.update(question!!)
                     }