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

login/src/main/res/layout/activity_login.xml

@@ -18,9 +18,9 @@
             android:layout_height="match_parent"
             android:background="@drawable/bg_login"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/loginLayout"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/loginLayout"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -29,8 +29,8 @@
                 android:layout_height="wrap_content"
                 android:background="@mipmap/icon_login"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -41,8 +41,8 @@
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_32px"
                 android:textStyle="bold"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/appImage" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -53,9 +53,9 @@
             android:layout_height="match_parent"
             android:background="@android:color/white"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toEndOf="@id/imageLayout"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -68,8 +68,8 @@
                 android:textColor="@color/color_FF343434"
                 android:textSize="@dimen/divider_42px"
                 android:textStyle="bold"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.AppCompatEditText
@@ -81,8 +81,9 @@
                 android:layout_marginEnd="@dimen/divider_47px"
                 android:background="@drawable/bg_login_edit"
                 android:hint="@string/prompt_email"
-                android:inputType="text"
+                android:inputType="number"
                 android:paddingStart="@dimen/divider_21px"
+                android:paddingEnd="@dimen/divider_21px"
                 android:selectAllOnFocus="true"
                 android:textColor="@color/color_FF222222"
                 android:textSize="@dimen/divider_28px"
@@ -102,6 +103,7 @@
                 android:imeOptions="actionDone"
                 android:inputType="textPassword"
                 android:paddingStart="@dimen/divider_21px"
+                android:paddingEnd="@dimen/divider_21px"
                 android:selectAllOnFocus="true"
                 android:textColor="@color/color_FF222222"
                 android:textSize="@dimen/divider_28px"

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

