Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0

core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml

@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.mogo.eagle.core.function.hmi">
 
+
+    <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+    <uses-permission android:name="android.permission.BIND_APPWIDGET" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
+    <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />
+    <uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -39,10 +56,11 @@
             android:clearTaskOnLaunch="${ACTIVITY_ROOT}"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:enabled="true"
+            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:resizeableActivity="false"
             android:resumeWhilePausing="true"
-            android:screenOrientation="landscape"
+            android:screenOrientation="${SCREEN_ORIENTATION}"
             android:stateNotNeeded="true"
             android:theme="@style/Main"
             android:windowSoftInputMode="adjustPan|stateHidden">
@@ -67,7 +85,6 @@
 
         <activity
             android:name="com.mogo.eagle.core.function.main.PassengerLauncherActivity"
-            android:clearTaskOnLaunch="${ACTIVITY_ROOT}"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:enabled="true"
             android:exported="true"
@@ -99,7 +116,6 @@
 
         <activity
             android:name="com.mogo.eagle.core.function.main.VideoAdAtc"
-            android:clearTaskOnLaunch="${ACTIVITY_ROOT}"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:enabled="true"
             android:exported="true"
@@ -121,6 +137,16 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="com.mogo.eagle.core.function.main.AppListActivity"
+            android:exported="true"
+            android:launchMode="singleTask">
+            <!--            <intent-filter>-->
+            <!--                <action android:name="android.intent.action.MAIN"/>-->
+            <!--                <category android:name="android.intent.category.LAUNCHER"/>-->
+            <!--            </intent-filter>-->
+        </activity>
+
         <meta-data
             android:name="MAP_SDK_VERSION111111"
             android:value="${MAP_SDK_VERSION}" />

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt

@@ -87,10 +87,6 @@ class MoGoHmiProvider : IMoGoHmiProvider {
         )
     }
 
-    override fun updateMfStatus(tag: String, status: Boolean) {
-        CallerHmiViewControlListenerManager.updateMfStatus(StatusBarView.TAG, tag, status)
-    }
-
     /**
      * 不展示顶部弹窗，其它保留
      */

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -635,6 +635,33 @@ internal class DebugSettingView @JvmOverloads constructor(
             }
         }
 
