From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期五, 11 九月 2020 09:16:59 +0800 Subject: [PATCH] 优化多功能面板:绑定温湿度传感器目标,和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/ZigbeeApp20200825/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs old mode 100644 new mode 100755 similarity index 96% rename from ZigbeeApp20200825/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs index a73caea..9c4f1dc --- a/ZigbeeApp20200825/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs @@ -222,6 +222,7 @@ list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A3鎸夐敭闈㈡澘, RoomId = floorKey + "_KeTing", DeviceCount = 1 }); list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A4鎸夐敭闈㈡澘, RoomId = floorKey + "_KeTing", DeviceCount = 2 }); list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A绌鸿皟缃戝叧, RoomId = floorKey + "_KeTing", DeviceCount = 1 }); + //list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡, RoomId = floorKey + "_KeTing", DeviceCount = 1 }); //闃冲彴 list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A220pir浼犳劅鍣�, RoomId = floorKey + "_YangTai", DeviceCount = 1 }); @@ -894,6 +895,31 @@ } } + public void Zigbee鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡(int i_DeviceCount, string i_RoomId) + { + for (int i = 0; i < i_DeviceCount; i++) + { + //4涓共鎺ョ偣 + for (int j = 1; j <= 4; j++) + { + var device = new Panel() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = j }; + //璁剧疆璁惧鐨勫熀鏈俊鎭� + this.SetBaseDataToDevice(device, 2000, 2000, "MLR0310-ZB.20", i_RoomId); + } + //3涓户鐢靛櫒 + for (int j = 5; j <= 7; j++) + { + var device = new ToggleLight() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = j }; + device.DfunctionType = DeviceFunctionType.A鐏厜; + //璁剧疆璁惧鐨勫熀鏈俊鎭� + this.SetBaseDataToDevice(device, 2000, 2000, "MLR0310-ZB.20", i_RoomId); + device.DeviceEpointName = Language.StringByID(R.MyInternationalizationString.uLight) + (j - 4); + } + + this.DeviceNumber++; + } + } + /// <summary> /// 璁剧疆璁惧鐨勫熀鏈俊鎭� /// </summary> @@ -976,6 +1002,7 @@ A鏂规偊鏂伴闈㈡澘 = 25, A鏂规偊鏂伴灏忔ā鍧� = 26, A鍚搁《鐕冩皵浼犳劅鍣� = 27, + A鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 = 28, } #endregion -- Gitblit v1.8.0