Bläddra i källkod

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

王鹏鹏 2 år sedan
förälder
incheckning
3d7512c8ef

+ 1 - 1
.idea/misc.xml

@@ -97,7 +97,7 @@
         <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_selected_item.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_single_judgment.xml" value="0.22239583333333332" />
-        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_sound_record.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_sound_record.xml" value="0.4421768707482993" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_year.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/item_number.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/item_selected_item.xml" value="0.536" />

+ 8 - 3
mmse/src/main/java/com/yingyangfly/mmse/fragment/JudgmentFragment.kt

@@ -54,12 +54,17 @@ class JudgmentFragment : BaseFragment<FragmentJudgmentBinding>() {
                         val str = "请判断受试者的回答是否正确"
                         str.toast()
                     } else {
-                        if (questionId < 10) {
+                        questionId++
+                        if (questionId < 11) {
                             judgeRadio.clearCheck()
-                            questionId++
                             loadData()
                         } else {
-
+                            val bundle = bundleOf("questionId" to questionId)
+                            val controller = Navigation.findNavController(it)
+                            controller.navigate(
+                                R.id.action_judgmentFragment_to_soundRecordFragment,
+                                bundle
+                            )
                         }
                     }
                 }

+ 4 - 2
mmse/src/main/res/layout/fragment_judgment.xml

@@ -1,6 +1,8 @@
 <?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">
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:ignore="ResourceName">
 
     <data>
 

+ 71 - 4
mmse/src/main/res/layout/fragment_sound_record.xml

@@ -4,20 +4,87 @@
     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">
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
             android:id="@+id/tvTitle"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="number"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginStart="@dimen/divider_202px"
+            android:layout_marginTop="@dimen/divider_27px"
+            android:layout_marginEnd="@dimen/divider_200px"
+            android:gravity="center"
+            android:text="@string/Now_you_will_hear_three_words_After_listening_them_please_repeat_these_three_words"
+            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" />
 
+        <CheckBox
+            android:id="@+id/soundBox"
+            android:layout_width="@dimen/divider_154px"
+            android:layout_height="@dimen/divider_154px"
+            android:layout_marginTop="@dimen/divider_56px"
+            android:background="@mipmap/icon_play_sound"
+            android:button="@null"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
+
+        <TextView
+            android:id="@+id/tvplay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_20px"
+            android:text="@string/click_play"
+            android:textColor="@color/color_FF222222"
+            android:textSize="@dimen/divider_28px"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/soundBox" />
+
+        <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>

BIN
mmse/src/main/res/mipmap-xxhdpi/icon_play_sound.png


+ 14 - 0
mmse/src/main/res/navigation/nav_home.xml

@@ -55,5 +55,19 @@
         <action
             android:id="@+id/action_judgmentFragment_to_selectedItemFragment"
             app:destination="@id/selectedItemFragment" />
+
+        <action
+            android:id="@+id/action_judgmentFragment_to_soundRecordFragment"
+            app:destination="@id/soundRecordFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/soundRecordFragment"
+        android:name="com.yingyangfly.mmse.fragment.SoundRecordFragment"
+        android:label="soundRecordFragment">
+        <action
+            android:id="@+id/action_soundRecordFragment_to_judgmentFragment"
+            app:destination="@id/judgmentFragment" />
     </fragment>
+
 </navigation>

+ 2 - 0
mmse/src/main/res/values/dimens.xml

@@ -52,6 +52,7 @@
     <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_203px" tools:ignore="ResourceName">203px</dimen>
     <dimen name="divider_200px" tools:ignore="ResourceName">200px</dimen>
     <dimen name="divider_195px" tools:ignore="ResourceName">195px</dimen>
@@ -62,6 +63,7 @@
     <dimen name="divider_180px" tools:ignore="ResourceName">180px</dimen>
     <dimen name="divider_176px" tools:ignore="ResourceName">176px</dimen>
     <dimen name="divider_175px" tools:ignore="ResourceName">175px</dimen>
+    <dimen name="divider_154px" tools:ignore="ResourceName">154px</dimen>
     <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>
     <dimen name="divider_135px" tools:ignore="ResourceName">135px</dimen>
     <dimen name="divider_133px" tools:ignore="ResourceName">133px</dimen>

+ 3 - 0
mmse/src/main/res/values/strings.xml

@@ -8,4 +8,7 @@
     <string name="correct" tools:ignore="ResourceName">是</string>
     <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>
 </resources>