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 |  113 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 69 insertions(+), 44 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
old mode 100755
new mode 100644
index 13b308f..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)
             {
@@ -165,7 +176,8 @@
                     selectHouse.Init();
                     selectHouse.HouseAction = (houseId) =>
                     {
-                        ChangeResidence(House.GetHouseByHouseId(houseId));
+                        //鍒囨崲浣忓畢
+                        this.ChangeResidence(HdlResidenceLogic.Current.GetHouseByHouseId(houseId));
                     };
                 }
             };
@@ -250,7 +262,7 @@
             }
 
             //鍔熻兘鍜屽満鏅痓odyView
-            this.bodyFrameLayout = new FrameLayout();
+            this.bodyFrameLayout = new NormalFrameLayout();
             bodyFrameLayout.Y = functionSceneView.Bottom;
             bodyFrameLayout.Height = this.listBodyContr.frameTable.Height - functionSceneView.Bottom;
             bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
@@ -397,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;
@@ -500,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)
@@ -516,7 +527,7 @@
             //閲嶇疆涓�涓嬫ゼ灞傚悕瀛�
             if (this.btnFloorName != null)
             {
-                btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(Config.Instance.Home.CurrentFloorId);
+                btnFloorName.Text = Config.Instance.Home.GetCurrentFloorName;
             }
         }
 
@@ -634,6 +645,11 @@
                     else if (device.Type == DeviceType.DoorLock)
                     {
                         cardContr = new Controls.DeviceDoorLockCardControl();
+                    }
+                    //鑹叉俯鐏�
+                    else if (device.Type == DeviceType.ColorTemperatureLight)
+                    {
+                        cardContr = new Controls.DeviceColorTemperatureCardControl();
                     }
                     //鏃犳硶璇嗗埆
                     else
@@ -1045,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();
+                this.ShowProgressBar();
 
-                    Application.RunOnMainThread(() =>
-                    {
-                        //鍒锋柊鐣岄潰
-                        this.ShowForm();
+                //鍒囨崲浣忓畢
+                HdlResidenceLogic.Current.SwitchResidence(home.Id);
 
-                        CommonPage.Loading.Hide();
-                    });
-                })
-                { IsBackground = true }.Start();
-            }
-            catch (Exception ex)
-            {
-                Application.RunOnMainThread(() =>
+                HdlThreadLogic.Current.RunMain(() =>
                 {
-                    CommonPage.Loading.Hide();
-                    Console.WriteLine(ex.Message);
+                    //鍒锋柊鐣岄潰
+                    this.ShowForm();
+
+                    this.CloseProgressBar();
                 });
-            }
+            });
         }
 
         #endregion
@@ -1100,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);
             });
@@ -1141,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);
@@ -1161,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 = Config.Instance.Home.GetFloorNameById(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();
             };
         }
@@ -1181,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");
 
@@ -1207,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