Merge remote-tracking branch 'origin/release_robotaxi-d-app-module_2120_221017_2.12.0.1'

# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java

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

@@ -11,6 +11,7 @@ import android.text.TextUtils
 import android.transition.*
 import android.view.Gravity
 import android.view.View
+import android.view.ViewGroup
 import android.view.WindowManager
 import android.view.WindowManager.LayoutParams
 import android.view.animation.*
@@ -78,14 +79,18 @@ import com.mogo.eagle.core.function.hmi.ui.notice.NoticeNormalBannerView
 import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView
 import com.mogo.eagle.core.function.hmi.ui.setting.IPCReportWindow
 import com.mogo.eagle.core.function.hmi.ui.setting.ReportListFloatWindow
+import com.mogo.eagle.core.function.hmi.ui.setting.SOPSettingView
 import com.mogo.eagle.core.function.hmi.ui.tools.AdUpgradeDialog
 import com.mogo.eagle.core.function.hmi.ui.tools.AutoPilotAndCheckView
 import com.mogo.eagle.core.function.hmi.ui.tools.MaskView
+import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
+import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
 import com.mogo.eagle.core.function.hmi.ui.widget.V2XNotificationView
 import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.*
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.reminder.*
 import com.mogo.eagle.core.utilcode.reminder.api.*
@@ -126,6 +131,13 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     private var mDebugSettingViewFloat: WarningFloat.Builder? = null
     private var mDebugSettingView: DebugSettingView? = null
 
+    //SOPSettingView
+    private var mSOPSettingViewFloat: WarningFloat.Builder? = null
+    private var mSOPSettingView: SOPSettingView? = null
+
+    //StatusView
+    private var statusBarViewFloat: WarningFloat.Builder? = null
+    private var statusBarView: StatusBarView? = null
 
     private var mNoticeFloat: WarningFloat.Builder? = null
 
@@ -186,7 +198,17 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     }
 
     override fun initViews() {
+        toggleStatusBarView()
+
         initViewShowWithConfig()
+
+        //设置StatusBar初始状态
+        if (FunctionBuildConfig.isDemoMode) {
+            statusBarView?.updateRightView(true, "demoMode", DemoModeView(requireContext()))
+        } else {
+            statusBarView?.updateRightView(false, "demoMode", DemoModeView(requireContext()))
+        }
+
         ivCameraIcon?.setOnClickListener {
             if (cameraViewFloat == null) {
                 showCameraList(CallerMonitorManager.getCameraList())
@@ -408,6 +430,14 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         busOperationStatus?.showBusOperation()
     }
 
+    override fun setStatusBarDarkOrLight(light: Boolean) {
+        statusBarView?.setStatusBarDarkOrLight(light)
+    }
+
+    override fun updateStatusBarRightView(insert: Boolean, tag: String, viewGroup: ViewGroup) {
+        statusBarView?.updateRightView(insert, tag, viewGroup)
+    }
+
     /**
      * 设置 红绿灯 代理View
      */
@@ -446,6 +476,10 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                             dismissToolsFloatView()
                             CallerDevaToolsManager.showFeedbackView(it)
                         }
+
+                        override fun showSOPSettingView() {
+                            toggleSOPView()
+                        }
                     })
                 }
                 toolsViewFloat = WarningFloat.with(it)
@@ -659,6 +693,103 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         }
     }
 
