From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期二, 21 七月 2020 09:46:53 +0800 Subject: [PATCH] 请合并最新多功能面板代码 --- ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 349 +++++++++++++++++++++++++++------------------------------- 1 files changed, 163 insertions(+), 186 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs old mode 100755 new mode 100644 index 9d850cb..a425f9a --- 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,8 +53,11 @@ /// </summary> public void ShowForm() { - //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲) - if (ListRoomViewFrom.Instance == null) { } + this.FormID = "HomeMainPageForm"; + Instance = this; + + //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲) + if (LeftListRoomViewFrom.Instance == null) { } //鏁翠釜鑳屾櫙鐨勪笂涓嬫粦鍔ㄦ帶浠� if (this.listBodyContr == null) @@ -67,6 +74,9 @@ listBodyContr.RecoverTableHeight(); } + //鍒濆鍖栭粯璁ゆゼ灞侷D + this.InitDefultFloorId(); + //鍒濆鍖栧ご閮ㄦ帶浠� this.InitTopFrameLayoutControl(); //鍒濆鍖栦腑闂存帶浠� @@ -75,8 +85,6 @@ this.AddNormalDeviceReportEvent(); //娣诲姞浼犳劅鍣ㄧ姸鎬佷笂鎶ヤ簨浠� this.AddSensorDeviceReportEvent(); - //灏嗗綋鍓嶇殑鐢婚潰淇濆瓨鍒板唴瀛樺綋涓� - UserCenterLogic.AddActionForm(this); } /// <summary> @@ -85,7 +93,7 @@ private void InitTopFrameLayoutControl() { //澶撮儴瀹瑰櫒 - base.topFrameLayout = new FrameLayout(); + base.topFrameLayout = new NormalFrameLayout(); topFrameLayout.Y = Application.GetRealHeight(60); topFrameLayout.Height = Application.GetRealHeight(127); topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor; @@ -124,6 +132,9 @@ this.ShowSelectFloorForm(btnFloorName); }; } + + //鍙瀵硅蹇嵎鏂瑰紡 + //Shared.Phone.Device.VideoIntercom.VideoMachine.AccountSupportVideo(topFrameLayout); //瀹夐槻蹇嵎鏂瑰紡 if (UserCenterResourse.ResidenceOption.SafetyShortcut) { @@ -161,11 +172,12 @@ } else { - var selectHouse = new Device.Category.SelectHouse(); + var selectHouse = new Category.SelectHouseForm(); selectHouse.Init(); selectHouse.HouseAction = (houseId) => { - ChangeResidence(House.GetHouseByHouseId(houseId)); + //鍒囨崲浣忓畢 + this.ChangeResidence(HdlResidenceLogic.Current.GetHouseByHouseId(houseId)); }; } }; @@ -187,7 +199,7 @@ } //妫�娴嬫槸鍚︾粦瀹氭湁缃戝叧 - if (this.CheckHadBindGateway() == false) + if (Common.Config.Instance.Home.IsVirtually == false && this.CheckHadBindGateway() == false) { //鏄剧ず娌℃湁缁戝畾杩囩綉鍏崇殑鐣岄潰 this.ShowNoGatewayTip(); @@ -250,13 +262,10 @@ } //鍔熻兘鍜屽満鏅痓odyView - this.bodyFrameLayout = new FrameLayout() - { - Y = functionSceneView.Bottom, - Height = Application.GetRealHeight(750), - Gravity = Gravity.CenterHorizontal, - BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor - }; + this.bodyFrameLayout = new NormalFrameLayout(); + bodyFrameLayout.Y = functionSceneView.Bottom; + bodyFrameLayout.Height = this.listBodyContr.frameTable.Height - functionSceneView.Bottom; + bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor; this.listBodyContr.frameTable.AddChidren(bodyFrameLayout); //閫夋嫨鍔熻兘鍒嗘爮 @@ -312,7 +321,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; @@ -364,9 +373,22 @@ //宸﹀彸婊戝姩鎺т欢鐨勮儗鏅鍣� var frameBack = new FrameLayout(); frameBack.Y = Application.GetRealHeight(302); - frameBack.Width = Application.GetRealWidth(CommonPage.AppRealWidth); + frameBack.Width = this.Width; frameBack.Height = Application.GetRealHeight(478); this.listBodyContr.frameTable.AddChidren(frameBack); + + //鎴块棿婊戝姩鎺т欢宸﹁竟鐨勮櫄鎷熷浘鐗� + var mLeftImageView = new ImageView(); + mLeftImageView.ImagePath = "RoomIcon/19.jpg"; + mLeftImageView.Radius = (uint)Application.GetRealHeight(17); + mLeftImageView.Width = Application.GetRealWidth(717); + mLeftImageView.Height = Application.GetRealHeight(478); + //鎴块棿婊戝姩鎺т欢鍙宠竟鐨勮櫄鎷熷浘鐗� + var mRightImageView = new ImageView(); + mRightImageView.ImagePath = "RoomIcon/19.jpg"; + mRightImageView.Radius = (uint)Application.GetRealHeight(17); + mRightImageView.Width = mLeftImageView.Width; + mRightImageView.Height = mLeftImageView.Height; this.roomPageView = new HorizontalPages(); roomPageView.Width = frameBack.Width; @@ -383,8 +405,15 @@ btnRoomBottomShadow.UnSelectedImagePath = "Room/RoomCardShadow.png"; this.listBodyContr.frameTable.AddChidren(btnRoomBottomShadow); + //璁剧疆鎺у埗鏈�宸﹀拰鏈�鍙�2杈瑰~鍏呯殑鍋囪儗鏅疺iew锛屼笉璁剧疆涓嶆樉绀猴紝闇�瑕佸湪AddChidren 鍓嶈皟鐢ㄨ鏂规硶 + roomPageView.SetLeftAndRightImageView(mLeftImageView, mRightImageView); + //褰撳墠鎴块棿 - var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom(); + var listRoom = HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(Config.Instance.Home.CurrentFloorId); + if (HdlRoomLogic.Current.NowMainPageRoom == null) + { + HdlRoomLogic.Current.NowMainPageRoom = listRoom[0]; + } var curIndex = 0; for (int i = 0; i < listRoom.Count; i++) { @@ -392,7 +421,7 @@ roomPageView.AddChidren(roomView); roomView.Init(listRoom[i]); - if (listRoom[i].Id == HdlRoomLogic.Current.CurrentRoom.Id) + if (listRoom[i].Id == HdlRoomLogic.Current.NowMainPageRoom.Id) { //褰撳墠鎴块棿,鍒欐樉绀洪偅浜涙暟鎹嚭鏉� roomView.HideName(false); @@ -404,40 +433,34 @@ roomView.HideName(true); } } - //鎴块棿鑳藉婊戝姩鐨勬椂鍊欐墠鏄剧ず - FrameLayout btnRoomLeftShadow = null; - FrameLayout btnRoomRightShadow = null; - if (listRoom.Count > 1) - { - //鍦ㄦ埧闂村崱鐗囧乏杈规坊鍔犻伄缃� - btnRoomLeftShadow = new FrameLayout(); - btnRoomLeftShadow.Width = Application.GetRealWidth(124); - btnRoomLeftShadow.Height = roomPageView.Height - roomPageView.JMBJ * 2; - btnRoomLeftShadow.Gravity = Gravity.CenterVertical; - btnRoomLeftShadow.BackgroundColor = 0x1c000000; - btnRoomLeftShadow.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomRight); - btnRoomLeftShadow.Visible = curIndex >= 1; - frameBack.AddChidren(btnRoomLeftShadow); - //鍦ㄦ埧闂村崱鐗囧彸杈规坊鍔犻伄缃� - btnRoomRightShadow = new FrameLayout(); - btnRoomRightShadow.Width = btnRoomLeftShadow.Width; - btnRoomRightShadow.Height = btnRoomLeftShadow.Height; - btnRoomRightShadow.X = Application.GetRealWidth(956); - btnRoomRightShadow.Gravity = Gravity.CenterVertical; - btnRoomRightShadow.BackgroundColor = btnRoomLeftShadow.BackgroundColor; - btnRoomRightShadow.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft); - btnRoomRightShadow.Visible = curIndex < listRoom.Count - 1; - frameBack.AddChidren(btnRoomRightShadow); - } + //鍦ㄦ埧闂村崱鐗囧乏杈规坊鍔犻伄缃� + var btnRoomLeftShadow = new FrameLayout(); + btnRoomLeftShadow.Width = Application.GetRealWidth(124); + btnRoomLeftShadow.Height = roomPageView.Height - roomPageView.JMBJ * 2; + btnRoomLeftShadow.Gravity = Gravity.CenterVertical; + btnRoomLeftShadow.BackgroundColor = 0x1c000000; + btnRoomLeftShadow.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomRight); + //frameBack.AddChidren(btnRoomLeftShadow);//鏆傛椂涓嶅姞閬僵 + + //鍦ㄦ埧闂村崱鐗囧彸杈规坊鍔犻伄缃� + var btnRoomRightShadow = new FrameLayout(); + btnRoomRightShadow.Width = btnRoomLeftShadow.Width; + btnRoomRightShadow.Height = btnRoomLeftShadow.Height; + btnRoomRightShadow.X = Application.GetRealWidth(956); + btnRoomRightShadow.Gravity = Gravity.CenterVertical; + btnRoomRightShadow.BackgroundColor = btnRoomLeftShadow.BackgroundColor; + btnRoomRightShadow.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft); + //frameBack.AddChidren(btnRoomRightShadow);//鏆傛椂涓嶅姞閬僵 + //鎺т欢寮�濮嬫粦鍔ㄧ殑浜嬩欢 roomPageView.StartScrollAction += () => { this.isRoomChanging = true; //寮�濮嬫粦鍔ㄦ椂,闅愯棌褰撳墠鐨勬暟鎹樉绀� (roomPageView.GetChildren(roomPageView.PageIndex) as RoomView).HideName(true); - if (btnRoomLeftShadow != null) { btnRoomLeftShadow.Visible = false; } - if (btnRoomRightShadow != null) { btnRoomRightShadow.Visible = false; } + btnRoomLeftShadow.Visible = false; + btnRoomRightShadow.Visible = false; btnRoomBottomShadow.Visible = false; }; roomPageView.EndScrollAction += () => @@ -459,24 +482,22 @@ (roomPageView.GetChildren(curIndex + 1) as RoomView).HideName(true); } - if (btnRoomLeftShadow != null) { btnRoomLeftShadow.Visible = curIndex >= 1; } - if (btnRoomRightShadow != null) { btnRoomRightShadow.Visible = curIndex < listRoom.Count - 1; } + btnRoomLeftShadow.Visible = true; + btnRoomRightShadow.Visible = true; btnRoomBottomShadow.Visible = true; //鍒囨崲褰撳墠鎴块棿 - HdlRoomLogic.Current.CurrentRoom = listRoom[curIndex]; + HdlRoomLogic.Current.NowMainPageRoom = listRoom[curIndex]; //鍒锋柊璁惧妗屽竷鎺т欢 this.isRoomChanging = false; this.RefreshBodyView(); }; //璁剧疆鎴块棿鐨勫垵濮嬮�夋嫨 roomPageView.PageIndex = curIndex; -#if iOS - //Ios濡傛灉绱㈠紩鏄涓�涓椂锛屽畠瑙﹀彂涓嶄簡浜嬩欢,闇�瑕佹墜鍔ㄨЕ鍙� + //濡傛灉绱㈠紩鏄涓�涓椂锛屽畠瑙﹀彂涓嶄簡浜嬩欢,闇�瑕佹墜鍔ㄨЕ鍙� if (curIndex == 0) { roomPageView.EndScrollAction(); } -#endif } /// <summary> @@ -490,7 +511,7 @@ //褰撴病鏈夌粦瀹氭湁缃戝叧,宸︽粦鏃�,鐐瑰嚮鎴块棿鍒楄〃,鍒欎笉楦熷畠 return; } - var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom(); + var listRoom = HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(Config.Instance.Home.CurrentFloorId); for (int i = 0; i < listRoom.Count; i++) { if (room.Id == listRoom[i].Id) @@ -506,7 +527,7 @@ //閲嶇疆涓�涓嬫ゼ灞傚悕瀛� if (this.btnFloorName != null) { - btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(Config.Instance.Home.CurrentFloorId); + btnFloorName.Text = Config.Instance.Home.GetCurrentFloorName; } } @@ -527,7 +548,7 @@ this.dicDeviceCardControl.Clear(); var listDevice = new List<CommonDevice>(); - foreach (var mainkeys in HdlRoomLogic.Current.CurrentRoom.ListDevice) + foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice) { var device = LocalDevice.Current.GetDevice(mainkeys); //鍒ゆ柇璇ヨ澶囪兘鍚︽樉绀哄湪涓婚〉 @@ -541,7 +562,8 @@ //褰撳墠鎴块棿鐨勮澶囨暟 if (listDevice.Count == 0) { - ShowNoFunctionTip(); + //杩樻病鏈夊姛鑳藉摝 + this.ShowNotDataImage(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.NoFunction_Tip)); return; } //璁惧鍒楄〃瀹瑰櫒鎺т欢 @@ -565,7 +587,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>(); @@ -599,6 +621,11 @@ { cardContr = new Controls.DeviceAcCardControl(); } + //鏂伴 + else if (device.Type == DeviceType.FreshAir) + { + cardContr = new Controls.DeviceFreshAirCardControl(); + } //褰╃伅(璋冨厜鍣�) else if (device.Type == DeviceType.DimmableLight) { @@ -619,6 +646,11 @@ { cardContr = new Controls.DeviceDoorLockCardControl(); } + //鑹叉俯鐏� + else if (device.Type == DeviceType.ColorTemperatureLight) + { + cardContr = new Controls.DeviceColorTemperatureCardControl(); + } //鏃犳硶璇嗗埆 else { @@ -629,7 +661,7 @@ cardContr.X = XX; cardContr.Y = YY; listDeviceBackContr.AddChidren(cardContr); - cardContr.InitControl(device); + cardContr.InitControl(device, HdlRoomLogic.Current.NowMainPageRoom); //鍗$墖闇�瑕佽绉婚櫎鐨勪簨浠� cardContr.CardNeedRemoveEvent += () => { @@ -639,11 +671,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; @@ -675,36 +707,12 @@ }, ShowErrorMode.NO); } }); - - System.Threading.Thread.Sleep(50); + if (contrCount > 6) + { + //璁╁畠鍛堢幇涓�绉嶇洿鎺ヤ竴娆℃�у埛鍑烘潵鐨勬晥鏋� + System.Threading.Thread.Sleep(50); + } } - } - - /// <summary> - /// 鏄剧ず娌℃湁鍔熻兘 - /// </summary> - private void ShowNoFunctionTip() - { - var noFunction = new Button - { - Y = Application.GetRealHeight(69), - Width = Application.GetMinRealAverage(683), - Height = Application.GetMinRealAverage(392), - Gravity = Gravity.CenterHorizontal, - UnSelectedImagePath = "Item/NoFunction.png" - }; - bodyFrameLayout.AddChidren(noFunction); - - var noFunctionTip = new Button() - { - Y = noFunction.Bottom, - Height = Application.GetRealHeight(200), - Text = Language.StringByID(R.MyInternationalizationString.NoFunction_Tip).Replace("{\\r\\n}", "\r\n"), - TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor, - TextAlignment = TextAlignment.Center, - IsMoreLines = true - }; - bodyFrameLayout.AddChidren(noFunctionTip); } #endregion @@ -744,12 +752,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杞撮�掑 @@ -758,7 +766,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) { @@ -800,7 +808,7 @@ this.dicDeviceCardControl.Clear(); var listScene = new List<SceneUI>(); - foreach (int sceneId in HdlRoomLogic.Current.CurrentRoom.ListSceneId) + foreach (int sceneId in HdlRoomLogic.Current.NowMainPageRoom.ListSceneId) { var sceneUi = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId); if (sceneUi == null) @@ -813,8 +821,8 @@ if (listScene.Count == 0) { - //鏄剧ず娌″満鏅� - this.ShowNoSceneTip(); + //杩樻病鏈夊満鏅摝 + this.ShowNotDataImage(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.NoScene_Tip)); return; } //鍒楄〃鎺т欢 @@ -824,7 +832,7 @@ HdlThreadLogic.Current.RunThread(() => { - //鍒濆鍖栬澶囧崱鐗囧垪琛ㄦ帶浠� + //鍒濆鍖栧満鏅崱鐗囧垪琛ㄦ帶浠� this.InitSceneListCardControl(listSceneBackContr, listScene); }); } @@ -838,7 +846,7 @@ //鍦烘櫙璁℃暟 int contrCount = 0; //X杞村潗鏍�(鍥剧墖宸﹁竟鏈変綑鐧�) - int XX = Application.GetMinRealAverage(44); + int XX = this.GetPictrueRealSize(44); //Y杞村潗鏍� int YY = 0; foreach (var sceneUi in listScene) @@ -865,11 +873,11 @@ //璁惧璁℃暟 contrCount++; //姣忎袱涓悗,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.dicSceneCardControl[sceneUi.Id] = cardContr; @@ -890,34 +898,12 @@ }); } }); - System.Threading.Thread.Sleep(50); + if (contrCount > 6) + { + //璁╁畠鍛堢幇涓�绉嶄竴娆℃�ф樉绀哄嚭鏉ョ殑鏁堟灉 + System.Threading.Thread.Sleep(50); + } } - } - - /// <summary> - /// 鏄剧ず娌″満鏅� - /// </summary> - private void ShowNoSceneTip() - { - var noScene = new Button - { - Y = Application.GetRealHeight(69), - Width = Application.GetMinRealAverage(683), - Height = Application.GetMinRealAverage(392), - Gravity = Gravity.CenterHorizontal, - UnSelectedImagePath = "Item/NoFunction.png" - }; - bodyFrameLayout.AddChidren(noScene); - var noScenceTip = new Button() - { - Y = noScene.Bottom, - Height = Application.GetRealHeight(200), - Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"), - TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor, - TextAlignment = TextAlignment.Center, - IsMoreLines = true - }; - bodyFrameLayout.AddChidren(noScenceTip); } /// <summary> @@ -1000,12 +986,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杞撮�掑 @@ -1014,7 +1000,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) { @@ -1075,36 +1061,21 @@ /// <param name="home">Home.</param> private void ChangeResidence(House home) { - try + HdlThreadLogic.Current.RunThread(() => { - CommonPage.Loading.Start(); - new System.Threading.Thread(async () => - { - Config.Instance.HomeId = home.Id; - Config.Instance.Home = House.GetHouseByFilePath(home.FileName); - Global.CreateHomeDirectory(home.Id); - Config.Instance.Save(); - //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼ - await UserCenterLogic.InitUserCenterMenmoryAndThread(); - //鍒濆鍖栧叏閮ㄦ埧闂� - HdlRoomLogic.Current.InitAllRoom(); + this.ShowProgressBar(); - Application.RunOnMainThread(() => - { - ShowForm(); - CommonPage.Loading.Hide(); - }); - }) - { IsBackground = true }.Start(); - } - catch (Exception ex) - { - Application.RunOnMainThread(() => + //鍒囨崲浣忓畢 + HdlResidenceLogic.Current.SwitchResidence(home.Id); + + HdlThreadLogic.Current.RunMain(() => { - CommonPage.Loading.Hide(); - Console.WriteLine(ex.Message); + //鍒锋柊鐣岄潰 + this.ShowForm(); + + this.CloseProgressBar(); }); - } + }); } #endregion @@ -1127,12 +1098,14 @@ { //鍒锋柊鍗$墖淇℃伅 var locadevice = LocalDevice.Current.GetDevice(mainKeys); - if (report.DeviceStatusReport.CluterID == 513 && report.DeviceStatusReport.AttriBute[0].AttributeId == 28) + //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉 2020.05.09:鍒犻櫎Ack涓婚 + this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu(); + //鍒锋柊鎺т欢 + if (locadevice.Type != DeviceType.IASZone) { - //绌鸿皟鏄壒娈婄殑,瀹冪殑寮�鍏虫槸灞炴�т笂鎶ユ潵鐫�.宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉 - this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu(); + //浼犳劅鍣ㄤ笉闇�瑕佸睘鎬т笂鎶�(浣嗘槸閭d釜鐞冨瀷浼犳劅鍣ㄥ眳鐒朵細灞炴�т笂鎶�) + this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice); } - this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice); } }, ShowErrorMode.NO); }); @@ -1146,25 +1119,9 @@ 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; - } - - }, ShowErrorMode.NO); - }); - - //璁惧鎺у埗鍙嶉涓婃姤 - HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceRespone", ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉, (report) => - { - HdlThreadLogic.Current.RunMain(() => - { - string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report); - if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true) - { - //璁惧鍗$墖 - var deviceCardContr = this.dicDeviceCardControl[mainKeys]; - //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉 - deviceCardContr.SetHadGetResponeResultStatu(); } }, ShowErrorMode.NO); @@ -1189,10 +1146,8 @@ string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report); if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true) { - //鏈湴璁惧瀵硅薄 - var locadevice = LocalDevice.Current.GetDevice(mainKeys); - //鍒锋柊鍗$墖淇℃伅 - this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice); + //寮�鍚崱鐗囬棯鐑佺壒鏁� + this.dicDeviceCardControl[mainKeys].StartCardLightAppeal(); } }, ShowErrorMode.NO); @@ -1208,14 +1163,17 @@ /// </summary> private void ShowSelectFloorForm(NormalViewControl btnFloor) { - var floorFL = new Device.Category.SelectFloor(); + var floorFL = new Category.SelectFloorForm(); + floorFL.CurFloorId = Config.Instance.Home.CurrentFloorId; this.AddChidren(floorFL); floorFL.Init(35, 153); - floorFL.changeFloor = true; floorFL.FloorAction = (floorId) => { - btnFloor.Text = Config.Instance.Home.GetFloorNameById(floorId); - HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom(); + btnFloor.Text = HdlResidenceLogic.Current.GetFloorNameById(floorId); + Config.Instance.Home.CurrentFloorId = floorId; + HdlRoomLogic.Current.NowMainPageRoom = HdlRoomLogic.Current.GetLoveRoom(); + //鍒嗙被鐣岄潰闇�瑕佸埛鏂� + UserView.UserPage.Instance.RefreshCategoryForm = true; this.ShowForm(); }; } @@ -1229,8 +1187,10 @@ /// </summary> public override void CloseFormBefore() { + //鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖ + Instance = null; + HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceOnline"); - HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceRespone"); HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceStatus"); HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewSensor"); @@ -1255,6 +1215,23 @@ return true; } + /// <summary> + /// 鍒濆鍖栭粯璁ゆゼ灞侷D + /// </summary> + private void InitDefultFloorId() + { + if (Config.Instance.Home.CurrentFloorId != string.Empty) + { + return; + } + var dicFloor = HdlRoomLogic.Current.GetFloorSortList(); + foreach (var floorId in dicFloor.Keys) + { + Config.Instance.Home.CurrentFloorId = floorId; + break; + } + } + #endregion #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________ -- Gitblit v1.8.0