|
@@ -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
|
|
}
|
|
}
|
|
}
|
|
}
|