+    override fun toggleSOPView() {
+        activity?.let {
+            if (mSOPSettingViewFloat != null) {
+                WarningFloat.dismiss(mSOPSettingViewFloat!!.config.floatTag, false)
+                mSOPSettingViewFloat = null
+                mSOPSettingView = null
+            } else {
+                if (mSOPSettingView == null) {
+                    mSOPSettingView = SOPSettingView(it)
+                }
+                var side = RIGHT
+                var gravity = Gravity.RIGHT
+                //调试窗默认靠右显示，Bus的乘客端右端有视图覆盖，调试窗靠左显示
+                if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) &&
+                    AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
+                ) {
+                    side = LEFT
+                    gravity = Gravity.LEFT
+                }
+                mSOPSettingViewFloat = WarningFloat.with(it)
+                    .setTag("mSOPSettingView")
+                    .setLayout(mSOPSettingView!!)
+                    .setSidePattern(side)
+                    .setGravity(gravity, offsetY = 70)
+                    .setImmersionStatusBar(true)
+                    .setAnimator(object : DefaultAnimator() {
+                        override fun enterAnim(
+                            view: View,
+                            params: LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.enterAnim(view, params, windowManager, sidePattern)
+                                ?.apply {
+                                    interpolator = OvershootInterpolator()
+                                }
+
+                        override fun exitAnim(
+                            view: View,
+                            params: LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.exitAnim(view, params, windowManager, sidePattern)
+                                ?.setDuration(200)
+                    })
+                    .show()
+            }
+        }
+    }
+
+    private fun toggleStatusBarView() {
+        activity?.let{
+            if(statusBarViewFloat!= null){
+                WarningFloat.dismiss(statusBarViewFloat!!.config.floatTag, false)
+                statusBarViewFloat = null
+                statusBarView = null
+            }else{
+                if (statusBarView == null){
+                    statusBarView = StatusBarView(it)
+                }
+                val side = TOP
+                val gravity = Gravity.TOP
+                statusBarViewFloat = WarningFloat.with(it)
+                    .setTag("statusBarView")
+                    .setLayout(statusBarView!!)
+                    .setSidePattern(side)
+                    .setWindowWidth(ScreenUtils.getScreenWidth())
+                    .setWindowHeight(BarUtils.getStatusBarHeight())
+                    .setGravity(gravity, 0)
+                    .setImmersionStatusBar(true)
+                    .setAnimator(object : DefaultAnimator() {
+                        override fun enterAnim(
+                            view: View,
+                            params: LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.enterAnim(view, params, windowManager, sidePattern)
+                                ?.apply {
+                                    interpolator = LinearInterpolator()
+                                }
+
+                        override fun exitAnim(
+                            view: View,
+                            params: LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.exitAnim(view, params, windowManager, sidePattern)
+                                ?.setDuration(200)
+                    })
+                    .show()
+            }
+        }
+    }
+
     /**
      * 展示VR下V2X预警
      *
@@ -682,6 +813,21 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         activity?.let {
             val warningContent = alertContent
                 ?: EventTypeEnum.getWarningContent(v2xType)
+
+            //占道施工预警
+            if (v2xType.equals("10006") || v2xType.equals("100061")) {
+                val currentTime = System.currentTimeMillis() / 1000
+                val oldTime =
+                    context?.let { it -> SharedPrefsMgr.getInstance(it).getLong("roadwork", 0) }
+                if (currentTime - oldTime!! > 60) { //超过一分钟，才会继续播报重复提醒
+                    context?.let { it ->
+                        SharedPrefsMgr.getInstance(it)
+                            .putLong("roadwork", System.currentTimeMillis() / 1000)
+                    }
+                    CallerAutoPilotManager.sendTripInfo(5, "", "", "", false);
+                }
+            }
+
             if (warningContent.isEmpty()) {
                 CallerLogger.e("$M_HMI$TAG", "Show warningContent is null or empty!")
                 return
@@ -789,7 +935,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
             it.invokeOnCancellation {
                 AIAssist.getInstance(ctx).stopSpeakTts(text)
             }
-            AIAssist.getInstance(ctx).speakTTSVoice(text, voiceCallback)
+            AIAssist.getInstance(ctx).speakTTSVoiceWithLevel(text, AIAssist.LEVEL2, voiceCallback)
         } catch (t: Throwable) {
             it.resumeWith(Result.success(Unit))
             CallerLogger.d("$M_HMI$TAG", t.message)

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

@@ -42,7 +42,6 @@ import com.mogo.eagle.core.data.obu.ObuStatusInfo
 import com.mogo.eagle.core.data.report.ReportEntity
 import com.mogo.eagle.core.data.upgrade.UpgradeVersionEntity
 import com.mogo.eagle.core.function.api.autopilot.*
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.Companion
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
 import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener
@@ -63,6 +62,7 @@ import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.ui.logcatch.ILogViewListener
 import com.mogo.eagle.core.function.hmi.ui.logcatch.LogInfoView
 import com.mogo.eagle.core.function.hmi.ui.upgrade.UpgradeListAdapter
+import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel
@@ -197,9 +197,7 @@ class DebugSettingView @JvmOverloads constructor(
 
         //添加 业务配置监听
         CallerDevaToolsFuncConfigListenerManager.registerDevaToolsFuncConfigListener(
-            FuncBizConfig.FOUNDATION,
-            TAG,
-            this
+            FuncBizConfig.FOUNDATION, TAG, true, this
         )
 
         if (logInfoView != null) {
@@ -231,7 +229,7 @@ class DebugSettingView @JvmOverloads constructor(
         CallerAutopilotVehicleStateListenerManager.removeListener(TAG)
 
         // 移除 业务配置监听
-        CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener(this)
+        CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener( FuncBizConfig.FOUNDATION, TAG)
 
         if (logInfoView != null) {
             logInfoView!!.onEnterBackground()
@@ -569,11 +567,16 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
+        Log.i(
+            "1026-emArrow",
+            "debug setting  FunctionBuildConfig.isDemoMode : ${FunctionBuildConfig.isDemoMode}"
+        )
         // 演示模式,上一次勾选的数据
         tbIsDemoMode.isChecked = FunctionBuildConfig.isDemoMode
 
         // 演示模式
         tbIsDemoMode.setOnCheckedChangeListener { _, isChecked ->
+            CallerHmiManager.updateStatusBarRightView(isChecked, "demoMode", DemoModeView(context))
             CallerAutoPilotManager.setDemoMode(isChecked)
             if (!isChecked) {
                 //关闭美化模式时，通知工控机
@@ -1855,41 +1858,55 @@ class DebugSettingView @JvmOverloads constructor(
         }
     }
 
-    override fun updateBizData(type: String, state: Boolean, lock: Boolean, data: String?) {
+    override fun updateBizView(type: String, lock: Boolean) {
         when (type) {
             BIZ_BEAUTY_MODE -> {
-                if(lock){
-                    tbIsDemoMode.background = resources.getDrawable(R.drawable.radio_button_lock_background)
-                }else{
-                    tbIsDemoMode.background = resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                tbIsDemoMode.isClickable = !lock
+                if (lock) {
+                    tbIsDemoMode.background =
+                        resources.getDrawable(R.drawable.radio_button_lock_background)
+                } else {
+                    tbIsDemoMode.background =
+                        resources.getDrawable(R.drawable.radio_button_normal_background_right)
                 }
             }
             BIZ_RAIN_MODE -> {
-                if(lock){
-                    tbIsRainMode.background = resources.getDrawable(R.drawable.radio_button_lock_background)
-                }else{
-                    tbIsRainMode.background = resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                tbIsRainMode.isClickable = !lock
+                if (lock) {
+                    tbIsRainMode.background =
+                        resources.getDrawable(R.drawable.radio_button_lock_background)
+                } else {
+                    tbIsRainMode.background =
+                        resources.getDrawable(R.drawable.radio_button_normal_background_right)
                 }
             }
             BIZ_WARNING_UPLOAD -> {
-                if(lock){
-                    tbReportWarning.background = resources.getDrawable(R.drawable.radio_button_lock_background)
-                }else{
+                tbReportWarning.isClickable = !lock
+                if (lock) {
+                    tbReportWarning.background =
+                        resources.getDrawable(R.drawable.radio_button_lock_background)
+                } else {
                     tbReportWarning.background = null
                 }
             }
             BIZ_BAG_RECORD -> {
                 if (lock) {
-                    btnRecordBag.background = resources.getDrawable(R.drawable.radio_button_lock_background)
+                    btnRecordBag.isClickable = false
+                    btnRecordBag.background =
+                        resources.getDrawable(R.drawable.radio_button_lock_background)
                 } else {
+                    btnRecordBag.isClickable = true
                     btnRecordBag.requestFocus()
                     btnRecordBag.background = null
                 }
             }
             BIZ_FULL_LOG -> {
                 if (lock) {
-                    tbLogCatch.background = resources.getDrawable(R.drawable.radio_button_lock_background)
+                    tbLogCatch.isClickable = false
+                    tbLogCatch.background =
+                        resources.getDrawable(R.drawable.radio_button_lock_background)
                 } else {
+                    tbLogCatch.isClickable = true
                     tbLogCatch.requestFocus()
                     tbLogCatch.background = null
                 }

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

@@ -0,0 +1,232 @@
+package com.mogo.eagle.core.function.hmi.ui.setting
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.data.config.HmiBuildConfig
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
+import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.obu.CallerOBUManager
+import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.module.service.routeoverlay.RouteStrategy
+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
+
+/**
+ * SOP设置窗口
+ */
+class SOPSettingView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoDevaToolsFuncConfigListener {
+
+    companion object {
+        const val TAG = "SOPSettingView"
+    }
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_sop_setting, this, true)
+        initView()
+    }
+
+    private fun initView() {
+        //绕障类功能开关
+        tbObstacleAvoidance.isChecked = FunctionBuildConfig.isDetouring
+        tbObstacleAvoidance.setOnCheckedChangeListener { _, isChecked ->
+            CallerAutoPilotManager.sendDetouring(isChecked)
+            FunctionBuildConfig.isDetouring = isChecked
+        }
+
+        tbMarkingObstacles.isChecked = FunctionBuildConfig.isPNCWarning
+        //危险障碍物颜色标记开关
+        tbMarkingObstacles.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isPNCWarning = isChecked
+        }
+
+        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
+            tbMarkingObstacles.visibility = View.GONE
+        }
+
+        //引导线动态效果
+        tbRouteDynamicEffect.isChecked =
+            AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) && !AppIdentityModeUtils.isBus(
+                FunctionBuildConfig.appIdentityMode
+            )
+        tbRouteDynamicEffect.setOnCheckedChangeListener { _, isChecked ->
+            if (isChecked) {
+                RouteStrategy.enable(true)
+            } else {
+                RouteStrategy.enable(false)
+            }
+        }
+
+        //红绿灯标识
+        tbTrafficLight.isChecked = HmiBuildConfig.isShowTrafficLightView
+        tbTrafficLight.setOnCheckedChangeListener { _, isChecked ->
+            if (!isChecked) {
+                HmiBuildConfig.isShowTrafficLightView = false
+            } else {
+                HmiBuildConfig.isShowTrafficLightView = true
+                CallerHmiManager.disableWarningTrafficLight()
+            }
+        }
+
+        //限速标识
+        tbSpeedLimit.isChecked = HmiBuildConfig.isShowLimitingVelocityView
+        tbSpeedLimit.setOnCheckedChangeListener { _, isChecked ->
+            if (isChecked) {
+                HmiBuildConfig.isShowLimitingVelocityView = true
+            } else {
+                HmiBuildConfig.isShowLimitingVelocityView = false
+                CallerHmiManager.disableLimitingVelocity()
+            }
+        }
+
+        // 演示模式,上一次勾选的数据
+        tbDemoMode.isChecked = FunctionBuildConfig.isDemoMode
+        // 演示模式
+        tbDemoMode.setOnCheckedChangeListener { _, isChecked ->
+            CallerAutoPilotManager.setDemoMode(isChecked)
+            if (!isChecked) {
+                //关闭美化模式时，通知工控机
+                CallerAutoPilotManager.setIPCDemoMode(isChecked)
+            }
+            FunctionBuildConfig.isDemoMode = isChecked
+        }
+        //只在司机端设置美化模式开关功能
+        if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            tbDemoMode.visibility = View.GONE
+        }
+
+
+        // 雨天模式，上一次勾选的数据
+        tbRainMode.isChecked = FunctionBuildConfig.isRainMode
+        //雨天模式
+        tbRainMode.setOnCheckedChangeListener { _, isChecked ->
+            CallerAutoPilotManager.setRainMode(isChecked)
+            FunctionBuildConfig.isRainMode = isChecked
+        }
+        //雨天模式按钮只在司机屏生效，乘客屏不显示
+        if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            tbRainMode.visibility = View.GONE
+        }
+
+        //OBU控制总开关
+        tbObu.isChecked = CallerOBUManager.isConnected()
+        tbObu.setOnCheckedChangeListener { _, isChecked ->
+            if (!isChecked) {
+                if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
+                    CallerOBUManager.resetObuIpAddress("192.168.1.199")
+                } else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
+                    CallerOBUManager.resetObuIpAddress("192.168.8.199")
+                }
+            } else {
+                //断开链接
+                CallerOBUManager.disConnectObu()
+            }
+        }
+
+
+        //是否开启异常上报
+        tbIPCReport.isChecked = FunctionBuildConfig.isReportWarning
+        tbIPCReport.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isReportWarning = isChecked
+        }
+
+        //变道绕障的目标障碍物速度阈值
+        tvSpeed.text = "${FunctionBuildConfig.detouringSpeed} m/s"
+        ivSpeedReduce.setOnClickListener {
+            if (FunctionBuildConfig.detouringSpeed <= 3) {
+                ToastUtils.showShort("阈值最小可为3 m/s")
+            } else {
+                FunctionBuildConfig.detouringSpeed--
+                tvSpeed.text = "${FunctionBuildConfig.detouringSpeed} m/s"
+            }
+        }
+        ivSpeedAdd.setOnClickListener {
+            if (FunctionBuildConfig.detouringSpeed >= 7) {
+                ToastUtils.showShort("阈值最大可为7 m/s")
+            } else {
+                FunctionBuildConfig.detouringSpeed++
+                tvSpeed.text = "${FunctionBuildConfig.detouringSpeed} m/s"
+            }
+        }
+        btnSpeedSet.setOnClickListener {
+            val isSuccess =
+                CallerAutoPilotManager.sendDetouringSpeed(FunctionBuildConfig.detouringSpeed.toDouble())
+            if (isSuccess == true) {
+                ToastUtils.showShort("变道绕障的目标障碍物速度阈值设置成功")
+            } else {
+                ToastUtils.showShort("变道绕障的目标障碍物速度阈值设置失败")
+            }
+        }
+
+        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
+            tvSpeedThresholdTitle.visibility = View.GONE
+            ivSpeedReduce.visibility = View.GONE
+            tvSpeed.visibility = View.GONE
+            ivSpeedAdd.visibility = View.GONE
+            btnSpeedSet.visibility = View.GONE
+        }
+
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        //添加 业务配置监听
+        CallerDevaToolsFuncConfigListenerManager.registerDevaToolsFuncConfigListener(
+            FuncBizConfig.FOUNDATION, TAG, true, this
+        )
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        // 移除 业务配置监听
+        CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener(FuncBizConfig.FOUNDATION, TAG)
+    }
+
+    override fun updateBizView(type: String, lock: Boolean) {
+        when (type) {
+            FuncBizConfig.BIZ_BEAUTY_MODE -> {
+                tbDemoMode.isClickable = !lock
+                if (lock) {
+                    tbDemoMode.background =
+                        resources.getDrawable(R.drawable.radio_button_lock_background)
+                } else {
+                    tbDemoMode.background =
+                        resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                }
+            }
+            FuncBizConfig.BIZ_RAIN_MODE -> {
+                tbRainMode.isClickable = !lock
+                if (lock) {
+                    tbRainMode.background =
+                        resources.getDrawable(R.drawable.radio_button_lock_background)
+                } else {
+                    tbRainMode.background =
+                        resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                }
+            }
+            FuncBizConfig.BIZ_PNC_WARNING -> {
+                tbMarkingObstacles.isClickable = !lock
+                if (lock) {
+                    tbMarkingObstacles.background =
+                        resources.getDrawable(R.drawable.radio_button_lock_background)
+                } else {
+                    tbMarkingObstacles.background =
+                        resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                }
+            }
+        }
+    }
+}

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

