diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinErrorDialog.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinErrorDialog.kt index a588f7f450..ec34665fab 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinErrorDialog.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinErrorDialog.kt @@ -6,6 +6,7 @@ import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.bridge.R import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager +import kotlinx.android.synthetic.main.common_checkvin_view.actv_error_body_vin import kotlinx.android.synthetic.main.common_checkvin_view.actv_see class CheckVinErrorDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver { @@ -26,6 +27,11 @@ class CheckVinErrorDialog(context: Context) : BaseFloatDialog(context), Lifecycl } } + fun setVinInfo(serverVin: String, delineVin: String) { + actv_error_body_vin.text = "${serverVin}-->${delineVin}" + } + + fun showDialog() { if (isShowing) { return @@ -39,5 +45,4 @@ class CheckVinErrorDialog(context: Context) : BaseFloatDialog(context), Lifecycl } } - } \ No newline at end of file diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinManager.kt index e666166d0c..3e2b9316bb 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinManager.kt @@ -56,9 +56,11 @@ object CheckVinManager : IMoGoAutopilotCarConfigListener { topActivity?.let { UiThreadHandler.post({ if (checkVinErrorDialog != null && checkVinErrorDialog!!.isShowing) { + checkVinErrorDialog?.setVinInfo(serverVin,delineVin) return@post } checkVinErrorDialog = CheckVinErrorDialog(it) + checkVinErrorDialog?.setVinInfo(serverVin,delineVin) checkVinErrorDialog?.showDialog() }, UiThreadHandler.MODE.QUEUE) } diff --git a/OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml b/OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml index dbe88a7879..fc3dcee363 100644 --- a/OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml +++ b/OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml @@ -53,19 +53,33 @@ app:layout_constraintTop_toBottomOf="@+id/actv_error_body" android:text="@string/common_check_vin_tip" /> + +