From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期五, 08 五月 2020 17:46:44 +0800 Subject: [PATCH] 请合并最新代码,优化绑定信息 --- ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 58 +++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 37 insertions(+), 21 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs index e80c361..cb99f85 100755 --- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs +++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs @@ -161,7 +161,7 @@ } else { - var selectHouse = new Device.Category.SelectHouse(); + var selectHouse = new Category.SelectHouseForm(); selectHouse.Init(); selectHouse.HouseAction = (houseId) => { @@ -187,7 +187,7 @@ } //妫�娴嬫槸鍚︾粦瀹氭湁缃戝叧 - if (this.CheckHadBindGateway() == false) + if (Common.Config.Instance.Home.IsVirtually == false && this.CheckHadBindGateway() == false) { //鏄剧ず娌℃湁缁戝畾杩囩綉鍏崇殑鐣岄潰 this.ShowNoGatewayTip(); @@ -312,7 +312,7 @@ bg.UnSelectedImagePath = "Item/NoBindGW.png"; this.listBodyContr.frameTable.AddChidren(bg); - var tip = new NormalViewControl(Application.GetMinRealAverage(717), Application.GetMinRealAverage(58), false); + var tip = new NormalViewControl(this.GetPictrueRealSize(717), this.GetPictrueRealSize(58), false); tip.Y = Application.GetRealHeight(815); tip.Gravity = Gravity.CenterHorizontal; tip.TextID = R.MyInternationalizationString.NewAccountNeedBingGW; @@ -573,7 +573,7 @@ //璁惧璁℃暟 int contrCount = 0; //X杞村潗鏍�(鍥剧墖宸﹁竟鏈変綑鐧�) - int XX = Application.GetMinRealAverage(44); + int XX = this.GetPictrueRealSize(44); //Y杞村潗鏍� int YY = 0; var listContr = new List<Controls.DeviceCardCommon>(); @@ -606,6 +606,11 @@ else if (device.Type == DeviceType.Thermostat) { cardContr = new Controls.DeviceAcCardControl(); + } + //鏂伴 + else if (device.Type == DeviceType.FreshAir) + { + cardContr = new Controls.DeviceFreshAirCardControl(); } //褰╃伅(璋冨厜鍣�) else if (device.Type == DeviceType.DimmableLight) @@ -647,11 +652,11 @@ //璁惧璁℃暟 contrCount++; //鍗$墖宸﹀彸涓よ竟鏈�14鐨勪綑鐧�,姣忎袱涓悗,X杞撮噸缃� - XX = contrCount % 2 == 0 ? Application.GetMinRealAverage(44) : cardContr.Right + Application.GetMinRealAverage(20); + XX = contrCount % 2 == 0 ? this.GetPictrueRealSize(44) : cardContr.Right + this.GetPictrueRealSize(20); if (contrCount % 2 == 0) { //娌′袱涓箣鍚�,Y杞撮�掑 - YY = cardContr.Bottom + Application.GetMinRealAverage(15); + YY = cardContr.Bottom + this.GetPictrueRealSize(15); } //鎺т欢璁板綍鍒扮紦瀛樹腑 this.dicDeviceCardControl[LocalDevice.Current.GetDeviceMainKeys(device)] = cardContr; @@ -683,8 +688,11 @@ }, ShowErrorMode.NO); } }); - - System.Threading.Thread.Sleep(50); + if (contrCount > 6) + { + //璁╁畠鍛堢幇涓�绉嶇洿鎺ヤ竴娆℃�у埛鍑烘潵鐨勬晥鏋� + System.Threading.Thread.Sleep(50); + } } } @@ -696,8 +704,8 @@ var noFunction = new Button { Y = Application.GetRealHeight(69), - Width = Application.GetMinRealAverage(683), - Height = Application.GetMinRealAverage(392), + Width = this.GetPictrueRealSize(683), + Height = this.GetPictrueRealSize(392), Gravity = Gravity.CenterHorizontal, UnSelectedImagePath = "Item/NoFunction.png" }; @@ -752,12 +760,12 @@ if (contrCount % 2 == 1) { //绗竴涓浐瀹�44 - XX = Application.GetMinRealAverage(44); + XX = this.GetPictrueRealSize(44); } else { //绗簩涓槸44+鎺т欢瀹藉害+20浣欑櫧 - XX = Application.GetMinRealAverage(44) + this.dicDeviceCardControl[mainkey].Width + Application.GetMinRealAverage(20); + XX = this.GetPictrueRealSize(44) + this.dicDeviceCardControl[mainkey].Width + this.GetPictrueRealSize(20); } //姣忎袱涓箣鍚�,骞朵笖鏄涓�涓殑鏃跺��,Y杞撮�掑 @@ -766,7 +774,7 @@ //姹傚晢 int value = contrCount / 2; //鎺т欢鐨勫簳閮ㄦ湁15鐨勯棿闅� - YY = value * (this.dicDeviceCardControl[mainkey].Height + Application.GetMinRealAverage(15)); + YY = value * (this.dicDeviceCardControl[mainkey].Height + this.GetPictrueRealSize(15)); } if (canMove == true) { @@ -898,7 +906,11 @@ }); } }); - System.Threading.Thread.Sleep(50); + if (contrCount > 6) + { + //璁╁畠鍛堢幇涓�绉嶄竴娆℃�ф樉绀哄嚭鏉ョ殑鏁堟灉 + System.Threading.Thread.Sleep(50); + } } } @@ -1002,12 +1014,12 @@ if (contrCount % 2 == 1) { //绗竴涓浐瀹�44 - XX = Application.GetMinRealAverage(44); + XX = this.GetPictrueRealSize(44); } else { //绗簩涓槸44+鎺т欢瀹藉害+20浣欑櫧 - XX = Application.GetMinRealAverage(44) + this.dicSceneCardControl[sceneId].Width + Application.GetMinRealAverage(20); + XX = this.GetPictrueRealSize(44) + this.dicSceneCardControl[sceneId].Width + this.GetPictrueRealSize(20); } //姣忎袱涓箣鍚�,骞朵笖鏄涓�涓椂,Y杞撮�掑 @@ -1016,7 +1028,7 @@ //姹傚晢 int value = contrCount / 2; //鎺т欢鐨勫簳閮ㄦ湁15鐨勯棿闅� - YY = value * (this.dicSceneCardControl[sceneId].Height + Application.GetMinRealAverage(15)); + YY = value * (this.dicSceneCardControl[sceneId].Height + this.GetPictrueRealSize(15)); } if (canMove == true) { @@ -1088,8 +1100,6 @@ Config.Instance.Save(); //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼ await UserCenterLogic.InitUserCenterMenmoryAndThread(); - //鍒濆鍖栧叏閮ㄦ埧闂� - HdlRoomLogic.Current.InitAllRoom(); Application.RunOnMainThread(() => { @@ -1134,6 +1144,11 @@ //绌鸿皟鏄壒娈婄殑,瀹冪殑寮�鍏虫槸灞炴�т笂鎶ユ潵鐫�.宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉 this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu(); } + if (report.DeviceStatusReport.CluterID == 514 && report.DeviceStatusReport.AttriBute[0].AttributeId == 0) + { + //鏂伴鏄壒娈婄殑,瀹冪殑寮�鍏虫槸灞炴�т笂鎶ユ潵鐫�.宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉 + this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu(); + } this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice); } }, ShowErrorMode.NO); @@ -1148,7 +1163,8 @@ if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true) { //鍒锋柊鍗$墖鐘舵�� - this.dicDeviceCardControl[mainKeys].SetCardOnlineStatu(report.IsOnline == 1); + bool bolOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(report); + this.dicDeviceCardControl[mainKeys].SetCardOnlineStatu(bolOnline); return; } @@ -1210,7 +1226,7 @@ /// </summary> private void ShowSelectFloorForm(NormalViewControl btnFloor) { - var floorFL = new Device.Category.SelectFloor(); + var floorFL = new Category.SelectFloorForm(); this.AddChidren(floorFL); floorFL.Init(35, 153); floorFL.changeFloor = true; -- Gitblit v1.8.0