From c4b015770e8a29f18e19cc44b3df46c20a4762f4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 10 八月 2021 10:17:42 +0800
Subject: [PATCH] 2021-08-10 1.更新
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AddDevicesActivity.java | 80 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AddDevicesActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AddDevicesActivity.java
index 6f85fac..77ddb5b 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AddDevicesActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AddDevicesActivity.java
@@ -59,7 +59,7 @@
private String parentRemarks;
private ArrayList<String> parentRemarksList = new ArrayList();
- private EditText et_subnetID, et_deviceID, et_bitType, et_littleType, et_remarks, et_remarks_mk, et_mChannelNum,et_scene,et_mPort;
+ private EditText et_subnetID, et_deviceID, et_bitType, et_littleType, et_remarks, et_remarks_mk, et_mChannelNum,et_scene,et_mPort,et_scene2;
private Button btn_add,btn_scene,btn_addAll;
@Override
@@ -78,6 +78,7 @@
et_mPort = findViewById(R.id.et_mPort);
et_scene = findViewById(R.id.et_scene);
+ et_scene2 = findViewById(R.id.et_scene2);
btn_add = findViewById(R.id.btn_add);
btn_scene = findViewById(R.id.btn_scene);
@@ -138,7 +139,7 @@
return;
}
String mChannelNumStr = et_mChannelNum.getText().toString();
- if (TextUtils.isEmpty(littleTypeStr)) {
+ if (TextUtils.isEmpty(mChannelNumStr)) {
showToast("鍥炶矾鍙蜂笉鑳戒负绌�");
return;
}
@@ -211,6 +212,7 @@
*
* @param mSubnetID
* @param mDeviceID
+ * @param mChannelNum 鍥炶矾鍙� 杩欓噷鐨勫洖璺彿闇�瑕佹敞鎰忥紝鐩稿悓瀛愮綉鍙峰拰璁惧鍙蜂笅鐨勫満鏅渶瑕佺疮鍔犱笉閲嶅锛岄�昏緫妯″潡涓轰緥锛�1鍖烘湁3涓〃锛�2鍖烘湁2涓〃 鎬诲叡5涓満鏅紝鎵�浠ワ紙2鍖鸿〃1 鍥炶矾鍙蜂负4銆�2鍖鸿〃2 鍥炶矾鍙蜂负5锛�
* @param mAreaNum //鍦烘櫙 鍖哄煙鍙�
* @param mAreaSceneNum //鍦烘櫙 褰撳墠鍖哄煙鍦烘櫙鍙�
* @param mChannelRemark 璇诲彇鍦烘櫙鐨勫娉ㄥ悕绉� 渚嬪: 鍏ヤ綇銆佽捣搴婃ā寮忋�侀槄璇绘ā寮�
@@ -218,9 +220,9 @@
* @param bSaveAndCallBack 鏄惁椹笂淇濆瓨鏈湴骞朵笖鎺ㄩ�丏evicesInfoEvent 浜嬩欢
* @return
*/
- private void AddScenesDevices(int mSubnetID, int mDeviceID, int mAreaNum, int mAreaSceneNum, String mChannelRemark, String parentRemarks, boolean bSaveAndCallBack) {
+ private void AddScenesDevices(int mSubnetID, int mDeviceID, int mChannelNum, int mAreaNum, int mAreaSceneNum, String mChannelRemark, String parentRemarks, boolean bSaveAndCallBack) {
//娣诲姞鍦烘櫙
- DevicesData mScenesData = DeviceParser.addScenesDevicesListWithoutSearching(port, mSubnetID, mDeviceID, mAreaNum, mAreaSceneNum, mChannelRemark, parentRemarks,true);
+ DevicesData mScenesData = DeviceParser.addScenesDevicesListWithoutSearching(port, mSubnetID, mDeviceID, mChannelNum, mAreaNum, mAreaSceneNum, mChannelRemark, parentRemarks,true);
}
@@ -247,6 +249,13 @@
showToast("绔彛鍙蜂笉鑳戒负绌�");
return;
}
+
+ String mChannelNumStr = et_mChannelNum.getText().toString();
+ if (TextUtils.isEmpty(mChannelNumStr)) {
+ showToast("鍥炶矾鍙蜂笉鑳戒负绌�");
+ return;
+ }
+
// String bitTypeStr = et_bitType.getText().toString();
// if (TextUtils.isEmpty(bitTypeStr)) {
@@ -279,11 +288,19 @@
return;
}
- String et_sceneString = et_scene.getText().toString();
- if (TextUtils.isEmpty(et_sceneString)) {
- showToast("鍦烘櫙ID涓嶈兘涓虹┖");
+ String et_AreaNumString = et_scene.getText().toString();
+ if (TextUtils.isEmpty(et_AreaNumString)) {
+ showToast("鍦烘櫙锛氬尯鍙蜂笉鑳戒负绌�");
return;
}
+
+ String et_scene2String = et_scene2.getText().toString();
+ if (TextUtils.isEmpty(et_scene2String)) {
+ showToast("鍦烘櫙锛氬満鏅彿涓嶈兘涓虹┖");
+ return;
+ }
+
+
mSubnetID = Integer.parseInt(subnetIDStr);
@@ -291,11 +308,12 @@
port = Integer.parseInt(mPortStr);
// bigType = Integer.parseInt(bitTypeStr);
// littleType = Integer.parseInt(littleTypeStr);
-// mChannelNum = Integer.parseInt(mChannelNumStr);
+ mChannelNum = Integer.parseInt(mChannelNumStr);
parentRemarks = remarksMkString;
- int sceneID = Integer.parseInt(et_sceneString);
+ int areaID = Integer.parseInt(et_AreaNumString);
+ int sceneID = Integer.parseInt(et_scene2String);
- DevicesData mScenesData = DeviceParser.addScenesDevicesListWithoutSearching(port, mSubnetID, mDeviceID, sceneID, sceneID, remarksString, parentRemarks,true);
+ DevicesData mScenesData = DeviceParser.addScenesDevicesListWithoutSearching(port, mSubnetID, mDeviceID, mChannelNum, areaID, sceneID, remarksString, parentRemarks,true);
if (mScenesData != null) {
showToast("娣诲姞鎴愬姛");
} else {
@@ -375,26 +393,34 @@
// DeviceParser.addScenesDevicesListWithoutSearching(port, mSubnetID, mDeviceID, 5, 5, "浼氬妯″紡", parentRemarks,true);
- //娣诲姞涓�涓�4璺户鐢靛櫒
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 1, "鍚у彴鐏�", "4璺户鐢靛櫒",false);
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 2, "浼戦棽鐏�", "4璺户鐢靛櫒",false);
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 3, "鐢佃鐏�", "4璺户鐢靛櫒",false);
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 4, "寤婄伅", "4璺户鐢靛櫒",false);
+// //娣诲姞涓�涓�4璺户鐢靛櫒
+// DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 1, "鍚у彴鐏�", "4璺户鐢靛櫒",false);
+// DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 2, "浼戦棽鐏�", "4璺户鐢靛櫒",false);
+// DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 3, "鐢佃鐏�", "4璺户鐢靛櫒",false);
+// DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 4, "寤婄伅", "4璺户鐢靛櫒",false);
+//
+// //娣诲姞涓�涓共鑺傜偣浼犳劅鍣�
+// DeviceParser.addDevicesListWithoutSearching(port, Configuration.SENSOR_BIG_TYPE, 0, 111, 99, 1, "骞茶妭鐐�", "骞茶妭鐐�",false);
+//
+//
+// //娣诲姞涓�涓�2璺獥甯�
+// DeviceParser.addDevicesListWithoutSearching(port, Configuration.CURTAIN_BIG_TYPE, 2, 111, 8, 1, "绐楀笜", "2璺獥甯�",false);
+// DeviceParser.addDevicesListWithoutSearching(port, Configuration.CURTAIN_BIG_TYPE, 2, 111, 8, 2, "绾辩獥", "2璺獥甯�",false);
+// //娣诲姞涓�涓紑鍚堝笜
+// DeviceParser.addDevicesListWithoutSearching(port, Configuration.CURTAIN_BIG_TYPE, 1, 111, 92, 1, "寮�鍚堝笜", "寮�鍚堝笜",false);
+//
+// //娣诲姞涓�涓┖璋�
+// DeviceParser.addDevicesListWithoutSearching(port, Configuration.AIR_BIG_TYPE, 0, 111, 9, 1, "鎴块棿绌鸿皟", "HVAC绌鸿皟妯″潡",false);
- //娣诲姞涓�涓共鑺傜偣浼犳劅鍣�
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.SENSOR_BIG_TYPE, 0, 111, 99, 1, "骞茶妭鐐�", "骞茶妭鐐�",false);
+ /**
+ * 鍦烘櫙杩欓噷鐨勫洖璺彿闇�瑕佹敞鎰忥細 鐩稿悓瀛愮綉鍙峰拰璁惧鍙蜂笅鐨勫満鏅渶瑕佺疮鍔犱笉閲嶅锛岄�昏緫妯″潡涓轰緥锛�1鍖烘湁3涓〃锛�2鍖烘湁2涓〃 鎬诲叡5涓満鏅紝鎵�浠ワ紙2鍖鸿〃1 鍥炶矾鍙蜂负4銆�2鍖鸿〃2 鍥炶矾鍙蜂负5锛�
+ * 涓嶇劧濡傛灉鍥炶矾鍙蜂笉瀵圭畝鏄撶紪绋嬫悳绱㈠娉ㄧ殑璇濅細鍑洪敊
+ */
+ //娣诲姞涓�涓満鏅�
+ DeviceParser.addLogicScenesDevicesListWithoutSearching(port, 1, 16, 4, 2, 1, "鍗у寮�鐏�", "閫昏緫妯″潡",false);
-
- //娣诲姞涓�涓�2璺獥甯�
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.CURTAIN_BIG_TYPE, 2, 111, 8, 1, "绐楀笜", "2璺獥甯�",false);
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.CURTAIN_BIG_TYPE, 2, 111, 8, 2, "绾辩獥", "2璺獥甯�",false);
- //娣诲姞涓�涓紑鍚堝笜
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.CURTAIN_BIG_TYPE, 1, 111, 92, 1, "寮�鍚堝笜", "寮�鍚堝笜",false);
-
- //娣诲姞涓�涓┖璋�
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.AIR_BIG_TYPE, 0, 111, 9, 1, "鎴块棿绌鸿皟", "HVAC绌鸿皟妯″潡",false);
//娣诲姞涓�涓満鏅� 鏈�鍚庝竴涓猙SaveAndCallBack 璁剧疆涓簍rue
- DeviceParser.addScenesDevicesListWithoutSearching(port, mSubnetID, mDeviceID, 5, 5, "浼氬妯″紡", parentRemarks,true);
+ DeviceParser.addLogicScenesDevicesListWithoutSearching(port, 1, 16, 5,2, 2, "鍗у鍏崇伅", "閫昏緫妯″潡",true);
--
Gitblit v1.8.0