From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01

---
 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs |   67 +++++++++++++++++++++++++++++----
 1 files changed, 58 insertions(+), 9 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..01d33a7
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -6,6 +6,7 @@
 using System.Text;
 using ZigBee.Device;
 
+
 namespace Shared.Phone.MainPage
 {
     /// <summary>
@@ -15,6 +16,10 @@
     {
         #region 鈻� 鍙橀噺澹版槑___________________________
 
+        /// <summary>
+        /// The instance.
+        /// </summary>
+        public static HomeMainPageForm Instance;
         /// <summary>
         /// 鏁翠釜鐣岄潰鐨勪笂涓嬫粦鍔ㄦ帶浠�
         /// </summary>
@@ -49,6 +54,9 @@
         /// </summary>
         public void ShowForm()
         {
+            this.FormID = "HomeMainPageForm";
+            Instance = this;
+            
             //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲)
             if (ListRoomViewFrom.Instance == null) { }
 
@@ -75,15 +83,16 @@
             this.AddNormalDeviceReportEvent();
             //娣诲姞浼犳劅鍣ㄧ姸鎬佷笂鎶ヤ簨浠�
             this.AddSensorDeviceReportEvent();
-            //灏嗗綋鍓嶇殑鐢婚潰淇濆瓨鍒板唴瀛樺綋涓�
-            UserCenterLogic.AddActionForm(this);
         }
 
         /// <summary>
         /// 鍒濆鍖栧ご閮ㄦ帶浠�
         /// </summary>
         private void InitTopFrameLayoutControl()
-        {
+        {
+
+        
+
             //澶撮儴瀹瑰櫒
             base.topFrameLayout = new FrameLayout();
             topFrameLayout.Y = Application.GetRealHeight(60);
@@ -123,8 +132,37 @@
                     //鏄剧ず閫夋嫨妤煎眰鐨勭晫闈�
                     this.ShowSelectFloorForm(btnFloorName);
                 };
-            }
-            //瀹夐槻蹇嵎鏂瑰紡
+            }
+
+            //鍙瀵硅蹇嵎鏂瑰紡
+            Shared.Phone.Device.VideoIntercom.VideoMachine.AccountSupportVideo(topFrameLayout);
+
+            //var videoIntercomBtn = new Button();
+            //videoIntercomBtn.Gravity = Gravity.CenterVertical;
+            //videoIntercomBtn.UnSelectedImagePath = "Item/videoIntercom.png";
+            //videoIntercomBtn.Width = Application.GetMinRealAverage(69);
+            //videoIntercomBtn.Height = Application.GetMinRealAverage(69);
+            //topFrameLayout.AddChidren(videoIntercomBtn);
+            //if (UserCenterResourse.ResidenceOption.SafetyShortcut)
+            //{
+            //    videoIntercomBtn.X = Application.GetRealWidth(746+10);
+            //}
+            //else
+            //{
+            //    videoIntercomBtn.X = Application.GetRealWidth(850+10);
+            //}
+            //videoIntercomBtn.MouseUpEventHandler += (sender, e) =>
+            //{
+            //    var videoMachine = new Device.VideoIntercom.VideoMachine();
+            //    UserView.HomePage.Instance.AddChidren(videoMachine);
+            //    UserView.HomePage.Instance.PageIndex += 1;
+            //    videoMachine.Show();
+            //};
+
+           
+
+
+            //瀹夐槻蹇嵎鏂瑰紡
             if (UserCenterResourse.ResidenceOption.SafetyShortcut)
             {
                 var btnSafety = new Controls.SafetyShortcutControl();
@@ -132,6 +170,10 @@
                 btnSafety.Gravity = Gravity.CenterVertical;
                 topFrameLayout.AddChidren(btnSafety);
             }
+
+
+
+
             //娑堟伅鍥炬爣
             var btnMessage = new MessageManagementControl();
             btnMessage.X = Application.GetRealWidth(953);
@@ -165,7 +207,7 @@
                     selectHouse.Init();
                     selectHouse.HouseAction = (houseId) =>
                     {
-                        ChangeResidence(House.GetHouseByHouseId(houseId));
+                        ChangeResidence(HdlResidenceLogic.Current.GetHouseByHouseId(houseId));
                     };
                 }
             };
@@ -635,6 +677,11 @@
                     {
                         cardContr = new Controls.DeviceDoorLockCardControl();
                     }
+                    //鑹叉俯鐏�
+                    else if (device.Type == DeviceType.ColorTemperatureLight)
+                    {
+                        cardContr = new Controls.DeviceColorTemperatureCardControl();
+                    }
                     //鏃犳硶璇嗗埆
                     else
                     {
@@ -1051,7 +1098,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 +1213,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 +1228,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