+        tbV2NFromCar.isChecked = FunctionBuildConfig.isV2NFromCar
+        //v2n车端预警
+        tbV2NFromCar.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isV2NFromCar = isChecked
+            if (!FunctionBuildConfig.isV2NFromCar) {
+                tbV2NFromCar.isChecked = false
+            }
+        }
+
+        tbDrawAiCloudFusion.isChecked = FunctionBuildConfig.isDrawAiCloudFusion
+        //云端感知绘制
+        tbDrawAiCloudFusion.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isDrawAiCloudFusion = isChecked
+            if (!FunctionBuildConfig.isDrawAiCloudFusion) {
+                tbDrawAiCloudFusion.isChecked = false
+            }
+        }
+
+        tbDrawRomaMode.isChecked = FunctionBuildConfig.isRomaMode
+        //roma
+        tbDrawRomaMode.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isRomaMode = isChecked
+            if (!FunctionBuildConfig.isRomaMode) {
+                tbDrawRomaMode.isChecked = false
+            }
+        }
+
         //重启工控机所有节点
         btnIpcReboot.onClick {
             CallerAutoPilotControlManager.sendIpcReboot()

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt

@@ -175,11 +175,7 @@ internal class SOPSettingView @JvmOverloads constructor(
         tbObu.isChecked = CallerObuApiManager.isConnected()
         tbObu.setOnCheckedChangeListener { _, isChecked ->
             if (!isChecked) {
-                if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
-                    CallerObuApiManager.resetObuIpAddress("192.168.1.199")
-                } else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
-                    CallerObuApiManager.resetObuIpAddress("192.168.8.199")
-                }
+                CallerObuApiManager.resetObuIpAddress("192.168.1.199")
             } else {
                 //断开链接
                 CallerObuApiManager.disConnectObu()

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt

@@ -77,8 +77,11 @@ class PncActionsView @JvmOverloads constructor(
                 UiThreadHandler.post {
                     var actions: String? = null
                     planningActionMsg.actionMsg?.let { it ->
-                        actions = PncActionsHelper.getAction(it.drivingState.number, it.drivingAction.number)
-
+                        try {
+                            actions = PncActionsHelper.getAction(it.drivingState.number, it.drivingAction.number)
+                        } catch (e:Exception){
+                            e.printStackTrace()
+                        }
                         //如果是存在云端红绿灯数据条件下，设置云端数据
                         if (PncActionsHelper.isWaitingTrafficlight(it.drivingState.number, it.drivingAction.number)
                             && mTrafficLightResult != null

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TurnLightViewStatus.kt

@@ -11,8 +11,8 @@ import android.view.animation.Animation
 import android.widget.ImageView
 import androidx.constraintlayout.widget.ConstraintLayout
 import chassis.Chassis
+import com.mogo.eagle.core.function.api.map.angle.*
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
-import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Turning
 import com.mogo.eagle.core.function.hmi.R
 import kotlinx.android.synthetic.main.view_turn_light_status.view.*
 import kotlinx.coroutines.Dispatchers
@@ -55,7 +55,7 @@ class TurnLightViewStatus @JvmOverloads constructor(
             //根据左右进行显示和隐藏，实际要判断每个来的时间和频度
             when (directionLight) {
                 Chassis.LightSwitch.LIGHT_LEFT -> { //左转向
-                    CallerVisualAngleManager.changeVisualAngle(Turning(true))
+                    CallerVisualAngleManager.changeAngle(Turning(true))
                     showNormalAnimation()
                     left_select_image.visibility = View.VISIBLE
                     right_select_image.visibility = View.GONE
@@ -63,7 +63,7 @@ class TurnLightViewStatus @JvmOverloads constructor(
                     setAnimation(left_select_image)
                 }
                 Chassis.LightSwitch.LIGHT_RIGHT -> { //右转向
-                    CallerVisualAngleManager.changeVisualAngle(Turning(true))
+                    CallerVisualAngleManager.changeAngle(Turning(true))
                     showNormalAnimation()
                     left_select_image.visibility = View.GONE
                     right_select_image.visibility = View.VISIBLE
@@ -71,7 +71,7 @@ class TurnLightViewStatus @JvmOverloads constructor(
                     setAnimation(right_select_image)
                 }
                 else -> { //消失
-                    CallerVisualAngleManager.changeVisualAngle(Turning(false))
+                    CallerVisualAngleManager.changeAngle(Turning(false))
                     animationDisappear()
                 }
             }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt

@@ -4,7 +4,13 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.RelativeLayout
+import com.mogo.eagle.core.data.mofang.MfConstants
+import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import kotlinx.android.synthetic.main.view_blue_tooth.view.*
+import kotlinx.android.synthetic.main.view_status_bar.view.*
 
 /**
  * 魔戒蓝牙控件
@@ -14,10 +20,38 @@ class BlueToothView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
+) : RelativeLayout(context, attrs, defStyleAttr),IMoGoDevaToolsListener {
+
+    companion object{
+        private const val TAG = "BlueToothView"
+    }
 
     init {
         LayoutInflater.from(context).inflate(R.layout.view_blue_tooth, this, true)
     }
 
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        val isBluetoothConnect =
+            SharedPrefsMgr.getInstance(context).getBoolean(MfConstants.BLUETOOTH_STATUS, false)
+        if (isBluetoothConnect) {
+            mofangStatus(true)
+        }
+        CallerDevaToolsListenerManager.addListener(TAG, this)
+    }
+
+    override fun mofangStatus(status: Boolean) {
+        super.mofangStatus(status)
+        if (status) {
+            mofangView.setImageResource(R.drawable.icon_bluetooth_p)
+        } else {
+            mofangView.setImageResource(R.drawable.blue_tooth)
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerDevaToolsListenerManager.removeListener(TAG)
+    }
+
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt

@@ -7,14 +7,13 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
-import com.mogo.eagle.core.data.mofang.MfConstants
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
 import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.eagle.core.utilcode.util.BarUtils
 import kotlinx.android.synthetic.main.view_status_bar.view.*
 import java.util.concurrent.CopyOnWriteArrayList
 
@@ -38,12 +37,12 @@ class StatusBarView @JvmOverloads constructor(
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        viewStatusBarRight.addView(BatteryGroupView(this.context))
-        val isBluetoothConnect =
-            SharedPrefsMgr.getInstance(context).getBoolean(MfConstants.BLUETOOTH_STATUS, false)
-        if (isBluetoothConnect) {
-            updateMfStatus("MoFangManager", true)
+        post {
+            val params: ViewGroup.LayoutParams = getLayoutParams()
+            params.height = BarUtils.getStatusBarHeight()
+            layoutParams = params
         }
+        viewStatusBarRight.addView(BatteryGroupView(this.context))
 
         //添加view控制
         CallerHmiViewControlListenerManager.addListener(TAG,this)
@@ -106,14 +105,6 @@ class StatusBarView @JvmOverloads constructor(
         }
     }
 
-    override fun updateMfStatus(tag: String, status: Boolean) {
-        if (status) {
-            viewMofangStatus.setImageResource(R.drawable.icon_bluetooth_p)
-        } else {
-            viewMofangStatus.setImageResource(R.drawable.blue_tooth)
-        }
-    }
-
     private fun setTextColor(color: Int) {
         viewTextClock.setTextColor(color)
         viewStatusBarTag.setTextColor(color)

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt

@@ -11,7 +11,9 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.function.main.AppListActivity
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.AppUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.android.synthetic.main.view_version_name.view.*
@@ -44,6 +46,12 @@ class VersionNameView @JvmOverloads constructor(
             showCurrentPadVersion()
             showCurrentMapVersion()
         }
+
+        // 调试入口，应对M1、M2没有安装Launcher的情况
+        setOnLongClickListener {
+            ActivityUtils.startActivity(AppListActivity::class.java)
+            true
+        }
     }
 
     /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/AppListActivity.kt

@@ -0,0 +1,40 @@
+package com.mogo.eagle.core.function.main
+
+import android.os.Bundle
+import android.view.WindowManager
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.function.main.adapter.AppListAdapter
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
+import com.mogo.eagle.core.utilcode.util.BarUtils
+import kotlinx.android.synthetic.main.activity_app_list.*
+
+
+/**
+ * 系统应用列表，调试使用，暂不对外显示开放，只通过隐藏后门进入
+ */
+class AppListActivity : AppCompatActivity(), AppListAdapter.OnItemClickedListener {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        BarUtils.hideStatusBarAndSticky(this.window)
+        window.setFlags(
+            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
+            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+        )
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_app_list)
+
+        val linearLayoutManager = GridLayoutManager(this, 6) //第二个参数为网格的列数
+        recyclerViewAppList.layoutManager = linearLayoutManager
+
+        recyclerViewAppList.itemAnimator = DefaultItemAnimator()
+        val appListAdapter =
+            AppListAdapter(this)
+        recyclerViewAppList.adapter = appListAdapter
+    }
+
+    override fun onItemClicked(appListAdapter: AppListAdapter, position: Int) {
+        ActivityUtils.startLauncherActivity(appListAdapter.getItem(position).packageName)
+    }
+}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/KoomInitTask.kt

@@ -1,24 +0,0 @@
-package com.mogo.eagle.core.function.main
-
-import android.app.Application
-import android.os.Build
-import com.kwai.koom.base.CommonConfig
-import com.kwai.koom.base.InitTask
-import com.kwai.koom.base.MonitorManager
-
-object KoomInitTask : InitTask {
-    override fun init(application: Application) {
-        val config = CommonConfig.Builder()
-            .setApplication(application) // Set application
-            .setDebugMode(false)
-            .setVersionNameInvoker { "1.0.0" } // Set version name, java leak feature use it
-            .setSdkVersionMatch(
-                Build.VERSION.SDK_INT <= 31 && Build.VERSION.SDK_INT
-                        >= Build.VERSION_CODES.LOLLIPOP
-            )  // Set if current sdk version is supported
-            .build()
-
-        MonitorManager.initCommonConfig(config)
-            .apply { onApplicationCreate() }
-    }
-}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt

@@ -8,9 +8,7 @@ import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.alibaba.android.arouter.launcher.ARouter
 import com.kwai.koom.base.MonitorManager.addMonitorConfig
 import com.kwai.koom.nativeoom.leakmonitor.LeakListener
 import com.kwai.koom.nativeoom.leakmonitor.LeakMonitor.start
@@ -20,11 +18,9 @@ import com.mogo.commons.analytics.AnalyticsUtils
 import com.mogo.commons.context.ContextHolderUtil
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.module.status.MogoStatusManager
-import com.mogo.commons.mvp.BaseFragment
 import com.mogo.commons.mvp.MvpActivity
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
-import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -38,12 +34,9 @@ import com.mogo.eagle.core.function.main.modules.MogoModulesManager
 import com.mogo.eagle.core.function.main.windowview.FloatingViewHandler
 import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils
-import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper
-import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.ProcessUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
@@ -104,12 +97,12 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
         decorView.clipToPadding = false
         var statusBarView = decorView.findViewWithTag<View>("status_bar")
         if (statusBarView == null) {
-            statusBarView = StatusBarView(this)
+            statusBarView = statusBar
             statusBarView.setTag("status_bar")
         }
         val statusBarLP = FrameLayout.LayoutParams(
             ViewGroup.LayoutParams.MATCH_PARENT,
-            BarUtils.getStatusBarHeight()
+            ViewGroup.LayoutParams.WRAP_CONTENT,
         )
         statusBarLP.topMargin = 0
         statusBarLP.gravity = Gravity.TOP
@@ -117,11 +110,17 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
     }
 
     /**
-     * 修改statusBar 重写实现，需要继承 StatusBarView，xml中基础系统控件不要修改其id，拿来即用
+     * 修改statusBar重新赋值
      * @return StatusBarView
      */
-    protected val statusBarView: StatusBarView
-        get() = StatusBarView(this)
+    protected var statusBar: View?=null
+        get() {
+            return if (field == null) {
+                StatusBarView(this)
+            }else{
+                field
+            }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -353,30 +352,4 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
         }
     }
 
-    /**
-     * 由于应用是单页面的，所以采用Fragment将各模块的UI进行分割解耦合
-     *
-     * @param newFragment 功能UI
-     * @param tagName     UI绑定的Tag
-     * @param containerId 要加入的资源ID
-     */
-    private fun addFragment(newFragment: Fragment, tagName: String, containerId: Int) {
-        var fragment = supportFragmentManager.findFragmentByTag(tagName)
-        if (fragment == null) {
-            fragment = newFragment
-        }
-        if (fragment == null) {
-            e(
-                SceneConstant.M_HMI + TAG,
-                "add fragment fail  cause fragment == null, container is " + ResourcesHelper.getResNameById(
-                    applicationContext, containerId
-                )
-            )
-            return
-        }
-        supportFragmentManager.beginTransaction()
-            .replace(containerId, fragment, tagName)
-            .commitAllowingStateLoss()
-    }
-
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java

@@ -13,7 +13,6 @@ import android.os.Handler;
 import android.os.Process;
 import android.text.TextUtils;
 import android.view.KeyEvent;
-import android.widget.FrameLayout;
 
 import androidx.annotation.Nullable;
 
@@ -32,6 +31,7 @@ import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
+import com.mogo.eagle.core.utilcode.util.ActivityUtils;
 import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -46,8 +46,6 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import me.jessyan.autosize.utils.AutoSizeUtils;
-
 /**
  * 针对作为Launcher的情况，做个性化操作
  *
@@ -78,6 +76,11 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     private long pressEDownTime = 0;
     private long pressEUpTime = 0;
 
+    private int clickTime = 300; //单击
+    private int clickTimeInterval = 330;
+    private int longPressTime = 670;
+    private int longPressTimeInterval = 700;
+
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -89,6 +92,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     @Override
     protected void onResume() {
         super.onResume();
+        ActivityUtils.setDefaultL(this);
     }
 
     @Override
@@ -251,7 +255,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) > 360 && (pressADownTime - startPressTime) < 1300 && pressBDownTime > 0) {
+                    if ((pressADownTime - startPressTime) > clickTimeInterval && (pressADownTime - startPressTime) < longPressTime && pressBDownTime > 0) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 A 按AB组合 +1 ");
                         }
@@ -260,7 +264,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                     }
 
                     if (isCombinationKey != 3 && isCombinationKey != 1) {
-                        if ((pressADownTime - startPressTime) > 1320) {
+                        if ((pressADownTime - startPressTime) > longPressTimeInterval) {
                             if (isShowToast) {
                                 ToastUtils.showShort("方块 长按A -2 ");
                             }
@@ -271,7 +275,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) < 350 && isCombinationKey != 3) {
+                    if ((pressAUpTime - startPressTime) < clickTime && isCombinationKey != 3) {
                         isCombinationKey = 1;
                         if (isShowToast) {
                             ToastUtils.showShort("方块 单击A -1 ");
@@ -292,7 +296,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) > 360 && (pressBDownTime - startPressTime) < 1300 && pressADownTime > 0) {
+                    if ((pressBDownTime - startPressTime) > clickTimeInterval && (pressBDownTime - startPressTime) < longPressTime && pressADownTime > 0) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 B 按AB组合 +1 ");
                         }
@@ -300,7 +304,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                         isCombinationKey = 3;
                     }
                     if (isCombinationKey != 3 && isCombinationKey != 1) {
-                        if ((pressBDownTime - startPressTime) > 1320) {
+                        if ((pressBDownTime - startPressTime) > longPressTimeInterval) {
                             if (isShowToast) {
                                 ToastUtils.showShort("方块 长按B 无操作 ");
                             }
@@ -310,7 +314,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) < 350 && isCombinationKey != 3) {
+                    if ((pressBUpTime - startPressTime) < clickTime && isCombinationKey != 3) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 单击B  0 ");
                         }
@@ -332,7 +336,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressCDownTime = System.currentTimeMillis();
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按C 无操作 time dif = " + (pressCDownTime - startPressTime));
-                    if ((pressCDownTime - startPressTime) > 1320) {
+                    if ((pressCDownTime - startPressTime) > longPressTimeInterval) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 长按C 无操作 ");
                         }
@@ -341,7 +345,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) < 350) {
+                    if ((pressCUpTime - startPressTime) < clickTime) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 单击C ← 向左变道 ");
                         }
@@ -353,7 +357,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressDDownTime = System.currentTimeMillis();
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按D 无操作 time dif = " + (pressDDownTime - startPressTime));
-                    if ((pressDDownTime - startPressTime) > 1320) {
+                    if ((pressDDownTime - startPressTime) > longPressTimeInterval) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 长按D 无操作 ");
                         }
@@ -362,7 +366,7 @@ 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) < 350) {
+                    if ((pressDUpTime - startPressTime) < clickTime) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 单击D → 向右变道 ");
                         }
@@ -374,7 +378,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressEDownTime = System.currentTimeMillis();
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按E 鸣笛 time dif = " + (pressEDownTime - startPressTime));
-                    if ((pressEDownTime - startPressTime) > 1320) {
+                    if ((pressEDownTime - startPressTime) > longPressTimeInterval) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 长按E 鸣笛 ");
                         }
@@ -394,7 +398,7 @@ 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) < 350) {
+                    if ((pressEUpTime - startPressTime) < clickTime) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 单击E 开启自动驾驶 ");
                         }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java

@@ -3,35 +3,23 @@ package com.mogo.eagle.core.function.main;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI;
 
 import android.annotation.SuppressLint;
-import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Process;
 
-import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
-
 import com.bytedance.boost_multidex.BoostMultiDex;
-import com.elegant.utils.UiThreadHandler;
 import com.mogo.cloud.socket.SocketBuildConfig;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.module.MogoModule;
 import com.mogo.commons.module.MogoModulePaths;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
-import com.mogo.eagle.core.data.constants.MoGoConfig;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.function.api.chat.biz.ChatConsts;
-import com.mogo.eagle.core.function.api.devatools.IMogoDevaToolsUpgradeListener;
-import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
-import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListenerManager;
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager;
 import com.mogo.eagle.core.function.msgbox.db.MsgBoxDb;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.ProcessUtils;
 import com.mogo.eagle.core.utilcode.util.SPUtils;
 
@@ -41,7 +29,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
- * 默认初始化一些基础服务配置  todo 分离 overView业务 和 msgBox去各自模块中 --- 扶风
+ * 默认初始化一些基础服务配置  todo 分离 msgBox去自己的模块中 --- 扶风
  */
 public abstract class MainMoGoApplication extends AbsMogoApplication {
 
@@ -55,23 +43,16 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
             return;
         }
         start = System.currentTimeMillis();
-        connectAmiIp();
         // Crash 日志收集
         initCrashConfig();
         initLogConfig();
         initTipToast();
         initModules();
-        //查询是否有版本的更新
-        queryAppUpgrade();
         if (ProcessUtils.isMainProcess(this)) {
-            initOverviewDb();
-            if (DebugConfig.isDebug()) {
-                initKoom();
-            }
             clearMessageBoxTable();
             CallerMsgBoxManager.INSTANCE.queryAllMessages(this);
         }
-        upgradeProgressListener();
+        CallerDevaToolsManager.INSTANCE.updateUpgradeProgress();
     }
 
     @Override
@@ -80,15 +61,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         return true;
     }
 
-    private void queryAppUpgrade() {
-        UiThreadHandler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                CallerDevaToolsManager.INSTANCE.queryAppUpgrade();
-            }
-        },9000);
-    }
-
     @SuppressLint("SimpleDateFormat")
     private void clearMessageBoxTable() {
         new Thread(() -> {
@@ -121,56 +93,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         }).start();
     }
 
