From 5da99fed2eb0d08b6338064da5f998891252c7b8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 16:39:59 +0800
Subject: [PATCH] 2020-05-18-2
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs
index 20ec7b1..fecfda3 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Shared.Phone.UserCenter;
+using System;
using System.Collections.Generic;
using System.Text;
using ZigBee.Device;
@@ -27,9 +28,18 @@
var btnSwitch = this.AddSwitchControl();
btnSwitch.ButtonClickEvent += (sender, e) =>
{
+ //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ //鐩存帴鍙樻洿缂撳瓨
+ ((AC)i_device).currentSystemMode = btnSwitch.IsSelected == true ? 0 : 3;
+ this.RefreshControlInfo(this.device);
+ return;
+ }
+
bool setStatu = !btnSwitch.IsSelected;
//鍙樻洿鍗＄墖鐘舵��
- this.SetCardStatu(setStatu);
+ this.SetCardOpenStatu(setStatu);
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
this.StartCheckResponeResult(!setStatu);
@@ -62,12 +72,10 @@
{
Common.CommonPage.Instance.IsDrawerLockMode = true;
- var lightControl = new Phone.Device.AC.ACControl();
- 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;
+ //绌鸿皟绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
+ var form = new ControlForm.DeviceAcDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1457);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
@@ -92,10 +100,18 @@
/// <summary>
/// 鍙戦�佽幏鍙栫姸鎬佸懡浠�
/// </summary>
- /// <param name="i_device"></param>
- public override void SendStatuComand(CommonDevice i_device)
+ public override void SendStatuComand()
{
- Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendACStatuComand(i_device);
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,鍒欐鍔熻兘鏃犳晥
+ return;
+ }
+ //妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
+ if (this.CheckCanSendStatuComand() == true)
+ {
+ HdlDeviceAttributeLogic.Current.SendACStatuComand(this.device);
+ }
}
#endregion
--
Gitblit v1.8.0