@@ -7,6 +7,7 @@ import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Process
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
@@ -59,15 +60,13 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
 
     companion object {
         private var maxAcceleration: Double = 2.0
-        private var speedLimit: Double = 0.0
+        private var speedLimit: Int = 0
     }
 
     @SuppressLint("ClickableViewAccessibility")
     private fun initView() {
         background = ColorDrawable(Color.parseColor("#F0151D41"))
-        if (keyBoardUtil == null) {
-            keyBoardUtil = KeyBoardUtil(sKeyBoardView, etInputSpeed)
-        }
+
         keyBoardUtil?.setActionListener { inputContent ->
             inputContent.toIntOrNull()?.let { speed ->
                 when {
@@ -76,10 +75,6 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
                         ToastUtils.showShort("超过最大限速值60，设置失败")
                     }
                     else -> {
-                        llSpeedPosition.background =
-                            resources.getDrawable(R.drawable.pilot_speed_bg)
-                        keyBoardUtil?.hideKeyboard()
-                        etInputSpeed.clearFocus()
                         // 设置自动驾驶速度
                         val isSuccess = CallerAutoPilotManager.setAutoPilotSpeed(speed)
                         when {
@@ -94,13 +89,15 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
                 }
             }
         }
-        KeyBoardUtil.hideSystemSoftKeyboard(context, etInputSpeed)
         ivCloseIcon.setOnClickListener {
             clickListener?.onClose(it)
         }
         rlKillLayout.setOnClickListener {
             killApp()
         }
+        sopLayout.setOnClickListener {
+            clickListener?.showSOPSettingView()
+        }
         viewCheckStatus.setOnClickListener {
             clickListener?.go2CheckPage()
         }
@@ -110,49 +107,54 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
         ivDebugFeedback.onClick {
             clickListener?.showFeedbackView()
         }
-        etInputSpeed.setOnFocusChangeListener { v, hasFocus ->
-            when {
-                hasFocus -> {
-                    llSpeedPosition.background =
-                        resources.getDrawable(R.drawable.pilot_speed_high_light_bg)
-                    if (keyBoardUtil == null) {
-                        keyBoardUtil = KeyBoardUtil(sKeyBoardView, etInputSpeed)
-                    }
-                    keyBoardUtil?.showKeyboard()
-                }
-                else -> llSpeedPosition.background =
-                    resources.getDrawable(R.drawable.pilot_speed_bg)
-            }
-        }
-        etInputSpeed.setOnTouchListener { v, event ->
-            var curTime = System.currentTimeMillis()
-            if (curTime - lastTime < 1000) {
-                return@setOnTouchListener true
-            }
-            if (!connectStatus) {
-                ToastUtils.showShort("设置车速失败，请启动域控制器")
-                keyBoardUtil?.hideKeyboard()
-                return@setOnTouchListener true
-            } else {
-                return@setOnTouchListener false
-            }
-        }
-        updateSpeedSettingViews()
+
         if (AppConfigInfo.isConnectAutopilot) {
             CallerAutoPilotManager.getCarConfig()
         }
-        if (maxAcceleration > 0) {
-            tvAcceleration.text = "加速度 $maxAcceleration m/s²"
-        }
+//        if (maxAcceleration > 0) {
+//            tvAcceleration.text = "加速度 $maxAcceleration m/s²"
+//        }
+        tvAcceleration.text = "每次调整车速±5km/h,点击确定生效"
         if (speedLimit > 0) {
-            etInputSpeed.setText((speedLimit * 3.6).toInt().toString())
+            tvSpeed.text = speedLimit.toString()
+        }else{
+            tvSpeed.text = "0"
         }
-        initOchView()
-//        // 比如需要设置默认速度
-//        val speed = "30"
-//        etInputSpeed.setText(speed)
-//        etInputSpeed.setSelection(speed.length)
 
+        ivSpeedReduce.setOnClickListener {
+            if(speedLimit>=5){
+                speedLimit -= 5
+                tvSpeed.text = speedLimit.toString()
+            }else{
+                ToastUtils.showShort("车速不能再减了")
+            }
+        }
+
+        ivSpeedAdd.setOnClickListener {
+            if(speedLimit<=55){
+                speedLimit += 5
+                tvSpeed.text = speedLimit.toString()
+            }else{
+                ToastUtils.showShort("车速不能再加了")
+            }
+        }
+
+        //速度确认
+        tvSureModify.setOnClickListener {
+            val isSuccess = CallerAutoPilotManager.setAutoPilotSpeed(speedLimit)
+            when {
+                isSuccess -> {
+                    //速度显示
+                    tvSpeed.text = speedLimit.toString()
+                    ToastUtils.showShort("车速设置成功，立即生效")
+                }
+                else -> {
+                    ToastUtils.showShort("设置车速失败，请启动域控制器")
+                }
+            }
+        }
+
+        initOchView()
     }
 
     private fun initOchView() {
@@ -189,11 +191,6 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
         this.clickListener = clickListener
     }
 
-    private fun updateSpeedSettingViews() {
-        tvSpeedTitle.visibility = View.VISIBLE
-        llSpeedPosition.visibility = View.VISIBLE
-    }
-
     fun showAdUpgradeStatus(ipcUpgradeStateInfo: IPCUpgradeStateInfo) {
         systemVersionView?.showAdUpgradeStatus(ipcUpgradeStateInfo)
     }
@@ -220,16 +217,20 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
         fun onClose(v: View)
         fun showDebugPanelView()
         fun showFeedbackView()
+        fun showSOPSettingView()
     }
 
     override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
         UiThreadHandler.post {
-            tvAcceleration?.let {
-                maxAcceleration = carConfigResp.maxAcceleration
-                speedLimit = carConfigResp.speedLimit
-                tvAcceleration.text = "加速度 ${carConfigResp.maxAcceleration} m/s²"
-                etInputSpeed.setText((carConfigResp.speedLimit * 3.6).toInt().toString())
-            }
+//            tvAcceleration?.let {
+//                maxAcceleration = carConfigResp.maxAcceleration
+//                speedLimit = carConfigResp.speedLimit
+////                tvAcceleration.text = "加速度 ${carConfigResp.maxAcceleration} m/s²"
+//                tvSpeed.text = (carConfigResp.speedLimit * 3.6).toInt().toString()
+//            }
+            maxAcceleration = carConfigResp.maxAcceleration
+            speedLimit = (carConfigResp.speedLimit * 3.6).toInt()
+            tvSpeed.text = speedLimit.toString()
         }
     }
 }

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

