From 2450c12c825ad4d78d1572da2fa421706db2df2f Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 18 六月 2020 16:01:14 +0800 Subject: [PATCH] 新代码 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs index 5203ff7..198b656 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs @@ -58,6 +58,8 @@ this.InitDeviceData(); //鍒濆鍖栧満鏅� this.InitSceneData(); + //鍒锋柊宸﹁竟鍒锋柊鎴块棿瑙嗗浘鍒楄〃 + HdlRoomLogic.Current.RefreshRoomListView(); } #endregion @@ -104,7 +106,7 @@ 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); //棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶� UserCenterLogic.CreatAllUserCenterDirectory(); @@ -714,8 +716,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); @@ -912,10 +914,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); -- Gitblit v1.8.0