diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt index dd259ae25e..67a2b90900 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt @@ -128,6 +128,10 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback { setImageStatus(statusView,LockManager.getLockStatus()) } + /** + * @param statusView UnlockView的显示和隐藏 + * @param lockStatus 锁屏状态 + */ private fun setImageStatus(statusView: Int,lockStatus: LockManager.LockStatus){ when (statusView) { View.GONE -> { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt index 81bc154694..aa7d0cbe6a 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt @@ -128,7 +128,7 @@ class UnlockView : ConstraintLayout, LockManager.LockStatusCallback { when (isLock) { LockManager.LockStatus.LOCKED -> { // 锁定 - actv_lock_status.text = "长按开锁键1秒,快速解锁" + actv_lock_status.text = "长按开锁键2秒,快速解锁" aciv_only_unlock.setImageResource(R.drawable.charter_p_only_lock) } LockManager.LockStatus.UNLOCKING -> { diff --git a/OCH/charter/passenger/src/main/res/layout/m1_devices_unlock.xml b/OCH/charter/passenger/src/main/res/layout/m1_devices_unlock.xml index 0797cda389..2ce8e3177d 100644 --- a/OCH/charter/passenger/src/main/res/layout/m1_devices_unlock.xml +++ b/OCH/charter/passenger/src/main/res/layout/m1_devices_unlock.xml @@ -29,7 +29,7 @@ { + // 1--5 + val intArrayExtra = intent.getStringExtra("code") + val newBuilder = MogoReportMsg.MogoReportMessage.newBuilder() + newBuilder.code = intArrayExtra + newBuilder.timestampBuilder.sec = 0 + newBuilder.timestampBuilder.nsec = 0 + newBuilder.src = "2" + newBuilder.level = "" + CallerAutoPilotStatusListenerManager.invokeAutopilotGuardian(newBuilder.build()) + } else -> {} } }