From 1c0ea65926caa9b34d1e58296f62df3643aaa7e7 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Tue, 29 Mar 2022 21:27:24 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=8A=B6=E6=80=81=E6=A0=8F=E9=80=8F=E6=98=8E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20TODO=20UI=E9=9C=80=E8=A6=81=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 app/src/main/AndroidManifest.xml              |   2 +-
 app/src/main/res/values/colors.xml            |   1 -
 app/src/main/res/values/styles.xml            |  26 ---
 config.gradle                                 |   4 +-
 .../badcase/biz/BadCaseView.kt                |   2 +-
 .../core/function/hmi/ui/MoGoHmiFragment.kt   |   4 +-
 .../src/main/AndroidManifest.xml              |   1 -
 .../res/layout/module_main_activity_main.xml  | 168 +++++++++---------
 .../src/main/res/values/colors.xml            |   1 +
 .../src/main/res/values/styles.xml            |   8 +-
 .../eagle/core/utilcode/util/BarUtils.java    |   8 +-
 .../com/mogo/commons/mvp/MvpActivity.java     |  26 +--
 12 files changed, 107 insertions(+), 144 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 209b9e5144..7528c86e94 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         android:resizeableActivity="false"
         android:usesCleartextTraffic="true"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.App"
+        android:theme="@style/Main"
         tools:replace="android:label">
 
         <!-- 配置APP ID -->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bd09796588..7e091a2301 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,5 +5,4 @@
     <color name="colorAccent">#D81B60</color>
 
 
-    <color name="app_window_background">#1C1C1C</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0973015c8f..cc42d0d0c2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,31 +8,5 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="AppTheme.App" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:statusBarColor" tools:ignore="NewApi">@null</item>
-        <item name="android:windowEnterAnimation">@null</item>
-        <item name="android:windowExitAnimation">@null</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowBackground">@color/app_window_background</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="android:windowFullscreen">false</item>
-        <item name="android:windowAnimationStyle">@style/Animation</item>
-    </style>
-
-    <style name="Animation">
-        <item name="android:activityOpenEnterAnimation">@null</item>
-        <item name="android:activityOpenExitAnimation">@null</item>
-        <item name="android:activityCloseEnterAnimation">@null</item>
-        <item name="android:activityCloseExitAnimation">@null</item>
-        <item name="android:taskOpenEnterAnimation">@null</item>
-        <item name="android:taskOpenExitAnimation">@null</item>
-        <item name="android:taskCloseEnterAnimation">@null</item>
-        <item name="android:taskCloseExitAnimation">@null</item>
-        <item name="android:taskToFrontEnterAnimation">@null</item>
-        <item name="android:taskToFrontExitAnimation">@null</item>
-        <item name="android:taskToBackEnterAnimation">@null</item>
-        <item name="android:taskToBackExitAnimation">@null</item>
-    </style>
 
 </resources>
