Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into 'test_robotaxi-d-app-module_2130_221116_2.13.0.1'

Dev robotaxi d app module 2130 221116 2.13.0 See merge request zhjt/AndroidApp/MoGoEagleEye!476
2022-12-22 11:24:53 +00:00
parent 58a3df09f5 a102aab3c0
commit 80db9b4419
6 changed files with 54 additions and 32 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -255,8 +255,8 @@ dependencies {
    implementation rootProject.ext.dependencies.arouter
    implementation rootProject.ext.dependencies.boostmultidex

-    debugImplementation rootProject.ext.dependencies.debugleakcanary
-    releaseImplementation rootProject.ext.dependencies.releaseleakcanary
+//    debugImplementation rootProject.ext.dependencies.debugleakcanary
+//    releaseImplementation rootProject.ext.dependencies.releaseleakcanary
    implementation rootProject.ext.dependencies.android_start_up
    implementation rootProject.ext.dependencies.lancetx_runtime

--- a/core/function-impl/mogo-core-function-hmi/build.gradle
+++ b/core/function-impl/mogo-core-function-hmi/build.gradle
@@ -65,8 +65,8 @@ dependencies {
 //    implementation rootProject.ext.dependencies.crashSdk
    implementation rootProject.ext.dependencies.boostmultidex

-    debugImplementation rootProject.ext.dependencies.debugleakcanary
-    releaseImplementation rootProject.ext.dependencies.releaseleakcanary
+//    debugImplementation rootProject.ext.dependencies.debugleakcanary
+//    releaseImplementation rootProject.ext.dependencies.releaseleakcanary

    implementation rootProject.ext.dependencies.arouter
    kapt rootProject.ext.dependencies.aroutercompiler
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt
@@ -201,8 +201,8 @@ class DriverMsgBoxListView @JvmOverloads constructor(
    @Subscribe(threadMode = ThreadMode.MAIN)
    fun notifyList(msgBoxList: MsgBoxBean){
        badCaseList?.let {
-            it.remove(msgBoxList)
            driverMsgBoxListAdapter?.notifyItemRemoved(it.indexOf(msgBoxList))
+            it.remove(msgBoxList)
        }
    }
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -83,7 +83,6 @@ import com.zhidao.support.adas.high.other.permission.BackgrounderPermission
 import com.zhjt.mogo_core_function_devatools.env.*
 import kotlinx.android.synthetic.main.view_debug_setting.view.*
 import kotlinx.android.synthetic.main.view_debug_setting.view.tbRouteDynamicEffect
-import kotlinx.android.synthetic.main.view_sop_setting.view.*
 import mogo.telematics.pad.MessagePad
 import mogo_msg.MogoReportMsg
 import java.text.SimpleDateFormat
@@ -583,15 +582,15 @@ class DebugSettingView @JvmOverloads constructor(
        tbIsDemoMode.isChecked = FunctionBuildConfig.isDemoMode

        // 演示模式
-        tbIsDemoMode.setOnCheckedChangeListener { _, isChecked ->
-            CallerHmiManager.updateStatusBarLeftView(isChecked, "demoMode", DemoModeView(context))
-            CallerAutoPilotManager.setDemoMode(isChecked)
-            if (!isChecked) {
+        tbIsDemoMode.setOnCheckedChangeListener { _, _ ->
+            FunctionBuildConfig.isDemoMode = !FunctionBuildConfig.isDemoMode
+            CallerHmiManager.updateStatusBarLeftView(FunctionBuildConfig.isDemoMode, "demoMode", DemoModeView(context))
+            CallerAutoPilotManager.setDemoMode(FunctionBuildConfig.isDemoMode)
+            if (!FunctionBuildConfig.isDemoMode) {
                //关闭美化模式时，通知工控机
-                CallerAutoPilotManager.setIPCDemoMode(isChecked)
+                CallerAutoPilotManager.setIPCDemoMode(FunctionBuildConfig.isDemoMode)
            }
-            FunctionBuildConfig.isDemoMode = isChecked
-            tbIsDrawAutopilotTrajectoryData.isEnabled = !isChecked
+            tbIsDrawAutopilotTrajectoryData.isEnabled = !FunctionBuildConfig.isDemoMode
            if (!FunctionBuildConfig.isDemoMode) {
                tbIsDrawAutopilotTrajectoryData.isChecked = false
            }
@@ -1833,6 +1832,13 @@ class DebugSettingView @JvmOverloads constructor(
        mUnknownIdentifyDataSize = 0
        mTrajectoryInfoSize = 0
        mRouteInfoSize = 0
+
+        if(FunctionBuildConfig.isDemoMode){
+            tbIsDemoMode.text = "关闭美化模式"
+        }else{
+            tbIsDemoMode.text = "开启美化模式"
+        }
+
    }

    /**
--- 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
@@ -20,9 +20,11 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.function.business.routeoverlay.RouteStrategy
 import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.android.synthetic.main.view_debug_setting.view.*
 import kotlinx.android.synthetic.main.view_sop_setting.view.*
 import kotlinx.android.synthetic.main.view_sop_setting.view.tbRouteDynamicEffect
+import java.util.*

 /**
 * SOP设置窗口
@@ -153,14 +155,14 @@ class SOPSettingView @JvmOverloads constructor(
        // 演示模式,上一次勾选的数据
        tbDemoMode.isChecked = FunctionBuildConfig.isDemoMode
        // 演示模式
-        tbDemoMode.setOnCheckedChangeListener { _, isChecked ->
-            CallerHmiManager.updateStatusBarLeftView(isChecked, "demoMode", DemoModeView(context))
-            CallerAutoPilotManager.setDemoMode(isChecked)
-            if (!isChecked) {
+        tbDemoMode.setOnCheckedChangeListener { _, _ ->
+            FunctionBuildConfig.isDemoMode = !FunctionBuildConfig.isDemoMode
+            CallerHmiManager.updateStatusBarLeftView(FunctionBuildConfig.isDemoMode, "demoMode", DemoModeView(context))
+            CallerAutoPilotManager.setDemoMode(FunctionBuildConfig.isDemoMode)
+            if (!FunctionBuildConfig.isDemoMode) {
                //关闭美化模式时，通知工控机
-                CallerAutoPilotManager.setIPCDemoMode(isChecked)
+                CallerAutoPilotManager.setIPCDemoMode(FunctionBuildConfig.isDemoMode)
            }
-            FunctionBuildConfig.isDemoMode = isChecked
        }
        //只在司机端设置美化模式开关功能
        if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
@@ -246,12 +248,32 @@ class SOPSettingView @JvmOverloads constructor(
        CallerDevaToolsFuncConfigListenerManager.registerDevaToolsFuncConfigListener(
            FuncBizConfig.FOUNDATION, TAG, true, this
        )
+        // 开启定时查询速度
+        Timer().schedule(timerTaskRefresh, Date(), 500)
    }

    override fun onDetachedFromWindow() {
        super.onDetachedFromWindow()
        // 移除 业务配置监听
        CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener(FuncBizConfig.FOUNDATION, TAG)
+        try {
+            timerTaskRefresh.cancel()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    private val timerTaskRefresh = object : TimerTask(){
+        override fun run() {
+            UiThreadHandler.post{
+                if(FunctionBuildConfig.isDemoMode){
+                    tbDemoMode.text = "关闭美化模式"
+                }else{
+                    tbDemoMode.text = "开启美化模式"
+                }
+            }
+        }
+
    }

    override fun updateBizView(type: String, lock: Boolean) {
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
@@ -219,7 +219,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                if (event.getAction() == KeyEvent.ACTION_DOWN) {
                    pressADownTime = System.currentTimeMillis();
                    CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent A down pressADownTime = " + pressADownTime + "---" + (pressADownTime - startPressTime) + "----isCombinationKey = " + isCombinationKey + "--pressBDownTime = " + pressBDownTime);
-                    if ((pressADownTime - startPressTime) > 320 && (pressADownTime - startPressTime) < 1300 && pressBDownTime > 0) {
+                    if ((pressADownTime - startPressTime) > 360 && (pressADownTime - startPressTime) < 1300 && pressBDownTime > 0) {
                        if (isShowToast) {
                            ToastUtils.showShort("方块 A 按AB组合 -2 ");
                        }
@@ -238,7 +238,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                } else if (event.getAction() == KeyEvent.ACTION_UP) {
                    pressAUpTime = System.currentTimeMillis();
                    CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent A up    pressAUpTime = " + pressAUpTime + "---" + (pressAUpTime - startPressTime) + "--pressBDownTime = " + pressBDownTime);
-                    if ((pressAUpTime - startPressTime) < 300 && isCombinationKey != 3) {
+                    if ((pressAUpTime - startPressTime) < 350 && isCombinationKey != 3) {
                        isCombinationKey = 1;
                        if (isShowToast) {
                            ToastUtils.showShort("方块 单击A -1 ");
@@ -259,7 +259,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                if (event.getAction() == KeyEvent.ACTION_DOWN) {
                    pressBDownTime = System.currentTimeMillis();
                    CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent B down pressBDownTime = " + pressBDownTime + "--差-" + (pressBDownTime - startPressTime) + "---isCombinationKey = " + isCombinationKey + "--pressADownTime = " + pressADownTime);
-                    if ((pressBDownTime - startPressTime) > 320 && (pressBDownTime - startPressTime) < 1300 && pressADownTime > 0) {
+                    if ((pressBDownTime - startPressTime) > 360 && (pressBDownTime - startPressTime) < 1300 && pressADownTime > 0) {
                        if (isShowToast) {
                            ToastUtils.showShort("方块 B 按AB组合  ");
                        }
@@ -278,7 +278,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                } else if (event.getAction() == KeyEvent.ACTION_UP) {
                    pressBUpTime = System.currentTimeMillis();
                    CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent B up   pressBUpTime = " + pressBUpTime + "--差-" + (pressBUpTime - startPressTime) + "--pressADownTime = " + pressADownTime);
-                    if ((pressBUpTime - startPressTime) < 300 && isCombinationKey != 3) {
+                    if ((pressBUpTime - startPressTime) < 350 && isCombinationKey != 3) {
                        if (isShowToast) {
                            ToastUtils.showShort("方块 单击B  0 ");
                        }
@@ -301,7 +301,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                    pressCDownTime = System.currentTimeMillis();
                    CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按C 无操作 time dif = " + (pressCDownTime - startPressTime));
                    if ((pressCDownTime - startPressTime) > 1320) {
-                        CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按C 无操作 ");
                        if (isShowToast) {
                            ToastUtils.showShort("方块 长按C 无操作 ");
                        }
@@ -310,8 +309,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                    pressCUpTime = System.currentTimeMillis();
                    isPressEnd = false;
                    CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 单击C ← 向左变道 time dif = " + (pressCUpTime - startPressTime));
-                    if ((pressCUpTime - startPressTime) < 300) {
-                        CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 单击C ← 向左变道 ");
+                    if ((pressCUpTime - startPressTime) < 350) {
                        if (isShowToast) {
                            ToastUtils.showShort("方块 单击C ← 向左变道 ");
                        }
@@ -324,7 +322,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                    pressDDownTime = System.currentTimeMillis();
                    CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按D 无操作 time dif = " + (pressDDownTime - startPressTime));
                    if ((pressDDownTime - startPressTime) > 1320) {
-                        CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按D 无操作 ");
                        if (isShowToast) {
                            ToastUtils.showShort("方块 长按D 无操作 ");
                        }
@@ -333,11 +330,10 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                    pressDUpTime = System.currentTimeMillis();
                    isPressEnd = false;
                    CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 单击D → 向右变道 time dif = " + (pressDUpTime - startPressTime));
-                    if ((pressDUpTime - startPressTime) < 300) {
+                    if ((pressDUpTime - startPressTime) < 350) {
                        if (isShowToast) {
                            ToastUtils.showShort("方块 单击D → 向右变道 ");
                        }
-                        CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 单击D → 向右变道 ");
                        CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneRight();
                    }
                }
@@ -350,7 +346,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                        if (isShowToast) {
                            ToastUtils.showShort("方块 长按E 鸣笛 ");
                        }
-                        CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按E 鸣笛 ");
                        CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(1);
                        if (timerHorn == null) {
                            timerHorn = new Timer();
@@ -367,11 +362,10 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                    pressEUpTime = System.currentTimeMillis();
                    isPressEnd = false;
                    CallerLogger.INSTANCE.d(M_F + "MoFangManager", "方块 单击E 开启自动驾驶 time dif = " + (pressEUpTime - startPressTime));
-                    if ((pressEUpTime - startPressTime) < 300) {
+                    if ((pressEUpTime - startPressTime) < 350) {
                        if (isShowToast) {
                            ToastUtils.showShort("方块 单击E 开启自动驾驶 ");
                        }
-                        CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 单击E 开启自动驾驶 = " + CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getAutopilotControlParameters());
                        CallerAutoPilotManager.INSTANCE.startAutoPilot(CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getAutopilotControlParameters());
                    }
                }