From a291be17a07e3f657f5871675709d7ff76fe35b6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 11 四月 2024 18:04:09 +0800
Subject: [PATCH] 2024年04月11日18:04:06
---
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 53 ++++++++++++++++-------------------------------------
1 files changed, 16 insertions(+), 37 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 5265042..fafd7b0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -2,6 +2,7 @@
import android.app.Application;
import android.content.Intent;
+import android.os.SystemClock;
import android.text.TextUtils;
@@ -28,6 +29,7 @@
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.NetworkUtils;
import com.hdl.photovoltaic.utils.SharedPreUtils;
+import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
@@ -61,14 +63,13 @@
@Override
public void onCreate() {
-
super.onCreate();
+
mHDLApp = this;
SharedPreUtils.init(this);
getAppLanguage();
initThirdSDK();
// appLocationInfo();
-
}
public void getAppLanguage() {
@@ -115,7 +116,7 @@
*/
public void initThirdSDK() {
// 灏忕▼搴忚繘绋�
- if (RuningAcitvityUtil.getAppName(getBaseContext()).contains("unimp")) {
+ if (RuningAcitvityUtil.getAppName(getBaseContext()).contains(":")) {
return;
}
if (isInitThirdSDK) {
@@ -144,7 +145,7 @@
//鐩戝惉缃戠粶鐘舵�佸彉鍖�
this.networkMonitoring();
//鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠�
- this.initLocalAssetsData();
+// this.initLocalAssetsData();
}
@@ -193,21 +194,20 @@
if (mInfoMap != null) {
mInfoMap.clear();
}
-
- //鏂紑mqtt杩炴帴
- if (MqttRecvClient.getInstance() != null) {
- MqttRecvClient.getInstance().stop();
- }
+// //鏂紑mqtt杩炴帴
+// if (MqttRecvClient.getInstance() != null) {
+// MqttRecvClient.getInstance().disConnect();
+// }
//鏂紑鎵�鏈塼cp杩炴帴涓旀竻绌鸿繛鎺ョ紦瀛�
// TODO: 10/10/23
// TcpSocketBoot.stopAllConnectLinkGateway();
-// if(null!=HDLUniMPSDKManager.getInstance().getUniMP()){
-// LogUtils.d("asdfasdfasdfsdf鎴戣鍒犻櫎鍟�");
-// HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
-// }
-// initDCUniMPSDK();
+ if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+ HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+ }
+ SystemClock.sleep(200);
+ initDCUniMPSDK();
Intent intent = new Intent(getInstance(), HomeLoginActivity.class);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_CLEAR_TOP);
if (type == 1) {
intent.putExtra("isJpush", true);
}
@@ -302,7 +302,7 @@
*/
private void initUniMqtt() {
try {
- String ip = NetworkUtils.getIPAddress(this);
+ String ip = "10.10.35.79";//NetworkUtils.getIPAddress(this);
if (TextUtils.isEmpty(ip)) {
return;
}
@@ -313,25 +313,4 @@
HdlLogLogic.print("娴嬭瘯Mqtt杩炴帴鏈嶅姟绔け璐�--->");
}
}
-
- /**
- * 鍒濆鍖杕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