@@ -24,7 +24,7 @@ class BusOperationView @JvmOverloads constructor(
         init {
             LayoutInflater.from(context).inflate(R.layout.view_och_bus_operation,this,true)
             context?.let {
-                actvAccountPhone.text = SharedPrefs.getInstance(it).getString("account","")
+                actvAccountPhone.text = phoneMask(SharedPrefs.getInstance(it).getString("och_account",""))
             }
         }
 

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

@@ -0,0 +1,109 @@
+package com.mogo.eagle.core.function.hmi.ui.widget
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.BatteryManager
+import android.os.Handler
+import android.os.Message
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import android.widget.LinearLayout
+import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener
+import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
+import com.mogo.eagle.core.function.hmi.R
+import java.lang.ref.WeakReference
+
+class BatteryGroupView : LinearLayout, IMoGoSkinModeChangeListener {
+
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+    ) : super(context, attrs, defStyleAttr) {
+    }
+
+    private var batteryHandler: BatteryHandler = BatteryHandler(this)
+    private var view: View =
+        LayoutInflater.from(context).inflate(R.layout.view_battery_group, this, true)
+    private var batteryView: BatteryView = (view as BatteryGroupView).findViewById(R.id.viewBattery)
+    private var ivBatteryCharge: ImageView = (view as BatteryGroupView).findViewById(R.id.ivBatteryCharge)
+    private var mSkinMode = 0
+
+    private val batteryStateReceiver: BroadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            when (intent.action) {
+                Intent.ACTION_BATTERY_CHANGED -> {
+                    val level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0)
+                    val scale = intent.getIntExtra(BatteryManager.EXTRA_SCALE, 0)
+                    val charge = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1)
+                    val percentage = (level * 100) / scale
+                    val message = Message.obtain()
+                    message.what = 0
+                    message.arg1 = percentage
+                    message.arg2 = charge
+                    batteryHandler.sendMessage(message)
+                }
+            }
+        }
+    }
+
+    companion object {
+
+        const val TAG = "BatteryGroupView"
+
+        class BatteryHandler(batteryGroupView: BatteryGroupView) : Handler() {
+
+            //虚引用
+            private var stateViewWeakReference: WeakReference<BatteryGroupView>? = null
+
+            init {
+                stateViewWeakReference = WeakReference(batteryGroupView)
+            }
+
+            override fun handleMessage(msg: Message) {
+                super.handleMessage(msg)
+                val batteryGroupView = stateViewWeakReference?.get()
+                batteryGroupView?.let {
+                    if (msg.what == 0) {
+                        it.batteryView.setPower(msg.arg1)
+                        val isCharging = msg.arg2 == BatteryManager.BATTERY_STATUS_CHARGING ||
+                                msg.arg2 == BatteryManager.BATTERY_STATUS_FULL
+                        it.batteryView.setCharging(isCharging)
+                        if (isCharging) {
+                            it.ivBatteryCharge.visibility = View.VISIBLE
+                            when(it.mSkinMode){
+                                0 -> it.ivBatteryCharge.setImageResource(R.drawable.battery_charge_light)
+                                1 -> it.ivBatteryCharge.setImageResource(R.drawable.battery_charge_dark)
+                            }
+                        } else {
+                            it.ivBatteryCharge.visibility = View.GONE
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        val intentFilter = IntentFilter()
+        intentFilter.addAction(Intent.ACTION_BATTERY_CHANGED)
+        context.registerReceiver(batteryStateReceiver, intentFilter)
+        // 添加换肤监听
+        CallerSkinModeListenerManager.addListener(TAG, this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        context.unregisterReceiver(batteryStateReceiver)
+        CallerSkinModeListenerManager.removeListener(TAG)
+    }
+
+    override fun onSkinModeChange(skinMode: Int) {
+        mSkinMode = skinMode
+    }
+}

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

@@ -0,0 +1,165 @@
+package com.mogo.eagle.core.function.hmi.ui.widget
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.RectF
+import android.util.AttributeSet
+import android.view.View
+import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener
+import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
+import com.mogo.eagle.core.function.hmi.R
+import kotlin.math.abs
+
+
+class BatteryView : View , IMoGoSkinModeChangeListener {
+
+    companion object{
+        const val TAG = "BatteryView"
+    }
+
+    private val radius = context.resources.getDimension(R.dimen.dp_4) // 圆角角度
+    private val border = context.resources.getDimension(R.dimen.dp_3) // 外边缘宽度
+    private val margin = context.resources.getDimension(R.dimen.dp_6) // 边框与内部电量距离
+    private val width = context.resources.getDimension(R.dimen.dp_57) // 电池宽度
+    private val height = context.resources.getDimension(R.dimen.dp_28) // 电池高度
+    private val headWidth = context.resources.getDimension(R.dimen.dp_3) // 电池头宽度
+    private val headHeight = context.resources.getDimension(R.dimen.dp_8) // 电池头高度
+    private val headRadius = context.resources.getDimension(R.dimen.dp_1) // 电池头圆角角度
+    private val batteryNumSize = context.resources.getDimension(R.dimen.dp_20) // 电量显示文字大小
+    private var batteryColor = context.resources.getColor(R.color.color_27FFFFFF) // 电量内部颜色
+    private var powerColor = Color.WHITE
+
+    //默认满电
+    private var mPower = 100
+
+    //是否充电
+    private var mIsCharging = false
+
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null
+    ) : super(context, attrs, 0) {
+
+    }
+
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+    ) : super(context, attrs, defStyleAttr) {
+    }
+
+    @SuppressLint("NewApi")
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+        setMeasuredDimension(width.toInt(), height.toInt())
+    }
+
+    @SuppressLint("DrawAllocation")
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        //电池头
+        val paint = Paint()
+        paint.style = Paint.Style.FILL
+        paint.strokeWidth = 0f
+        paint.isAntiAlias = true
+        paint.color = powerColor
+
+        val rectHead =
+            RectF(width - headWidth, (height - headHeight) / 2, width, (height + headHeight) / 2)
+        canvas.drawRoundRect(rectHead, headRadius, headRadius, paint)
+
+        //边框
+        paint.strokeWidth = border
+        paint.style = Paint.Style.STROKE
+        val rectF =
+            RectF(radius / 2, radius / 2, width - headWidth - radius / 2, height - radius / 2)
+        canvas.drawRoundRect(rectF, radius, radius, paint)
+
+        //文字画笔
+        val textPaint = Paint()
+        textPaint.color = powerColor
+        textPaint.isAntiAlias = true
+        textPaint.textSize = batteryNumSize
+        textPaint.textAlign = Paint.Align.CENTER
+        //画数字
+        val fontMetrics = textPaint.fontMetrics
+        canvas.drawText(mPower.toString(), rectF.centerX(), abs(fontMetrics.top), textPaint)
+
+        //电池电量
+        val powerValues = mPower / 100.0f
+        val paintPower = Paint(paint)
+        paintPower.style = Paint.Style.FILL
+
+        //低电量
+        val lowerPaint = Paint(paint)
+        lowerPaint.style = Paint.Style.FILL
+        lowerPaint.color = powerColor
+        if (mPower < 20) {
+            lowerPaint.color = Color.RED
+        } else {
+            lowerPaint.color = batteryColor
+        }
+
+        //画电量
+        if (powerValues != 0f) {
+            val right = (width - margin - headWidth) * powerValues
+            val bottom = height - margin
+            val rect = RectF(margin, margin, right, bottom)
+            //画矩形
+            canvas.drawRoundRect(rect, radius, radius, lowerPaint)
+        }
+    }
+
+    /**
+     * 设置当前电量
+     */
+    fun setPower(power: Int) {
+        if (this.mPower < 0) {
+            this.mPower = 0
+        }
+        if (this.mPower > 100) {
+            this.mPower = 100
+        }
+        this.mPower = power
+        if(isAttachedToWindow){
+            invalidate()
+        }
+    }
+
+    /**
+     * 是否充电中
+     */
+    fun setCharging(charging: Boolean) {
+        this.mIsCharging = charging
+        invalidate()
+    }
+
+    override fun onSkinModeChange(skinMode: Int) {
+        when (skinMode) {
+            0 -> {
+                batteryColor = resources.getColor(R.color.color_27FFFFFF)
+                powerColor = Color.WHITE
+            }
+            1 -> {
+                batteryColor = resources.getColor(R.color.color_1E111111)
+                powerColor = resources.getColor(R.color.color_2C2E30)
+            }
+        }
+        invalidate()
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        // 添加换肤监听
+        CallerSkinModeListenerManager.addListener(TAG, this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerSkinModeListenerManager.removeListener(TAG)
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.mogo.eagle.core.function.hmi.ui.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.RelativeLayout
+import com.mogo.eagle.core.function.hmi.R
+
+/**
+ * 魔戒蓝牙控件
+ * 放置于StatusBar右侧位置
+ */
+class BlueToothView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : RelativeLayout(context, attrs, defStyleAttr) {
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_blue_tooth, this, true)
+    }
+
+}

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

@@ -0,0 +1,23 @@
+package com.mogo.eagle.core.function.hmi.ui.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.RelativeLayout
+import com.mogo.eagle.core.function.hmi.R
+
+/**
+ * 演示模式控件
+ * 放置于StatusBar右侧位置
+ */
+class DemoModeView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : RelativeLayout(context, attrs, defStyleAttr) {
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_demo_mode, this, true)
+    }
+
+}

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

@@ -7,6 +7,7 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.data.config.HmiBuildConfig
 import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
