修复了登录成功后跳转界面错误问题
This commit is contained in:
@@ -320,7 +320,8 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
|
||||
MainActivity.start(
|
||||
context,
|
||||
pageType = PageType.PLATE_TIP,
|
||||
equipmentUserInfo = equipmentUserInfo
|
||||
equipmentUserInfo = equipmentUserInfo,
|
||||
isAdmin
|
||||
)
|
||||
return
|
||||
}
|
||||
@@ -329,7 +330,11 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
|
||||
equipmentUserInfo.equipmentBoxCode!!.toInt(),
|
||||
object : SerialPortManager.SendCallback {
|
||||
override fun onSuccess() {
|
||||
MainActivity.start(context, pageType = PageType.PLATE_TIP)
|
||||
MainActivity.start(
|
||||
context,
|
||||
pageType = PageType.PLATE_TIP,
|
||||
isAdmin = isAdmin
|
||||
)
|
||||
}
|
||||
|
||||
override fun onFail(e: Exception?) {
|
||||
@@ -344,7 +349,8 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
|
||||
MainActivity.start(
|
||||
context,
|
||||
pageType = PageType.PLATE_TIP,
|
||||
equipmentUserInfo = equipmentUserInfo
|
||||
equipmentUserInfo = equipmentUserInfo,
|
||||
isAdmin = isAdmin
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -255,7 +255,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
|
||||
val layoutParams = adjustPreviewViewSize(
|
||||
binding.dualCameraTexturePreviewRgb,
|
||||
binding.dualCameraTexturePreviewRgb, binding.dualCameraFaceRectView,
|
||||
previewSizeRgb, displayOrientation, 0.8f
|
||||
previewSizeRgb, displayOrientation, 0.6f
|
||||
)
|
||||
Timber.d("initRgbCamera previewSizeRgb = ${previewSizeRgb.width}-${previewSizeRgb.height}")
|
||||
Timber.d("initRgbCamera layoutParams = ${layoutParams.width}-${layoutParams.height}")
|
||||
@@ -400,7 +400,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
|
||||
|
||||
override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
|
||||
super.handleLoginSuccess(equipmentUserInfo, isAdmin)
|
||||
goInitActivity()
|
||||
// goInitActivity()
|
||||
}
|
||||
|
||||
fun initCountTime() {
|
||||
|
||||
@@ -32,27 +32,31 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
|
||||
companion object {
|
||||
private const val PARAM_PAGE_TYPE = "pageType"
|
||||
private const val PARAM_EQUIPMENT_INFO = "equipmentUserInfo"
|
||||
private const val PARAM_IS_ADMIN = "isAdmin"
|
||||
fun start(
|
||||
context: Context,
|
||||
pageType: PageType,
|
||||
equipmentUserInfo: EquipmentUserInfo? = null
|
||||
equipmentUserInfo: EquipmentUserInfo? = null,
|
||||
isAdmin: Boolean = false
|
||||
) {
|
||||
val intent = Intent(context, MainActivity::class.java)
|
||||
intent.putExtra(PARAM_PAGE_TYPE, pageType.name)
|
||||
intent.putExtra(PARAM_EQUIPMENT_INFO, equipmentUserInfo)
|
||||
intent.putExtra(PARAM_IS_ADMIN, isAdmin)
|
||||
context.startActivity(intent)
|
||||
}
|
||||
}
|
||||
|
||||
override fun initialize() {
|
||||
val param = intent.getStringExtra(PARAM_PAGE_TYPE)
|
||||
val isAdmin = intent.getBooleanExtra(PARAM_IS_ADMIN, false)
|
||||
val equipmentUserInfo = intent.getParcelableExtra<EquipmentUserInfo>(PARAM_EQUIPMENT_INFO)
|
||||
pageType = param?.let { PageType.valueOf(param) } ?: PageType.SETTING_LIST
|
||||
fragmentHelper = FragmentHelper(supportFragmentManager, R.id.fragment_container)
|
||||
val page = when (pageType) {
|
||||
PageType.SETTING_LIST -> SettingListFragment()
|
||||
PageType.BIND_PLATE -> BindPlateFragment.newInstance(equipmentUserInfo)
|
||||
PageType.PLATE_TIP -> PlateOpenFragment.newInstance(equipmentUserInfo)
|
||||
PageType.PLATE_TIP -> PlateOpenFragment.newInstance(equipmentUserInfo, isAdmin)
|
||||
PageType.UNBIND_PLATE -> UnBindPlateFragment.newInstance(equipmentUserInfo)
|
||||
PageType.PLATE_CABINET_FULL -> PlateCabinetFullFragment()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user