From 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 19 十一月 2020 10:23:45 +0800 Subject: [PATCH] Evoyo.Home1.1.0120111601_Release --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs | 78 +++++++++++++++++++++++++++++++++++--- 1 files changed, 71 insertions(+), 7 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs index 6a0fd93..2ad3bcd 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs @@ -36,6 +36,13 @@ /// 鐢ㄦ潵閫掑鐢熸垚Mac鐢ㄧ殑 /// </summary> private int DeviceNumber = 0; + /// <summary> + /// 鏄惁鏄父瀹綋楠� + /// </summary> + public bool IsExperience + { + get { return Config.Instance.Guid == "chushiGuid"; } + } #endregion @@ -58,6 +65,8 @@ this.InitDeviceData(); //鍒濆鍖栧満鏅� this.InitSceneData(); + //鍒锋柊宸﹁竟鍒锋柊鎴块棿瑙嗗浘鍒楄〃 + HdlRoomLogic.Current.RefreshRoomListView(); } #endregion @@ -104,7 +113,10 @@ house.IsVirtually = true; house.Save(false); Config.Instance.HomeId = house.Id; - Config.Instance.Home = House.GetHouseByHouseId(house.Id); + Config.Instance.Home = HdlResidenceLogic.Current.GetHouseByHouseId(house.Id); + + //棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶� + HdlFileLogic.Current.CreatAllUserCenterDirectory(); } #endregion @@ -163,8 +175,6 @@ var listFloorKey = this.GetAllFloorKeys(); var dicRoomName = this.GetRoomSampleList(); - //璁剧疆鍒濆妤煎眰 - Config.Instance.Home.CurrentFloorId = listFloorKey[0]; foreach (string floorKey in listFloorKey) { foreach (string roomId in dicRoomName.Keys) @@ -219,6 +229,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 }); @@ -561,6 +572,7 @@ //1涓紶鎰熷櫒 var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 }; device.IasDeviceType = 13; + device.DeviceID = 1026; //璁剧疆璁惧鐨勫熀鏈俊鎭� this.SetBaseDataToDevice(device, 1200, 1200, "MSPIR01-ZB.10", i_RoomId); @@ -581,6 +593,7 @@ { var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 }; device.IasDeviceType = 43; + device.DeviceID = 1026; //璁剧疆璁惧鐨勫熀鏈俊鎭� this.SetBaseDataToDevice(device, 1300, 1300, "MSG01/M-ZB.10", i_RoomId); @@ -594,6 +607,7 @@ { var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 }; device.IasDeviceType = 43; + device.DeviceID = 1026; //璁剧疆璁惧鐨勫熀鏈俊鎭� this.SetBaseDataToDevice(device, 1300, 1300, "MGCD01/ZB.10", i_RoomId); @@ -607,6 +621,7 @@ { var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 }; device.IasDeviceType = 21; + device.DeviceID = 1026; //璁剧疆璁惧鐨勫熀鏈俊鎭� this.SetBaseDataToDevice(device, 1301, 1301, "MSDC01/M-ZB.10", i_RoomId); @@ -620,6 +635,7 @@ { var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 }; device.IasDeviceType = 40; + device.DeviceID = 1026; //璁剧疆璁惧鐨勫熀鏈俊鎭� this.SetBaseDataToDevice(device, 1301, 1301, "MSS01/M-ZB.10", i_RoomId); @@ -633,6 +649,7 @@ { var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 }; device.IasDeviceType = 13; + device.DeviceID = 1026; //璁剧疆璁惧鐨勫熀鏈俊鎭� this.SetBaseDataToDevice(device, 1303, 1303, "MSPIR01/M-ZB.10", i_RoomId); @@ -646,6 +663,7 @@ { var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 }; device.IasDeviceType = 42; + device.DeviceID = 1026; //璁剧疆璁惧鐨勫熀鏈俊鎭� this.SetBaseDataToDevice(device, 1304, 1304, "MSW01/M-ZB.10", i_RoomId); @@ -659,6 +677,7 @@ { var device = new IASZone() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 1 }; device.IasDeviceType = 44; + device.DeviceID = 1026; //璁剧疆璁惧鐨勫熀鏈俊鎭� this.SetBaseDataToDevice(device, 1305, 1305, "MBU01/M-ZB.10", i_RoomId); @@ -703,8 +722,8 @@ this.SetBaseDataToDevice(device, 2300, 2300, "MPD0101-ZB.10", i_RoomId); } - //1涓户鐢靛櫒 - var device2 = new ToggleLight() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 8 }; + //1涓皟鍏夊櫒 + var device2 = new DimmableLight() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 8 }; device2.DfunctionType = DeviceFunctionType.A鐏厜; //璁剧疆璁惧鐨勫熀鏈俊鎭� this.SetBaseDataToDevice(device2, 2300, 2300, "MPD0101-ZB.10", i_RoomId); @@ -717,6 +736,11 @@ public void Zigbee绌鸿皟缃戝叧(int i_DeviceCount, string i_RoomId) { + var device2 = new OTADevice() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 200 }; + //璁剧疆璁惧鐨勫熀鏈俊鎭� + this.SetBaseDataToDevice(device2, 3600, 3600, "MAC/GW-ZB.10", i_RoomId); + this.DeviceNumber++; + return; for (int i = 0; i < i_DeviceCount; i++) { //10涓┖璋冨簲璇ュ彲浠ヤ簡 @@ -883,6 +907,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> @@ -901,10 +950,24 @@ device.ModelIdentifier = ModelIdentifier; device.CurrentGateWayId = string.Empty; - //榛樿姣忎釜璁惧閮藉彲浠ュ畾浣� + //榛樿姣忎釜璁惧閮藉彲浠ュ畾浣�,鎷ユ湁寮�鍏冲姛鑳� device.InClusterList.Add(new CommonDevice.InClusterObj { InCluster = 3 }); device.OutClusterList.Add(new CommonDevice.OutClusterObj { OutCluster = 3 }); - + if (device.Type == DeviceType.AirSwitch || device.Type == DeviceType.OnOffOutput + || device.Type == DeviceType.DimmableLight || device.Type == DeviceType.ColorDimmableLight) + { + device.InClusterList.Add(new CommonDevice.InClusterObj { InCluster = 6 }); + device.OutClusterList.Add(new CommonDevice.OutClusterObj { OutCluster = 6 }); + } + if (device.Type == DeviceType.OnOffOutput || device.Type == DeviceType.DimmableLight + || device.Type == DeviceType.ColorDimmableLight) + { + device.InClusterList.Add(new CommonDevice.InClusterObj { InCluster = 8 }); + } + if (device.Type == DeviceType.WindowCoveringDevice) + { + device.InClusterList.Add(new CommonDevice.InClusterObj { InCluster = 258 }); + } //娣诲姞铏氭嫙璁惧 LocalDevice.Current.AddVirtualDeviceToMemory(device); @@ -951,6 +1014,7 @@ A鏂规偊鏂伴闈㈡澘 = 25, A鏂规偊鏂伴灏忔ā鍧� = 26, A鍚搁《鐕冩皵浼犳劅鍣� = 27, + A鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 = 28, } #endregion -- Gitblit v1.8.0