From fc62f8cd289a24de670b872e9accb20caae91582 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Mon, 22 Apr 2024 21:13:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=81=B6=E7=8E=B0=E5=A4=9A=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98=EF=BC=88?=
 =?UTF-8?q?=E5=8F=91=E7=8E=B0=E4=B8=80=E5=8F=B0Vivo=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=9C=BA=EF=BC=8C=E8=BF=9B=E5=85=A5=E9=80=80=E5=87=BA=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E5=90=8E=EF=BC=8CApplication?=
 =?UTF-8?q?=E7=9A=84Locale=E8=A2=AB=E9=87=8D=E7=BD=AE=20=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?ResUtils.getString=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=E6=96=87=E6=9C=AC=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/chwl/app/application/App.java    |  2 ++
 .../src/main/java/com/chwl/library/utils/ResUtil.java  | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/src/main/java/com/chwl/app/application/App.java b/app/src/main/java/com/chwl/app/application/App.java
index 20ee31e0e..7f5fa62b3 100644
--- a/app/src/main/java/com/chwl/app/application/App.java
+++ b/app/src/main/java/com/chwl/app/application/App.java
@@ -14,6 +14,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.core.util.Supplier;
 import androidx.multidex.MultiDex;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -525,6 +526,7 @@ public class App extends BaseApp {
         BasicConfig.INSTANCE.setAppContext(this.getApplicationContext());
         SharedPreferenceUtils.init(this);
         ResUtil.init(this);
+        ResUtil.contextSupplier = () -> App.gStack.getTopContext();
         LanguageHelper.INSTANCE.wrapContext(instance);
         initOtherSDK();
         initContext(this);
diff --git a/library/src/main/java/com/chwl/library/utils/ResUtil.java b/library/src/main/java/com/chwl/library/utils/ResUtil.java
index f6f603170..91954d3c3 100644
--- a/library/src/main/java/com/chwl/library/utils/ResUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/ResUtil.java
@@ -1,18 +1,28 @@
 package com.chwl.library.utils;
 
 import android.app.Application;
+import android.content.Context;
 
 import androidx.annotation.StringRes;
+import androidx.core.util.Supplier;
 
 
 public class ResUtil {
     private static Application context;
 
+    public static Supplier<Context> contextSupplier;
+
     public static void init(Application context) {
         ResUtil.context = context;
     }
 
     public static String getString(@StringRes int resId) {
+        if (contextSupplier != null) {
+            Context context1 = contextSupplier.get();
+            if (context1 != null) {
+                return context1.getString(resId);
+            }
+        }
         return context.getString(resId);
     }
 }