1.添加获取moca试题库module

.idea/misc.xml

@@ -130,8 +130,9 @@
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_identify_result.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_listen_record.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_memorize_numbers.xml" value="0.23697916666666666" />
-        <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_memorize_result.xml" value="0.72" />
+        <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_memorize_result.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_multiple_choice.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_number_records.xml" value="0.329232995658466" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_record_result.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_signature.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_sound_record.xml" value="0.4" />

moca/src/main/java/com/yingyangfly/moca/drawdesign/DrawDesignFragment.kt

@@ -3,7 +3,6 @@ package com.yingyangfly.moca.drawdesign
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.os.Bundle
-import android.text.Html
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.style.ForegroundColorSpan

moca/src/main/java/com/yingyangfly/moca/memorizenumbers/MemorizeNumbersFragment.kt

@@ -8,7 +8,6 @@ import com.yingyang.moca.databinding.FragmentMemorizeNumbersBinding
 import com.yingyangfly.baselib.base.BaseFragment
 import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
-import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.voice.PlayVoice
 
 /**
@@ -60,7 +59,12 @@ class MemorizeNumbersFragment : BaseFragment<FragmentMemorizeNumbersBinding>() {
             }
             btnNext.setOnSingleClickListener {
                 if (questionId == 51) {
-                    "节奏错了几次".toast()
+                    val controller = Navigation.findNavController(it)
+                    val bundle = bundleOf("questionId" to 51)
+                    controller.navigate(
+                        R.id.action_memorizeNumbersFragment_to_numberRecordsFragment,
+                        bundle
+                    )
                 } else {
                     val controller = Navigation.findNavController(it)
                     val bundle = bundleOf("questionId" to questionId)

moca/src/main/java/com/yingyangfly/moca/numberrecords/NumberRecordsFragment.kt

@@ -0,0 +1,38 @@
+package com.yingyangfly.moca.numberrecords
+
+import androidx.core.os.bundleOf
+import androidx.navigation.Navigation
+import com.yingyang.moca.R
+import com.yingyang.moca.databinding.FragmentNumberRecordsBinding
+import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+
+/**
+ * 记录患者错了几次
+ */
+class NumberRecordsFragment : BaseFragment<FragmentNumberRecordsBinding>() {
+
+    override fun initViews() {
+
+    }
+
+    override fun initListener() {
+        binding {
+            btnPrevious.setOnSingleClickListener {
+                val controller = Navigation.findNavController(it)
+                val bundle = bundleOf("questionId" to 51)
+                controller.navigate(
+                    R.id.action_numberRecordsFragment_to_memorizeNumbersFragment,
+                    bundle
+                )
+            }
+            btnNext.setOnSingleClickListener {
+
+            }
+        }
+    }
+
+    override fun initData() {
+
+    }
+}

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

@@ -81,7 +81,6 @@
             </LinearLayout>
         </com.google.android.material.card.MaterialCardView>
 
-
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btnPrevious"
             android:layout_width="@dimen/divider_240px"

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

@@ -0,0 +1,135 @@
+<?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">
+
+    <data>
+
+        <variable
+            name="data"
+            type="com.yingyangfly.baselib.db.QuestionsBean" />
+
+        <import type="android.text.InputType" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:id="@+id/titleLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_53px"
+            android:gravity="center_horizontal"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/may_i_ask_the_subject_is_wrong"
+                android:textColor="@color/color_FF222222"
+                android:textSize="@dimen/divider_34px"
+                android:textStyle="bold" />
+
+            <androidx.appcompat.widget.AppCompatEditText
+                android:layout_width="@dimen/divider_80px"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_6px"
+                android:layout_marginEnd="@dimen/divider_6px"
+                android:background="@drawable/bg_choice_item"
+                android:gravity="center_horizontal"
+                android:inputType="@{InputType.TYPE_CLASS_NUMBER}"
+                android:textColor="@color/color_FF222222"
+                android:textSize="@dimen/divider_34px"
+                android:textStyle="bold" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/time"
+                android:textColor="@color/color_FF222222"
+                android:textSize="@dimen/divider_34px"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="@dimen/divider_398px"
+            android:layout_height="@dimen/divider_448px"
+            android:layout_marginTop="@dimen/divider_28px"
+            android:theme="@style/Theme.MaterialComponents.NoActionBar"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardCornerRadius="@dimen/divider_20px"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/titleLayout"
+            app:strokeColor="@color/color_FF979797"
+            app:strokeWidth="@dimen/divider_1px">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <EditText
+                    android:id="@+id/editYear"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_62px"
+                    android:background="@color/color_FF4A76FF"
+                    android:gravity="center_vertical"
+                    android:inputType="@{InputType.TYPE_CLASS_NUMBER}"
+                    android:paddingStart="@dimen/divider_43px"
+                    android:paddingEnd="@dimen/divider_43px"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rvNum"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/divider_13px"
+                    android:layout_marginTop="@dimen/divider_6px"
+                    android:layout_marginEnd="@dimen/divider_13px" />
+
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <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_page"
+            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>

moca/src/main/res/navigation/nav_moca.xml

@@ -152,6 +152,10 @@
             android:id="@+id/action_memorizeNumbersFragment_to_memorizeResultFragment"
             app:destination="@id/memorizeResultFragment" />
 
+        <action
+            android:id="@+id/action_memorizeNumbersFragment_to_numberRecordsFragment"
+            app:destination="@id/numberRecordsFragment" />
+
     </fragment>
 
     <fragment
@@ -165,4 +169,15 @@
 
     </fragment>
 
+    <fragment
+        android:id="@+id/numberRecordsFragment"
+        android:name="com.yingyangfly.moca.numberrecords.NumberRecordsFragment"
+        android:label="numberRecordsFragment">
+
+        <action
+            android:id="@+id/action_numberRecordsFragment_to_memorizeNumbersFragment"
+            app:destination="@id/memorizeNumbersFragment" />
+
+    </fragment>
+
 </navigation>

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

@@ -34,4 +34,6 @@
     <string name="please_say_words_you_just_heard" tools:ignore="ResourceName">请您说出刚才听到的词</string>
     <string name="here_some_numbers_listen_after_listening_please_recite_them_in_order" tools:ignore="ResourceName">下面给您听一些数字，听完后请按照顺序背出来请听题</string>
     <string name="please_say_numbers_just_heard_in_order" tools:ignore="ResourceName">请您按顺序说出刚才听到的数字</string>
+    <string name="may_i_ask_the_subject_is_wrong" tools:ignore="ResourceName">请问受试者错了</string>
+    <string name="time" tools:ignore="ResourceName">次</string>
 </resources>