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

.idea/misc.xml

@@ -103,10 +103,11 @@
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_input.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_judgment.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_judgment_record.xml" value="0.536" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_memory_words.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_multiple_choice.xml" value="0.2845528455284553" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_number.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_read.xml" value="0.264" />
-        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_recognition_image.xml" value="0.8" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_recognition_image.xml" value="0.264" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_record_action.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_repeat.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_selected_item.xml" value="0.264" />

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

@@ -1,5 +1,6 @@
 package com.yingyangfly.mmse.fragment
 
+import android.graphics.Bitmap
 import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.navigation.Navigation
@@ -28,7 +29,15 @@ class DrawDesignsFragment : BaseFragment<FragmentDrawDesignsBinding>() {
             }
 
             btnNext.setOnSingleClickListener {
-
+                val bundle = Bundle()
+                bundle.putInt("questionId", 31)
+                val bitmap: Bitmap = signatureView.drawingCache
+                bundle.putParcelable("bitmap", bitmap)
+                val controller = Navigation.findNavController(it)
+                controller.navigate(
+                    R.id.action_drawDesignsFragment_to_recognitionImageFragment,
+                    bundle
+                )
             }
         }
     }

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

@@ -0,0 +1,21 @@
+package com.yingyangfly.mmse.fragment
+
+import com.yingyang.mmse.databinding.FragmentMemoryWordsBinding
+import com.yingyangfly.baselib.base.BaseFragment
+
+/**
+ * 回忆词语
+ */
+class MemoryWordsFragment : BaseFragment<FragmentMemoryWordsBinding>() {
+    override fun initViews() {
+
+    }
+
+    override fun initListener() {
+
+    }
+
+    override fun initData() {
+
+    }
+}

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

@@ -15,9 +15,20 @@ import com.yingyangfly.mmse.adapter.ChoiceAdapter
  */
 class RecognitionImageFragment : BaseFragment<FragmentRecognitionImageBinding>() {
 
+    /**
+     * 问题id
+     */
+    var questionId = 0
+
     private val choiceItemList = mutableListOf<QuestionsBean>()
     private val adapter by lazy { ChoiceAdapter() }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        questionId = arguments?.getInt("questionId") ?: 11
+        super.onCreate(savedInstanceState)
+    }
+
+
     override fun initViews() {
         binding {
             rvChoice.adapter = adapter
@@ -32,17 +43,27 @@ class RecognitionImageFragment : BaseFragment<FragmentRecognitionImageBinding>()
     override fun initListener() {
         binding {
             btnPrevious.setOnSingleClickListener {
-                val bundle = bundleOf("questionId" to 21)
-                val controller = Navigation.findNavController(it)
-                controller.navigate(
-                    R.id.action_recognitionImageFragment_to_countFragment,
-                    bundle
-                )
+                if (questionId == 31) {
+                    val controller = Navigation.findNavController(it)
+                    controller.navigate(R.id.action_recognitionImageFragment_to_drawDesignsFragment)
+                } else {
+                    val bundle = bundleOf("questionId" to 21)
+                    val controller = Navigation.findNavController(it)
+                    controller.navigate(
+                        R.id.action_recognitionImageFragment_to_countFragment,
+                        bundle
+                    )
+                }
             }
 
             btnNext.setOnSingleClickListener {
-                val controller = Navigation.findNavController(it)
-                controller.navigate(R.id.action_recognitionImageFragment_to_judgmentRecordFragment)
+                if (questionId == 31) {
+                    val controller = Navigation.findNavController(it)
+                    controller.navigate(R.id.action_recognitionImageFragment_to_memoryWordsFragment)
+                } else {
+                    val controller = Navigation.findNavController(it)
+                    controller.navigate(R.id.action_recognitionImageFragment_to_judgmentRecordFragment)
+                }
             }
         }
     }

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

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/tvTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_120px"
+            android:text="@string/do_you_remember_three_words_you_just_remembered_please_say_again"
+            android:textColor="@color/color_FF222222"
+            android:textSize="@dimen/divider_34px"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnPrevious"
+            android:layout_width="@dimen/divider_240px"
+            android:layout_height="@dimen/divider_68px"
+            android:layout_marginStart="@dimen/divider_307px"
+            android:layout_marginBottom="@dimen/divider_60px"
+            android:background="@drawable/bg_previous_question"
+            android:gravity="center"
+            android:text="@string/previous_question"
+            android:textColor="@color/color_FF4A76FF"
+            android:textSize="@dimen/divider_28px"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnNext"
+            android:layout_width="@dimen/divider_240px"
+            android:layout_height="@dimen/divider_68px"
+            android:layout_marginEnd="@dimen/divider_305px"
+            android:layout_marginBottom="@dimen/divider_60px"
+            android:background="@drawable/bg_next_question"
+            android:gravity="center"
+            android:text="@string/continues"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_28px"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

mmse/src/main/res/navigation/nav_home.xml

@@ -129,6 +129,14 @@
         <action
             android:id="@+id/action_recognitionImageFragment_to_judgmentRecordFragment"
             app:destination="@id/judgmentRecordFragment" />
+
+        <action
+            android:id="@+id/action_recognitionImageFragment_to_drawDesignsFragment"
+            app:destination="@id/drawDesignsFragment" />
+
+        <action
+            android:id="@+id/action_recognitionImageFragment_to_memoryWordsFragment"
+            app:destination="@id/memoryWordsFragment" />
     </fragment>
 
     <fragment
@@ -176,5 +184,15 @@
         <action
             android:id="@+id/action_drawDesignsFragment_to_judgmentFragment"
             app:destination="@id/judgmentFragment" />
+        <action
+            android:id="@+id/action_drawDesignsFragment_to_recognitionImageFragment"
+            app:destination="@id/recognitionImageFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/memoryWordsFragment"
+        android:name="com.yingyangfly.mmse.fragment.MemoryWordsFragment"
+        android:label="memoryWordsFragment">
+
     </fragment>
 </navigation>

mmse/src/main/res/values/strings.xml

@@ -20,4 +20,5 @@
     <string name="please_draw_in_the_blank_space_as_shown_in_picture_below" tools:ignore="ResourceName">请您按照下图的样子，在空白处画出来</string>
     <string name="erase" tools:ignore="ResourceName">擦除</string>
     <string name="subjects_can_also_draw_pictures_on_paper" tools:ignore="ResourceName">受试者也可在纸上画图</string>
+    <string name="do_you_remember_three_words_you_just_remembered_please_say_again" tools:ignore="ResourceName">还记得刚才让您记住的三个词吗？请您再说一遍</string>
 </resources>