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

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

@@ -2,16 +2,16 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "964f0a8af3aa6fe11435dd347f004086",
+    "identityHash": "c9ab519666a92987918aa117a3c26a1c",
     "entities": [
       {
         "tableName": "Questions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `isJudge` TEXT, `orgCode` TEXT, `orgName` TEXT, `reviewDesc` TEXT, `reviewItem` TEXT, `reviewScore` TEXT, `reviewType` TEXT, `type` TEXT, `updateBy` TEXT, `viewType` TEXT, `inputString` 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, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
             "columnName": "id",
-            "affinity": "TEXT",
+            "affinity": "INTEGER",
             "notNull": true
           },
           {
@@ -94,7 +94,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, '964f0a8af3aa6fe11435dd347f004086')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c9ab519666a92987918aa117a3c26a1c')"
     ]
   }
 }

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

@@ -2,7 +2,6 @@ package com.yingyangfly.baselib.db;
 
 import android.text.TextUtils;
 
-import androidx.annotation.NonNull;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 
@@ -13,8 +12,7 @@ import androidx.room.PrimaryKey;
 public class QuestionsBean {
 
     @PrimaryKey
-    @NonNull
-    private String id;
+    private int id;
     private String isJudge;
     private String orgCode;
     private String orgName;
@@ -27,14 +25,11 @@ public class QuestionsBean {
     private String viewType;
     private String inputString;
 
-    public String getId() {
-        if (TextUtils.isEmpty(id)) {
-            return "";
-        }
+    public int getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(int id) {
         this.id = id;
     }
 

baselib/src/main/java/com/yingyangfly/baselib/db/QuestionsDao.kt

@@ -15,7 +15,7 @@ interface QuestionsDao : BaseDao<QuestionsBean> {
     fun getAllQuestions(): MutableList<QuestionsBean>
 
     @Query("select * from Questions where id = :id")
-    fun getQuestion(id: String): QuestionsBean
+    fun getQuestion(id: Int): QuestionsBean
 
     @Query("select * from Questions order by id desc ")
     fun getAllByIdDesc(): MutableList<QuestionsBean>

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

@@ -2,6 +2,7 @@ package com.yingyangfly.mmse.activity.questions
 
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.mmse.databinding.ActivityQuestionsBinding
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 
@@ -16,7 +17,9 @@ class QuestionsActivity : BaseMVVMActivity<ActivityQuestionsBinding, QuestionsVi
     }
 
     override fun initListener() {
-
+        binding.layoutOperate.setOnSingleClickListener {
+            finish()
+        }
     }
 
     override fun initData() {

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

@@ -1,5 +1,6 @@
 package com.yingyangfly.mmse.fragment
 
+import android.os.Bundle
 import androidx.navigation.Navigation
 import com.yingyang.mmse.R
 import com.yingyang.mmse.databinding.FragmentSelectedItemBinding
@@ -11,6 +12,16 @@ import com.yingyangfly.baselib.ext.setOnSingleClickListener
  */
 class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
 
+    /**
+     * 问题id
+     */
+    var questionId = ""
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        questionId = arguments?.getString("questionId") ?: ""
+        super.onCreate(savedInstanceState)
+    }
+
     override fun initViews() {
 
     }
@@ -27,4 +38,8 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
     override fun initData() {
 
     }
+
+    override fun onResume() {
+        super.onResume()
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.yingyangfly.mmse.fragment
 
+import android.os.Bundle
+import androidx.core.os.bundleOf
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.GridLayoutManager
 import com.yingyang.mmse.R
@@ -9,6 +11,7 @@ import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.mmse.adapter.NumberAdapter
 
+
 /**
  * 数字输入类
  */
@@ -45,7 +48,7 @@ class YearFragment : BaseFragment<FragmentYearBinding>() {
                 }
                 "2" -> {
                     if (dao != null) {
-                        val question = dao?.getQuestion("1")
+                        val question = dao?.getQuestion(1)
                         if (question != null) {
                             question.inputString = stringBuffer.toString()
                             dao?.update(question)
@@ -61,11 +64,19 @@ class YearFragment : BaseFragment<FragmentYearBinding>() {
         binding {
             btnNext.setOnSingleClickListener { view ->
                 if (binding.tvYear.text.toString().trim().isNullOrEmpty()) {
-                    val str = "请输入" + toastInfo
+                    val str = "请输入$toastInfo"
                     str.toast()
                 } else {
+                    if (dao != null) {
+                        val question = dao?.getQuestion(1)
+                        if (question != null) {
+                            question.inputString = stringBuffer.toString()
+                            dao?.update(question)
+                        }
+                    }
+                    val bundle = bundleOf("questionId" to "2")
                     val controller = Navigation.findNavController(view)
-                    controller.navigate(R.id.action_yearFragment_to_selectedItemFragment)
+                    controller.navigate(R.id.action_yearFragment_to_selectedItemFragment, bundle)
                 }
             }
         }
@@ -75,11 +86,6 @@ class YearFragment : BaseFragment<FragmentYearBinding>() {
 
     }
 
-    override fun onPause() {
-        super.onPause()
-
-    }
-
     override fun onResume() {
         super.onResume()
         loadData()
@@ -90,7 +96,7 @@ class YearFragment : BaseFragment<FragmentYearBinding>() {
      */
     private fun loadData() {
         if (dao != null) {
-            val question = dao?.getQuestion("1")
+            val question = dao?.getQuestion(1)
             if (question != null) {
                 binding.data = question
                 toastInfo = question.reviewItem