From 6f51faf6909322da3397604b1d11d28addeb5cf9 Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 30 Jun 2023 15:03:58 +0800 Subject: [PATCH] =?UTF-8?q?[3.3.0][=E9=AD=94=E6=96=B9]=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=BF=9E=E6=8E=A5=E7=A8=B3=E5=AE=9A=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- .../mofang/MoGoMoFangProviderImpl.kt | 7 ++++++- .../eagle/core/function/hmi/ui/setting/SOPSettingView.kt | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/config.gradle b/config.gradle index 0538e951be..087d80e74b 100644 --- a/config.gradle +++ b/config.gradle @@ -218,7 +218,7 @@ ext { weak_network : "com.mogo.weak:network:1.0.0", - mofang_runtime : "com.mogo.eagle.core.mofang:runtime:2.0.0" + mofang_runtime : "com.mogo.eagle.core.mofang:runtime:2.0.5" ] android = [ launcherApplicationId : "com.mogo.launcher", diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt index a65afbaa0f..a4ed1a2a8f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt @@ -51,7 +51,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen private val linkedLog by lazy { MoFangLinkedLog().also { executor.setLinkedLog(it) } } - private val isTest by lazy { AtomicBoolean(SPUtils.getInstance().getBoolean(SP_KEY_TEST_ENABLE)) } + private val isTest by lazy { AtomicBoolean(SPUtils.getInstance().getBoolean(SP_KEY_TEST_ENABLE) && isConnected()) } private var toast: MoGoPopWindow? = null @@ -292,4 +292,9 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen Toast.makeText(Utils.getApp(), "检测到魔方未正确连接，请在系统蓝牙设置页面，找到魔方并配对连接...", Toast.LENGTH_SHORT).show() } } + + override fun onBluetoothKeyboardAbnormalDisconnected(status: Int) { + Log.d(TAG, "--- onBluetoothKeyboardAbnormalDisconnected(status: $status) ---") + linkedLog.record(mapOf("callback" to "onBluetoothKeyboardAbnormalDisconnected:$status")) + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index 5fde15f7d2..62bf041148 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -320,7 +320,7 @@ internal class SOPSettingView @JvmOverloads constructor( } } - mfTest.isEnabled = true + mfTest.isEnabled = mf?.isConnected() ?: false mfTest.isChecked = mf?.isEnableTest() ?: false mfTest.setOnCheckedChangeListener { _, isChecked -> mf?.enableTest(isChecked) @@ -410,6 +410,8 @@ internal class SOPSettingView @JvmOverloads constructor( mfStatusLayout?.also { it.hideLoadingView() it.setClickedTextAndTag("断开魔方连接", 0) + mfTest?.isEnabled = true + mfTest?.isChecked = CallerDevaToolsManager.mofang()?.isEnableTest() ?: false } } @@ -417,6 +419,7 @@ internal class SOPSettingView @JvmOverloads constructor( mfStatusLayout?.also { it.hideLoadingView() it.setClickedTextAndTag("开始连接魔方", 1) + mfTest?.isEnabled = false } }