From ebf1b9c813030a366bdc8967d2788eba3f3d9b5a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 21 八月 2023 13:18:58 +0800
Subject: [PATCH] 2023年08月21日13:18:56
---
.idea/libraries/Gradle__androidx_activity_activity_1_2_3_aar.xml | 4 ++
.gradle/buildOutputCleanup/buildOutputCleanup.lock | 0
.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml | 3 +
.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml | 3 +
.gradle/buildOutputCleanup/outputFiles.bin | 0
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 4 +-
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java | 4 +-
.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml | 3 +
.idea/workspace.xml | 12 +++++
.gradle/checksums/checksums.lock | 0
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 1
.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_3_0_aar.xml | 3 +
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 3 +
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 26 +++++++++++-
14 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index c06cb4b..8226868 100644
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary files differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 197fcf4..103182b 100644
--- a/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/.gradle/buildOutputCleanup/outputFiles.bin
Binary files differ
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
index 06e98ce..ecba611 100644
--- a/.gradle/checksums/checksums.lock
+++ b/.gradle/checksums/checksums.lock
Binary files differ
diff --git a/.idea/libraries/Gradle__androidx_activity_activity_1_2_3_aar.xml b/.idea/libraries/Gradle__androidx_activity_activity_1_2_3_aar.xml
index 35348b6..0509652 100644
--- a/.idea/libraries/Gradle__androidx_activity_activity_1_2_3_aar.xml
+++ b/.idea/libraries/Gradle__androidx_activity_activity_1_2_3_aar.xml
@@ -2,12 +2,16 @@
<library name="Gradle: androidx.activity:activity:1.2.3@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ee1d03f4d84cb751875323eb696cf182/activity-1.2.3/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ee1d03f4d84cb751875323eb696cf182/jetified-activity-1.2.3/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/5704de195441da262a1d207a21eb2942/transformed/activity-1.2.3/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ee1d03f4d84cb751875323eb696cf182/activity-1.2.3/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ee1d03f4d84cb751875323eb696cf182/activity-1.2.3/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ee1d03f4d84cb751875323eb696cf182/activity-1.2.3/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ee1d03f4d84cb751875323eb696cf182/jetified-activity-1.2.3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ee1d03f4d84cb751875323eb696cf182/jetified-activity-1.2.3/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ee1d03f4d84cb751875323eb696cf182/jetified-activity-1.2.3/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_3_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_3_0_aar.xml
index 2893cc5..1acb3b8 100644
--- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_3_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_3_0_aar.xml
@@ -4,6 +4,9 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f18e8d8b91f057cef24442913add79a/appcompat-resources-1.3.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f18e8d8b91f057cef24442913add79a/appcompat-resources-1.3.0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f18e8d8b91f057cef24442913add79a/appcompat-resources-1.3.0/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f18e8d8b91f057cef24442913add79a/jetified-appcompat-resources-1.3.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f18e8d8b91f057cef24442913add79a/jetified-appcompat-resources-1.3.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f18e8d8b91f057cef24442913add79a/jetified-appcompat-resources-1.3.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml b/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml
index 1ca6064..d347d82 100644
--- a/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml
@@ -5,6 +5,9 @@
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc0c1d0eccd0aba11f9b9ffda7968eb7/core-1.4.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc0c1d0eccd0aba11f9b9ffda7968eb7/core-1.4.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc0c1d0eccd0aba11f9b9ffda7968eb7/core-1.4.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc0c1d0eccd0aba11f9b9ffda7968eb7/jetified-core-1.4.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc0c1d0eccd0aba11f9b9ffda7968eb7/jetified-core-1.4.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc0c1d0eccd0aba11f9b9ffda7968eb7/jetified-core-1.4.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/core/1.4.0/96b4d161def059d92989a352500d05d215c33d5e/core-1.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml
index 9067c14..a814243 100644
--- a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml
@@ -5,6 +5,9 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec13215cb07ad694bd77147b398393d1/junit-1.1.3/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec13215cb07ad694bd77147b398393d1/junit-1.1.3/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec13215cb07ad694bd77147b398393d1/junit-1.1.3/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec13215cb07ad694bd77147b398393d1/jetified-junit-1.1.3/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec13215cb07ad694bd77147b398393d1/jetified-junit-1.1.3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec13215cb07ad694bd77147b398393d1/jetified-junit-1.1.3/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.ext/junit/1.1.3/f138cf897cc1e024dd714073df04f2425d845104/junit-1.1.3-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml b/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml
index 7e24ac2..bc50507 100644
--- a/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml
@@ -5,6 +5,9 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b13e4fe0bba7910b3716f5671067498/storage-1.4.0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b13e4fe0bba7910b3716f5671067498/storage-1.4.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b13e4fe0bba7910b3716f5671067498/storage-1.4.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b13e4fe0bba7910b3716f5671067498/jetified-storage-1.4.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b13e4fe0bba7910b3716f5671067498/jetified-storage-1.4.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b13e4fe0bba7910b3716f5671067498/jetified-storage-1.4.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a739de6..cf489ea 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,9 +14,19 @@
<component name="ChangeListManager">
<list default="true" id="263c1e85-a8b8-438a-bde2-e35109721369" name="Default Changelist" comment="">
<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$/.gradle/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/checksums/checksums.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_activity_activity_1_2_3_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_activity_activity_1_2_3_aar.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_3_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_3_0_aar.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml" 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/common/event/EventDispatcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.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/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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -64,7 +74,7 @@
<property name="android-custom-view/Users/wenjucheng/Library/Android/sdk/sources/android-32/android/widget/TextView.java_SELECTED" value="TextView" />
<property name="android-custom-view/Users/wenjucheng/Library/Android/sdk/sources/android-32/android/widget/TextView.java_TextView_DIMENSIONS" value="1080 1920" />
<property name="cidr.known.project.marker" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/app/src/main/java/com/hdl/photovoltaic/utils" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="memory.settings.postsync.last.time.stamp" value="1685683717307" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.17" />
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java
index 37f8b50..4076aa7 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java
@@ -135,8 +135,8 @@
/**
* 浜嬩欢鍒嗗彂鍣紝鍒嗗彂鎵�鏈夊湪鎺ュ彛鍒楄〃涓殑浜嬩欢
- * @param topicTag
- * @param o
+ * @param topicTag -
+ * @param o -
*/
public synchronized void post(String topicTag, @NonNull Object o) {
try {
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 40df325..df1ced3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -44,6 +44,26 @@
private static volatile HdlDeviceLogic sHdlDeviceLogic;
/**
+ * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�
+ */
+ public List<GatewayBean> getGatewayList() {
+ List<GatewayBean> newList = new ArrayList<>();
+ List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
+ if (list.size() > 0) {
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (!TextUtils.isEmpty(gatewayBean.getHomeId())
+ && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ newList.add(gatewayBean);
+ }
+
+ }
+ }
+ return newList;
+
+ }
+
+ /**
* 鑾峰彇褰撳墠瀵硅薄
*
* @return HdlDeviceLogic
@@ -68,7 +88,7 @@
* @param sid -
* @param oid -
* @param name -
- * @param cloudCallBeak
+ * @param cloudCallBeak -
*/
public void addInverterDeviceToCloud(String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) {
@@ -263,7 +283,7 @@
* @param mac 璁惧mac
* @param linkCallBack 鍥炶皟update
*/
- public void steGatewayParam(String mac, LinkCallBack<Boolean> linkCallBack) {
+ public void setGatewayRemoteParam(String mac, LinkCallBack<Boolean> linkCallBack) {
String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
JsonObject json = new JsonObject();
json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
@@ -428,7 +448,7 @@
}
}
for (int i = 0; i < removeSidList.size(); i++) {
- //鑾峰彇鏈湴鐨勬绫虫尝
+ //鑾峰彇鏈湴鐨勯�嗗彉鍣�
removeInverter(removeSidList.get(i));
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 5837237..46d5c9e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -98,7 +98,7 @@
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
//娣诲姞璁惧鍒颁簯绔�
String mac = getKeyValue("mac", getKeyValue("data", data));
- HdlDeviceLogic.getInstance().steGatewayParam(mac, new LinkCallBack<Boolean>() {
+ HdlDeviceLogic.getInstance().setGatewayRemoteParam(mac, new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
HdlDeviceLogic.getInstance().editGatewayParam(mac, new LinkCallBack<Boolean>() {
@@ -165,7 +165,7 @@
@Override
public void onSuccess(Boolean obj) {
if (callback != null) {
- uniCallbackData(HDLLinkLocalGateway.getInstance().getGatewayList(), callback);
+ uniCallbackData(HdlDeviceLogic.getInstance().getGatewayList(), callback);
}
}
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 5292e09..54bc272 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -46,6 +46,8 @@
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.utils.WifiUtils;
+import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.nostra13.dcloudimageloader.utils.L;
import org.json.JSONException;
import org.json.JSONObject;
@@ -206,7 +208,6 @@
// //闅愮鍗忚鎻愮ず
// return;
// }
- Log.d("娴嬭瘯涓�", "123456789");
showLoading(getString(R.string.home_login_鐧诲綍涓�));
HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
@Override
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 86c279e..107c441 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -22,6 +22,7 @@
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
import com.hdl.sdk.link.core.bean.LinkResponse;
+import com.hdl.sdk.link.core.bean.ModbusResponse;
import java.nio.charset.StandardCharsets;
--
Gitblit v1.8.0