-    private void upgradeProgressListener() {
-        final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
-//        builder.setSmallIcon(R.mipmap.icon1001);//todo emArrow 更换图标，去除地图下载图标的依赖关系
-        builder.setContentTitle("下载");
-        builder.setContentText("正在下载");
-        final NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-
-        CallerDevaToolsUpgradeListenerManager.INSTANCE.addListener(TAG, new IMogoDevaToolsUpgradeListener() {
-            @Override
-            public void onStart(@Nullable String url) {
-
-            }
-
-            @Override
-            public void onPause(@Nullable String url) {
-
-            }
-
-            @Override
-            public void onProgress(@Nullable String url, int length) {
-                builder.setProgress(100, length,false);
-                manager.notify(0x3, builder.build());
-                //下载进度提示
-                builder.setContentText("已下载" + length + "%");
-                CallerHmiManager.INSTANCE.updateStatusBarDownloadView(true, "download", length);
-            }
-
-            @Override
-            public void onFinished(@Nullable String url) {
-                builder.setContentText("已下载" + 100 + "%");
-                UiThreadHandler.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        manager.cancel(0x3);
-                        CallerHmiManager.INSTANCE.updateStatusBarDownloadView(false, "download", 100);
-                    }
-                }, 1000);
-            }
-
-            @Override
-            public void onError(@Nullable String url, @Nullable String errorMsg) {
-
-            }
-        });
-    }
-
-    private void initKoom() {
-        KoomInitTask.INSTANCE.init(this);
-    }
-
     /**
      * 初始化异常采集配置
      */
