diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt
index 3ad8a1cfd2..e40bf14a9c 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt
@@ -1,5 +1,6 @@
 package com.mogo.och.common.module.biz.ui
 
+import android.annotation.SuppressLint
 import android.content.DialogInterface
 import android.graphics.Rect
 import android.os.Bundle
@@ -20,10 +21,10 @@ import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.mvp.MvpDialogFragment
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.utilcode.util.KeyboardUtils
 import com.mogo.och.common.module.R
 import com.mogo.och.common.module.biz.constant.OchCommonConst
@@ -35,7 +36,8 @@ import com.mogo.och.common.module.biz.provider.LoginService
  * @author: yangyakun
  * @date: 2022/8/15
  */
-class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, OchCommonLoginPresenter?>(),
+class TaxiLoginDialogFragment :
+    MvpDialogFragment<TaxiLoginDialogFragment?, OchCommonLoginPresenter?>(),
     DialogInterface.OnKeyListener {
 
     lateinit var clMain: ConstraintLayout
@@ -54,14 +56,6 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, OchC
         setStyle(STYLE_NO_TITLE, R.style.DialogFullScreen) //dialog全屏
     }
 
-    override fun onResume() {
-        super.onResume()
-        dialog?.let {
-            it.window?.let {window->
-                BarUtils.setNavBarVisibility(window,false)
-            }
-        }
-    }
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -88,11 +82,8 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, OchC
         initBg()
         initListener()
         dialog?.window?.let {
-            context?.let { contextIn->
-                BarUtils.setStatusBarColor(
-                    it,
-                    ContextCompat.getColor(contextIn, R.color.taxi_4D000000)
-                )
+            context?.let { _ ->
+                CallerHmiManager.setStatusBarDarkOrLight(false)
             }
         }
     }
