From ec34983e291d1c85284472a27109d55891f9a6b5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 07 八月 2020 16:20:16 +0800
Subject: [PATCH] 不是新代码,别 合并

---
 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
index 9e3b374..8313777 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
@@ -47,6 +47,12 @@
                     //鎵撳紑
                     this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
                     i_device.SwitchControl(1);
+                    HdlThreadLogic.Current.RunThread(() =>
+                    {
+                        //鑾峰彇鐏厜浜害
+                        System.Threading.Thread.Sleep(300);
+                        HdlDeviceAttributeLogic.Current.SendLevelStatuComand(i_device);
+                    });
                 }
                 else
                 {
@@ -71,22 +77,11 @@
             {
                 Common.CommonPage.Instance.IsDrawerLockMode = true;
 
-                //濡傛灉鏄疢ini澶滅伅
-                if (Common.LocalDevice.Current.IsMiniLight(i_device) == true)
-                {
-                    var form = new ControlForm.DeviceMiniLightDetailCardForm();
-                    form.RowOrCardControl = this;
-                    form.AddForm(i_device, this.nowSelectRoom, 965, 1466);
-                    form.FormCloseEvent += this.CardDetailInfoBackEvent;
-                }
-                else
-                {
-                    //褰╃伅,璋冨厜鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰
-                    var form = new ControlForm.DeviceColorLightDetailCardForm();
-                    form.RowOrCardControl = this;
-                    form.AddForm(i_device, this.nowSelectRoom, 965, 1316);
-                    form.FormCloseEvent += this.CardDetailInfoBackEvent;
-                }
+                //褰╃伅,璋冨厜鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰
+                var form = new ControlForm.DeviceColorLightDetailCardForm();
+                form.RowOrCardControl = this;
+                form.AddForm(i_device, this.nowSelectRoom, 965, 1316);
+                form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
 

--
Gitblit v1.8.0