From 2ccbe547569c845c20b752ce365fe5991750db6f Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.om>
Date: Fri, 25 Oct 2024 10:32:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=8CUpdate=E3=80=8D=201=E3=80=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/cloud/fragment/SkinFragment.java | 26 +++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     | 18 +++++++++----
 gradle.properties                             |  2 +-
 .../com/mogo/skin/SkinActivityLifecycle.java  |  6 ++++-
 .../java/com/mogo/skin/SkinAttribute.java     |  3 +--
 .../java/com/mogo/skin/SkinLayoutFactory.java | 17 ++++++++++--
 6 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/com/mogo/cloud/fragment/SkinFragment.java

diff --git a/app/src/main/java/com/mogo/cloud/fragment/SkinFragment.java b/app/src/main/java/com/mogo/cloud/fragment/SkinFragment.java
new file mode 100644
index 0000000..12589c8
--- /dev/null
+++ b/app/src/main/java/com/mogo/cloud/fragment/SkinFragment.java
@@ -0,0 +1,26 @@
+package com.mogo.cloud.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+public class SkinFragment extends Fragment {
+
+    public SkinFragment() {
+    }
+
+    public SkinFragment(int contentLayoutId) {
+        super(contentLayoutId);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 91014b6..0f1ca52 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,10 +10,18 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <com.mogo.skin.widget.SkinImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/icon_notice_default" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/bGConstraintLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/icon_notice_default">
+
+            <com.mogo.skin.widget.SkinImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon_notice_default" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
             android:layout_width="match_parent"
@@ -54,8 +62,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
-            android:textColor="@color/colorAccent"
             android:text="Token："
+            android:textColor="@color/colorAccent"
             android:textSize="20dp" />
 
         <Button
diff --git a/gradle.properties b/gradle.properties
index 2a973c7..2c369b3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -58,4 +58,4 @@ MOGO_TELEMATIC_VERSION=1.4.7.42
 # v2x
 MOGO_V2X_VERSION=1.4.7.42
 # SKIN
-MOGO_SKIN_VERSION=1.4.7.49.11-debug
+MOGO_SKIN_VERSION=1.4.7.49.14-debug
diff --git a/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinActivityLifecycle.java b/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinActivityLifecycle.java
index 7f3c6dd..19e6785 100644
--- a/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinActivityLifecycle.java
+++ b/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinActivityLifecycle.java
@@ -52,9 +52,13 @@ public class SkinActivityLifecycle implements Application.ActivityLifecycleCallb
         } else {
             // 兼容 targetSdkVersion >= 29
             try {
-                Field field = LayoutInflater.class.getDeclaredField("mFactory2");
+                Field field = LayoutInflater.class.getDeclaredField("mFactory");
                 field.setAccessible(true);
                 field.set(layoutInflater, skinLayoutFactory);
+
+                Field field2 = LayoutInflater.class.getDeclaredField("mFactory2");
+                field2.setAccessible(true);
+                field2.set(layoutInflater, skinLayoutFactory);
             } catch (Exception e) {
                 e.printStackTrace();
             }
diff --git a/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinAttribute.java b/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinAttribute.java
index 2a1226a..e5c13ff 100644
--- a/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinAttribute.java
+++ b/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinAttribute.java
@@ -1,6 +1,5 @@
 package com.mogo.skin;
 
-import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
@@ -84,7 +83,7 @@ public class SkinAttribute {
                         }
                     } catch (Exception e) {
                         // 由于有时候TextView会直接配置文字，而不是用 @string/XXX 所以会导致这里转换异常，车里简单的处理异常跳过即可
-                        //e.printStackTrace();
+                        e.printStackTrace();
                     }
                 }
                 if (resId != 0) {
diff --git a/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinLayoutFactory.java b/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinLayoutFactory.java
index 723f60e..ec6a1cf 100644
--- a/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinLayoutFactory.java
+++ b/libraries/mogo-skin/src/main/java/com/mogo/skin/SkinLayoutFactory.java
@@ -2,7 +2,6 @@ package com.mogo.skin;
 
 import android.app.Activity;
 import android.content.Context;
-import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -34,7 +33,7 @@ public class SkinLayoutFactory implements LayoutInflater.Factory2, Observer {
 
     // 当选择新皮肤后需要替换View与之对应的属性
     // 页面属性管理器
-    SkinAttribute skinAttribute;
+    private SkinAttribute skinAttribute;
 
     public SkinLayoutFactory(Activity activity) {
         this.activity = activity;
@@ -46,6 +45,20 @@ public class SkinLayoutFactory implements LayoutInflater.Factory2, Observer {
 
     @Override
     public View onCreateView(View parent, String name, Context context, AttributeSet attrs) {
+//        // 获取 AttributeSet 中的所有属性
+//        int count = attrs.getAttributeCount();
+//        ArrayList<String> attributeSet  = new ArrayList<>();
+//        for (int i = 0; i < count; i++) {
+////            String namespace = attrs.getAttributeNamespace(i);
+//            String attributeName = attrs.getAttributeName(i);
+//            String attributeValue = attrs.getAttributeValue(i);
+//            attributeSet.add("Attribute Name: " + attributeName + ", Value: " + attributeValue);
+//        }
+//
+//        Log.d(TAG, "onCreateView() parent = "
+//                + "  name = " + name
+//                + " attrs = " + attributeSet);
+
         //换肤就是在需要时候替换 View的属性(src、background等)
         //创建 View,从而修改View属性
         View view = createViewFromTag(name, context, attrs);