From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
index 757165b..0fda2b2 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
@@ -17,9 +17,9 @@
/// 鍒濆鍖栨帶浠�
/// </summary>
/// <param name="i_device"></param>
- public override void InitControl(CommonDevice i_device)
+ public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
{
- base.InitControl(i_device);
+ base.InitControl(i_device, i_nowSelectRoom);
//娣诲姞璺宠浆娣卞害鍗＄墖淇℃伅浜嬩欢
this.AddDetailInfoEvent(i_device);
@@ -28,6 +28,14 @@
var btnSwitch = this.AddSwitchControl();
btnSwitch.ButtonClickEvent += (sender, e) =>
{
+ //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ //鐩存帴鍙樻洿缂撳瓨
+ ((LightBase)i_device).OnOffStatus = btnSwitch.IsSelected == true ? 0 : 1;
+ this.RefreshControlInfo(this.device);
+ return;
+ }
bool setStatu = !btnSwitch.IsSelected;
//鍙樻洿鍗＄墖鐘舵��
this.SetCardOpenStatu(setStatu);
@@ -65,7 +73,8 @@
//褰╃伅,璋冨厜鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰
var form = new ControlForm.DeviceColorLightDetailCardForm();
- form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+ form.RowOrCardControl = this;
+ form.AddForm(i_device, this.nowSelectRoom, 965, 1316);
form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
@@ -93,6 +102,11 @@
/// </summary>
public override void SendStatuComand()
{
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,鍒欐鍔熻兘鏃犳晥
+ return;
+ }
//妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
if (this.CheckCanSendStatuComand() == true)
{
--
Gitblit v1.8.0