@@ -49,7 +50,9 @@ class SingleTrafficLightView @JvmOverloads constructor(
     override fun showWarningTrafficLight(checkLightId: Int,lightSource: Int) {
         super.showWarningTrafficLight(checkLightId,lightSource)
         mCurrentLightId = checkLightId
-        updateTrafficLightIcon(checkLightId,lightSource)
+        if(!HmiBuildConfig.isShowTrafficLightView){
+            updateTrafficLightIcon(checkLightId,lightSource)
+        }
     }
 
     /**

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

@@ -0,0 +1,90 @@
+package com.mogo.eagle.core.function.hmi.ui.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.RelativeLayout
+import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener
+import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
+import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.util.BarUtils
+import com.mogo.eagle.core.utilcode.util.ScreenUtils
+import kotlinx.android.synthetic.main.view_status_bar.view.*
+import java.util.concurrent.CopyOnWriteArrayList
+
+class StatusBarView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : RelativeLayout(context, attrs, defStyleAttr), IMoGoSkinModeChangeListener {
+
+    companion object {
+        const val TAG = "StatusBarView"
+    }
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_status_bar, this, true)
+    }
+
+    private val rightViewList = CopyOnWriteArrayList<String>()
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        val layoutParamsLeft =
+            LayoutParams(ScreenUtils.getScreenWidth() / 3, BarUtils.getStatusBarHeight())
+        viewStatusBarLeft.layoutParams = layoutParamsLeft
+        val layoutParamsRight =
+            LayoutParams(ScreenUtils.getScreenWidth() / 3 * 2, BarUtils.getStatusBarHeight())
+        layoutParamsRight.addRule(ALIGN_PARENT_END)
+        layoutParamsRight.addRule(CENTER_HORIZONTAL)
+        layoutParamsRight.addRule(CENTER_IN_PARENT)
+        layoutParamsRight.marginEnd = context.resources.getDimension(R.dimen.dp_44).toInt()
+        viewStatusBarRight.layoutParams = layoutParamsRight
+        viewStatusBarRight.addView(BatteryGroupView(this.context))
+
+        // 添加换肤监听
+        CallerSkinModeListenerManager.addListener(TAG, this)
+    }
+
+    override fun onSkinModeChange(skinMode: Int) {
+        when (skinMode) {
+            0 -> setStatusBarDarkOrLight(false)
+            1 -> setStatusBarDarkOrLight(true)
+        }
+    }
+
+    fun setStatusBarDarkOrLight(light: Boolean) {
+        if (light) {
+            setTextColor(resources.getColor(R.color.color_2C2E30))
+        } else {
+            setTextColor(resources.getColor(R.color.color_FFFFFF))
+        }
+    }
+
+    fun updateRightView(insert: Boolean, tag: String, viewGroup: ViewGroup) {
+        if (insert) {
+            rightViewList.add(0, tag)
+            viewStatusBarRight.addView(viewGroup, 0)
+        } else {
+            rightViewList.forEachIndexed { index, s ->
+                if (s == tag) {
+                    rightViewList.removeAt(index)
+                    viewStatusBarRight.removeViewAt(index)
+                }
+            }
+        }
+    }
+
+    private fun setTextColor(color: Int) {
+        viewTextClock.setTextColor(color)
+        viewStatusBarTag.setTextColor(color)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerSkinModeListenerManager.removeListener(TAG)
+    }
+
+}
+

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

@@ -0,0 +1,127 @@
+package com.mogo.eagle.core.function.hmi.ui.widget
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.wifi.WifiManager
+import android.os.Handler
+import android.os.Message
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatImageView
+import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener
+import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
+import com.mogo.eagle.core.function.hmi.R
+import java.lang.ref.WeakReference
+
+
+class WifiStateView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : AppCompatImageView(context, attrs, defStyleAttr), IMoGoSkinModeChangeListener {
+
+    companion object {
+        const val TAG = "WifiStateView"
+
+        class WifiHandler(wifiStateView: WifiStateView) : Handler() {
+
+            //虚引用
+            private var stateViewWeakReference: WeakReference<WifiStateView>? = null
+
+            init {
+                stateViewWeakReference = WeakReference(wifiStateView)
+            }
+
+            override fun handleMessage(msg: Message) {
+                super.handleMessage(msg)
+                val wifiStateView = stateViewWeakReference?.get()
+                wifiStateView?.updateView(msg.what) {
+                    wifiStateView.setImageResource(it)
+                }
+            }
+        }
+    }
+
+    private var wifiManager: WifiManager? = null
+    private var wifiHandler: WifiHandler? = null
+
+    @Volatile
+    private var mSkinMode: Int = 0
+
+    @Volatile
+    private var level: Int = 0
+
+    init {
+        wifiManager =
+            context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager?
+        wifiHandler = WifiHandler(this)
+    }
+
+    private val wifiStateReceiver: BroadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            when (intent.action) {
+                WifiManager.WIFI_STATE_CHANGED_ACTION, WifiManager.RSSI_CHANGED_ACTION -> {
+                    if (wifiManager!!.wifiState == WifiManager.WIFI_STATE_DISABLED
+                        || wifiManager!!.wifiState == WifiManager.WIFI_STATE_DISABLING
+                    ) {
+                        wifiHandler?.sendEmptyMessage(-1)
+                        return
+                    }
+                    val wifiInfo = wifiManager!!.connectionInfo
+                    level = WifiManager.calculateSignalLevel(wifiInfo.rssi, 5)
+                    wifiHandler?.sendEmptyMessage(level)
+                }
+            }
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        val intentFilter = IntentFilter()
+        //Wifi连接状态变化
+        intentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION)
+        //Wifi信号强度变化
+        intentFilter.addAction(WifiManager.RSSI_CHANGED_ACTION)
+        context.registerReceiver(wifiStateReceiver, intentFilter)
+        // 添加换肤监听
+        CallerSkinModeListenerManager.addListener(TAG, this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        wifiHandler?.removeCallbacksAndMessages(null)
+        context.unregisterReceiver(wifiStateReceiver)
+        CallerSkinModeListenerManager.removeListener(TAG)
+    }
+
+    override fun onSkinModeChange(skinMode: Int) {
+        mSkinMode = skinMode
+        wifiHandler?.sendEmptyMessage(level)
+    }
+
+    fun updateView(wifiState: Int, resId: ((Int) -> Unit)) {
+        when (mSkinMode) {
+            0 -> {
+                when (wifiState) {
+                    -1 -> resId.invoke(R.drawable.wifi_light_state_close)
+                    0 -> resId.invoke(R.drawable.wifi_light_state_one)
+                    1 -> resId.invoke(R.drawable.wifi_light_state_two)
+                    2 -> resId.invoke(R.drawable.wifi_light_state_three)
+                    3 -> resId.invoke(R.drawable.wifi_light_state_four)
+                    4 -> resId.invoke(R.drawable.wifi_light_state_five)
+                }
+            }
+            1 -> {
+                when (wifiState) {
+                    -1 -> resId.invoke(R.drawable.wifi_light_state_close)
+                    0 -> resId.invoke(R.drawable.wifi_dark_state_one)
+                    1 -> resId.invoke(R.drawable.wifi_dark_state_two)
+                    2 -> resId.invoke(R.drawable.wifi_dark_state_three)
+                    3 -> resId.invoke(R.drawable.wifi_dark_state_four)
+                    4 -> resId.invoke(R.drawable.wifi_dark_state_five)
+                }
+            }
+        }
+    }
+}

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

@@ -11,7 +11,9 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
@@ -38,6 +40,7 @@ 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.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.hmi.R;
+import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView;
 import com.mogo.eagle.core.function.main.cards.MogoModulesManager;
 import com.mogo.eagle.core.function.main.service.MogoMainService;
 import com.mogo.eagle.core.function.main.stagetwo.AutopilotStartup;
@@ -47,6 +50,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 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.map.listener.IMogoHosListenerRegister;
@@ -115,6 +119,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
 
     @Override
     protected void initViews() {
+        injectStatusBar();
         getWindow().setBackgroundDrawable(null);
 
         mFloatingLayout = findViewById(R.id.module_main_id_floating_view);
@@ -135,6 +140,24 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         }
     }
 
+    private void injectStatusBar() {
+        FrameLayout decorView =(FrameLayout) this.getWindow().getDecorView();
+        View contentView = ((ViewGroup)decorView.findViewById(android.R.id.content)).getChildAt(0);
+        contentView.setFitsSystemWindows(false);
+        decorView.setClipToPadding(false);
+
+        View statusBarView = decorView.findViewWithTag("status_bar");
+        if (statusBarView == null) {
+            statusBarView = new StatusBarView(this);
+            statusBarView.setTag("status_bar");
+        }
+        FrameLayout.LayoutParams statusBarLP =
+                new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, BarUtils.getStatusBarHeight());
+        statusBarLP.topMargin = 0;
+        statusBarLP.gravity = Gravity.TOP;
+        decorView.addView(statusBarView, statusBarLP);
+    }
+
     // 隐藏布局
     protected void hideLayout() {
         mFloatingLayout.setVisibility(View.GONE);
@@ -173,6 +196,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
 
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
         if (hasFocus) {
             // 统计代码
             final Map<String, Object> properties = new HashMap<>();

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

@@ -27,6 +27,7 @@ import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
 import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager;
 import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.function.main.moujie.BluetoothMonitorReceiver;
@@ -34,7 +35,6 @@ import com.mogo.eagle.core.function.main.moujie.ConnectBluetoothEvent;
 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.BarUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.service.intent.IMogoIntentListener;
@@ -71,7 +71,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
 
     private BluetoothMonitorReceiver mBluetoothReceiver = null;
     private BluetoothAdapter mBluetoothAdapter;
-    private List<BluetoothDevice> mAreadlyConnectedList = new ArrayList<>();//已连接设备集合
+//    private List<BluetoothDevice> mAreadlyConnectedList = new ArrayList<>();//已连接设备集合
     private int numberA = 0;
     private boolean isLongPressA = false;
     private int numberB = 0;
@@ -98,13 +98,11 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         super.onResume();
 
         initBluetooth();
-
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
         if (!mBluetoothAdapter.isEnabled()) {
             mBluetoothAdapter.enable();
         }
         mBluetoothAdapter.startDiscovery();
-
         showBondedDevice(mBluetoothAdapter);
     }
 
@@ -212,31 +210,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) { //向上长按 开启自动驾驶
-            long currentTime = System.currentTimeMillis() / (1000);
-            long oldTime = SharedPrefsMgr.getInstance(getContext()).getLong("old_time_up", 0);
-//            Log.d("liyz", "time = " + (currentTime - oldTime));
-            if (currentTime - oldTime > 6) {
-                SharedPrefsMgr.getInstance(getContext()).putLong("old_time_up", System.currentTimeMillis() / 1000);
-//                ToastUtils.showShort("长按 ↑↑↑ 开启自动驾驶");
-//                CallerAutoPilotManager.INSTANCE.setControlAutopilotCarAuto(true);
-                CallerAutoPilotManager.INSTANCE.startAutoPilot(CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getAutopilotControlParameters());
-
-            }
-
-            return true;
-        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) { //下和中间键盘长按，减速为-2
-            long currentTime = System.currentTimeMillis() / (1000);
-            long oldTime = SharedPrefsMgr.getInstance(getContext()).getLong("old_time_down", 0);
-            if (currentTime - oldTime > 6) {
-                SharedPrefsMgr.getInstance(getContext()).putLong("old_time_down", System.currentTimeMillis() / 1000);
-//                ToastUtils.showShort("长按 ↓↓↓ 减速 -2 ");
-                sendAcc(true, -2);
-            }
-            return true;
-        }
-
-//        Log.e("liyz", "onKeyDown keyCode = " + keyCode + "--action = " + event.getAction() + "---" + event);
         return super.onKeyDown(keyCode, event);
     }
 
@@ -244,109 +217,112 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
 //        Log.d("liyz", "dispatchKeyEvent code = " + event.getKeyCode() +  "--action = " + event.getAction() + "----" + event);
-        if (event.getKeyCode() == KeyEvent.KEYCODE_A) { //单击向左变道，长按-1
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                numberA++;
-                if (numberA > 2) {
-                    if (!isLongPressA) {
-//                        ToastUtils.showShort("方块 长按A -2 ");
-                        sendAcc(true, -2);
-                        isLongPressA = true;
-                    }
-                }
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                if (numberA == 1) {
-//                    ToastUtils.showShort("方块 点击A -1 ");
-                    sendAcc(true, -1);
-                }
-                numberA = 0;
-                isLongPressA = false;
-            }
-            return true;
-        } else if (event.getKeyCode() == KeyEvent.KEYCODE_B) { //单击向右变道，长按-2
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                numberB++;
-                if (numberB > 2) {
-                    if (!isLongPressB) {
-//                        ToastUtils.showShort("方块 长按B 无操作 ");
-                        isLongPressB = true;
-                    }
-                }
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                if (numberB == 1) {
-//                    ToastUtils.showShort("方块 单击B 复原 ");
-                    sendAcc(false, 0.0);
-                }
-                numberB = 0;
-                isLongPressB = false;
-            }
-            return true;
-        } else if (event.getKeyCode() == KeyEvent.KEYCODE_C) { //单击鸣笛，
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                numberC++;
-                if (numberC > 2) {
-                    if (!isLongPressC) {
-//                        ToastUtils.showShort("方块 长按C 无操作");
-                        isLongPressC = true;
-                    }
-                }
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                if (numberC == 1) {
-//                    ToastUtils.showShort("方块 单击C ← 向左变道 ");
-                    CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneLeft();
-                }
-                numberC = 0;
-                isLongPressC = false;
-            }
-            return true;
-        } else if (event.getKeyCode() == KeyEvent.KEYCODE_D) { //单击开启自动驾驶，
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                numberD++;
-                if (numberD > 2) {
-                    if (!isLongPressD) {
-//                        ToastUtils.showShort("方块 长按D  无操作");
-                        isLongPressD = true;
-                    }
-                }
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                if (numberD == 1) {
-//                    ToastUtils.showShort("方块 单击D → 向右变道 ");
-                    CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneRight();
-                }
-                numberD = 0;
-                isLongPressD = false;
-            }
-            return true;
-        } else if (event.getKeyCode() == KeyEvent.KEYCODE_E) { //单击复原，
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                numberE++;
-                if (numberE > 2) {
-                    if (!isLongPressE) {
-//                        ToastUtils.showShort("方块 长按E 鸣笛 ");
-                        CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(1);
-                        if (timerHorn == null) {
-                            timerHorn = new Timer();
+        String bluetoothName = SharedPrefsMgr.getInstance(getContext()).getString("BLUETOOTH");
+        if (bluetoothName.equals("MINI_KEYBOARD")) {
+            if (event.getKeyCode() == KeyEvent.KEYCODE_A) { //单击向左变道，长按-1
+                if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                    numberA++;
+                    if (numberA > 2) {
+                        if (!isLongPressA) {
+                            ToastUtils.showShort("方块 长按A -2 ");
+                            sendAcc(true, -2);
+                            isLongPressA = true;
                         }
-                        timerHorn.schedule(new TimerTask() {
-                            @Override
-                            public void run() {
-                                CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(2);
-                                timerHorn = null;
-                            }
-                        }, 500);
-                        isLongPressE = true;
                     }
+                } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                    if (numberA == 1) {
+                        ToastUtils.showShort("方块 点击A -1 ");
+                        sendAcc(true, -1);
+                    }
+                    numberA = 0;
+                    isLongPressA = false;
                 }
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                if (numberE == 1) {
-//                    ToastUtils.showShort("方块 单击E 开启自动驾驶 ");
+                return true;
+            } else if (event.getKeyCode() == KeyEvent.KEYCODE_B) { //单击向右变道，长按-2
+                if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                    numberB++;
+                    if (numberB > 2) {
+                        if (!isLongPressB) {
+                            ToastUtils.showShort("方块 长按B 无操作 ");
+                            isLongPressB = true;
+                        }
+                    }
+                } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                    if (numberB == 1) {
+                        ToastUtils.showShort("方块 单击B 复原 ");
+                        sendAcc(false, 0.0);
+                    }
+                    numberB = 0;
+                    isLongPressB = false;
+                }
+                return true;
+            } else if (event.getKeyCode() == KeyEvent.KEYCODE_C) { //单击鸣笛，
+                if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                    numberC++;
+                    if (numberC > 2) {
+                        if (!isLongPressC) {
+                            ToastUtils.showShort("方块 长按C 无操作");
+                            isLongPressC = true;
+                        }
+                    }
+                } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                    if (numberC == 1) {
+                        ToastUtils.showShort("方块 单击C ← 向左变道 ");
+                        CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneLeft();
+                    }
+                    numberC = 0;
+                    isLongPressC = false;
+                }
+                return true;
+            } else if (event.getKeyCode() == KeyEvent.KEYCODE_D) { //单击开启自动驾驶，
+                if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                    numberD++;
+                    if (numberD > 2) {
+                        if (!isLongPressD) {
+                            ToastUtils.showShort("方块 长按D  无操作");
+                            isLongPressD = true;
+                        }
+                    }
+                } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                    if (numberD == 1) {
+                        ToastUtils.showShort("方块 单击D → 向右变道 ");
+                        CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneRight();
+                    }
+                    numberD = 0;
+                    isLongPressD = false;
+                }
+                return true;
+            } else if (event.getKeyCode() == KeyEvent.KEYCODE_E) { //单击复原，
+                if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                    numberE++;
+                    if (numberE > 2) {
+                        if (!isLongPressE) {
+                            ToastUtils.showShort("方块 长按E 鸣笛 ");
+                            CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(1);
+                            if (timerHorn == null) {
+                                timerHorn = new Timer();
+                            }
+                            timerHorn.schedule(new TimerTask() {
+                                @Override
+                                public void run() {
+                                    CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(2);
+                                    timerHorn = null;
+                                }
+                            }, 500);
+                            isLongPressE = true;
+                        }
+                    }
+                } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                    if (numberE == 1) {
+                        ToastUtils.showShort("方块 单击E 开启自动驾驶 ");
 //                    CallerAutoPilotManager.INSTANCE.setControlAutopilotCarAuto(true);
-                    CallerAutoPilotManager.INSTANCE.startAutoPilot(CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getAutopilotControlParameters());
+                        CallerAutoPilotManager.INSTANCE.startAutoPilot(CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getAutopilotControlParameters());
+                    }
+                    numberE = 0;
+                    isLongPressE = false;
                 }
-                numberE = 0;
-                isLongPressE = false;
+                return true;
             }
-            return true;
         }
 
         return super.dispatchKeyEvent(event);
@@ -354,54 +330,13 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent event) {
-//        Log.d("liyz", "dispatchTouchEvent event.getX() = " + event.getX() + "--event.getY() = " + event.getY() + "--action = " + event.getAction());
-        if (event.getX() == -1469.6875 && event.getY() == 530.0) { //向左变道
-//            ToastUtils.showShort("← 向左变道");
-            CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneLeft();
-
-            return true;
-        } else if (event.getX() == -1096.25 && event.getY() == 132.5) { //鸣笛
-//            ToastUtils.showShort("↑ 鸣笛 ");
-            CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(1);
-
-            if (timerHorn == null) {
-                timerHorn = new Timer();
-            }
-            timerHorn.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(2);
-                    timerHorn = null;
-                }
-            }, 500);
-
-            return true;
-        } else if (event.getX() == -863.4375 && event.getY() == 690.0) { //向右变道
-            CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneRight();
-//            ToastUtils.showShort("→ 向右变道");
-            return true;
-        } else if (event.getX() == -1096.25 && event.getY() == 1099.0) { // -1减速
-            sendAcc(true, -1);
-//            ToastUtils.showShort("↓ 减速 -1 ");
-
-            return true;
-        } else if (event.getX() == -1096.25 && event.getY() == 690.0) { //复原
-//            ToastUtils.showShort("O 复原 ");
-            sendAcc(false, 0.0);
-
-            return true;
-        }
 
         return super.dispatchTouchEvent(event);
     }
 
     @Override
     public void onSkinModeChange(int skinMode) {
-        if (skinMode == 0) {
-            BarUtils.setStatusBarLightMode(this, false);
-        } else {
-            BarUtils.setStatusBarLightMode(this, true);
-        }
+
     }
 
     private synchronized void sendAcc(boolean isSend, double acc) {
@@ -445,10 +380,9 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     /**
      * 查找蓝牙连接过的蓝牙设备
      *
-     * @param bluetoothAdapter
      */
     private void showBondedDevice(BluetoothAdapter bluetoothAdapter) {
-        mAreadlyConnectedList.clear();
+//        mAreadlyConnectedList.clear();
         Set<BluetoothDevice> deviceList = bluetoothAdapter.getBondedDevices();
         for (BluetoothDevice device : deviceList) {
             try {
@@ -456,15 +390,10 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 Method isConnectedMethod = BluetoothDevice.class.getDeclaredMethod("isConnected", (Class[]) null);
                 isConnectedMethod.setAccessible(true);
                 boolean isConnected = (boolean) isConnectedMethod.invoke(device, (Object[]) null);
-//                Log.e("liyz", "showBondedDevice Name:" + device.getName() + " Mac:" + device.getAddress() + "---isConnected = " + isConnected);
-                mAreadlyConnectedList.add(device);
-                if (device.getName().equals("JX-05")) { //后面魔戒可能不使用了
-                    SharedPrefsMgr.getInstance(getContext()).putString("BT_MAC", device.getAddress());
-                }
-                if (!isConnected) {
-                    UiThreadHandler.postDelayed(() -> {
-                        connectBluetooth(); //主动连接一次
-                    }, 4000L);
+//                mAreadlyConnectedList.add(device);
+//                Log.d("liyz", "-- device.getName() = " + device.getName()); //device.getAddress()
+                if (device.getName().equals("MINI_KEYBOARD")) {
+                    SharedPrefsMgr.getInstance(getContext()).putString("BLUETOOTH", device.getName());
                 }
             } catch (NoSuchMethodException e) {
                 e.printStackTrace();
@@ -476,43 +405,11 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         }
     }
 
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onAutoConnection(ConnectBluetoothEvent event) {
 //        connectBluetooth();
     }
 
-    /**
-     * 主动连接最近的一次连接
-     */
-    private void connectBluetooth() {
-//        Log.d("liyz", "connectBluetooth ----> size() = " + mAreadlyConnectedList.size());
-        if (mAreadlyConnectedList.size() > 0) {
-            try {
-                Method method = BluetoothDevice.class.getMethod("createBond");
-                String macAddress = SharedPrefsMgr.getInstance(getContext()).getString("BT_MAC");
-                int pos = -1;
-                for (int i = 0; i < mAreadlyConnectedList.size(); i++) {
-                    if (macAddress.equals(mAreadlyConnectedList.get(i).getAddress())) {
-                        pos = i;
-                    }
-                }
-
-//                Log.d("liyz", "connectBluetooth macAddress = " + macAddress + "---pos = " + pos);
-                if (mAreadlyConnectedList.size() > pos && (pos >= 0)) {
-                    method.invoke(mAreadlyConnectedList.get(pos));
-                }
-
-            } catch (NoSuchMethodException e) {
-                e.printStackTrace();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (InvocationTargetException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
 
 }
 

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

@@ -10,6 +10,7 @@ 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.voice.AIAssist;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.constants.MoGoConfig;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
@@ -56,6 +57,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         initCrashConfig();
         initLogConfig();
         initTipToast();
+        AIAssist.getInstance(this);
         initModules();
         if (DebugConfig.isDebug()) {
             initKoom();

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

@@ -45,13 +45,11 @@ public class BluetoothMonitorReceiver extends BroadcastReceiver {
 
                 case BluetoothDevice.ACTION_ACL_CONNECTED:
 //                    Toast.makeText(context, "蓝牙设备已连接", Toast.LENGTH_SHORT).show();
-//                    Log.d("liyz", "蓝牙设备已连接 ----> ");
 //                    SharedPrefsMgr.getInstance(context).putBoolean("BLUETOOTH", true);
                     break;
 
                 case BluetoothDevice.ACTION_ACL_DISCONNECTED:
 //                    SharedPrefsMgr.getInstance(context).putBoolean("BLUETOOTH", false);
-//                    Log.d("liyz", "蓝牙设备已断开 ----> ");
 //                    Toast.makeText(context, "蓝牙设备已断开", Toast.LENGTH_SHORT).show();
                     EventBus.getDefault().post(new ConnectBluetoothEvent());
                     break;

core/function-impl/mogo-core-function-hmi/src/main/res/drawable/taxi_loginout_sure_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="24px"/>
+    <solid android:color="#1E3062" />
+</shape>

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

@@ -8,7 +8,7 @@
 
     <View
         android:id="@+id/viewShowDebugView"
-        android:layout_width="@dimen/dp_100"
+        android:layout_width="@dimen/dp_400"
         android:layout_height="@dimen/dp_100"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -50,10 +50,10 @@
 
         <com.mogo.eagle.core.function.hmi.ui.takeover.TakeOverView
             android:id="@+id/clTakeOverView"
-            android:visibility="gone"
             android:layout_width="@dimen/hmi_take_over_request_width"
             android:layout_height="@dimen/hmi_take_over_request_height"
             android:layout_marginTop="@dimen/hmi_take_over_request_m_top"
+            android:visibility="gone"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

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

@@ -43,6 +43,7 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="@+id/tv_check_title"
                 app:layout_constraintTop_toBottomOf="@+id/v_second_group">
 
@@ -144,6 +145,32 @@
 
             </LinearLayout>
 
+            <RelativeLayout
+                android:id="@+id/sopLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_216"
+                android:layout_marginTop="@dimen/dp_90"
+                app:layout_constraintTop_toBottomOf="@id/checkLayout"
+                app:layout_constraintLeft_toLeftOf="@id/checkLayout">
+
+                <ImageView
+                    android:layout_width="150px"
+                    android:layout_height="150px"
+                    android:layout_centerHorizontal="true"
+                    android:background="@drawable/debug_icon_sop" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="42px"
+                    android:text="@string/debug_sop"
+                    android:textColor="@color/color_FFA7B6F0"
+                    android:textSize="32px"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerHorizontal="true"
+                    />
+
+            </RelativeLayout>
+
             <TextView
                 android:id="@+id/tv_check_title"
                 android:layout_width="84px"
@@ -164,7 +191,7 @@
                 android:layout_marginTop="94px"
                 android:background="@color/color_FF2966EC"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/checkLayout" />
+                app:layout_constraintTop_toBottomOf="@id/sopLayout" />
 
             <TextView
                 android:id="@+id/tvSpeedTitle"
@@ -177,45 +204,68 @@
                 android:textColor="@color/color_FFFFFF"
                 android:textSize="42px"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/checkLayout" />
+                app:layout_constraintTop_toBottomOf="@id/sopLayout" />
 
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:id="@+id/llSpeedPosition"
-                android:layout_width="390px"
+            <ImageView
+                android:id="@+id/ivSpeedReduce"
+                android:layout_width="105px"
                 android:layout_height="140px"
                 android:layout_marginStart="113px"
                 android:layout_marginTop="40px"
-                android:background="@drawable/pilot_speed_bg"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:orientation="horizontal"
+                android:src="@drawable/icon_speed_reduce"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvSpeedTitle">
+                app:layout_constraintTop_toBottomOf="@id/tvSpeedTitle"
+                />
 
-                <androidx.appcompat.widget.AppCompatEditText
-                    android:id="@+id/etInputSpeed"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="92px"
-                    android:layout_weight="1"
-                    android:background="@null"
-                    android:gravity="center"
-                    android:maxLength="3"
-                    android:maxLines="1"
-                    android:textColor="#FFFFFFFF"
-                    android:textSize="80px"
-                    tools:ignore="SpeakableTextPresentCheck" />
+            <TextView
+                android:id="@+id/tvSpeed"
+                android:layout_width="189px"
+                android:layout_height="140px"
+                app:layout_constraintTop_toTopOf="@id/ivSpeedReduce"
+                app:layout_constraintBottom_toBottomOf="@id/ivSpeedReduce"
+                app:layout_constraintLeft_toRightOf="@id/ivSpeedReduce"
+                android:background="#1E3062"
+                android:textColor="#FFFFFFFF"
+                android:textSize="80px"
+                android:gravity="center"
+                />
 
-                <TextView
-                    android:layout_width="93px"
-                    android:layout_height="53px"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginEnd="28px"
-                    android:text="km/h"
-                    android:textColor="@color/color_B3FFFFFF"
-                    android:textSize="38px" />
+            <ImageView
+                android:id="@+id/ivSpeedAdd"
+                android:layout_width="105px"
+                android:layout_height="140px"
+                app:layout_constraintTop_toTopOf="@id/tvSpeed"
+                app:layout_constraintBottom_toBottomOf="@id/tvSpeed"
+                app:layout_constraintLeft_toRightOf="@id/tvSpeed"
+                android:src="@drawable/icon_speed_add"
+                />
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
+            <TextView
+                android:id="@+id/tvUnit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="km/h"
+                android:textColor="#FFFFFFFF"
+                android:textSize="38px"
+                app:layout_constraintTop_toTopOf="@id/ivSpeedAdd"
+                app:layout_constraintBottom_toBottomOf="@id/ivSpeedAdd"
+                app:layout_constraintLeft_toRightOf="@id/ivSpeedAdd"
+                android:layout_marginStart="40px" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvSureModify"
+                android:layout_width="200px"
+                android:layout_height="135px"
+                android:background="@drawable/taxi_loginout_sure_bg"
+                android:gravity="center"
+                android:text="确定"
+                android:textColor="@android:color/white"
+                android:textSize="42px"
+                android:layout_marginLeft="50px"
+                app:layout_constraintTop_toTopOf="@id/tvSpeed"
+                app:layout_constraintBottom_toBottomOf="@id/tvSpeed"
+                app:layout_constraintLeft_toRightOf="@id/tvUnit"
+                tools:visibility="visible" />
 
             <TextView
                 android:id="@+id/tvAcceleration"
@@ -226,7 +276,7 @@
                 android:textColor="#A7B6F0"
                 android:textSize="32px"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/llSpeedPosition" />
+                app:layout_constraintTop_toBottomOf="@id/ivSpeedReduce" />
 
             <View
                 android:layout_width="14px"

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:layout_marginLeft="@dimen/dp_10"
+    android:orientation="horizontal">
+
+    <com.mogo.eagle.core.function.hmi.ui.widget.BatteryView
+        android:id="@+id/viewBattery"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <ImageView
+        android:id="@+id/ivBatteryCharge"
+        android:layout_width="@dimen/dp_16"
+        android:layout_height="@dimen/dp_22"
+        android:layout_marginStart="@dimen/dp_6"
+        android:scaleType="fitXY"
+        android:src="@drawable/battery_charge_light"
+        android:visibility="gone" />
+</LinearLayout>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="@dimen/dp_54"
+    android:layout_height="@dimen/dp_54">
+
+    <ImageView
+        android:scaleType="fitXY"
+        android:src="@drawable/blue_tooth"
+        android:layout_width="@dimen/dp_54"
+        android:layout_height="@dimen/dp_54"
+        tools:ignore="ContentDescription" />
+
+</RelativeLayout>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="@dimen/dp_54"
+    android:layout_height="@dimen/dp_54">
+
+    <ImageView
+        android:scaleType="fitXY"
+        android:src="@drawable/demo_mode"
+        android:layout_width="@dimen/dp_54"
+        android:layout_height="@dimen/dp_54"
+        tools:ignore="ContentDescription" />
+
+</RelativeLayout>

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

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:layout_width="@dimen/dp_800"
+    android:layout_height="@dimen/dp_1100"
+    android:background="#FFFFFF"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:ignore="UselessParent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!--绕障类功能-->
+            <ToggleButton
+                android:id="@+id/tbObstacleAvoidance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启绕障类功能"
+                android:textOn="关闭绕障类功能"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toTopOf="parent"
+                />
+            <!--危险障碍物颜色标记-->
+            <ToggleButton
+                android:id="@+id/tbMarkingObstacles"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启「危险障碍物颜色标记」"
+                android:textOn="关闭「危险障碍物颜色标记」"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbObstacleAvoidance"
+                />
+            <!--引导线动态效果-->
+            <ToggleButton
+                android:id="@+id/tbRouteDynamicEffect"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启「引导线动态效果」"
+                android:textOn="关闭「引导线动态效果」"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbMarkingObstacles"
+                />
+            <!--红绿灯标识-->
+            <ToggleButton
+                android:id="@+id/tbTrafficLight"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="隐藏红绿灯标识"
+                android:textOn="展示红绿灯标识"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbRouteDynamicEffect"
+                />
+            <!--限速标识-->
+            <ToggleButton
+                android:id="@+id/tbSpeedLimit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="展示限速标识"
+                android:textOn="隐藏限速标识"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbTrafficLight"
+                />
+
+            <ToggleButton
+                android:id="@+id/tbDemoMode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启美化模式"
+                android:textOn="关闭美化模式"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbSpeedLimit"
+                />
+
+            <ToggleButton
+                android:id="@+id/tbRainMode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启雨天模式"
+                android:textOn="关闭雨天模式"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbDemoMode"
+                />
+
+            <ToggleButton
+                android:id="@+id/tbObu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="关闭OBU"
+                android:textOn="开启OBU"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbRainMode"
+                />
+
+            <ToggleButton
+                android:id="@+id/tbIPCReport"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启异常上报提示"
+                android:textOn="关闭异常上报提示"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbObu"
+                />
+
+            <TextView
+                android:id="@+id/tvSpeedThresholdTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tbIPCReport"
+                android:text="变道速度阈值："
+                android:textSize="18sp"
+                android:textColor="#1A1A1A"
+                android:layout_margin="10dp"
+                />
+
+            <ImageView
+                android:id="@+id/ivSpeedReduce"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintLeft_toRightOf="@id/tvSpeedThresholdTitle"
+                app:layout_constraintTop_toTopOf="@id/tvSpeedThresholdTitle"
+                app:layout_constraintBottom_toBottomOf="@id/tvSpeedThresholdTitle"
+                android:src="@drawable/icon_reduce"
+                android:padding="10dp"
+                />
+
+            <TextView
+                android:id="@+id/tvSpeed"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                app:layout_constraintTop_toTopOf="@id/ivSpeedReduce"
+                app:layout_constraintBottom_toBottomOf="@id/ivSpeedReduce"
+                app:layout_constraintLeft_toRightOf="@id/ivSpeedReduce"
+                android:textSize="18sp"
+                android:gravity="center"
+                android:background="@drawable/debug_setting_edit_bg"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
+                />
+
+            <ImageView
+                android:id="@+id/ivSpeedAdd"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="@id/tvSpeed"
+                app:layout_constraintBottom_toBottomOf="@id/tvSpeed"
+                app:layout_constraintLeft_toRightOf="@id/tvSpeed"
+                android:src="@drawable/icon_add"
+                android:padding="10dp"
+                />
+
+            <Button
+                android:id="@+id/btnSpeedSet"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="@id/ivSpeedAdd"
+                app:layout_constraintBottom_toBottomOf="@id/ivSpeedAdd"
+                app:layout_constraintLeft_toRightOf="@id/ivSpeedAdd"
+                android:text="设置阈值"
+                android:layout_marginStart="10dp"
+                />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_margin="10dp"
+                android:background="#F0F0F0"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btnSpeedSet"
+                />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+
+</LinearLayout>

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_72">
+
+    <LinearLayout
+        android:id="@+id/viewStatusBarLeft"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_72"
+        android:layout_alignParentStart="true"
+        android:orientation="horizontal">
+
+        <TextClock
+            android:id="@+id/viewTextClock"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_64"
+            android:layout_marginStart="@dimen/dp_24"
+            android:format12Hour="HH:mm"
+            android:format24Hour="HH:mm"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textColor="@color/color_2C2E30"
+            android:textSize="@dimen/dp_45"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/viewStatusBarTag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_27"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:text="@string/status_bar_tag"
+            android:textColor="@color/color_2C2E30"
+            android:textSize="@dimen/dp_35" />
+
+        <com.mogo.eagle.core.function.hmi.ui.widget.WifiStateView
+            android:layout_width="@dimen/dp_54"
+            android:layout_height="@dimen/dp_54"
+            android:layout_gravity="center"
+            android:layout_marginStart="@dimen/dp_18" />
+
+    </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/viewStatusBarRight"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="@dimen/dp_44"
+            android:gravity="end|center"
+            android:orientation="horizontal">
+
+        </LinearLayout>
+
+</RelativeLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml

@@ -9,4 +9,6 @@
     <color name="acc_default_txt_color">#FF343C63</color>
     <color name="hmi_check_keyboard_input_field">#FF282F62</color>
     <color name="bus_autopilot_text_color_normal">#FFFFFF</color>
+    <color name="color_2C2E30">#2C2E30</color>
+    <color name="color_D4D8DC">#D4D8DC</color>
 </resources>

core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml

@@ -18,6 +18,10 @@
     <color name="color_FF0006">#FF0006</color>
     <color name="color_0099dd">#0099dd</color>
     <color name="color_FFFFFF">#FFFFFF</color>
+    <color name="color_2C2E30">#2C2E30</color>
+    <color name="color_D4D8DC">#D4D8DC</color>
+    <color name="color_27FFFFFF">#27FFFFFF</color>
+    <color name="color_1E111111">#1E111111</color>
 
     <color name="background_wtf">#FF999900</color>
     <color name="background_error">#FFCC0000</color>

core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml

@@ -22,6 +22,7 @@
     <string name="check_vehicle_detection">车辆检测</string>
     <string name="debug_panel">调试面板</string>
     <string name="debug_panel_fb">录包设置</string>
+    <string name="debug_sop">运营面板</string>
     <string name="check_vehicle_speed_setting">车速设置</string>
     <string name="bus_operation_title">账户信息</string>
     <string name="check_system_operation">系统运行</string>
@@ -51,5 +52,5 @@
     <string name="modify_binding_car">是否修改车机绑定？</string>
     <string name="to_binding_car">是否绑定车机？</string>
 
-
+    <string name="status_bar_tag">蘑菇星云</string>
 </resources>