Browse Source

修改设备首次安装启动出现报错闪退问题

weizhengliang 1 year ago
parent
commit
827422b33b

+ 5 - 6
android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -317,10 +317,6 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNewN
             }.start()
             }.start()
         }
         }
 
 
-        //检查版本
-        Constant.autoUpdate = true
-        checkApp()
-
         language = LocaleMangerUtils.getApplicationLocale().language
         language = LocaleMangerUtils.getApplicationLocale().language
 
 
         if ("rk3128".equals(Build.MODEL)) {
         if ("rk3128".equals(Build.MODEL)) {
@@ -888,6 +884,9 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNewN
 
 
             setSettingConfiguration()
             setSettingConfiguration()
 
 
+            //检查版本
+            Constant.autoUpdate = true
+            checkApp()
 
 
         } catch (e: Exception) {
         } catch (e: Exception) {
             //showMessage("Setting configs error: " + e.message)
             //showMessage("Setting configs error: " + e.message)
@@ -1055,7 +1054,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNewN
             //transaction.setCustomAnimations(R.anim.slide_in_from_right, 0)
             //transaction.setCustomAnimations(R.anim.slide_in_from_right, 0)
             transaction.show(currentFragmentThree!!)
             transaction.show(currentFragmentThree!!)
             transaction.addToBackStack(null)
             transaction.addToBackStack(null)
-            transaction.commit()
+            transaction.commitAllowingStateLoss()
             isFragmentVisible = true
             isFragmentVisible = true
         }
         }
     }
     }
@@ -1065,7 +1064,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNewN
             val transaction = supportFragmentManager.beginTransaction()
             val transaction = supportFragmentManager.beginTransaction()
             //transaction.setCustomAnimations(0,R.anim.slide_out_from_right)
             //transaction.setCustomAnimations(0,R.anim.slide_out_from_right)
             transaction.hide(currentFragmentThree!!)
             transaction.hide(currentFragmentThree!!)
-            transaction.commit()
+            transaction.commitAllowingStateLoss()
             isFragmentVisible = false
             isFragmentVisible = false
         }
         }
     }
     }

+ 3 - 1
android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/FramePartFragment.kt

@@ -101,7 +101,9 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
         listView.layoutManager = virtualLayoutManager
         listView.layoutManager = virtualLayoutManager
         listView.adapter = delegateAdapter
         listView.adapter = delegateAdapter
 
 
-        presenter.loadData(Constant.PART_ID)
+        if (Constant.PART_ID != null) {
+            presenter.loadData(Constant.PART_ID)
+        }
 
 
     }
     }
     /**
     /**

+ 3 - 3
callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -322,7 +322,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
     fun switchFragment(id: Int, fragment: Fragment, tag: String) {
     fun switchFragment(id: Int, fragment: Fragment, tag: String) {
         supportFragmentManager.beginTransaction()
         supportFragmentManager.beginTransaction()
                 .replace(id, fragment, tag)
                 .replace(id, fragment, tag)
-                .commit()
+                .commitAllowingStateLoss()
         curFragment = tag
         curFragment = tag
     }
     }
 
 
@@ -339,7 +339,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         supportFragmentManager.beginTransaction()
         supportFragmentManager.beginTransaction()
             .setCustomAnimations(R.anim.slide_down_in, R.anim.slide_up_out)
             .setCustomAnimations(R.anim.slide_down_in, R.anim.slide_up_out)
             .add(R.id.call_frame_new, fragment)
             .add(R.id.call_frame_new, fragment)
-            .commit()
+            .commitAllowingStateLoss()
     }
     }
 
 
     fun removeCallFragment() {
     fun removeCallFragment() {
@@ -347,7 +347,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             supportFragmentManager.beginTransaction()
             supportFragmentManager.beginTransaction()
                 //.setCustomAnimations(R.anim.slide_down_in, R.anim.slide_down_out)
                 //.setCustomAnimations(R.anim.slide_down_in, R.anim.slide_down_out)
                 .remove(skyCallFragment!!)
                 .remove(skyCallFragment!!)
-                .commit()
+                .commitAllowingStateLoss()
             skyCallFragment = null
             skyCallFragment = null
         }
         }
     }
     }