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

.idea/misc.xml

@@ -82,6 +82,7 @@
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/drawable/bg_login_btn.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/drawable/bg_login_edit.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/layout/activity_login.xml" value="0.22826086956521738" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/bg_calculation_results.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/bg_choice_item.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/bg_next_question.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/bg_previous_question.xml" value="0.1615" />
@@ -96,6 +97,7 @@
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/activity_number.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/activity_questions.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/activity_signature.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_count.xml" value="0.44960474308300397" />
         <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_multiple_choice.xml" value="0.2845528455284553" />

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

@@ -0,0 +1,49 @@
+package com.yingyangfly.mmse.fragment
+
+import androidx.recyclerview.widget.GridLayoutManager
+import com.yingyang.mmse.databinding.FragmentCountBinding
+import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.mmse.adapter.NumberAdapter
+
+/**
+ * 计算题fragment
+ */
+class CountFragment : BaseFragment<FragmentCountBinding>() {
+
+    private val numberList = mutableListOf<String>()
+    private val adapter by lazy { NumberAdapter() }
+
+    override fun initViews() {
+        binding {
+            rvInput.layoutManager = GridLayoutManager(mContext, 3)
+            rvInput.adapter = adapter
+        }
+    }
+
+    override fun initListener() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun onResume() {
+        super.onResume()
+        loadData()
+    }
+
+    /**
+     * 加载数据
+     */
+    private fun loadData() {
+        numberList.clear()
+        for (i in 1..9) {
+            numberList.add(i.toString())
+        }
+        numberList.add("删除")
+        numberList.add("0")
+        numberList.add("确定")
+        adapter.setData(numberList)
+    }
+}

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

@@ -47,6 +47,14 @@ class MultipleChoiceFragment : BaseFragment<FragmentMultipleChoiceBinding>() {
                     bundle
                 )
             }
+            btnNext.setOnSingleClickListener {
+                val bundle = bundleOf("questionId" to 14)
+                val controller = Navigation.findNavController(it)
+                controller.navigate(
+                    R.id.action_multipleChoiceFragment_to_countFragment,
+                    bundle
+                )
+            }
         }
     }
 

mmse/src/main/res/drawable/bg_calculation_results.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF979797" />
+    <corners android:radius="@dimen/divider_8px" />
+    <solid android:color="@color/color_FFF6F4F4" />
+    <padding
+        android:left="@dimen/divider_40px"
+        android:right="@dimen/divider_40px" />
+</shape>

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

