1.添加获取moca试题库module

.idea/misc.xml

@@ -139,6 +139,7 @@
         <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" />
+        <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_timepiece.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_verify_answers.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/item_choice.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/item_moca_choice.xml" value="0.23697916666666666" />

moca/src/main/java/com/yingyangfly/moca/listenspeak/ListenSpeakResultFragment.kt

@@ -56,7 +56,12 @@ class ListenSpeakResultFragment : BaseFragment<FragmentListenSpeakResultBinding>
                         bundle
                     )
                 } else {
-                    "下一页".toast()
+                    val controller = Navigation.findNavController(it)
+                    val bundle = bundleOf("questionId" to 59)
+                    controller.navigate(
+                        R.id.action_listenSpeakResultFragment_to_timepieceFragment,
+                        bundle
+                    )
                 }
             }
         }

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

@@ -1,5 +1,6 @@
 package com.yingyangfly.moca.numberrecords
 
+import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.GridLayoutManager
@@ -8,6 +9,7 @@ import com.yingyang.moca.databinding.FragmentNumberRecordsBinding
 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.moca.adapter.NumberAdapter
 
 /**
@@ -15,11 +17,21 @@ import com.yingyangfly.moca.adapter.NumberAdapter
  */
 class NumberRecordsFragment : BaseFragment<FragmentNumberRecordsBinding>() {
 
+    /**
+     * 问题id
+     */
+    private var questionId = 0
+
     private val numberList = mutableListOf<String>()
     private val numberAdapter by lazy { NumberAdapter() }
     private val stringBuffer = StringBuffer()
     var question: QuestionsBean? = null
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        questionId = arguments?.getInt("questionId") ?: 57
+        super.onCreate(savedInstanceState)
+    }
+
     override fun initViews() {
         binding.rvNum.layoutManager = GridLayoutManager(mContext, 3)
         binding.rvNum.adapter = numberAdapter
@@ -61,20 +73,33 @@ class NumberRecordsFragment : BaseFragment<FragmentNumberRecordsBinding>() {
     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
-                )
+                if (questionId == 59) {
+                    val controller = Navigation.findNavController(it)
+                    val bundle = bundleOf("questionId" to questionId)
+                    controller.navigate(
+                        R.id.action_numberRecordsFragment_to_timepieceFragment,
+                        bundle
+                    )
+                } else {
+                    val controller = Navigation.findNavController(it)
+                    val bundle = bundleOf("questionId" to 51)
+                    controller.navigate(
+                        R.id.action_numberRecordsFragment_to_memorizeNumbersFragment,
+                        bundle
+                    )
+                }
             }
             btnNext.setOnSingleClickListener {
-                val controller = Navigation.findNavController(it)
-                val bundle = bundleOf("questionId" to 52)
-                controller.navigate(
-                    R.id.action_numberRecordsFragment_to_computationFragment,
-                    bundle
-                )
+                if (questionId == 59) {
+                    "计时器".toast()
+                } else {
+                    val controller = Navigation.findNavController(it)
+                    val bundle = bundleOf("questionId" to 52)
+                    controller.navigate(
+                        R.id.action_numberRecordsFragment_to_computationFragment,
+                        bundle
+                    )
+                }
             }
         }
     }

moca/src/main/java/com/yingyangfly/moca/timepiece/TimepieceFragment.kt

@@ -0,0 +1,44 @@
+package com.yingyangfly.moca.timepiece
+
+import androidx.core.os.bundleOf
+import androidx.navigation.Navigation
+import com.yingyang.moca.R
+import com.yingyang.moca.databinding.FragmentTimepieceBinding
+import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+
+/**
+ * 计时器
+ */
+class TimepieceFragment : BaseFragment<FragmentTimepieceBinding>() {
+
+    override fun initViews() {
+
+    }
+
+    override fun initListener() {
+        binding {
+            btnPrevious.setOnSingleClickListener {
+                val controller = Navigation.findNavController(it)
+                val bundle = bundleOf("questionId" to 58)
+                controller.navigate(
+                    R.id.action_timepieceFragment_to_listenSpeakResultFragment,
+                    bundle
+                )
+            }
+
+            btnNext.setOnSingleClickListener {
+                val controller = Navigation.findNavController(it)
+                val bundle = bundleOf("questionId" to 59)
+                controller.navigate(
+                    R.id.action_timepieceFragment_to_numberRecordsFragment,
+                    bundle
+                )
+            }
+        }
+    }
+
+    override fun initData() {
+
+    }
+}

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

@@ -0,0 +1,44 @@
+<?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">
+
+        <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

@@ -182,6 +182,10 @@
             android:id="@+id/action_numberRecordsFragment_to_computationFragment"
             app:destination="@id/computationFragment" />
 
+        <action
+            android:id="@+id/action_numberRecordsFragment_to_timepieceFragment"
+            app:destination="@id/timepieceFragment" />
+
     </fragment>
 
     <fragment
@@ -223,6 +227,25 @@
             android:id="@+id/action_listenSpeakResultFragment_to_listenSpeakFragment"
             app:destination="@id/listenSpeakFragment" />
 
+        <action
+            android:id="@+id/action_listenSpeakResultFragment_to_timepieceFragment"
+            app:destination="@id/timepieceFragment" />
+
+    </fragment>
+
+    <fragment
+        android:id="@+id/timepieceFragment"
+        android:name="com.yingyangfly.moca.timepiece.TimepieceFragment"
+        android:label="timepieceFragment">
+
+        <action
+            android:id="@+id/action_timepieceFragment_to_listenSpeakResultFragment"
+            app:destination="@id/listenSpeakResultFragment" />
+
+        <action
+            android:id="@+id/action_timepieceFragment_to_numberRecordsFragment"
+            app:destination="@id/numberRecordsFragment" />
+
     </fragment>