From a0e8f81afc4fe2a21a5c504d53e569ea50d463d6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 15 三月 2024 11:51:23 +0800
Subject: [PATCH] 2024年03月15日11:51:17
---
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 4c71607..3421e37 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -125,7 +125,7 @@
// CrashReport.initCrashReport(this, Constant.BUGLY_APP_ID, true);
//6.鍒濆鍖朌CUniMPSDK
initDCUniMPSDK();
-// this.initUniMqtt();//濡傛灉鏄儴缃插埌/鎵嬫満涓婃寮忎娇鐢紝娉ㄩ噴鎺夎繖琛屼唬鐮佸氨鍙�
+ this.initUniMqtt();//濡傛灉鏄儴缃插埌/鎵嬫満涓婃寮忎娇鐢紝娉ㄩ噴鎺夎繖琛屼唬鐮佸氨鍙�
// //7.鍒濆鍖栬嚜瀹氫箟IconToast
// ToastUtils.getInstance().initIconToast(this);
// //8.瀵筬astjson杩涜璁剧疆锛岃В鍐砯astjosn杞崲鎴愬瓧绗︿覆鏃堕瀛楁瘝澶у皬鍐欓棶棰�
@@ -195,16 +195,15 @@
//鏂紑mqtt杩炴帴
if (MqttRecvClient.getInstance() != null) {
- MqttRecvClient.getInstance().stop();
+ 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();
+ }
+ initDCUniMPSDK();
Intent intent = new Intent(getInstance(), HomeLoginActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
if (type == 1) {
@@ -301,7 +300,7 @@
*/
private void initUniMqtt() {
try {
- String ip = NetworkUtils.getIPAddress(this);
+ String ip = "10.10.35.79";//NetworkUtils.getIPAddress(this);
if (TextUtils.isEmpty(ip)) {
return;
}
@@ -312,25 +311,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