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

mmse/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
             android:name="com.yingyangfly.mmse.activity.questions.QuestionsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
-            android:windowSoftInputMode="adjustResize|adjustPan" />
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name="com.yingyangfly.mmse.activity.SignatureActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

mmse/src/main/java/com/yingyangfly/mmse/adapter/ChoiceAdapter.kt

@@ -19,7 +19,7 @@ class ChoiceAdapter(override val layoutId: Int = R.layout.item_choice) :
         binding.radioCorrect.isChecked = TextUtils.equals(item.inputString, "是")
         binding.radioDeny.isChecked = TextUtils.equals(item.inputString, "否")
         binding.radioChoice.setOnCheckedChangeListener { group, checkedId ->
-            item.review_id = item!!.id
+            item.review_id = item.id
             item.review_answer = ""
             if (checkedId == R.id.radioCorrect) {
                 item.inputString = "是"

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

@@ -37,18 +37,19 @@ class YearFragment : BaseFragment<FragmentYearBinding>() {
         numberAdapter.onNumClickListener = { bean, type ->
             when (type) {
                 "0" -> {
-                    binding.tvYear.post {
+                    binding.editYear.post {
                         stringBuffer.append(bean)
-                        binding.tvYear.setText(stringBuffer.toString())
-                        binding.tvYear.setSelection(stringBuffer.toString().length)
+                        binding.editYear.setText(stringBuffer.toString())
+                        binding.editYear.setSelection(stringBuffer.toString().length)
                     }
                 }
                 "1" -> {
-                    binding.tvYear.post {
+                    binding.editYear.post {
                         if (stringBuffer.toString().isNullOrEmpty().not()) {
                             val size = stringBuffer.toString().length - 1
                             stringBuffer.deleteCharAt(size)
-                            binding.tvYear.setText(stringBuffer.toString())
+                            binding.editYear.setText(stringBuffer.toString())
+                            binding.editYear.setSelection(stringBuffer.toString().length)
                         }
                     }
                 }
@@ -68,7 +69,7 @@ class YearFragment : BaseFragment<FragmentYearBinding>() {
     override fun initListener() {
         binding {
             btnNext.setOnSingleClickListener { view ->
-                if (binding.tvYear.text.toString().trim().isNullOrEmpty()) {
+                if (binding.editYear.text.toString().trim().isNullOrEmpty()) {
                     val str = "请输入$toastInfo"
                     str.toast()
                 } else {
@@ -88,7 +89,6 @@ class YearFragment : BaseFragment<FragmentYearBinding>() {
     }
 
     override fun initData() {
-
     }
 
     override fun onResume() {
@@ -100,12 +100,20 @@ class YearFragment : BaseFragment<FragmentYearBinding>() {
      * 加载数据
      */
     private fun loadData() {
+        binding.editYear.requestFocus()
+        binding.editYear.isFocusable = true
+        binding.editYear.isFocusableInTouchMode = true
         if (dao != null) {
             question = dao?.getQuestion(1)
             if (question != null) {
                 binding.data = question
                 toastInfo = question!!.reviewItem
-                binding.tvYear.setText(question!!.inputString)
+                if (question!!.inputString.isNullOrEmpty().not()) {
+                    stringBuffer.delete(0, question!!.inputString.length - 1)
+                    stringBuffer.append(question!!.inputString)
+                    binding.editYear.setText(question!!.inputString)
+                    binding.editYear.setSelection(question!!.inputString.length)
+                }
             }
         }
     }

mmse/src/main/manifest/AndroidManifest.xml

@@ -7,7 +7,7 @@
             android:name="com.yingyangfly.mmse.activity.questions.QuestionsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
-            android:windowSoftInputMode="adjustResize|adjustPan" />
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name="com.yingyangfly.mmse.activity.SignatureActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

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

@@ -46,6 +46,8 @@
                     android:layout_marginStart="@dimen/divider_20px"
                     android:layout_marginTop="@dimen/divider_118px"
                     android:background="@drawable/bg_calculation_results"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
                     android:gravity="center"
                     android:inputType="@{InputType.TYPE_CLASS_NUMBER}"
                     android:selectAllOnFocus="true"

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

@@ -48,21 +48,18 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <androidx.appcompat.widget.AppCompatEditText
-                    android:id="@+id/tvYear"
+                <EditText
+                    android:id="@+id/editYear"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/divider_62px"
                     android:background="@color/color_FF4A76FF"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
                     android:gravity="center_vertical"
-                    android:inputType="@{InputType.TYPE_CLASS_NUMBER}"
+                    android:inputType="none"
                     android:paddingStart="@dimen/divider_43px"
                     android:paddingEnd="@dimen/divider_43px"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_34px"
-                    android:textStyle="bold"
-                    tools:text="@string/app_name" />
+                    android:textStyle="bold" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rvNum"