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

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

@@ -7,12 +7,26 @@ import androidx.navigation.Navigation
 import com.yingyang.mmse.R
 import com.yingyang.mmse.databinding.FragmentDrawDesignsBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 
 /**
  * 画图
  */
 class DrawDesignsFragment : BaseFragment<FragmentDrawDesignsBinding>() {
+
+    /**
+     * 原始问题id
+     */
+    var questionId = 0
+
+    var question: QuestionsBean? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        questionId = arguments?.getInt("questionId") ?: 30
+        super.onCreate(savedInstanceState)
+    }
+
     override fun initViews() {
 
     }
@@ -27,10 +41,9 @@ class DrawDesignsFragment : BaseFragment<FragmentDrawDesignsBinding>() {
                     bundle
                 )
             }
-
             btnNext.setOnSingleClickListener {
                 val bundle = Bundle()
-                bundle.putInt("questionId", 31)
+                bundle.putInt("questionId", 30)
                 val bitmap: Bitmap = signatureView.drawingCache
                 bundle.putParcelable("bitmap", bitmap)
                 val controller = Navigation.findNavController(it)
@@ -45,4 +58,23 @@ class DrawDesignsFragment : BaseFragment<FragmentDrawDesignsBinding>() {
     override fun initData() {
 
     }
+
+    override fun onResume() {
+        super.onResume()
+        loadData()
+    }
+
+    /**
+     * 加载数据
+     */
+    private fun loadData() {
+        if (dao != null) {
+            question = dao?.getQuestion(questionId)
+            if (question != null) {
+                binding {
+                    data = question
+                }
+            }
+        }
+    }
 }

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

@@ -17,14 +17,14 @@ import com.yingyangfly.baselib.ext.toast
 class JudgmentFragment : BaseFragment<FragmentJudgmentBinding>() {
 
     /**
-     * 原始问题id(6.7.8.9.10) ()
+     * 原始问题id(6.7.8.9.10) (29)
      */
     var questionId = 0
 
     var question: QuestionsBean? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        questionId = arguments?.getInt("questionId") ?: 4
+        questionId = arguments?.getInt("questionId") ?: 6
         super.onCreate(savedInstanceState)
     }
 
@@ -59,8 +59,9 @@ class JudgmentFragment : BaseFragment<FragmentJudgmentBinding>() {
             }
             btnNext.setOnSingleClickListener {
                 if (questionId == 29) {
+                    val bundle = bundleOf("questionId" to 30)
                     val controller = Navigation.findNavController(it)
-                    controller.navigate(R.id.action_judgmentFragment_to_drawDesignsFragment)
+                    controller.navigate(R.id.action_judgmentFragment_to_drawDesignsFragment, bundle)
                 } else {
                     if (question != null) {
                         if (question!!.inputString.isNullOrEmpty()) {

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

@@ -39,7 +39,7 @@ class JudgmentRecordFragment : BaseFragment<FragmentJudgmentRecordBinding>() {
         binding {
             soundImage.setOnSingleClickListener {
                 if (question != null) {
-                    playVoice?.speak(question?.reviewDesc!!)
+                    playVoice?.speak(question?.reviewItem!!)
                 }
             }
             judgeRadio.setOnCheckedChangeListener { group, checkedId ->

mmse/src/main/res/layout/fragment_draw_designs.xml

@@ -4,6 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
 
+    <data>
+
+        <variable
+            name="data"
+            type="com.yingyangfly.baselib.db.QuestionsBean" />
+    </data>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -27,9 +34,10 @@
             android:layout_height="@dimen/divider_179px"
             android:layout_marginStart="@dimen/divider_63px"
             android:layout_marginTop="@dimen/divider_149px"
-            android:background="@mipmap/icon_play_sound"
+            app:isCircle="@{false}"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle"
+            app:loadHeadImg="@{data.reviewDesc}" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="0dp"