From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs
index a5d24f0..60fe1f3 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.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,10 +77,21 @@
{
Common.CommonPage.Instance.IsDrawerLockMode = true;
- var form = new ControlForm.DeviceColorTemperatureLightDetailCardForm();
- form.RowOrCardControl = this;
- form.AddForm(i_device, this.nowSelectRoom, 965, 1466);
- form.FormCloseEvent += this.CardDetailInfoBackEvent;
+ if (Common.LocalDevice.Current.IsMiniLight(this.device) == false)
+ {
+ var form = new ControlForm.DeviceColorTemperatureLightDetailCardForm();
+ form.RowOrCardControl = this;
+ form.AddForm(i_device, this.nowSelectRoom, 965, 1466);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
+ }
+ else
+ {
+ //mini澶滅伅
+ var form = new ControlForm.DeviceMiniLightDetailCardForm();
+ form.RowOrCardControl = this;
+ form.AddForm(i_device, this.nowSelectRoom, 965, 1466);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
+ }
};
}
--
Gitblit v1.8.0