From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 68 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 444d0a4..b4ba57d 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;
@@ -39,10 +41,12 @@
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.QueueUtils;
+import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
import org.greenrobot.eventbus.EventBus;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Objects;
import cn.jpush.android.api.JPushInterface;
@@ -59,6 +63,12 @@
private Boolean isLogEnabled = true;
//涓夋柟sdk鍒濆鍖栨爣璇�
private Boolean isInitThirdSDK = false;
+ //涓夋柟sdk鍒濆鍖栨爣璇�
+ /**
+ * 涓夋柟sdk鍒濆鍖栨爣璇�
+ * 鍦⊿tartActivity閲岄潰鍒濆鍖栦笁鏂筍DK鐨勬爣璇�
+ */
+ public Boolean isStartInitThirdSDK = false;
//澹版槑涓�涓綋鍓嶅簲鐢ㄧ殑瀹炰緥
private static HDLApp mHDLApp;
//澹版槑涓�涓叕鍏辩殑淇℃伅鏄犲皠,鍙綋浣滃叏灞�鍙橀噺浣跨敤;
@@ -81,14 +91,16 @@
//棰勫垱寤鸿剼鏈琷son鏂囦欢澶�
HdlFileLogic.getInstance().createHdlESLocalJsonDirectory();
init();
+
+
}
public void getAppLanguage() {
String language = UserConfigManage.getInstance().getCurrentAppLanguage();
if (TextUtils.isEmpty(language)) {
//浠庡唴瀛橀噷闈㈣幏鍙栦笉鍒拌瑷�,鑾峰彇褰撳墠绯荤粺鐨�;
- String str = getResources().getConfiguration().locale.getCountry();
- if (str.equals("CN") || str.equals("TW")) {
+ String str = getResources().getConfiguration().locale.getLanguage();
+ if (str.equals(LocalManageUtil.zh)) {
UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.zh);
} else {
UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.en);
@@ -146,8 +158,8 @@
// //9.鍒濆鍖栫綉缁滃伐鍏�
// NetWorkUtil.init(this);
initAutoSize();
- //鍒濆鍖栨瀬鍏夋帹閫�
- initJPush();
+// //鍒濆鍖栨瀬鍏夋帹閫�
+// initJPush();
initHDLLinkPMSdk();
HDLLinkLocalSdk.getInstance().init(getInstance());
initSocket();
@@ -168,9 +180,10 @@
*/
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.en);
@@ -190,7 +203,7 @@
HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
@Override
public void onReLogin(int type) {
- HdlLogLogic.print("閫�鍒扮櫥褰曠晫闈�---" + type, true);
+ HdlLogLogic.print("鐩戝惉鍒扮櫥褰曢��鍑�---" + type, true);
//type: 0:姝ｅ父閫�鍑� 1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
//鏀跺埌鐧诲綍澶勭悊閫氱煡锛屽叧闂墍鏈夐〉闈㈠苟鎵撳紑鐧诲綍椤甸潰
AppManagerUtils.getAppManager().finishAllActivity();
@@ -212,10 +225,10 @@
if (mInfoMap != null) {
mInfoMap.clear();
}
-// //鏂紑mqtt杩炴帴
-// if (MqttRecvClient.getInstance() != null) {
-// MqttRecvClient.getInstance().disConnect();
-// }
+ //鏂紑mqtt杩炴帴
+ if (MqttRecvClient.getInstance() != null) {
+ MqttRecvClient.getInstance().disConnect();
+ }
//鏂紑鎵�鏈塼cp杩炴帴涓旀竻绌鸿繛鎺ョ紦瀛�
// TODO: 10/10/23
// TcpSocketBoot.stopAllConnectLinkGateway();
@@ -266,7 +279,6 @@
private void initJPush() {
JPushInterface.setDebugMode(true);
JPushInterface.init(getBaseContext());
-
}
/**
@@ -337,6 +349,7 @@
});
}
+
/**
* 鍒濆鍖杣ni app mqtt
*/
@@ -354,11 +367,44 @@
}
}
+
@Override
protected void attachBaseContext(Context base) {
MultiDex.install(base);
super.attachBaseContext(base);
}
+ /**
+ * 鏀寔涓嫳鏂囧垏鎹�
+ */
+ public Context getAppLocaleContext(Context context) {
+ try {
+ Locale locale = new Locale(UserConfigManage.getInstance().getCurrentAppLanguage());
+ Configuration configuration = context.getResources().getConfiguration();
+ configuration.setLocale(locale);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ configuration.setLocales(new LocaleList(locale));
+ }
+ return context.createConfigurationContext(configuration);
+ } catch (Exception e) {
+ return context;
+ }
+ }
+ /**
+ * 鏀寔涓嫳鏂囧垏鎹�
+ */
+ 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