From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12
---
ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index aeccb00..5c0822a 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -54,6 +54,7 @@
/// </summary>
public CategoryMainForm()
{
+ this.FormID = "CategoryMainForm";
BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
instance = this;
}
@@ -161,7 +162,7 @@
floors.changeFloor = true;
floors.FloorAction += (floorId) =>
{
- btnFloorName.Text = Config.Instance.Home.GetFloorNameById(floorId);
+ btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(floorId);
HdlRoomLogic.Current.NowCategoryRoom = HdlRoomLogic.Current.GetLoveRoom();
//鍒锋柊bodyView
this.RefreshBodyView();
@@ -532,6 +533,11 @@
{
cardContr = new Controls.DeviceDoorLockRowControl();
}
+ //鑹叉俯鐏�
+ else if (device.Type == DeviceType.ColorTemperatureLight)
+ {
+ cardContr = new Controls.DeviceColorTemperatureRowControl();
+ }
//鏃犳硶璇嗗埆
else
{
@@ -605,6 +611,20 @@
//涓嬫媺鍒锋柊
listview1.BeginHeaderRefreshingAction += () =>
{
+ //濡傛灉褰撳墠鏄櫄鎷熶綇瀹�,鍒欏彧缁欎釜鐗规晥
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ System.Threading.Thread.Sleep(1500);
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ listview1.EndHeaderRefreshing();
+ });
+ });
+ return;
+ }
+
HdlThreadLogic.Current.RunThread(() =>
{
//浠庣綉鍏冲埛鏂板満鏅垪琛�
@@ -783,7 +803,7 @@
private void AddNormalDeviceReportEvent()
{
//璁惧灞炴�т笂鎶�(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceStatus", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("CategoryMainFormDeviceStatus", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -802,7 +822,7 @@
});
//璁惧鍦ㄧ嚎涓婃姤(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceOnline", ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤, (report) =>
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("CategoryMainFormDeviceOnline", ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤, (report) =>
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -829,7 +849,7 @@
private void AddSensorDeviceReportEvent()
{
//浼犳劅鍣ㄤ笂鎶�(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewSensor", ReceiveComandDiv.A浼犳劅鍣ㄤ笂鎶�, (report) =>
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("CategoryMainFormSensor", ReceiveComandDiv.A浼犳劅鍣ㄤ笂鎶�, (report) =>
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -904,6 +924,9 @@
{
//鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
instance = null;
+ HdlGatewayReceiveLogic.Current.RemoveEvent("CategoryMainFormDeviceStatus");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("CategoryMainFormDeviceOnline");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("CategoryMainFormSensor");
base.CloseFormBefore();
}
--
Gitblit v1.8.0