From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码

---
 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs |   35 +++++++++++++++++++++++++----------
 1 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs
index 22bd1ae..2b5184e 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs
@@ -29,7 +29,7 @@
             {
                 bool setStatu = !btnSwitch.IsSelected;
                 //鍙樻洿鍗$墖鐘舵��
-                this.SetCardStatu(setStatu);
+                this.SetCardOpenStatu(setStatu);
                 //妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
                 this.StartCheckResponeResult(!setStatu);
 
@@ -62,12 +62,24 @@
             {
                 Common.CommonPage.Instance.IsDrawerLockMode = true;
 
-                var lightControl = new Phone.Device.Light.OnOffControl();
-                UserView.HomePage.Instance.AddChidren(lightControl);
-                UserView.HomePage.Instance.PageIndex += 1;
-                lightControl.IsDrawerLockMode = true;
-                lightControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
-                lightControl.action += this.CardDetailInfoBackEvent;
+                int backHeight = 0;
+                if (i_device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+                {
+                    backHeight = 1290;
+                }
+                else if (i_device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+                {
+                    backHeight = 1290;
+                }
+                else
+                {
+                    backHeight = 1316;
+                }
+
+                //缁х數鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰(鍚┖姘斿紑鍏�)
+                var form = new ControlForm.DeviceRelayDetailCardForm();
+                form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);
+                form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
 
@@ -92,10 +104,13 @@
         /// <summary>
         /// 鍙戦�佽幏鍙栫姸鎬佸懡浠�
         /// </summary>
-        /// <param name="i_device"></param>
-        public override void SendStatuComand(CommonDevice i_device)
+        public override void SendStatuComand()
         {
-            Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendLightStatuComand(i_device);
+            //妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
+            if (this.CheckCanSendStatuComand() == true)
+            {
+                Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendLightStatuComand(this.device);
+            }
         }
 
         #endregion

--
Gitblit v1.8.0