From c7c07eaa32ca7b137b1ac028d17beee0ebcf9a0b Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 26 三月 2024 15:22:15 +0800 Subject: [PATCH] 2024年03月26日15:22:09 --- app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 45 +++++++++++---------------------------------- 1 files changed, 11 insertions(+), 34 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..078e64a 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -114,7 +114,7 @@ */ public void initThirdSDK() { // 灏忕▼搴忚繘绋� - if (RuningAcitvityUtil.getAppName(getBaseContext()).contains("unimp")) { + if (RuningAcitvityUtil.getAppName(getBaseContext()).contains(":")) { return; } if (isInitThirdSDK) { @@ -143,7 +143,7 @@ //鐩戝惉缃戠粶鐘舵�佸彉鍖� this.networkMonitoring(); //鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠� - this.initLocalAssetsData(); +// this.initLocalAssetsData(); } @@ -192,19 +192,17 @@ 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(); + } + initDCUniMPSDK(); Intent intent = new Intent(getInstance(), HomeLoginActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); if (type == 1) { @@ -301,7 +299,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 +310,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