@@ -108,23 +99,22 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, OchC
         }
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     private fun initListener() {
         mRootView.isFocusable = true
         mRootView.isFocusableInTouchMode = true
-        mRootView.setOnTouchListener(object : View.OnTouchListener {
-            override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-                when (event?.action) {
-                    MotionEvent.ACTION_DOWN -> {
-                        closeSoftInput()
-                    }
+        mRootView.setOnTouchListener { _, event ->
+            when (event?.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    closeSoftInput()
                 }
-                return false
             }
-        })
+            false
+        }
         acbtnLogin.onClick {
             val phone = aceLoginPhoneValue.text.toString()
             val code = acetPhoneCodeValue.text.toString()
-            mPresenter?.gotoLogin(phone,code)
+            mPresenter?.gotoLogin(phone, code)
         }
         actvWelcomeLoginTitle.setOnClickListener {
             continuousClick()
@@ -148,7 +138,7 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, OchC
         actvLoginGetCode.onClick {
             mPresenter?.getPhoneCode(aceLoginPhoneValue.text.toString())
         }
-        actvLoginShowSn.setOnLongClickListener{
+        actvLoginShowSn.setOnLongClickListener {
             val loginService = ARouter.getInstance().build(OchCommonConst.LOGINSERVICE)
                 .navigation() as LoginService
             loginService.showUiModel(false)
@@ -156,8 +146,8 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, OchC
             true
         }
         aceLoginPhoneValue.addTextChangedListener {
-            it?.let { itEditable->
-                if(itEditable.isNotEmpty()){
+            it?.let { itEditable ->
+                if (itEditable.isNotEmpty()) {
                     inputPhoneNormal()
                 }
             }
@@ -175,28 +165,29 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, OchC
         }
     }
 
-    fun setCountDownText(text:String,enable: Boolean){
-        if(enable){
+    fun setCountDownText(text: String, enable: Boolean) {
+        if (enable) {
             actvLoginGetCode.setText(R.string.module_och_taxi_login_get_code)
             actvLoginGetCode.isEnabled = true
-        }else{
+        } else {
             actvLoginGetCode.text = text
             actvLoginGetCode.isEnabled = false
         }
     }
 
-    fun inputPhoneError(){
+    fun inputPhoneError() {
         aceLoginPhoneValue.text?.clear()
         aceLoginPhoneValue.setHint(R.string.module_och_taxi_login_phone_error)
         context?.let {
-            aceLoginPhoneValue.setHintTextColor(ContextCompat.getColor(it,R.color.taxi_EF262C))
+            aceLoginPhoneValue.setHintTextColor(ContextCompat.getColor(it, R.color.taxi_EF262C))
             aceLoginPhoneValue.setBackgroundResource(R.drawable.taxi_login_phone_error)
         }
     }
-    private fun inputPhoneNormal(){
+
+    private fun inputPhoneNormal() {
         //aceLoginPhoneValue.setHint(R.string.module_och_taxi_login_phone_hint_text)
         context?.let {
-            aceLoginPhoneValue.setHintTextColor(ContextCompat.getColor(it,R.color.taxi_878890))
+            aceLoginPhoneValue.setHintTextColor(ContextCompat.getColor(it, R.color.taxi_878890))
             aceLoginPhoneValue.setBackgroundResource(R.drawable.taxi_login_phone_normal)
         }
     }
@@ -205,17 +196,30 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, OchC
         return OchCommonLoginPresenter(this)
     }
 
-    val COUNTS = 4 // 点击次数
-    val DURATION: Long = 1000 // 规定有效时间
-    var mHits = LongArray(COUNTS)
+    companion object {
+        private const val COUNTS = 4 // 点击次数
+        private const val DURATION: Long = 1000 // 规定有效时间
+        val TAG = TaxiLoginDialogFragment::class.java.simpleName
+
+        @JvmStatic
+        fun newInstance(): TaxiLoginDialogFragment {
+            val args = Bundle()
+            val fragment = TaxiLoginDialogFragment()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+
+    private var mHits = LongArray(COUNTS)
+
     private fun continuousClick() {
         //每次点击时，数组向前移动一位
         System.arraycopy(mHits, 1, mHits, 0, mHits.size - 1)
         //为数组最后一位赋值
-        mHits[mHits.size-1] = SystemClock.uptimeMillis()
+        mHits[mHits.size - 1] = SystemClock.uptimeMillis()
         if (mHits[0] >= (SystemClock.uptimeMillis() - DURATION)) {
             mHits = LongArray(COUNTS) //重新初始化数组
-            mPresenter?.gotoLogin("13288888888","8888")
+            mPresenter?.gotoLogin("13288888888", "8888")
         }
     }
 
@@ -234,6 +238,7 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, OchC
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
         mOnClickListener?.onDismiss(dialog)
+        CallerHmiManager.setStatusBarDarkOrLight(false)
     }
 
     /**
@@ -269,16 +274,4 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, OchC
         }
     }
 
-
-    companion object {
-        val TAG = TaxiLoginDialogFragment::class.java.simpleName
-
-        @JvmStatic
-        fun newInstance(): TaxiLoginDialogFragment {
-            val args = Bundle()
-            val fragment = TaxiLoginDialogFragment()
-            fragment.arguments = args
-            return fragment
-        }
-    }
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
index fdef63f02d..6945095a4c 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
@@ -13,14 +13,10 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.eagle.core.utilcode.util.BarUtils
-import com.mogo.och.common.module.utils.DateTimeUtil
-import com.mogo.och.common.module.utils.NumberFormatUtil
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerVideoPlay
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst
 import com.mogo.och.taxi.passenger.event.FinishActivity
-import com.mogo.och.taxi.passenger.mulprocess.ICallback
 import com.mogo.och.taxi.passenger.ui.leftmenu.LeftMenuOpen
 import com.mogo.och.taxi.passenger.ui.leftmenu.OverlayLeftViewUtils
 import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CarouselLayoutManager
@@ -41,7 +37,6 @@ import rx.Observer
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
-import java.util.Calendar
 import java.util.concurrent.TimeUnit
 import kotlin.collections.ArrayList
 import kotlin.math.floor
@@ -49,18 +44,18 @@ import kotlin.math.floor
 
 class VideoActivity : AppCompatActivity() {
 
-    private var rvVideoPlaylist: RecyclerView?=null
+    private var rvVideoPlaylist: RecyclerView? = null
     private lateinit var indicatorView: IndicatorView
     private lateinit var clContain: ConstraintLayout
     private lateinit var acivTitleIcon: AppCompatImageView
     private lateinit var tvTitle: TextView
-    private var subscribe: Subscription?=null
+    private var subscribe: Subscription? = null
     private val TAG = "mulprocessVideoActivity"
 
     private val arrayListOf = ArrayList<TaxiPassengerVideoPlay>()
 
 
-    companion object{
+    companion object {
         const val VIDEOTYPE = "VIDEOTYPE"
         const val VIDEOTYPE_CONSULT = 0
         const val VIDEOTYPE_MOIES = 1
@@ -68,10 +63,10 @@ class VideoActivity : AppCompatActivity() {
 
         const val EVENT_FINISH = 0
 
-        fun startActivity(context:Context,videoType:Int,sumDis:Int){
+        fun startActivity(context: Context, videoType: Int, sumDis: Int) {
             val intent = Intent(context, VideoActivity::class.java)
             intent.putExtra(VIDEOTYPE, videoType)
-            intent.putExtra(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS,sumDis)
+            intent.putExtra(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS, sumDis)
             context.startActivity(intent)
         }
     }
@@ -114,7 +109,7 @@ class VideoActivity : AppCompatActivity() {
         LeftMenuOpen.registerCallback(LeftMenuOpen.callBack)
     }
 
-    private fun initConsultData(){
+    private fun initConsultData() {
         arrayListOf.clear()
         arrayListOf.add(
             TaxiPassengerVideoPlay(
@@ -238,7 +233,7 @@ class VideoActivity : AppCompatActivity() {
             }
             indicatorView.onPageScrolled(currentIndex, fl, 0)
         }
-        val recyclerVideoAdapter = RecyclerVideoAdapter(this, arrayListOf,rvVideoPlaylist)
+        val recyclerVideoAdapter = RecyclerVideoAdapter(this, arrayListOf, rvVideoPlaylist)
         recyclerVideoAdapter.setOnThumbImageClilckListener {
             val (_: Int, player) = getPlayer(carouselLayoutManager)
             if (player is ConsultVideoPlayer) {
@@ -280,24 +275,31 @@ class VideoActivity : AppCompatActivity() {
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        when (videotype){
+        when (videotype) {
             VIDEOTYPE_CONSULT -> {
-                OverlayLeftViewUtils.showOverlayView(this,isOpen = false, checkIndex = OverlayLeftViewUtils.CONSULT)
+                OverlayLeftViewUtils.showOverlayView(
+                    this,
+                    isOpen = false,
+                    checkIndex = OverlayLeftViewUtils.CONSULT
+                )
             }
             VIDEOTYPE_MOIES -> {
-                OverlayLeftViewUtils.showOverlayView(this,isOpen = false, checkIndex = OverlayLeftViewUtils.MOVIE)
+                OverlayLeftViewUtils.showOverlayView(
+                    this,
+                    isOpen = false,
+                    checkIndex = OverlayLeftViewUtils.MOVIE
+                )
             }
         }
         val sumDis = intent.getIntExtra(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS, 0)
-        FloatingDistanceInfoUtils.showOverlayView(this,sumDis=sumDis)
+        FloatingDistanceInfoUtils.showOverlayView(this, sumDis = sumDis)
     }
 
     override fun onResume() {
         super.onResume()
-        BarUtils.setNavBarVisibility(window,false)
         val carouselLayoutManager = rvVideoPlaylist?.layoutManager as CarouselLayoutManager
         val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager)
-        if(centerItemPosition<0){
+        if (centerItemPosition < 0) {
             setBackageAndPlayNext(arrayListOf[0])
         }
         player?.let {
@@ -325,12 +327,20 @@ class VideoActivity : AppCompatActivity() {
                 override fun onError(e: Throwable?) {}
                 override fun onNext(t: Long?) {
                     if (!OverlayLeftViewUtils.getStatus()) {
-                        when (videotype){
+                        when (videotype) {
                             VIDEOTYPE_CONSULT -> {
-                                OverlayLeftViewUtils.showOverlayView(this@VideoActivity,isOpen = false, checkIndex = OverlayLeftViewUtils.CONSULT)
+                                OverlayLeftViewUtils.showOverlayView(
+                                    this@VideoActivity,
+                                    isOpen = false,
+                                    checkIndex = OverlayLeftViewUtils.CONSULT
+                                )
                             }
                             VIDEOTYPE_MOIES -> {
-                                OverlayLeftViewUtils.showOverlayView(this@VideoActivity,isOpen = false, checkIndex = OverlayLeftViewUtils.MOVIE)
+                                OverlayLeftViewUtils.showOverlayView(
+                                    this@VideoActivity,
+                                    isOpen = false,
+                                    checkIndex = OverlayLeftViewUtils.MOVIE
+                                )
                             }
                         }
                     }
@@ -356,7 +366,7 @@ class VideoActivity : AppCompatActivity() {
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
-    fun finishActivity(event: FinishActivity){
+    fun finishActivity(event: FinishActivity) {
         CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "finishActivity(event)")
         cancleSubscribe()
         val intent = Intent()
@@ -379,21 +389,21 @@ class VideoActivity : AppCompatActivity() {
         cancleSubscribe()
     }
 
-    private fun cancleSubscribe(){
+    private fun cancleSubscribe() {
         subscribe?.let {
-            if(!it.isUnsubscribed){
+            if (!it.isUnsubscribed) {
                 it.unsubscribe()
             }
         }
     }
 
     private fun releaseOnNewInstance() {
-        if (rvVideoPlaylist!=null&&rvVideoPlaylist?.layoutManager != null) {
+        if (rvVideoPlaylist != null && rvVideoPlaylist?.layoutManager != null) {
             val carouselLayoutManager = rvVideoPlaylist?.layoutManager as CarouselLayoutManager
             val (_: Int, player) = getPlayer(carouselLayoutManager)
             player?.let {
-                    player.currentPlayer.release()
-                    player.onVideoReset()
+                player.currentPlayer.release()
+                player.onVideoReset()
             }
         }
         FullVideoUtils.dismissOverlayView(true)
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt
index 4feb330166..7a68a09b7c 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt
@@ -82,11 +82,11 @@ class FuncConfigCenter : IMogoOnMessageListener<FuncConfig>, IMoGoAutopilotCarCo
         clientPkFileName = "sn"
     )
     private fun refreshConfig(funcConfig: FuncConfig) {
-        BizManager.updateBizConfigData(funcConfig)
         invokeUpdate(funcConfig)
     }
 
     private fun invokeUpdate(funcConfig: FuncConfig) {
+        BizManager.updateBizConfigData(funcConfig)
         funcConfig.business.forEach { business ->
             CallerDevaToolsFuncConfigListenerManager.invokeDevaToolsFuncConfigBizUpdate(
                 business.biz.uppercase(),
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt
index 84f786e521..25644cdc03 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt
@@ -34,9 +34,13 @@ class FuncConfigNetWorkModel {
                 if (error == null) {
                     error = onError
                 }
-                map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
-                map["mac"] = mac
-                map["channelVersion"] = FuncConfigConst.getChannelCode()
+                //todo test
+//                map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
+                map["sn"] = "X20202203105S688HZ"
+//                map["mac"] = DeviceUtils.getMacAddress()
+                map["mac"] = "48:b0:2d:3a:bc:78"
+//                map["channelVersion"] = FuncConfigConst.getChannelCode()
+                map["channelVersion"] = 1
             }
             loader {
                 apiCall {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
index 79d4d8520d..f055703288 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/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.*
@@ -82,6 +83,7 @@ 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.V2XNotificationView
 import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
@@ -192,6 +194,14 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
 
     override fun initViews() {
         initViewShowWithConfig()
+
+        //设置StatusBar初始状态
+        if (FunctionBuildConfig.isDemoMode) {
+            viewStatusBar.updateRightView(true, "demoMode", DemoModeView(requireContext()))
+        } else {
+            viewStatusBar.updateRightView(false, "demoMode", DemoModeView(requireContext()))
+        }
+
         ivCameraIcon?.setOnClickListener {
             if (cameraViewFloat == null) {
                 showCameraList(CallerMonitorManager.getCameraList())
@@ -413,6 +423,14 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         busOperationStatus?.showBusOperation()
     }
 
+    override fun setStatusBarDarkOrLight(light: Boolean) {
+        viewStatusBar.setStatusBarDarkOrLight(light)
+    }
+
+    override fun updateStatusBarRightView(insert: Boolean, tag: String, viewGroup: ViewGroup) {
+        viewStatusBar.updateRightView(insert, tag, viewGroup)
+    }
+
     /**
      * 设置 红绿灯 代理View
      */
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 9b8c6d67f0..4a20ce0775 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -62,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
@@ -573,6 +574,7 @@ class DebugSettingView @JvmOverloads constructor(
 
         // 演示模式
         tbIsDemoMode.setOnCheckedChangeListener { _, isChecked ->
+            CallerHmiManager.updateStatusBarRightView(isChecked,"demoMode", DemoModeView(context))
             CallerAutoPilotManager.setDemoMode(isChecked)
             if (!isChecked) {
                 //关闭美化模式时，通知工控机
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryGroupView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryGroupView.kt
new file mode 100644
index 0000000000..95c72f7406
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryGroupView.kt
@@ -0,0 +1,92 @@
+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.hmi.R
+import java.lang.ref.WeakReference
+
+class BatteryGroupView : LinearLayout {
+
+    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 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 {
+        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
+                        } else {
+                            it.ivBatteryCharge.visibility = View.GONE
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        val intentFilter = IntentFilter()
+        intentFilter.addAction(Intent.ACTION_BATTERY_CHANGED)
+        context.registerReceiver(batteryStateReceiver, intentFilter)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        context.unregisterReceiver(batteryStateReceiver)
+    }
+}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryView.kt
new file mode 100644
index 0000000000..0afbea73f0
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryView.kt
@@ -0,0 +1,135 @@
+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.hmi.R
+import kotlin.math.abs
+
+
+class BatteryView : View {
+
+    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 val batteryColor = context.resources.getColor(R.color.color_7FECECEC) // 电量内部颜色
+    private val 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()
+    }
+
+}
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt
new file mode 100644
index 0000000000..85649ffa64
--- /dev/null
+++ b/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)
+    }
+
+}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DemoModeView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DemoModeView.kt
new file mode 100644
index 0000000000..f0a51a62f8
--- /dev/null
+++ b/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)
+    }
+
+}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt
new file mode 100644
index 0000000000..ef49f6f3d0
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt
@@ -0,0 +1,89 @@
+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.*
+
+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 = mutableListOf<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)
+    }
+
+}
+
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt
new file mode 100644
index 0000000000..5e45d6c065
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt
@@ -0,0 +1,92 @@
+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.hmi.R
+import java.lang.ref.WeakReference
+
+
+class WifiStateView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : AppCompatImageView(context, attrs, defStyleAttr) {
+
+    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?.let {
+                    when (msg.what) {
+                        -1 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_close)
+                        0 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_one)
+                        1 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_two)
+                        2 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_three)
+                        3 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_four)
+                        4 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_five)
+                    }
+                }
+            }
+        }
+    }
+
+    private var wifiManager: WifiManager? = null
+    private var wifiHandler: WifiHandler? = null
+
+    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
+                    val 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)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        wifiHandler?.removeCallbacksAndMessages(null)
+        context.unregisterReceiver(wifiStateReceiver)
+    }
+}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
index 0b7bcbd9a4..5e4b73b40e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
@@ -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;
@@ -336,11 +336,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
 
     @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) {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/battery_charge.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/battery_charge.png
new file mode 100644
index 0000000000..2c46f99c91
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/battery_charge.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/blue_tooth.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/blue_tooth.png
new file mode 100644
index 0000000000..97eaf32b50
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/blue_tooth.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/demo_mode.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/demo_mode.png
new file mode 100644
index 0000000000..380b81e942
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/demo_mode.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_close.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_close.png
new file mode 100644
index 0000000000..7090814f91
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_close.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_five.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_five.png
new file mode 100644
index 0000000000..8f48f53e24
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_five.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_four.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_four.png
new file mode 100644
index 0000000000..56e484f3ca
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_four.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_one.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_one.png
new file mode 100644
index 0000000000..1b06cb152d
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_one.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_three.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_three.png
new file mode 100644
index 0000000000..1ee2dcd8fe
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_three.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_two.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_two.png
new file mode 100644
index 0000000000..6f88fb8307
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_light_state_two.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
index 444016d9fd..321a8106ac 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
@@ -6,6 +6,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
+        android:id="@+id/viewStatusBar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_72"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <View
         android:id="@+id/viewShowDebugView"
         android:layout_width="@dimen/dp_400"
@@ -50,10 +58,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" />
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_battery_group.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_battery_group.xml
new file mode 100644
index 0000000000..4789ca1988
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_battery_group.xml
@@ -0,0 +1,21 @@
+<?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: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_26"
+        android:layout_marginStart="@dimen/dp_6"
+        android:scaleType="fitXY"
+        android:src="@drawable/battery_charge"
+        android:visibility="gone" />
+</LinearLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_blue_tooth.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_blue_tooth.xml
new file mode 100644
index 0000000000..e5e6fcb799
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_demo_mode.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_demo_mode.xml
new file mode 100644
index 0000000000..81ffb29e9e
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml
new file mode 100644
index 0000000000..57fd8a6b0a
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml
index b9cfaf3e10..34334da834 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml
+++ b/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>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
index b458be2e4f..fb22d27937 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
@@ -18,6 +18,9 @@
     <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_7FECECEC">#7FECECEC</color>
 
     <color name="background_wtf">#FF999900</color>
     <color name="background_error">#FFCC0000</color>
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
index 69abd2557a..90c260be7e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
@@ -52,5 +52,5 @@
     <string name="modify_binding_car">是否修改车机绑定？</string>
     <string name="to_binding_car">是否绑定车机？</string>
 
-
+    <string name="status_bar_tag">蘑菇星云</string>
 </resources>
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
index da734fb58f..2ab37413c9 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.api.hmi.warning
 
 import android.view.View
+import android.view.ViewGroup
 import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
 import com.mogo.eagle.core.data.map.Infrastructure
@@ -263,4 +264,15 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy {
     fun showVideoDialog(infList: List<Infrastructure>)
 
     fun setBusOperationView(view:IOchBusView)
+
+    /**
+     * 设置状态栏暗夜或明亮模式
+     * 默认 light
+     */
+    fun setStatusBarDarkOrLight(light: Boolean)
+
+    /**
+     * 更新(添加/删除)状态栏右侧元素
+     */
+    fun updateStatusBarRightView(insert: Boolean, tag: String, viewGroup: ViewGroup)
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
index c4d6fc3a55..20a408e34c 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.call.hmi
 
 import android.view.View
+import android.view.ViewGroup
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
@@ -292,7 +293,13 @@ object CallerHmiManager : CallerBase() {
         waringProviderApi?.showModifyBindingcarDialog()
     }
 
-    fun showUpgradeDialog(name: String, url: String, title: String, content: String, installType: String) {
+    fun showUpgradeDialog(
+        name: String,
+        url: String,
+        title: String,
+        content: String,
+        installType: String
+    ) {
         waringProviderApi?.showUpgradeDialog(name, url, title, content, installType)
     }
 
@@ -397,7 +404,6 @@ object CallerHmiManager : CallerBase() {
         waringProviderApi?.showVideoDialog(infList)
     }
 
-
     /**
      * 设置 bus出车/收车View
      * @param view
@@ -405,4 +411,19 @@ object CallerHmiManager : CallerBase() {
     fun setBusOperationView(view: IOchBusView) {
         waringProviderApi?.setBusOperationView(view)
     }
+
+    /**
+     * 设置状态栏暗夜或明亮模式
+     * 默认 light
+     */
+    fun setStatusBarDarkOrLight(light: Boolean = true) {
+        waringProviderApi?.setStatusBarDarkOrLight(light)
+    }
+
+    /**
+     * 更新(添加/删除)状态栏右侧元素
+     */
+    fun updateStatusBarRightView(insert: Boolean, tag: String, viewGroup: ViewGroup) {
+        waringProviderApi?.updateStatusBarRightView(insert, tag, viewGroup)
+    }
 }
\ No newline at end of file
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BarUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BarUtils.java
index 78eae55bdb..bb1691f024 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BarUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BarUtils.java
@@ -414,6 +414,15 @@ public final class BarUtils {
         return statusBarView;
     }
 
+    public static void hideStatusBarAndSticky(@NonNull Window window){
+        final ViewGroup decorView = (ViewGroup) window.getDecorView();
+        final int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                | View.SYSTEM_UI_FLAG_FULLSCREEN
+                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+        decorView.setSystemUiVisibility(decorView.getSystemUiVisibility() | uiOptions);
+    }
+
     public static void transparentStatusBar(@NonNull final Activity activity) {
         transparentStatusBar(activity.getWindow());
     }
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
index 8015fc5637..4318a63680 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -25,7 +25,7 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>> exten
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-        BarUtils.transparentStatusBar(this);
+        BarUtils.hideStatusBarAndSticky(this.getWindow());
         super.onCreate(savedInstanceState);
         beforeSetContentView(savedInstanceState);
         setContentView(getLayoutId());
@@ -37,7 +37,6 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>> exten
     @Override
     protected void onResume() {
         super.onResume();
-        BarUtils.setNavBarVisibility(this, false);
     }