From 78bee741fd26dbf7cc23d9756c8dd8b305b0b5fd Mon Sep 17 00:00:00 2001
From: donghongyu-pc <donghongyu@zhidaoauto.com>
Date: Sat, 12 Oct 2024 17:09:29 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.2]=20[Update]=201=E3=80=81=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90YiXin=E7=9A=84=E7=9A=AE=E8=82=A4=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.gradle                                 |  2 +-
 .../function/main/MainMoGoApplication.java    |  6 ++---
 gradle.properties                             |  2 +-
 .../res/drawable/main_bitmap_splash_bg.xml    | 23 +++++++++++++++++++
 .../res/drawable/main_bitmap_splash_icon.xml  | 12 ++++++++++
 5 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 skin/YiXin-skin/src/main/res/drawable/main_bitmap_splash_bg.xml
 create mode 100644 skin/YiXin-skin/src/main/res/drawable/main_bitmap_splash_icon.xml

diff --git a/config.gradle b/config.gradle
index 5ce7f621f8..add105dc60 100644
--- a/config.gradle
+++ b/config.gradle
@@ -252,7 +252,7 @@ ext {
             compileSdkVersion              : 33,
             buildToolsVersion              : "29.0.2",
             minSdkVersion                  : 23,
-            targetSdkVersion               : 29,
+            targetSdkVersion               : 28,
             koomxhook                    : "com.kuaishou.koom:xhook-static:2.2.0",
     ]
 }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
index 9a70142658..3f574ac7ef 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -35,9 +35,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
     public void onCreate() {
         super.onCreate();
 
-        // 动态换肤
-        SkinManager.init(this);
-
         if (!shouldInit()) {
             return;
         }
@@ -50,6 +47,9 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
 
         initTipToast();
         initModules();
+
+        // 动态换肤
+        SkinManager.init(this);
     }
 
     @Override
diff --git a/gradle.properties b/gradle.properties
index 1e2578e789..37d93e3cf4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.42
 # 远程通讯模块
 MOGO_TELEMATIC_VERSION=1.4.7.42
 # 动态换肤SDK
-MOGO_SKIN_VERSION=1.4.7.42
+MOGO_SKIN_VERSION=1.4.7.44
 ######## MogoAiCloudSDK Version ########
 # 自研地图
 MAP_SDK_VERSION=3.4.1.2
diff --git a/skin/YiXin-skin/src/main/res/drawable/main_bitmap_splash_bg.xml b/skin/YiXin-skin/src/main/res/drawable/main_bitmap_splash_bg.xml
new file mode 100644
index 0000000000..d78157cb0e
--- /dev/null
+++ b/skin/YiXin-skin/src/main/res/drawable/main_bitmap_splash_bg.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--黑色矩形 作为背景色-->
+    <item>
+        <shape>
+            <gradient
+                android:angle="270"
+                android:centerX="0.6"
+                android:endColor="#0B0F17"
+                android:startColor="#171D2B"
+                android:type="linear" />
+        </shape>
+    </item>
+    <!--单独的slogan图片 并且设置下间距-->
+    <!--如果使用svg可以直接 drawable-->
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:scaleType="centerCrop"
+            android:src="@drawable/mogo_slogan"
+            android:tileMode="disabled" />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/skin/YiXin-skin/src/main/res/drawable/main_bitmap_splash_icon.xml b/skin/YiXin-skin/src/main/res/drawable/main_bitmap_splash_icon.xml
new file mode 100644
index 0000000000..b92cdb3d10
--- /dev/null
+++ b/skin/YiXin-skin/src/main/res/drawable/main_bitmap_splash_icon.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--单独的slogan图片 并且设置下间距-->
+    <!--如果使用svg可以直接 drawable-->
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:scaleType="centerCrop"
+            android:src="@drawable/mogo_slogan"
+            android:tileMode="disabled" />
+    </item>
+</layer-list>
\ No newline at end of file