Merge branch 'dev_robotaxi-d_240401_6.4.0' into dev_robotaxi-d_240401_6.4.0_bailing
This commit is contained in:
@@ -235,26 +235,27 @@ class StatusSummaryView @JvmOverloads constructor(
|
||||
|
||||
override fun authCrtFile(device: String, root: String) {
|
||||
super.authCrtFile(device, root)
|
||||
UiThreadHandler.post {
|
||||
UiThreadHandler.post ({
|
||||
if (data.size < 6) return@post
|
||||
data[5].desc = "本机证书已下载"
|
||||
data[5].isException = false
|
||||
adapter?.notifyItemChanged(5)
|
||||
}
|
||||
}, UiThreadHandler.MODE.QUEUE)
|
||||
}
|
||||
|
||||
override fun authCrtError(errorMsg: String) {
|
||||
super.authCrtError(errorMsg)
|
||||
UiThreadHandler.post {
|
||||
UiThreadHandler.post ({
|
||||
if (data.size < 6) return@post
|
||||
data[5].desc = "本机证书下载异常:$errorMsg"
|
||||
data[5].isException = true
|
||||
adapter?.notifyItemChanged(5)
|
||||
}
|
||||
}, UiThreadHandler.MODE.QUEUE)
|
||||
}
|
||||
|
||||
override fun onCertificationResult(msg: String) {
|
||||
super.onCertificationResult(msg)
|
||||
// Log.i("emArrow","onCertificationResult : $msg")
|
||||
if (!SharedPrefsMgr.getInstance().getBoolean(
|
||||
"${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}",
|
||||
MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE
|
||||
@@ -262,11 +263,11 @@ class StatusSummaryView @JvmOverloads constructor(
|
||||
) {
|
||||
return
|
||||
}
|
||||
UiThreadHandler.post {
|
||||
UiThreadHandler.post ({
|
||||
if (data.size < 6) return@post
|
||||
data[5].desc = msg
|
||||
data[5].isException = !msg.contains("成功校验")
|
||||
adapter?.notifyItemChanged(5)
|
||||
}
|
||||
}, UiThreadHandler.MODE.QUEUE)
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,15 @@ object CallerTelematicListenerManager: CallerBase<IReceivedMsgListener>() {
|
||||
|
||||
private const val TAG = "CallerTelematicListenerManager"
|
||||
|
||||
private var sn: String? = null
|
||||
|
||||
override fun doSomeAfterAddListener(tag: String, listener: IReceivedMsgListener) {
|
||||
super.doSomeAfterAddListener(tag, listener)
|
||||
if (!sn.isNullOrEmpty()) {
|
||||
listener.onReceivedServerSn(sn)
|
||||
}
|
||||
}
|
||||
|
||||
fun invokeReceivedMsg(type: Int, byteArray: ByteArray) {
|
||||
M_LISTENERS.forEach {
|
||||
val listener = it.value
|
||||
@@ -21,6 +30,7 @@ object CallerTelematicListenerManager: CallerBase<IReceivedMsgListener>() {
|
||||
}
|
||||
|
||||
fun dispatchServerSn(sn: String?) {
|
||||
this.sn = sn
|
||||
M_LISTENERS.forEach {
|
||||
val listener = it.value
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user