From dce6c3481a37216292724013ff9d2b75ceb82f86 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期三, 10 六月 2020 15:47:28 +0800 Subject: [PATCH] 添加小度的代码 --- ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs index 13b308f..9d9ac37 100755 --- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs +++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs @@ -16,6 +16,10 @@ #region 鈻� 鍙橀噺澹版槑___________________________ /// <summary> + /// The instance. + /// </summary> + public static HomeMainPageForm Instance; + /// <summary> /// 鏁翠釜鐣岄潰鐨勪笂涓嬫粦鍔ㄦ帶浠� /// </summary> private VerticalFrameControl listBodyContr = null; @@ -49,6 +53,9 @@ /// </summary> public void ShowForm() { + this.FormID = "HomeMainPageForm"; + Instance = this; + //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲) if (ListRoomViewFrom.Instance == null) { } @@ -75,8 +82,6 @@ this.AddNormalDeviceReportEvent(); //娣诲姞浼犳劅鍣ㄧ姸鎬佷笂鎶ヤ簨浠� this.AddSensorDeviceReportEvent(); - //灏嗗綋鍓嶇殑鐢婚潰淇濆瓨鍒板唴瀛樺綋涓� - UserCenterLogic.AddActionForm(this); } /// <summary> @@ -165,7 +170,7 @@ selectHouse.Init(); selectHouse.HouseAction = (houseId) => { - ChangeResidence(House.GetHouseByHouseId(houseId)); + ChangeResidence(HdlResidenceLogic.Current.GetHouseByHouseId(houseId)); }; } }; @@ -635,6 +640,11 @@ { cardContr = new Controls.DeviceDoorLockCardControl(); } + //鑹叉俯鐏� + else if (device.Type == DeviceType.ColorTemperatureLight) + { + cardContr = new Controls.DeviceColorTemperatureCardControl(); + } //鏃犳硶璇嗗埆 else { @@ -1051,7 +1061,7 @@ new System.Threading.Thread(async () => { Config.Instance.HomeId = home.Id; - Config.Instance.Home = House.GetHouseByFilePath(home.FileName); + Config.Instance.Home = HdlResidenceLogic.Current.GetHouseByHouseId(home.Id); Global.CreateHomeDirectory(home.Id); Config.Instance.Save(); //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼ @@ -1166,7 +1176,7 @@ floorFL.changeFloor = true; floorFL.FloorAction = (floorId) => { - btnFloor.Text = Config.Instance.Home.GetFloorNameById(floorId); + btnFloor.Text = HdlResidenceLogic.Current.GetFloorNameById(floorId); HdlRoomLogic.Current.NowMainPageRoom = HdlRoomLogic.Current.GetLoveRoom(); this.ShowForm(); }; @@ -1181,8 +1191,10 @@ /// </summary> public override void CloseFormBefore() { + //鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖ + Instance = null; + HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceOnline"); - HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceRespone"); HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceStatus"); HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewSensor"); -- Gitblit v1.8.0