修复了登录成功后跳转界面错误问题
This commit is contained in:
@@ -213,7 +213,8 @@ class BindPlateFragment : BaseFragment<FragmentBindPlateBinding>(
|
||||
MainActivity.start(
|
||||
requireContext(),
|
||||
pageType = PageType.PLATE_TIP,
|
||||
equipmentUserInfo = errorInfo.equipmentUserInfo
|
||||
equipmentUserInfo = errorInfo.equipmentUserInfo,
|
||||
isAdmin = true
|
||||
)
|
||||
} else {
|
||||
SerialApi.openPlate(
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package com.sw.platecabinet.fragment
|
||||
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.os.CountDownTimer
|
||||
import com.sw.platecabinet.Constants
|
||||
import com.sw.platecabinet.R
|
||||
import com.sw.platecabinet.activity.InitActivity
|
||||
import com.sw.platecabinet.databinding.FragmentPlateOpenBinding
|
||||
import com.sw.platecabinet.model.response.EquipmentUserInfo
|
||||
|
||||
@@ -14,14 +16,17 @@ class PlateOpenFragment :
|
||||
BaseFragment<FragmentPlateOpenBinding>(FragmentPlateOpenBinding::inflate) {
|
||||
private var totalTimeInMillis: Long = Constants.AUTO_CLOSE_TIME * 1000
|
||||
internal val KEY_ACTION_TYPE = "actionType"
|
||||
internal val PARAM_IS_ADMIN = "isAdmin"
|
||||
private var info: EquipmentUserInfo? = null
|
||||
private var isAdmin: Boolean = false
|
||||
|
||||
companion object {
|
||||
@JvmStatic
|
||||
fun newInstance(userInfo: EquipmentUserInfo?) =
|
||||
fun newInstance(userInfo: EquipmentUserInfo?, isAdmin: Boolean) =
|
||||
PlateOpenFragment().apply {
|
||||
arguments = Bundle().apply {
|
||||
putParcelable(KEY_ACTION_TYPE, userInfo)
|
||||
putBoolean(PARAM_IS_ADMIN, isAdmin)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,6 +34,7 @@ class PlateOpenFragment :
|
||||
override fun initialize() {
|
||||
arguments?.let {
|
||||
info = it.getParcelable(KEY_ACTION_TYPE)
|
||||
isAdmin = it.getBoolean(PARAM_IS_ADMIN)
|
||||
info?.let {
|
||||
if (!it.hasEquipmentBox()) {
|
||||
binding.ivType.setImageResource(R.drawable.ic_tip_warn)
|
||||
@@ -60,6 +66,10 @@ class PlateOpenFragment :
|
||||
|
||||
override fun onFinish() {
|
||||
activity?.finish()
|
||||
if (!isAdmin) {
|
||||
val intent = Intent(context, InitActivity::class.java)
|
||||
startActivity(intent)
|
||||
}
|
||||
}
|
||||
}.start()
|
||||
}
|
||||
|
||||
@@ -168,7 +168,11 @@ class SettingListFragment :
|
||||
SerialApi.openPlate(equipmentBoxCode, object : SerialPortManager.SendCallback {
|
||||
override fun onSuccess() {
|
||||
hideWaitingDialog()
|
||||
MainActivity.start(requireContext(), pageType = PageType.PLATE_TIP)
|
||||
MainActivity.start(
|
||||
requireContext(),
|
||||
pageType = PageType.PLATE_TIP,
|
||||
isAdmin = true
|
||||
)
|
||||
}
|
||||
|
||||
override fun onFail(e: Exception?) {
|
||||
|
||||
Reference in New Issue
Block a user