修复异常相关页面跳转异常

app/src/main/java/com/grkj/iscs_mc/view/activity/HomeActivity.kt

@@ -6,7 +6,7 @@ import com.grkj.iscs_mc.databinding.ActivityHomeBinding
 import com.grkj.iscs_mc.view.adapter.MenuAdapter
 import com.grkj.iscs_mc.view.base.BaseFragment
 import com.grkj.iscs_mc.view.base.BaseMvpActivity
-import com.grkj.iscs_mc.view.fragment.ExceptionHandleFragment
+import com.grkj.iscs_mc.view.fragment.ExceptionFragment
 import com.grkj.iscs_mc.view.fragment.MaterialManagementFragment
 import com.grkj.iscs_mc.view.fragment.SettingFragment
 import com.grkj.iscs_mc.view.iview.IHomeView
@@ -26,7 +26,7 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
 
     override fun initView() {
         mMenuList.add(Menu(getString(R.string.material_management), R.mipmap.material_management, MaterialManagementFragment()))
-        mMenuList.add(Menu(getString(R.string.exception_handle), R.mipmap.exception_handle, ExceptionHandleFragment()))
+        mMenuList.add(Menu(getString(R.string.exception_handle), R.mipmap.exception_handle, ExceptionFragment()))
         mMenuList.add(Menu(getString(R.string.settings), R.mipmap.settings, SettingFragment()))
 
         mBinding?.itemSetting?.ivIcon?.setImageResource(R.mipmap.settings)

app/src/main/java/com/grkj/iscs_mc/view/fragment/ExceptionFragment.kt

@@ -0,0 +1,17 @@
+package com.grkj.iscs_mc.view.fragment
+
+import com.grkj.iscs_mc.databinding.FragmentExceptionBinding
+import com.grkj.iscs_mc.view.base.BaseFragment
+
+/**
+ * 异常页
+ */
+class ExceptionFragment : BaseFragment<FragmentExceptionBinding>() {
+
+    override val viewBinding: FragmentExceptionBinding
+        get() = FragmentExceptionBinding.inflate(layoutInflater)
+
+    override fun initView() {
+
+    }
+}

app/src/main/java/com/grkj/iscs_mc/view/fragment/ExceptionHandleFragment.kt

@@ -2,6 +2,7 @@ package com.grkj.iscs_mc.view.fragment
 
 import com.grkj.iscs_mc.R
 import com.grkj.iscs_mc.databinding.FragmentExceptionHandleBinding
+import com.grkj.iscs_mc.extentions.navigateTo
 import com.grkj.iscs_mc.view.base.BaseMvpFragment
 import com.grkj.iscs_mc.view.iview.IExceptionHandleView
 import com.grkj.iscs_mc.view.presenter.ExceptionHandlePresenter
@@ -37,7 +38,7 @@ class ExceptionHandleFragment :
         }
 
         mBinding?.cbReport?.setOnClickListener {
-            ExceptionHandleFragmentDirections.actionExceptionHandleFragmentToExceptionReportFragment()
+            navigateTo(ExceptionHandleFragmentDirections.actionExceptionHandleFragmentToExceptionReportFragment())
         }
     }
 

app/src/main/res/layout/fragment_exception.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".view.fragment.ExceptionFragment">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/nav_graph_exception" />
+
+</FrameLayout>

app/src/main/res/layout/fragment_exception_handle.xml

@@ -32,6 +32,7 @@
             android:id="@+id/cb_open"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/common_spacing"
             app:btn_bg="@drawable/common_btn_red_bg"
             app:btn_name="@string/open_cabinet"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -51,9 +52,10 @@
             android:layout_width="@dimen/common_icon_size_big"
             android:layout_height="@dimen/common_icon_size_big"
             android:layout_marginVertical="2dp"
+            android:layout_marginLeft="@dimen/common_spacing"
             android:background="@mipmap/settings"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintLeft_toRightOf="@id/cb_report"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView

app/src/main/res/navigation/nav_graph.xml

@@ -160,22 +160,4 @@
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right" />
     </fragment>
-
-    <fragment
-        android:id="@+id/exception_handle_fragment"
-        android:name="com.grkj.iscs_mc.view.fragment.ExceptionHandleFragment"
-        tools:layout="@layout/fragment_exception_handle">
-        <action
-            android:id="@+id/action_exception_handle_fragment_to_exception_report_fragment"
-            app:destination="@id/exception_report_fragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/exception_report_fragment"
-        android:name="com.grkj.iscs_mc.view.fragment.ExceptionReportFragment"
-        tools:layout="@layout/fragment_exception_report" />
 </navigation>

app/src/main/res/navigation/nav_graph_exception.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation 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"
+    app:startDestination="@id/exception_handle_fragment">
+
+    <fragment
+        android:id="@+id/exception_handle_fragment"
+        android:name="com.grkj.iscs_mc.view.fragment.ExceptionHandleFragment"
+        tools:layout="@layout/fragment_exception_handle">
+        <action
+            android:id="@+id/action_exception_handle_fragment_to_exception_report_fragment"
+            app:destination="@id/exception_report_fragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/exception_report_fragment"
+        android:name="com.grkj.iscs_mc.view.fragment.ExceptionReportFragment"
+        tools:layout="@layout/fragment_exception_report" />
+</navigation>