From 0956b5497e1602218f0b6c4797b39d34584e2bec Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 21 三月 2024 09:32:48 +0800
Subject: [PATCH] 2024年03月21日09:32:35
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 27 +++++++------
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 27 +++++++------
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 4 +-
app/build.gradle | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 4 +
5 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index db0f933..523a3be 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -124,7 +124,7 @@
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
implementation 'com.hdl.android:pmsdk:1.0.1'
- implementation 'com.hdl.android:debugsdk:1.0.7'
+ implementation 'com.hdl.android:debugsdk:1.0.10'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index d5bf0a7..5684386 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -568,7 +568,7 @@
public void editGatewayParam(String mac, LinkCallBack<Boolean> linkCallBack) {
String requestUrl = TopicApi.SET_GATEWAY_EDIT;
JsonObject json = new JsonObject();
- json.addProperty("master", GatewayMasterType.MasterFalse);
+ json.addProperty("master", GatewayMasterType.MasterTrue);
TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
@@ -639,6 +639,7 @@
if (linkCallBack != null) {
linkCallBack.onSuccess(true);
}
+ HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + mac, true);
}
@Override
@@ -646,6 +647,7 @@
if (linkCallBack != null) {
linkCallBack.onError(e);
}
+ HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄥけ璐�-->mac:" + mac + "--->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index 90fab32..1f8448e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -250,21 +250,22 @@
* 鍒濆鍖杕qtt瀹㈡埛绔�
*/
public void initMqttClient() {
-
- HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
- @Override
- public void onSuccess(MqttInfo info) {
- if (info != null) {
- MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
- MqttRecvClient.getInstance().connect();
+ if (!MqttRecvClient.getInstance().isInit()) {
+ HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
+ @Override
+ public void onSuccess(MqttInfo info) {
+ if (info != null) {
+ MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
+ MqttRecvClient.getInstance().connect();
+ }
}
- }
- @Override
- public void onFailure(HDLException e) {
- HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
- }
- });
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
+ }
+ });
+ }
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index db93bb2..5ec3a0c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -395,21 +395,22 @@
* 鍒濆鍖杕qtt瀹㈡埛绔�
*/
public void initMqttClient() {
-
- HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
- @Override
- public void onSuccess(MqttInfo info) {
- if (info != null) {
- MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
- MqttRecvClient.getInstance().connect();
+ if (!MqttRecvClient.getInstance().isInit()) {
+ HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
+ @Override
+ public void onSuccess(MqttInfo info) {
+ if (info != null) {
+ MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
+ MqttRecvClient.getInstance().connect();
+ }
}
- }
- @Override
- public void onFailure(HDLException e) {
- HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
- }
- });
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
+ }
+ });
+ }
}
@Subscribe(threadMode = ThreadMode.MAIN)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index f896bfc..3f84eb8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -393,12 +393,12 @@
HdlDeviceLogic.getInstance().initializeGateway(cloudInverterDeviceBean.getOsn(), new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + cloudInverterDeviceBean.getOsn());
+// HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + cloudInverterDeviceBean.getOsn(),true);
}
@Override
public void onError(HDLLinkException e) {
- HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄥけ璐�-->mac:" + cloudInverterDeviceBean.getOsn());
+// HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄥけ璐�-->mac:" + cloudInverterDeviceBean.getOsn(),true);
}
});
}
--
Gitblit v1.8.0