@@ -0,0 +1,258 @@
+<?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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvHundredMinusSeven"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_205px"
+                    android:layout_marginTop="@dimen/divider_118px"
+                    android:text="@string/please_calculate_one_hundred_minus_seven"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/tvResultOne"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/divider_53px"
+                    android:layout_marginStart="@dimen/divider_20px"
+                    android:layout_marginTop="@dimen/divider_118px"
+                    android:background="@drawable/bg_calculation_results"
+                    android:gravity="center"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/tvHundredMinusSeven"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="@string/previous_question" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvHundredMinusSevenTwo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_205px"
+                    android:layout_marginTop="@dimen/divider_25px"
+                    android:text="@string/subtract_seven_more"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSeven" />
+
+                <TextView
+                    android:id="@+id/tvResultTwo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/divider_53px"
+                    android:layout_marginStart="@dimen/divider_20px"
+                    android:layout_marginTop="@dimen/divider_15px"
+                    android:background="@drawable/bg_calculation_results"
+                    android:gravity="center"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/tvHundredMinusSevenTwo"
+                    app:layout_constraintTop_toBottomOf="@+id/tvResultOne"
+                    tools:text="@string/previous_question" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvHundredMinusSeventhree"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_205px"
+                    android:layout_marginTop="@dimen/divider_22px"
+                    android:text="@string/subtract_seven_more"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSevenTwo" />
+
+                <TextView
+                    android:id="@+id/tvResultThree"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/divider_53px"
+                    android:layout_marginStart="@dimen/divider_20px"
+                    android:layout_marginTop="@dimen/divider_15px"
+                    android:background="@drawable/bg_calculation_results"
+                    android:gravity="center"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/tvHundredMinusSeventhree"
+                    app:layout_constraintTop_toBottomOf="@+id/tvResultTwo"
+                    tools:text="@string/previous_question" />
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvHundredMinusSevenFour"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_205px"
+                    android:layout_marginTop="@dimen/divider_22px"
+                    android:text="@string/subtract_seven_more"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSeventhree" />
+
+                <TextView
+                    android:id="@+id/tvResultFour"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/divider_53px"
+                    android:layout_marginStart="@dimen/divider_20px"
+                    android:layout_marginTop="@dimen/divider_15px"
+                    android:background="@drawable/bg_calculation_results"
+                    android:gravity="center"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/tvHundredMinusSevenFour"
+                    app:layout_constraintTop_toBottomOf="@+id/tvResultThree"
+                    tools:text="@string/previous_question" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvHundredMinusSevenFive"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_205px"
+                    android:layout_marginTop="@dimen/divider_23px"
+                    android:text="@string/subtract_seven_more"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSevenFour" />
+
+                <TextView
+                    android:id="@+id/tvResultFive"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/divider_53px"
+                    android:layout_marginStart="@dimen/divider_20px"
+                    android:layout_marginTop="@dimen/divider_15px"
+                    android:background="@drawable/bg_calculation_results"
+                    android:gravity="center"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/tvHundredMinusSevenFive"
+                    app:layout_constraintTop_toBottomOf="@+id/tvResultFour"
+                    tools:text="@string/previous_question" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvHundredMinusSevenSix"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_205px"
+                    android:layout_marginTop="@dimen/divider_23px"
+                    android:text="@string/subtract_seven_more"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSevenFive" />
+
+                <TextView
+                    android:id="@+id/tvResultSix"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/divider_53px"
+                    android:layout_marginStart="@dimen/divider_20px"
+                    android:layout_marginTop="@dimen/divider_15px"
+                    android:background="@drawable/bg_calculation_results"
+                    android:gravity="center"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/tvHundredMinusSevenSix"
+                    app:layout_constraintTop_toBottomOf="@+id/tvResultFive"
+                    tools:text="@string/previous_question" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1">
+
+                <com.google.android.material.card.MaterialCardView
+                    android:layout_width="@dimen/divider_398px"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/divider_119px"
+                    android:theme="@style/Theme.MaterialComponents.NoActionBar"
+                    app:cardBackgroundColor="@android:color/white"
+                    app:cardCornerRadius="@dimen/divider_20px"
+                    app:strokeColor="@color/color_FF979797"
+                    app:strokeWidth="@dimen/divider_1px">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rvInput"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_28px"
+                        android:layout_marginTop="@dimen/divider_10px"
+                        android:layout_marginBottom="@dimen/divider_30px" />
+
+                </com.google.android.material.card.MaterialCardView>
+            </LinearLayout>
+        </LinearLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/divider_307px"
+            android:layout_marginEnd="@dimen/divider_305px"
+            android:layout_marginBottom="@dimen/divider_60px">
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btnPrevious"
+                android:layout_width="@dimen/divider_240px"
+                android:layout_height="@dimen/divider_68px"
+                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: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>
+
+    </LinearLayout>
+
+</layout>

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

@@ -82,6 +82,19 @@
         <action
             android:id="@+id/action_multipleChoiceFragment_to_soundRecordFragment"
             app:destination="@id/soundRecordFragment" />
+
+        <action
+            android:id="@+id/action_multipleChoiceFragment_to_countFragment"
+            app:destination="@id/countFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/countFragment"
+        android:name="com.yingyangfly.mmse.fragment.CountFragment"
+        android:label="countFragment">
+        <action
+            android:id="@+id/action_countFragment_to_multipleChoiceFragment"
+            app:destination="@id/multipleChoiceFragment" />
     </fragment>
 
 </navigation>

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

@@ -52,8 +52,9 @@
     <dimen name="divider_215px" tools:ignore="ResourceName">215px</dimen>
     <dimen name="divider_214px" tools:ignore="ResourceName">214px</dimen>
     <dimen name="divider_213px" tools:ignore="ResourceName">213px</dimen>
-    <dimen name="divider_202px" tools:ignore="ResourceName">202px</dimen>
+    <dimen name="divider_205px" tools:ignore="ResourceName">205px</dimen>
     <dimen name="divider_203px" tools:ignore="ResourceName">203px</dimen>
+    <dimen name="divider_202px" tools:ignore="ResourceName">202px</dimen>
     <dimen name="divider_200px" tools:ignore="ResourceName">200px</dimen>
     <dimen name="divider_195px" tools:ignore="ResourceName">195px</dimen>
     <dimen name="divider_191px" tools:ignore="ResourceName">191px</dimen>

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

@@ -9,6 +9,7 @@
     <string name="deny" tools:ignore="ResourceName">否</string>
     <string name="continues" tools:ignore="ResourceName">继续</string>
     <string name="Now_you_will_hear_three_words_After_listening_them_please_repeat_these_three_words" tools:ignore="ResourceName">现在您将听到三个词，全部听完之后请您重复说一遍。请记住这三个词，过一会还要问您</string>
-
     <string name="click_play" tools:ignore="ResourceName">点击播放</string>
+    <string name="please_calculate_one_hundred_minus_seven" tools:ignore="ResourceName">请计算100–7</string>
+    <string name="subtract_seven_more" tools:ignore="ResourceName">再减7</string>
 </resources>