From 823f534dff0da0b34f68e32cdfe2651d1bb81db3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 12 七月 2023 17:16:40 +0800
Subject: [PATCH] 2023年07月12日17:16:39
---
.gitignore | 1 +
.gradle/buildOutputCleanup/buildOutputCleanup.lock | 0
.idea/workspace.xml | 13 +------------
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 1 +
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 12 ++++--------
5 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index 43124f4..f1b4aa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@
local.properties
+.idea/workspace.xml
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 0be4447..c06cb4b 100644
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b1e5a98..a739de6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -13,28 +13,17 @@
</component>
<component name="ChangeListManager">
<list default="true" id="263c1e85-a8b8-438a-bde2-e35109721369" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/listener/LinkCallBack.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/callback/HDLLinkCallBack.java" beforeDir="false" afterPath="$PROJECT_DIR$/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/callback/HDLLinkCallBack.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/listener/BaseFailureCallBack.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/listener/BaseFailureCallBack.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/other/HdlMqttLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/other/HdlMqttLogic.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
- <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[2ffc9a07]" />
+ <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[/Users/wenjucheng/.android/avd/Pixel_2_API_29.avd]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
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 a0ca15f..40df325 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -407,7 +407,7 @@
@Override
public void onSuccess(List<CloudInverterDeviceBean> list) {
if (list == null || list.size() == 0) {
-// //浜戠娌℃湁缁戝畾閫嗗彉鍣�,娓呯┖鏈湴鍒楄〃;
+// //浜戠娌℃湁缁戝畾閫嗗彉鍣�,浠ユ湰鍦颁负涓�;
// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
@@ -451,18 +451,13 @@
HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterDeviceBean> list) {
- if (list == null) {
+ if (list == null || list.size() == 0) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
}
return;
}
- if (list.size() <= 0) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
- }
- return;
- }
+ //娓呮鏈湴缃戝叧鍒楄〃
HDLLinkLocalGateway.getInstance().getGatewayList().clear();
for (int i = 0; i < list.size(); i++) {
CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
@@ -475,6 +470,7 @@
gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());
gatewayBean.setLocalEncrypt(true);
gatewayBean.setMaster("true");
+ //娣诲姞缃戝叧
HDLLinkLocalGateway.getInstance().getGatewayList().add(gatewayBean);
}
if (cloudCallBeak != null) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index f7b224c..5292e09 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -206,6 +206,7 @@
// //闅愮鍗忚鎻愮ず
// return;
// }
+ Log.d("娴嬭瘯涓�", "123456789");
showLoading(getString(R.string.home_login_鐧诲綍涓�));
HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
@Override
--
Gitblit v1.8.0