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 | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs old mode 100755 new mode 100644 index c461c90..a425f9a --- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs +++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs @@ -54,10 +54,10 @@ public void ShowForm() { this.FormID = "HomeMainPageForm"; - Instance = this; - - //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲) - if (ListRoomViewFrom.Instance == null) { } + Instance = this; + + //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲) + if (LeftListRoomViewFrom.Instance == null) { } //鏁翠釜鑳屾櫙鐨勪笂涓嬫粦鍔ㄦ帶浠� if (this.listBodyContr == null) @@ -73,6 +73,9 @@ this.listBodyContr.frameTable.RemoveAll(); listBodyContr.RecoverTableHeight(); } + + //鍒濆鍖栭粯璁ゆゼ灞侷D + this.InitDefultFloorId(); //鍒濆鍖栧ご閮ㄦ帶浠� this.InitTopFrameLayoutControl(); @@ -129,6 +132,9 @@ this.ShowSelectFloorForm(btnFloorName); }; } + + //鍙瀵硅蹇嵎鏂瑰紡 + //Shared.Phone.Device.VideoIntercom.VideoMachine.AccountSupportVideo(topFrameLayout); //瀹夐槻蹇嵎鏂瑰紡 if (UserCenterResourse.ResidenceOption.SafetyShortcut) { @@ -403,10 +409,9 @@ 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; @@ -506,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) @@ -522,7 +527,7 @@ //閲嶇疆涓�涓嬫ゼ灞傚悕瀛� if (this.btnFloorName != null) { - btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(Config.Instance.Home.CurrentFloorId); + btnFloorName.Text = Config.Instance.Home.GetCurrentFloorName; } } @@ -1096,7 +1101,11 @@ //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉 2020.05.09:鍒犻櫎Ack涓婚 this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu(); //鍒锋柊鎺т欢 - this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice); + if (locadevice.Type != DeviceType.IASZone) + { + //浼犳劅鍣ㄤ笉闇�瑕佸睘鎬т笂鎶�(浣嗘槸閭d釜鐞冨瀷浼犳劅鍣ㄥ眳鐒朵細灞炴�т笂鎶�) + this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice); + } } }, ShowErrorMode.NO); }); @@ -1155,13 +1164,16 @@ private void ShowSelectFloorForm(NormalViewControl btnFloor) { 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 = HdlResidenceLogic.Current.GetFloorNameById(floorId); + Config.Instance.Home.CurrentFloorId = floorId; HdlRoomLogic.Current.NowMainPageRoom = HdlRoomLogic.Current.GetLoveRoom(); + //鍒嗙被鐣岄潰闇�瑕佸埛鏂� + UserView.UserPage.Instance.RefreshCategoryForm = true; this.ShowForm(); }; } @@ -1203,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