From f10cda784bede39a861566850898747c38e6c94f Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 21 一月 2025 15:32:54 +0800 Subject: [PATCH] 2025年01月21日15:31:52 --- app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 75 ++++++++++++++++++++++++------------- 1 files changed, 48 insertions(+), 27 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..77351e4 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -5,6 +5,8 @@ import android.content.Context; import android.content.Intent; import android.content.res.Configuration; +import android.os.Build; +import android.os.LocaleList; import android.os.SystemClock; import android.text.TextUtils; import android.util.Log; @@ -12,6 +14,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 +26,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; @@ -41,6 +45,7 @@ import org.greenrobot.eventbus.EventBus; import java.util.HashMap; +import java.util.Locale; import java.util.Objects; import cn.jpush.android.api.JPushInterface; @@ -57,6 +62,12 @@ private Boolean isLogEnabled = true; //涓夋柟sdk鍒濆鍖栨爣璇� private Boolean isInitThirdSDK = false; + //涓夋柟sdk鍒濆鍖栨爣璇� + /** + * 涓夋柟sdk鍒濆鍖栨爣璇� + * 鍦⊿tartActivity閲岄潰鍒濆鍖栦笁鏂筍DK鐨勬爣璇� + */ + public Boolean isStartInitThirdSDK = false; //澹版槑涓�涓綋鍓嶅簲鐢ㄧ殑瀹炰緥 private static HDLApp mHDLApp; //澹版槑涓�涓叕鍏辩殑淇℃伅鏄犲皠,鍙綋浣滃叏灞�鍙橀噺浣跨敤; @@ -76,6 +87,8 @@ mHDLApp = this; SharedPreUtils.init(this); getAppLanguage(); + //棰勫垱寤鸿剼鏈琷son鏂囦欢澶� + HdlFileLogic.getInstance().createHdlESLocalJsonDirectory(); init(); } @@ -142,8 +155,8 @@ // //9.鍒濆鍖栫綉缁滃伐鍏� // NetWorkUtil.init(this); initAutoSize(); - //鍒濆鍖栨瀬鍏夋帹閫� - initJPush(); +// //鍒濆鍖栨瀬鍏夋帹閫� +// initJPush(); initHDLLinkPMSdk(); HDLLinkLocalSdk.getInstance().init(getInstance()); initSocket(); @@ -155,6 +168,7 @@ //鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠� // this.initLocalAssetsData(); + } @@ -163,12 +177,12 @@ */ private void initHDLLinkPMSdk() { //1.鍒濆鍖朣DK - HDLLinkPMSdk.initWithAppKey(getInstance(), AppConfigManage.getAppKey(), AppConfigManage.getAppSecret(), AppConfigManage.getAPPRegionUrl()); + HDLLinkPMSdk.initWithAppKey(this, AppConfigManage.getAppKey(), AppConfigManage.getAppSecret(), AppConfigManage.getAPPRegionUrl()); //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 +199,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(); @@ -261,7 +275,6 @@ private void initJPush() { JPushInterface.setDebugMode(true); JPushInterface.init(getBaseContext()); - } /** @@ -316,27 +329,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) { - } - }); + } + }); } /** @@ -362,5 +368,20 @@ super.attachBaseContext(base); } - + /** + * 鏀寔涓嫳鏂囧垏鎹� + */ + public Context getAppLocaleContext() { + try { + Locale locale = new Locale(UserConfigManage.getInstance().getCurrentAppLanguage()); + Configuration configuration = getResources().getConfiguration(); + configuration.setLocale(locale); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + configuration.setLocales(new LocaleList(locale)); + } + return createConfigurationContext(configuration); + } catch (Exception e) { + return this; + } + } } -- Gitblit v1.8.0