From 498c442cd1be3a53364b42660a8eee9ffe34051a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 10 八月 2021 11:26:13 +0800
Subject: [PATCH] 2021-08-10 1.
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AddDevicesActivity.java | 128 +++++++++++++++++++++++++-----------------
1 files changed, 76 insertions(+), 52 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 f4ed1de..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
@@ -17,27 +17,30 @@
import java.util.ArrayList;
-/** SDK鐩墠鏀寔鐨勫ぇ绫伙細灏忕被
- * 鐏厜绫伙細璋冨厜鍥炶矾銆佸紑鍏冲洖璺�佹贩鍚堣皟鍏夌被銆佹贩鍚堝紑鍏崇被
- * 绐楀笜绫伙細寮�鍚堝笜鐢垫満銆佸嵎甯樼數鏈恒�佺獥甯樻ā鍧�
- * 绌鸿皟鍔熻兘锛欻VAC 妯″潡銆侀�氱敤绌鸿皟闈㈡澘
- * 鑳屾櫙闊充箰鍔熻兘锛氳儗鏅煶涔愭ā鍧� 2018鏂拌儗鏅煶涔愭ā鍧楀皬绫�3
- * 浼犳劅鍣細骞茬粨鐐�0 鍒� 鍔熺巼24
- * 閫昏緫鍔熻兘锛氶�昏緫妯″潡
- * 鍏ㄥ眬鍦烘櫙锛�
- * 鍦扮儹鍔熻兘锛氬湴鐑ā鍧�
- * 鏂伴锛氭柊椋庣郴缁�
+/** SDK鐩墠鏀寔鎵嬪姩娣诲姞鐨勫ぇ绫伙細灏忕被
+ * 鐏厜绫伙紙澶х被1锛夛細璋冨厜鍥炶矾锛�0锛夈�佸紑鍏冲洖璺紙1锛夈�佹贩鍚堣皟鍏夌被锛�9锛夈�佹贩鍚堝紑鍏崇被锛�10锛�
+ * 绐楀笜绫伙紙澶х被2锛夛細寮�鍚堝笜鐢垫満锛�0锛夈�佸嵎甯樼數鏈猴紙1锛夈�佺獥甯樻ā鍧楋紙2锛�
+ * 绌鸿皟鍔熻兘锛堝ぇ绫�7锛夛細HVAC 妯″潡锛�0锛夈�侀�氱敤绌鸿皟闈㈡澘锛�3锛�
+ * 鑳屾櫙闊充箰鍔熻兘锛堝ぇ绫�9锛夛細鑳屾櫙闊充箰妯″潡 2018鏂拌儗鏅煶涔愭ā鍧楀皬绫�3
+ * 浼犳劅鍣紙澶х被5锛夛細骞茬粨鐐�0 鍒� 鍔熺巼24
+ * 閫昏緫鍔熻兘锛堝ぇ绫�12锛夛細閫昏緫妯″潡锛�0锛�
+ * 鍏ㄥ眬鍦烘櫙锛堝ぇ绫�17锛夛細鍏ㄥ眬鍦烘櫙锛�0锛�
+ * 鍦扮儹鍔熻兘锛氬湴鐑ā鍧楋紙0锛�
+ * 鏂伴锛堝ぇ绫�19锛夛細鏂伴绯荤粺锛�0锛�
+ * 閫氱敤寮�鍏筹紙澶х被100锛夛細閫氱敤寮�鍏筹紙0锛�
- * 鐏厜绫�1锛�0 锛�1锛�9锛�10
- * 绐楀笜绫�2锛�0锛�1锛�2
- * 浼犳劅鍣�5锛�0~24
- * 绌鸿皟绫�7锛�0锛�3
- * 鍦扮儹妯″潡8锛�0
- * 鑳屾櫙闊充箰鍔熻兘9锛�0
- * 閫昏緫鍔熻兘12锛�0
- * 鍏ㄥ眬鍦烘櫙17锛�0
- * 鏂伴妯″潡19锛�0
- * 閫氱敤寮�鍏�100锛�0
+ * 鏍煎紡 鏀寔鐨勬ā鍧楀悕瀛� 澶х被ID锛氬皬绫籌D
+ *
+ * 鐏厜绫� 1锛�0 锛�1锛�9锛�10
+ * 绐楀笜绫� 2锛�0锛�1锛�2
+ * 浼犳劅鍣� 5锛�0~24
+ * 绌鸿皟绫� 7锛�0锛�3
+ * 鍦扮儹妯″潡 8锛�0
+ * 鑳屾櫙闊充箰鍔熻兘 9锛�0
+ * 閫昏緫鍔熻兘 12锛�0
+ * 鍏ㄥ眬鍦烘櫙 17锛�0
+ * 鏂伴妯″潡 19锛�0
+ * 閫氱敤寮�鍏� 100锛�0
*
* 璇ユ柟娉曞簲鐢ㄤ簬鎻愪緵椤圭洰浜や粯鍓嶇殑鎻愬彇鎵归噺鏁版嵁鐢熸垚濂芥暟鎹��
* 妯℃嫙鐢熸垚璁惧鍥炶矾鏁版嵁锛屽湪椤圭洰涓嶆敮鎸佺畝鏄撶紪绋嬫悳绱㈡儏鍐典笅锛屽彲浠ラ�氳繃璇ユ柟娉曪紝鍏堝揩鎹风敓鎴愮洰鏍囨暟鎹� 寰楀埌 List<DevicesData> 鏍煎紡鐨勮澶囧垪琛ㄦ暟鎹�
@@ -56,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
@@ -75,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);
@@ -135,7 +139,7 @@
return;
}
String mChannelNumStr = et_mChannelNum.getText().toString();
- if (TextUtils.isEmpty(littleTypeStr)) {
+ if (TextUtils.isEmpty(mChannelNumStr)) {
showToast("鍥炶矾鍙蜂笉鑳戒负绌�");
return;
}
@@ -208,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 璇诲彇鍦烘櫙鐨勫娉ㄥ悕绉� 渚嬪: 鍏ヤ綇銆佽捣搴婃ā寮忋�侀槄璇绘ā寮�
@@ -215,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);
}
@@ -244,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)) {
@@ -276,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);
@@ -288,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 {
@@ -372,31 +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);
+ /**
+ * 鍦烘櫙杩欓噷鐨勫洖璺彿闇�瑕佹敞鎰忥細 鐩稿悓瀛愮綉鍙峰拰璁惧鍙蜂笅鐨勫満鏅渶瑕佺疮鍔犱笉閲嶅锛岄�昏緫妯″潡涓轰緥锛�1鍖烘湁3涓〃锛�2鍖烘湁2涓〃 鎬诲叡5涓満鏅紝鎵�浠ワ紙2鍖鸿〃1 鍥炶矾鍙蜂负4銆�2鍖鸿〃2 鍥炶矾鍙蜂负5锛�
+ * 涓嶇劧濡傛灉鍥炶矾鍙蜂笉瀵圭畝鏄撶紪绋嬫悳绱㈠娉ㄧ殑璇濅細鍑洪敊
+ */
+ //娣诲姞涓�涓満鏅�
+ DeviceParser.addLogicScenesDevicesListWithoutSearching(port, 1, 16, 4, 2, 1, "鍗у寮�鐏�", "閫昏緫妯″潡",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);
-
-
- //娣诲姞涓�涓�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