fix status bar problem

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

@@ -198,8 +198,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     }
 
     override fun initViews() {
-        toggleStatusBarView()
-
         initViewShowWithConfig()
 
         //设置StatusBar初始状态
@@ -694,13 +692,13 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     }
 
     override fun toggleSOPView() {
-        activity?.let{
-            if(mSOPSettingViewFloat!= null){
+        activity?.let {
+            if (mSOPSettingViewFloat != null) {
                 WarningFloat.dismiss(mSOPSettingViewFloat!!.config.floatTag, false)
                 mSOPSettingViewFloat = null
                 mSOPSettingView = null
-            }else{
-                if (mSOPSettingView == null){
+            } else {
+                if (mSOPSettingView == null) {
                     mSOPSettingView = SOPSettingView(it)
                 }
                 var side = RIGHT
@@ -744,52 +742,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         }
     }
 
-    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预警
      *
@@ -820,7 +772,10 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                 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) }
+                    context?.let { it ->
+                        SharedPrefsMgr.getInstance(it)
+                            .putLong("roadwork", System.currentTimeMillis() / 1000)
+                    }
                     CallerAutoPilotManager.sendTripInfo(5, "", "", "", false);
                 }
             }
@@ -932,7 +887,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
             it.invokeOnCancellation {
                 AIAssist.getInstance(ctx).stopSpeakTts(text)
             }
-            AIAssist.getInstance(ctx).speakTTSVoiceWithLevel(text, AIAssist.LEVEL2,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/widget/StatusBarView.kt

@@ -25,9 +25,6 @@ class StatusBarView @JvmOverloads constructor(
 
     init {
         LayoutInflater.from(context).inflate(R.layout.view_status_bar, this, true)
-        setOnClickListener {
-
-        }
     }
 
     private val rightViewList = CopyOnWriteArrayList<String>()

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);