@@ -193,18 +115,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         CallerDevaToolsManager.INSTANCE.init();
     }
 
-    private void initOverviewDb() {
-        CallerFuncBizManager.getBizProvider().initOverViewDb(this);
-    }
-
-    /**
-     * 连接ami
-     */
-    private void connectAmiIp() {
-        String ipAddress = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp().getBaseContext()).getString(MoGoConfig.OBU_IP, "192.168.1.199");
-//        AmiClientManager.getInstance().setObuIp(ipAddress);
-    }
-
     private void initModules() {
         CallerLogger.INSTANCE.d(M_HMI + TAG, "initModules");
         // OBU 模块

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java

@@ -45,7 +45,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 /**
- * 针对作为Launcher的情况，做个性化操作
+ * 针对作为Launcher的情况，做个性化操作 TODO 测试用的，可删除
  *
  * @author tongchenfei
  */

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/VideoAdAtc.kt

@@ -7,7 +7,7 @@ import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.widget.TextureVideoView
 
 /**
- * 视频广告
+ * 视频广告 TODO 测试用的，可删除
  */
 class VideoAdAtc : AppCompatActivity() {
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/adapter/AppListAdapter.java

@@ -0,0 +1,92 @@
+package com.mogo.eagle.core.function.main.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.mogo.eagle.core.function.hmi.R;
+import com.mogo.eagle.core.utilcode.util.AppUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class AppListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+    private OnItemClickedListener mOnItemClickedListener;
+
+    public interface OnItemClickedListener {
+        void onItemClicked(AppListAdapter appListAdapter, int position);
+    }
+
+    public static class AppViewHolder extends RecyclerView.ViewHolder {
+        public ImageView iconIv;
+        public TextView nameTv;
+
+        public AppViewHolder(View itemView) {
+            super(itemView);
+            iconIv = (ImageView) itemView.findViewById(R.id.list_item_app_icon_iv);
+            nameTv = (TextView) itemView.findViewById(R.id.list_item_app_name_tv);
+        }
+    }
+
+    private ArrayList<String> showApps = new ArrayList<>();
+
+    public AppListAdapter(OnItemClickedListener onItemClickedListener) {
+        // 设置被允许展示的APP
+        showApps.add("com.android.settings");
+
+        mOnItemClickedListener = onItemClickedListener;
+        mApps = new ArrayList<>();
+        for (AppUtils.AppInfo appInfo : AppUtils.getAppsInfo()) {
+            if (!appInfo.isSystem()) {
+                mApps.add(appInfo);
+            } else {
+                if (showApps.contains(appInfo.getPackageName())) {
+                    mApps.add(appInfo);
+                }
+            }
+        }
+    }
+
+    private List<AppUtils.AppInfo> mApps;
+
+    public AppUtils.AppInfo getItem(int position) {
+        return mApps.get(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mApps.size();
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_app_list, parent, false);
+        return new AppViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        AppViewHolder itemViewHolder = (AppViewHolder) holder;
+        itemViewHolder.iconIv.setImageDrawable(mApps.get(position).getIcon());
+        itemViewHolder.nameTv.setText(mApps.get(position).getName());
+        itemViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mOnItemClickedListener != null) {
+                    mOnItemClickedListener.onItemClicked(AppListAdapter.this, position);
+                }
+            }
+        });
+    }
+}

