From 636c4bb04e4fcd723766b82732990cdb4ae4ea2e Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 22 二月 2024 15:48:23 +0800
Subject: [PATCH] 删除掉本地库

---
 app/src/main/java/com/hdl/photovoltaic/HDLApp.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 5bcb757..6cd9850 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -7,14 +7,20 @@
 
 import com.hdl.hdlhttp.HxHttpConfig;
 import com.hdl.linkpm.sdk.HDLLinkPMSdk;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.home.type.HomeType;
 import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
 import com.hdl.linkpm.sdk.user.callback.IOnReloginListener;
 import com.hdl.linkpm.sdk.utils.HDLSDKSPUtils;
+import com.hdl.photovoltaic.bean.MqttInfo;
 import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.ConstantManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.enums.NetworkType;
+import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlMessageLogic;
+import com.hdl.photovoltaic.other.HdlMqttLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.ui.HomeLoginActivity;
 import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
@@ -31,12 +37,10 @@
 import org.greenrobot.eventbus.EventBus;
 
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Objects;
 
 import cn.jpush.android.api.JPushInterface;
 import io.dcloud.common.util.RuningAcitvityUtil;
-import io.dcloud.common.util.net.NetWork;
 import okhttp3.logging.HttpLoggingInterceptor;
 
 public class HDLApp extends Application {
@@ -63,6 +67,8 @@
         SharedPreUtils.init(this);
         getAppLanguage();
         initThirdSDK();
+//        appLocationInfo();
+
     }
 
     public void getAppLanguage() {
@@ -135,6 +141,7 @@
         initSocket();
         //4.鍒濆鍖朞KHttpLog 鏄惁寮�鍚�
         setOKHttpLogOpen(isLogEnabled);
+//        initMqttClient();
         //鐩戝惉缃戠粶鐘舵�佸彉鍖�
         this.networkMonitoring();
         //鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠�
@@ -151,13 +158,20 @@
         HDLLinkPMSdk.initWithAppKey(getInstance(), AppConfigManage.getAppKey(), AppConfigManage.getAppSecret(), AppConfigManage.getAPPRegionUrl());
         //2.璁剧疆鎵撳嵃
         HDLLinkPMSdk.setLogEnabled(isLogEnabled);
-        //3.閰嶇疆鎺ュ彛璇锋眰璇█
-        Locale locale = LocalManageUtil.getSystemLocale(this);
-        if (!locale.getLanguage().equals("zh")) {
-            HDLLinkPMSdk.setLanguage("en");
-        } else {
-            HDLLinkPMSdk.setLanguage("cn");
+        if (TextUtils.isEmpty(UserConfigManage.getInstance().getCurrentAppLanguage())) {
+            //榛樿閰嶇疆鎺ュ彛璇锋眰璇█鏄腑鏂�
+            UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.zh);
         }
+        //3.閰嶇疆鎺ュ彛璇锋眰璇█
+        HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
+
+//        //3.閰嶇疆鎺ュ彛璇锋眰璇█
+//        Locale locale = LocalManageUtil.getSystemLocale(this);
+//        if (!locale.getLanguage().equals("zh")) {
+//            HDLLinkPMSdk.setLanguage("en");
+//        } else {
+//            HDLLinkPMSdk.setLanguage("zh");
+//        }
 //        HDLLinkPMSdk.setLanguage("en");//寮哄埗浣跨敤鑻辨枃
         //4.鐩戝惉鐧诲嚭澶勭悊
         HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
@@ -173,6 +187,13 @@
                 //閲嶆柊璁惧畾涓�涓椂闂�
                 UserConfigManage.getInstance().setLoginDateTime(0);
                 UserConfigManage.getInstance().Save();
+
+                //娓呯┖娑堟伅缂撳瓨鏁版嵁
+                HdlMessageLogic.getInstance().clearListMessage();
+                //娓呯┖缂撳瓨鏁版嵁
+                if (mInfoMap != null) {
+                    mInfoMap.clear();
+                }
 
                 //鏂紑mqtt杩炴帴
                 if (MqttRecvClient.getInstance() != null) {
@@ -222,6 +243,9 @@
         }
     }
 
+    /**
+     * 鍒濆鍖栨瀬鍏塖DK
+     */
     private void initJPush() {
         JPushInterface.setDebugMode(true);
         JPushInterface.init(getBaseContext());
@@ -291,5 +315,24 @@
         }
     }
 
+    /**
+     * 鍒濆鍖杕qtt瀹㈡埛绔�
+     */
+    public void initMqttClient() {
+
+        HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
+            @Override
+            public void onSuccess(MqttInfo info) {
+                if (info != null) {
+                    MqttRecvClient.init(HDLApp.getInstance(), info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
+            }
+        });
+    }
 
 }

--
Gitblit v1.8.0