From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

---
 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs |   44 +++++++++++++++++---------------------------
 1 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index 79e9432..5784b2d 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -248,7 +248,8 @@
                 //鑷姩鍖�
                 else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)
                 {
-                    this.ShowAutotion();
+                    //鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
+                    Device.Logic.SkipView.ShowAutotionView(functionSceneAutoBodyView);
                     //闅愯棌妤煎眰
                     floorVisible = false;
                     //鏄剧ず鍙充笂瑙掔殑鍔犲彿
@@ -315,7 +316,7 @@
             functionSceneBodyView.Height = functionSceneAutoBodyView.Height - roomSwitchContr.Bottom;
             functionSceneAutoBodyView.AddChidren(functionSceneBodyView);
 
-            //鎵ц鍒濆鍖� 
+            //鎵ц鍒濆鍖�
             roomSwitchContr.InitControl();
         }
 
@@ -506,56 +507,56 @@
                     //绐楀笜
                     if (device.Type == DeviceType.WindowCoveringDevice)
                     {
-                        cardContr = new Controls.DeviceCurtainRowControl(listView.rowSpace / 2);
+                        cardContr = new Controls.DeviceCurtainRowControl();
                     }
                     //缁х數鍣�
                     else if (device.Type == DeviceType.OnOffOutput)
                     {
-                        cardContr = new Controls.DeviceRelayRowControl(listView.rowSpace / 2);
+                        cardContr = new Controls.DeviceRelayRowControl();
                     }
                     //绌烘皵寮�鍏�
                     else if (device.Type == DeviceType.AirSwitch)
                     {
-                        cardContr = new Controls.DeviceAirSwitchRowControl(listView.rowSpace / 2);
+                        cardContr = new Controls.DeviceAirSwitchRowControl();
                     }
                     //绌鸿皟
                     else if (device.Type == DeviceType.Thermostat)
                     {
-                        cardContr = new Controls.DeviceAcRowControl(listView.rowSpace / 2);
+                        cardContr = new Controls.DeviceAcRowControl();
                     }
                     // 鏂伴
                     else if (device.Type == DeviceType.FreshAir)
                     {
-                        cardContr = new Controls.DeviceFreshAirRowControl(listView.rowSpace / 2);
+                        cardContr = new Controls.DeviceFreshAirRowControl();
                     }
                     //褰╃伅(璋冨厜鍣�)
                     else if (device.Type == DeviceType.DimmableLight)
                     {
-                        cardContr = new Controls.DeviceColorLightRowControl(listView.rowSpace / 2);
+                        cardContr = new Controls.DeviceColorLightRowControl();
                     }
                     //浼犳劅鍣�
                     else if (device.Type == DeviceType.IASZone)
                     {
-                        cardContr = new Controls.DeviceSensorRowControl(listView.rowSpace / 2);
+                        cardContr = new Controls.DeviceSensorRowControl();
                     }
                     //娓╂箍搴�
                     else if (device.Type == DeviceType.TemperatureSensor)
                     {
-                        cardContr = new Controls.DeviceTemperatureRowControl(listView.rowSpace / 2);
+                        cardContr = new Controls.DeviceTemperatureRowControl();
                     }
                     //闂ㄩ攣
                     else if (device.Type == DeviceType.DoorLock)
                     {
-                        cardContr = new Controls.DeviceDoorLockRowControl(listView.rowSpace / 2);
+                        cardContr = new Controls.DeviceDoorLockRowControl();
                     }
                     //鏃犳硶璇嗗埆
                     else
                     {
-                        cardContr = new Controls.DeviceRowCommon(listView.rowSpace / 2);
+                        cardContr = new Controls.DeviceRowCommon();
                         //娌℃湁鐘舵�佸姛鑳�
                         cardContr.hadStatuFunction = false;
                     }
-
+                    cardContr.chidrenYaxis = listView.rowSpace / 2;
                     //鍒濆鍖栧崱鐗�
                     listView.AddChidren(cardContr);
                     cardContr.InitControl(device);
@@ -639,7 +640,7 @@
                 listview2 = new VerticalListControl();
                 functionSceneBodyView.AddChidren(listview2);
             }
-          
+
             foreach (var scene in listScene)
             {
                 //鍦烘櫙鍗＄墖鎺т欢
@@ -832,7 +833,8 @@
                     if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
                     {
                         //鍒锋柊鍗＄墖鐘舵��
-                        this.dicDeviceRowControl[mainKeys].SetRowOnlineStatu(report.IsOnline == 1);
+                        bool bolOnline = LocalDevice.Current.CheckDeviceIsOnline(report);
+                        this.dicDeviceRowControl[mainKeys].SetRowOnlineStatu(bolOnline);
                         return;
                     }
 
@@ -1009,18 +1011,6 @@
             /// 璁惧鍥炶矾涓婚敭
             /// </summary>
             public List<string> listDeviceKeys = new List<string>();
-        }
-
-        #endregion
-
-        #region 鈼� 鑷姩鍖朹_________________________
-
-        /// <summary>
-        /// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
-        /// </summary>
-        private void ShowAutotion()
-        {
-            Shared.Phone.Device.Logic.SkipView.ShowAutotionView(functionSceneAutoBodyView);
         }
 
         #endregion

--
Gitblit v1.8.0