@@ -106,38 +106,42 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
             val secondQuestionnId = questionId + 1
             secondQuestion = dao?.getQuestion(secondQuestionnId)
             if (secondQuestion != null) {
-                binding.tvResultTwo.text = if (secondQuestion?.inputString.isNullOrEmpty()) {
+                val str = if (secondQuestion?.inputString.isNullOrEmpty()) {
                     ""
                 } else {
                     secondQuestion?.inputString
                 }
+                binding.editResultTwo.setText(str)
             }
             val thirdQuestionId = questionId + 2
             thirdQuestion = dao?.getQuestion(thirdQuestionId)
             if (thirdQuestion != null) {
-                binding.tvResultThree.text = if (thirdQuestion?.inputString.isNullOrEmpty()) {
+                val str = if (thirdQuestion?.inputString.isNullOrEmpty()) {
                     ""
                 } else {
                     thirdQuestion?.inputString
                 }
+                binding.editResultThree.setText(str)
             }
             val fourthQuestionId = questionId + 3
             fourthQuestion = dao?.getQuestion(fourthQuestionId)
             if (fourthQuestion != null) {
-                binding.tvResultFour.text = if (fourthQuestion?.inputString.isNullOrEmpty()) {
+                val str = if (fourthQuestion?.inputString.isNullOrEmpty()) {
                     ""
                 } else {
                     fourthQuestion?.inputString
                 }
+                binding.editResultFour.setText(str)
             }
             val fifthQuestionId = questionId + 4
             fifthQuestion = dao?.getQuestion(fifthQuestionId)
             if (fifthQuestion != null) {
-                binding.tvResultFive.text = if (fifthQuestion?.inputString.isNullOrEmpty()) {
+                val str = if (fifthQuestion?.inputString.isNullOrEmpty()) {
                     ""
                 } else {
                     fifthQuestion?.inputString
                 }
+                binding.editResultFive.setText(str)
             }
         }
     }
@@ -152,43 +156,43 @@ class CountFragment : BaseFragment<FragmentCountBinding>() {
                 return false
             } else {
                 if (firstquestion != null) {
-                    firstquestion?.inputString = binding.editResultOne.text.toString()
+                    firstquestion?.inputString = binding.editResultOne.text.toString().trim()
                     dao?.update(firstquestion!!)
                 }
             }
-            if (binding.tvResultTwo.text.toString().isNullOrEmpty()) {
+            if (binding.editResultTwo.text.toString().trim().isNullOrEmpty()) {
                 "请输入第二道题目的答案".toast()
                 return false
             } else {
                 if (secondQuestion != null) {
-                    secondQuestion?.inputString = binding.tvResultTwo.text.toString()
+                    secondQuestion?.inputString = binding.editResultTwo.text.toString().trim()
                     dao?.update(secondQuestion!!)
                 }
             }
-            if (binding.tvResultThree.text.toString().isNullOrEmpty()) {
+            if (binding.editResultThree.text.toString().trim().isNullOrEmpty()) {
                 "请输入第三道题目的答案".toast()
                 return false
             } else {
                 if (thirdQuestion != null) {
-                    thirdQuestion?.inputString = binding.tvResultThree.text.toString()
+                    thirdQuestion?.inputString = binding.editResultThree.text.toString().trim()
                     dao?.update(thirdQuestion!!)
                 }
             }
-            if (binding.tvResultFour.text.toString().isNullOrEmpty()) {
+            if (binding.editResultFour.text.toString().trim().isNullOrEmpty()) {
                 "请输入第四道题目的答案".toast()
                 return false
             } else {
                 if (fourthQuestion != null) {
-                    fourthQuestion?.inputString = binding.tvResultFour.text.toString()
+                    fourthQuestion?.inputString = binding.editResultFour.text.toString().trim()
                     dao?.update(fourthQuestion!!)
                 }
             }
-            if (binding.tvResultFive.text.toString().isNullOrEmpty()) {
+            if (binding.editResultFive.text.toString().trim().isNullOrEmpty()) {
                 "请输入第五道题目的答案".toast()
                 return false
             } else {
                 if (fifthQuestion != null) {
-                    fifthQuestion?.inputString = binding.tvResultFive.text.toString()
+                    fifthQuestion?.inputString = binding.editResultFive.text.toString().trim()
                     dao?.update(fifthQuestion!!)
                 }
             }

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

@@ -48,6 +48,7 @@
                     android:background="@drawable/bg_calculation_results"
                     android:gravity="center"
                     android:inputType="@{InputType.TYPE_CLASS_NUMBER}"
+                    android:selectAllOnFocus="true"
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_34px"
                     android:textStyle="bold"
@@ -67,20 +68,21 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSeven" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvResultTwo"
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/editResultTwo"
                     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:inputType="@{InputType.TYPE_CLASS_NUMBER}"
+                    android:selectAllOnFocus="true"
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_34px"
                     android:textStyle="bold"
                     app:layout_constraintStart_toEndOf="@+id/tvHundredMinusSevenTwo"
-                    app:layout_constraintTop_toBottomOf="@+id/editResultOne"
-                    tools:text="@string/previous_question" />
+                    app:layout_constraintTop_toBottomOf="@+id/editResultOne" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/tvHundredMinusSeventhree"
@@ -95,20 +97,21 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSevenTwo" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvResultThree"
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/editResultThree"
                     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:inputType="@{InputType.TYPE_CLASS_NUMBER}"
+                    android:selectAllOnFocus="true"
                     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" />
+                    app:layout_constraintTop_toBottomOf="@+id/editResultTwo" />
 
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -124,19 +127,21 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSeventhree" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvResultFour"
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/editResultFour"
                     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:inputType="@{InputType.TYPE_CLASS_NUMBER}"
+                    android:selectAllOnFocus="true"
                     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"
+                    app:layout_constraintTop_toBottomOf="@+id/editResultThree"
                     tools:text="@string/previous_question" />
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -152,19 +157,21 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvHundredMinusSevenFour" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvResultFive"
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/editResultFive"
                     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:inputType="@{InputType.TYPE_CLASS_NUMBER}"
+                    android:selectAllOnFocus="true"
                     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"
+                    app:layout_constraintTop_toBottomOf="@+id/editResultFour"
                     tools:text="@string/previous_question" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>