core/function-impl/mogo-core-function-hmi/src/main/res/layout/activity_app_list.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/recyclerViewAppList"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/main_splash_bg"
+    android:clipToPadding="false"
+    android:padding="20dp"
+    android:scrollbarStyle="outsideOverlay"
+    android:scrollbars="vertical"
+    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:spanCount="6"
+    tools:itemCount="11"
+    tools:listitem="@layout/item_app_list" />

core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_app_list.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="250dp"
+    android:layout_height="250dp"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:paddingStart="10dp"
+    android:paddingTop="10dp"
+    android:paddingEnd="10dp"
+    android:paddingBottom="10dp">
+
+    <ImageView
+        android:id="@+id/list_item_app_icon_iv"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:src="@drawable/icon_ad" />
+
+    <TextView
+        android:id="@+id/list_item_app_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:singleLine="true"
+        android:text="应用名称"
+        android:textColor="@color/color_FFFFFF"
+        android:textSize="30dp" />
+
+</LinearLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_blue_tooth.xml

@@ -5,10 +5,11 @@
     android:layout_height="@dimen/dp_54">
 
     <ImageView
-        android:scaleType="fitXY"
-        android:src="@drawable/blue_tooth"
+        android:id="@+id/mofangView"
         android:layout_width="@dimen/dp_54"
         android:layout_height="@dimen/dp_54"