diff --git a/config.gradle b/config.gradle
index bc53544d66..a3a3365cb6 100644
--- a/config.gradle
+++ b/config.gradle
@@ -12,8 +12,8 @@ ext {
             commonIndependentAmapApiValue  : "1c3fbc5f5e183619ffb1e7bc01e6751f",
             compileSdkVersion              : 29,
             buildToolsVersion              : "29.0.2",
-            minSdkVersion                  : 19,
-            targetSdkVersion               : 19,
+            minSdkVersion                  : 21,
+            targetSdkVersion               : 21,
             minSdkVersionPadLenovo         : 23,
             targetSdkVersionPadLenovo      : 23,
     ]
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt
index d76c9cc63b..c547500c50 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt
@@ -61,7 +61,7 @@ internal class BadCaseView: ConstraintLayout {
         close?.onClick {
             onDismiss?.invoke()
         }
-        fitsSystemWindows = true
+        //fitsSystemWindows = true
         cancel?.also {
             it.background = shape(solid = Color.parseColor("#3B4577"), radius = 16)
             it.onClick {
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 9b66fdfcb8..b9cb896454 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
@@ -246,7 +246,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                     .setTag("ToolsViewFloat")
                     .setLayout(toolsView!!)
                     .setSidePattern(SidePattern.LEFT)
-                    .setGravity(Gravity.LEFT, offsetY = 72)
+                    .setGravity(Gravity.LEFT)
                     .setImmersionStatusBar(true)
                     .setWindowHeight(WindowManager.LayoutParams.MATCH_PARENT)
                     .setAnimator(object : DefaultAnimator() {
@@ -765,7 +765,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                     .setTag("CameraListFloat")
                     .setLayout(cameraListView!!)
                     .setSidePattern(SidePattern.RIGHT)
-                    .setGravity(Gravity.RIGHT, -40, 280)
+                    .setGravity(Gravity.RIGHT, -40, 255)
                     .setImmersionStatusBar(true)
                     .setAnimator(object : DefaultAnimator() {
                         override fun enterAnim(
diff --git a/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
index 9ed171e1dc..da2988996a 100644
--- a/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
+++ b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
@@ -38,7 +38,6 @@
             android:resumeWhilePausing="true"
             android:screenOrientation="landscape"
             android:stateNotNeeded="true"
-            android:theme="@style/Main"
             android:windowSoftInputMode="adjustPan|stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_activity_main.xml b/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_activity_main.xml
index ed250ecae6..20a27b4066 100644
--- a/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_activity_main.xml
+++ b/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_activity_main.xml
@@ -5,8 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/main_splash_bg"
-    android:clipChildren="true"
-    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <!-- 地图 -->
@@ -15,100 +13,104 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_special_effect"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
-        tools:visibility="visible">
+        android:fitsSystemWindows="true"
+        android:paddingTop="25dp">
 
-        <ImageView
-            android:id="@+id/iv_wu1"
-            android:layout_width="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_special_effect"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:alpha="0"
-            android:src="@drawable/wu1"
-            app:layout_constraintStart_toStartOf="parent" />
+            android:visibility="gone"
+            tools:visibility="visible">
 
-        <ImageView
-            android:id="@+id/iv_wu2"
-            android:layout_width="wrap_content"
+            <ImageView
+                android:id="@+id/iv_wu1"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:alpha="0"
+                android:src="@drawable/wu1"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <ImageView
+                android:id="@+id/iv_wu2"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:alpha="0"
+                android:src="@drawable/wu2"
+                app:layout_constraintEnd_toEndOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <!--预警视图 OBU、云端下发、自车感知、自车策略-->
+        <FrameLayout
+            android:id="@+id/module_main_id_waring_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <!-- 快捷操作浮层 -->
+        <FrameLayout
+            android:id="@+id/module_main_id_entrance_fragment_container"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:alpha="0"
-            android:src="@drawable/wu2"
-            app:layout_constraintEnd_toEndOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
+            android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
+            android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
+            android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
+            android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
 
-    <!--预警视图 OBU、云端下发、自车感知、自车策略-->
-    <FrameLayout
-        android:id="@+id/module_main_id_waring_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        <!-- 浮层-->
+        <FrameLayout
+            android:id="@+id/module_main_id_floating_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-    <!-- 快捷操作浮层 -->
-    <FrameLayout
-        android:id="@+id/module_main_id_entrance_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
-        android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
-        android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
-        android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
-        android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
+        <!-- 目的地车友 -->
+        <FrameLayout
+            android:id="@+id/module_main_id_message_history_fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" />
 
-    <!-- 浮层-->
-    <FrameLayout
-        android:id="@+id/module_main_id_floating_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <!-- 目的地车友 -->
-    <FrameLayout
-        android:id="@+id/module_main_id_message_history_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" />
-
-    <!--搜索视图-->
-    <FrameLayout
-        android:id="@+id/module_main_id_search_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        <!--搜索视图-->
+        <FrameLayout
+            android:id="@+id/module_main_id_search_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
 
-    <!--网约车视图-->
-    <FrameLayout
-        android:id="@+id/module_main_id_och_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        <!--网约车视图-->
+        <FrameLayout
+            android:id="@+id/module_main_id_och_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-    <!--小地图视图-->
-    <FrameLayout
-        android:id="@+id/module_main_id_smp_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        <!--小地图视图-->
+        <FrameLayout
+            android:id="@+id/module_main_id_smp_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-    <!--冷启动过渡Logo-->
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/module_main_id_cover_up"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/main_splash_bg"
-        android:clipChildren="true"
-        android:fitsSystemWindows="true">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/main_bitmap_splash_icon"
-            android:scaleType="centerCrop"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.47" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <!--冷启动过渡Logo-->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/module_main_id_cover_up"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/main_splash_bg">
 
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/main_bitmap_splash_icon"
+                android:scaleType="centerCrop"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.47" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml b/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml
index 639b257173..44ce84bc8c 100644
--- a/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml
+++ b/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="module_main_window_background_color">#212831</color>
+
 </resources>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml
index 1ed337e530..2f604869b6 100644
--- a/core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml
+++ b/core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml
@@ -2,8 +2,12 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Main" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:statusBarColor" tools:ignore="NewApi">@null</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowOverscan">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent
+        </item>
+        <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowEnterAnimation">@null</item>
         <item name="android:windowExitAnimation">@null</item>
         <item name="android:windowContentOverlay">@null</item>
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 83c8956da7..4991f52736 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
@@ -513,7 +513,9 @@ public final class BarUtils {
      * @param isVisible True to set navigation bar visible, false otherwise.
      */
     public static void setNavBarVisibility(@NonNull final Activity activity, boolean isVisible) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
+            return;
+        }
         setNavBarVisibility(activity.getWindow(), isVisible);
 
     }
@@ -525,7 +527,9 @@ public final class BarUtils {
      * @param isVisible True to set navigation bar visible, false otherwise.
      */
     public static void setNavBarVisibility(@NonNull final Window window, boolean isVisible) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
+            return;
+        }
         final ViewGroup decorView = (ViewGroup) window.getDecorView();
         for (int i = 0, count = decorView.getChildCount(); i < count; i++) {
             final View child = decorView.getChildAt(i);
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 5caa95b7c7..8015fc5637 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
@@ -1,21 +1,14 @@
 package com.mogo.commons.mvp;
 
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.view.MotionEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.utilcode.util.BarUtils;
 import com.mogo.eagle.core.utilcode.util.SoftKeyBoardJobber;
 
 /**
@@ -32,12 +25,9 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>> exten
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        BarUtils.transparentStatusBar(this);
         super.onCreate(savedInstanceState);
         beforeSetContentView(savedInstanceState);
-        if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD) {
-            requestWindowFeature(Window.FEATURE_NO_TITLE);
-            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        }
         setContentView(getLayoutId());
         initViews();
         mPresenter = createPresenter();
@@ -47,19 +37,9 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>> exten
     @Override
     protected void onResume() {
         super.onResume();
-        hideBottomUIMenu();
+        BarUtils.setNavBarVisibility(this, false);
     }
 
-    //隐藏导航栏
-    protected void hideBottomUIMenu() {
-        //隐藏虚拟按键
-        if (Build.VERSION.SDK_INT >= 19) {
-            //for new api versions.
-            View decorView = getWindow().getDecorView();
-            int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
-            decorView.setSystemUiVisibility(uiOptions);
-        }
-    }
 
     protected void beforeSetContentView(Bundle savedInstanceState) {