From 566ddb2ea03e2514de50f2ca861a2674f6e840ac Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期一, 27 十一月 2023 13:32:27 +0800
Subject: [PATCH] 新增科技系统、门锁、新风和地暖支持
---
app/src/main/java/com/hdl/sdk/ttl_sdk/activity/MainActivity.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/MainActivity.java b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/MainActivity.java
index 27ba6a5..9a573b4 100644
--- a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/MainActivity.java
+++ b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/MainActivity.java
@@ -88,7 +88,7 @@
private List<String> mAllDevicesList = new ArrayList<>();//鎼滅储鍒扮殑璁惧鐨勫娉ㄥ悕
private ProgressDialog mProgressDialog;
-// private static String HDL_PATH_NAME = "/dev/ttyS2"; //涓插彛璁惧璺緞鍚�
+ // private static String HDL_PATH_NAME = "/dev/ttyS2"; //涓插彛璁惧璺緞鍚�
// private static int HDL_BAUDRATE = 115200; //娉㈢壒鐜�
private Boolean bOpen = false;
private int remarkId = 0;
@@ -188,6 +188,7 @@
public void onClick(View v) {
/**鍏ㄩ儴閲嶆柊鎼滅储,娓呯┖鍘熻澶囧垪琛ㄦ暟鎹�*/
clearListView();
+ HDLDeviceManager.clearAllDeviceList();
HDLCommand.getHomeDevices();
mProgressDialog.show();
}
@@ -339,9 +340,9 @@
for (int i = 0; i < mDevicesDataList.size(); i++) {
if (TextUtils.isEmpty(mDevicesDataList.get(i).getRemark())) {
- mAllDevicesList.add("鏆傛棤澶囨敞");
+ mAllDevicesList.add("鏆傛棤澶囨敞" + "-" + mDevicesDataList.get(i).getSourceSubnetID() + "-" + mDevicesDataList.get(i).getSourceDeviceID());
} else {
- mAllDevicesList.add(mDevicesDataList.get(i).getRemark());
+ mAllDevicesList.add(mDevicesDataList.get(i).getRemark() + "-" + mDevicesDataList.get(i).getSourceSubnetID() + "-" + mDevicesDataList.get(i).getSourceDeviceID());
}
}
mHDLMainListAdapter.notifyDataSetChanged();
@@ -437,12 +438,10 @@
}
-
-
@SuppressWarnings("unused")
- private void closePhone(Context context, String[] shutdown){
+ private void closePhone(Context context, String[] shutdown) {
try {
- Process process = Runtime.getRuntime().exec(shutdown);
+ Process process = Runtime.getRuntime().exec(shutdown);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
--
Gitblit v1.8.0