+        android:scaleType="fitXY"
+        android:src="@drawable/blue_tooth"
         tools:ignore="ContentDescription" />
 
 </RelativeLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -242,6 +242,42 @@
                 android:textOn="关闭感知优化模式"
                 android:textSize="@dimen/dp_24" />
 
+            <ToggleButton
+                android:id="@+id/tbV2NFromCar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启车端V2N预警"
+                android:textOn="关闭车端V2N预警"
+                android:textSize="@dimen/dp_24" />
+
+            <ToggleButton
+                android:id="@+id/tbDrawAiCloudFusion"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启云端感知绘制"
+                android:textOn="关闭云端感知绘制"
+                android:textSize="@dimen/dp_24" />
+
+            <ToggleButton
+                android:id="@+id/tbDrawRomaMode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启漫游模式"
+                android:textOn="关闭漫游模式"
+                android:textSize="@dimen/dp_24" />
+
             <ToggleButton
                 android:id="@+id/tbMojie"
                 android:layout_width="match_parent"

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_pnc_actions.xml

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
-    android:layout_height="@dimen/dp_100">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/tvHmiPncActions"

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml

@@ -29,6 +29,7 @@
         android:textColor="@color/color_2C2E30"
         android:textSize="@dimen/dp_35" />
 
+    <!--Wifi状态-->
     <com.mogo.eagle.core.function.hmi.ui.widget.WifiStateView
         android:layout_width="@dimen/dp_54"
         android:layout_height="@dimen/dp_54"
@@ -36,8 +37,7 @@
         android:layout_marginStart="@dimen/dp_18" />
 
     <!--魔方连接状态-->
-    <ImageView
-        android:id="@+id/viewMofangStatus"
+    <com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/blue_tooth"