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

mmse/src/main/java/com/yingyangfly/mmse/activity/questions/QuestionsActivity.kt

@@ -1,11 +1,9 @@
 package com.yingyangfly.mmse.activity.questions
 
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.yingyang.mmse.R
 import com.yingyang.mmse.databinding.ActivityQuestionsBinding
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
-import com.yingyangfly.mmse.fragment.NumberFragment
 
 /**
  * MMSE测评
@@ -14,8 +12,7 @@ import com.yingyangfly.mmse.fragment.NumberFragment
 class QuestionsActivity : BaseMVVMActivity<ActivityQuestionsBinding, QuestionsViewModel>() {
 
     override fun initViews() {
-        supportFragmentManager.beginTransaction()
-            .add(R.id.layoutOperate, NumberFragment::class.java, null).commit()
+
     }
 
     override fun initListener() {

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

@@ -1,7 +1,10 @@
 package com.yingyangfly.mmse.fragment
 
+import androidx.navigation.Navigation
+import com.yingyang.mmse.R
 import com.yingyang.mmse.databinding.FragmentSelectedItemBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
 
 /**
  * 单选类
@@ -13,7 +16,12 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>() {
     }
 
     override fun initListener() {
-
+        binding {
+            btnPrevious.setOnSingleClickListener { view ->
+                val controller = Navigation.findNavController(view)
+                controller.navigate(R.id.action_selectedItemFragment_to_yearFragment)
+            }
+        }
     }
 
     override fun initData() {

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

@@ -1,8 +1,9 @@
 package com.yingyangfly.mmse.fragment
 
+import androidx.navigation.Navigation
 import androidx.recyclerview.widget.GridLayoutManager
 import com.yingyang.mmse.R
-import com.yingyang.mmse.databinding.FragmentNumberBinding
+import com.yingyang.mmse.databinding.FragmentYearBinding
 import com.yingyangfly.baselib.base.BaseFragment
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.mmse.adapter.NumberAdapter
@@ -10,7 +11,7 @@ import com.yingyangfly.mmse.adapter.NumberAdapter
 /**
  * 数字输入类
  */
-class NumberFragment : BaseFragment<FragmentNumberBinding>() {
+class YearFragment : BaseFragment<FragmentYearBinding>() {
 
     private val numberList = mutableListOf<String>()
     private val numberAdapter by lazy { NumberAdapter() }
@@ -31,11 +32,9 @@ class NumberFragment : BaseFragment<FragmentNumberBinding>() {
 
     override fun initListener() {
         binding {
-            btnNext.setOnSingleClickListener {
-                requireActivity().supportFragmentManager.beginTransaction()
-                    .setCustomAnimations(android.R.anim.slide_in_left, android.R.anim.slide_in_left)
-                    .replace(R.id.layoutOperate, SelectedItemFragment::class.java, null)
-                    .commit()
+            btnNext.setOnSingleClickListener { view ->
+                val controller = Navigation.findNavController(view)
+                controller.navigate(R.id.action_yearFragment_to_selectedItemFragment)
             }
         }
     }

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

@@ -44,8 +44,11 @@
 
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/layoutOperate"
+                android:name="androidx.navigation.fragment.NavHostFragment"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                app:defaultNavHost="true"
+                app:navGraph="@navigation/nav_home" />
 
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -5,19 +5,21 @@
     android:id="@+id/nav_home"
     app:startDestination="@id/yearFragment"
     tools:ignore="ResourceName">
-
+    <fragment
+        android:id="@+id/selectedItemFragment"
+        android:name="com.yingyangfly.mmse.fragment.SelectedItemFragment"
+        android:label="selectedItemFragment">
+        <action
+            android:id="@+id/action_selectedItemFragment_to_yearFragment"
+            app:destination="@id/yearFragment" />
+    </fragment>
     <fragment
         android:id="@+id/yearFragment"
-        android:name="com.yingyangfly.mmse.fragment.NumberFragment"
-        android:label="yearFragment">
+        android:name="com.yingyangfly.mmse.fragment.YearFragment"
+        android:label="yearFragment"
+        tools:layout="@layout/fragment_year">
         <action
             android:id="@+id/action_yearFragment_to_selectedItemFragment"
-            app:destination="@id/selectedItemFragment"
-            app:enterAnim="@android:anim/slide_in_left"
-            app:exitAnim="@android:anim/slide_out_right" />
+            app:destination="@id/selectedItemFragment" />
     </fragment>
-    <fragment
-        android:id="@+id/selectedItemFragment"
-        android:name="com.yingyangfly.mmse.fragment.SelectedItemFragment"
-        android:label="selectedItemFragment" />
 </navigation>