From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'

---
 app/src/main/java/com/hdl/photovoltaic/HDLApp.java |   42 ++++++++++++++++++++----------------------
 1 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index a379365..444d0a4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -12,6 +12,7 @@
 
 import androidx.multidex.MultiDex;
 
+import com.google.gson.Gson;
 import com.hdl.hdlhttp.HxHttpConfig;
 import com.hdl.linkpm.sdk.HDLLinkPMSdk;
 import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -23,6 +24,7 @@
 import com.hdl.photovoltaic.enums.LowerTagType;
 import com.hdl.photovoltaic.enums.NetworkType;
 import com.hdl.photovoltaic.other.HdlDeviceLogic;
+import com.hdl.photovoltaic.other.HdlFileLogic;
 import com.hdl.photovoltaic.other.HdlLogLogic;
 import com.hdl.photovoltaic.other.HdlMessageLogic;
 import com.hdl.photovoltaic.other.HdlResidenceLogic;
@@ -76,6 +78,8 @@
         mHDLApp = this;
         SharedPreUtils.init(this);
         getAppLanguage();
+        //棰勫垱寤鸿剼鏈琷son鏂囦欢澶�
+        HdlFileLogic.getInstance().createHdlESLocalJsonDirectory();
         init();
     }
 
@@ -155,6 +159,7 @@
         //鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠�
 //        this.initLocalAssetsData();
 
+
     }
 
 
@@ -167,8 +172,8 @@
         //2.璁剧疆鎵撳嵃
         HDLLinkPMSdk.setLogEnabled(isLogEnabled);
         if (TextUtils.isEmpty(UserConfigManage.getInstance().getCurrentAppLanguage())) {
-            //榛樿閰嶇疆鎺ュ彛璇锋眰璇█鏄腑鏂�
-            UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.zh);
+            //榛樿閰嶇疆鎺ュ彛璇锋眰璇█鏄嫳鏂�
+            UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.en);
         }
         //3.閰嶇疆鎺ュ彛璇锋眰璇█
         HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
@@ -185,14 +190,14 @@
         HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
             @Override
             public void onReLogin(int type) {
-                Log.d("====閫�鍒扮櫥褰曠晫闈�====", "====閫�鍒扮櫥褰曠晫闈�====" + type);
+                HdlLogLogic.print("閫�鍒扮櫥褰曠晫闈�---" + type, true);
                 //type:  0:姝e父閫�鍑�   1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
                 //鏀跺埌鐧诲綍澶勭悊閫氱煡锛屽叧闂墍鏈夐〉闈㈠苟鎵撳紑鐧诲綍椤甸潰
                 AppManagerUtils.getAppManager().finishAllActivity();
-                HDLSDKSPUtils.clear();
+//                HDLSDKSPUtils.clear();//搴曞眰鑷繁娓呯┖
 
                 //閲嶆柊鐧婚檰,榛樿鍚屾剰闅愮鏀跨瓥
-                UserConfigManage.getInstance().setAcceiptPolicy(true);
+                UserConfigManage.getInstance().setAcceiptPolicy(false);
                 //閲嶆柊璁惧畾涓�涓椂闂�
                 UserConfigManage.getInstance().setLoginDateTime(0);
                 UserConfigManage.getInstance().Save();
@@ -316,27 +321,20 @@
     private void initAutoSize() {
         AutoSize.initCompatMultiProcess(this);
         boolean isBaseOnWidth = getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
-        AutoSizeConfig.getInstance()
-                .setBaseOnWidth(true)
-                .setCustomFragment(true)
-                .setDesignWidthInDp(375)
-                .setDesignHeightInDp(812)
-                .setUseDeviceSize(false)
-                .setOnAdaptListener(new onAdaptListener() {
-                    @Override
-                    public void onAdaptBefore(Object target, Activity activity) {
+        AutoSizeConfig.getInstance().setBaseOnWidth(true).setCustomFragment(true).setDesignWidthInDp(375).setDesignHeightInDp(812).setUseDeviceSize(false).setOnAdaptListener(new onAdaptListener() {
+            @Override
+            public void onAdaptBefore(Object target, Activity activity) {
 
-                        AutoSizeConfig.getInstance().setScreenWidth(ScreenUtils.getScreenSize(activity)[0]);
-                        AutoSizeConfig.getInstance().setScreenHeight(ScreenUtils.getScreenSize(activity)[1] +
-                                ScreenUtils.getHeightOfNavigationBar(activity) + ScreenUtils.getStatusBarHeight());
+                AutoSizeConfig.getInstance().setScreenWidth(ScreenUtils.getScreenSize(activity)[0]);
+                AutoSizeConfig.getInstance().setScreenHeight(ScreenUtils.getScreenSize(activity)[1] + ScreenUtils.getHeightOfNavigationBar(activity) + ScreenUtils.getStatusBarHeight());
 
-                    }
+            }
 
-                    @Override
-                    public void onAdaptAfter(Object target, Activity activity) {
+            @Override
+            public void onAdaptAfter(Object target, Activity activity) {
 
-                    }
-                });
+            }
+        });
     }
 
     /**

--
Gitblit v1.8.0