From 7f56c5482fde1d2d897a104e25edc7bdf5e48cbe Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Tue, 1 Jun 2021 15:49:08 +0800
Subject: [PATCH] fix bug

---
 app/build.gradle                              | 59 +++++++++++--------
 .../res/layout/module_ext_layout_entrance.xml |  3 +-
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f3e22def1b..0208e47f03 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -108,6 +108,8 @@ android {
         }
         // f系列-网约车-出租车
         fochtaxi {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
             dimension "product"
@@ -137,6 +139,8 @@ android {
         }
         // f系列-网约车-小巴车
         fochbus {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
             dimension "product"
@@ -166,6 +170,8 @@ android {
         }
         // f系列-分体机全系列，未细分
         f8xx {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
             dimension "product"
@@ -195,12 +201,8 @@ android {
         }
         // f系列-分体机
         f80x {
-            android{
-                defaultConfig {
-                    minSdkVersion rootProject.ext.android.minSdkVersion
-                    targetSdkVersion rootProject.ext.android.targetSdkVersion
-                }
-            }
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
             dimension "product"
@@ -230,15 +232,10 @@ android {
         }
         // 衡阳-联想Pad
         fPadLenovo {
-            android{
-                defaultConfig {
-                    minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
-                    targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
-                }
-            }
+            minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
+            targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
-
             dimension "product"
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
@@ -266,12 +263,8 @@ android {
         }
         // f系列-网约车-出租车
         fPadLenovoOchTaxi {
-            android{
-                defaultConfig {
-                    minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
-                    targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
-                }
-            }
+            minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
+            targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
             dimension "product"
@@ -301,12 +294,8 @@ android {
         }
         // f系列-网约车-小巴车
         fPadLenovoOchBus {
-            android{
-                defaultConfig {
-                    minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
-                    targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
-                }
-            }
+            minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
+            targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
             dimension "product"
@@ -365,6 +354,8 @@ android {
         }
         // f系列-分体机-高德
         f8Amap {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.fLauncherApplicationId
             dimension "product"
@@ -394,6 +385,8 @@ android {
         }
         // e系列，采用Launcher方案
         e8xx {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.launcherApplicationId
             dimension "product"
@@ -423,6 +416,8 @@ android {
         }
         // 同上
         em4 {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.launcherApplicationId
             dimension "product"
@@ -452,6 +447,8 @@ android {
         }
         // e系列-2+32，对标D系列2+32，采用独立app的形式
         em3 {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.independentApplicationId
             dimension "product"
@@ -481,6 +478,8 @@ android {
         }
         // e系列-1+16，对标D系列1+16，采用独立app形式
         em1 {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.independentApplicationId
             dimension "product"
@@ -510,6 +509,8 @@ android {
         }
         // e系列-1+16，对标D系列1+16，采用独立app形式
         em2 {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.independentApplicationId
             dimension "product"
@@ -539,6 +540,8 @@ android {
         }
         // d系列
         d8xx {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.independentApplicationId
             dimension "product"
@@ -568,6 +571,8 @@ android {
         }
         // d系列 2 + 32
         d80x {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.independentApplicationId
             dimension "product"
@@ -597,6 +602,8 @@ android {
         }
         // d系列 1+16 版本
         d82x {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.independentApplicationId
             dimension "product"
@@ -626,6 +633,8 @@ android {
         }
         // 比亚迪
         bydauto {
+            minSdkVersion rootProject.ext.android.minSdkVersion
+            targetSdkVersion rootProject.ext.android.targetSdkVersion
             // 应用包名
             applicationId rootProject.ext.android.bydautoIndependentApplicationId
             dimension "product"
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index 6e2af4a54a..611d65ddbd 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -245,8 +245,7 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/module_ext_id_north"