From 7ed4aac0fa53652624f4c78bf0625423b6111bd4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 21 八月 2023 17:12:30 +0800
Subject: [PATCH] 2023年08月21日17:12:26
---
app/release/output-metadata.json | 18 ++++++++++++++++++
keystore/Untitled | 0
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 7 +++----
app/build.gradle | 2 ++
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 4 +---
5 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 3819430..60ebc56 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,6 +67,8 @@
implementation project(path: ':third-zxing')
//Link鏈湴搴�
implementation project(path: ':HDLLinkLocalSdk')
+// implementation project(path: ':HDLLinkPMSdk')
+
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
new file mode 100644
index 0000000..91451eb
--- /dev/null
+++ b/app/release/output-metadata.json
@@ -0,0 +1,18 @@
+{
+ "version": 2,
+ "artifactType": {
+ "type": "APK",
+ "kind": "Directory"
+ },
+ "applicationId": "com.hdl.photovoltaic",
+ "variantName": "processReleaseResources",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "versionCode": 1,
+ "versionName": "1.0",
+ "outputFile": "app-release.apk"
+ }
+ ]
+}
\ No newline at end of file
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 1cc6471..047566b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -53,15 +53,13 @@
if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
- if (!TextUtils.isEmpty(gatewayBean.getHomeId())
+ if (gatewayBean.getMaster().equals("true")
&& gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
newList.add(gatewayBean);
}
-
}
}
return newList;
-
}
/**
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 f297b49..763a4bf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -6,7 +6,6 @@
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
-import com.google.gson.JsonObject;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.bean.ModBusBean;
@@ -255,9 +254,9 @@
// ModBusBean modBusBean = new ModBusBean();
// modBusBean.setOid("0101050219D44A00");
// modBusBean.setData(new byte[]{00,01,00,00,00,0x09,00,00,00,01,03,00,00,00,01});
- if (TextUtils.isEmpty(modBusBean.getOid())) {
- modBusBean.setOid("0101050217BBC400");
- }
+// if (TextUtils.isEmpty(modBusBean.getOid())) {
+// modBusBean.setOid("0101050217BBC400");
+// }
if (modBusBean.getOid() == null || modBusBean.getData() == null) {
HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
return;
diff --git a/keystore/Untitled b/keystore/Untitled
new file mode 100644
index 0000000..d2a08b7
--- /dev/null
+++ b/keystore/Untitled
Binary files differ
--
Gitblit v1.8.0