From 18a7f9f40e5fab3bee5d4ac3d8fd0273dea052d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期日, 26 四月 2020 12:05:28 +0800
Subject: [PATCH] 先上传一个非最新的版本
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
index f764ca3..757165b 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Shared.Phone.UserCenter;
+using System;
using System.Collections.Generic;
using System.Text;
using ZigBee.Device;
@@ -60,12 +61,12 @@
//娣卞害鍗＄墖淇℃伅
this.ButtonClickEvent += (sender, e) =>
{
- var dimmableLightControl = new Phone.Device.Light.DimmableLightControl();
- UserView.HomePage.Instance.AddChidren(dimmableLightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- dimmableLightControl.IsDrawerLockMode = true;
- dimmableLightControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- dimmableLightControl.action += this.CardDetailInfoBackEvent;
+ Common.CommonPage.Instance.IsDrawerLockMode = true;
+
+ //褰╃伅,璋冨厜鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰
+ var form = new ControlForm.DeviceColorLightDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
@@ -95,7 +96,7 @@
//妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
if (this.CheckCanSendStatuComand() == true)
{
- Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(this.device);
+ HdlDeviceAttributeLogic.Current.SendDimmableLightStatuComand(this.device);
}
}
--
Gitblit v1.8.0