From 8e4dd3cdef1348bcf1285576bb946afb85ce2526 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 08 十二月 2020 17:31:27 +0800
Subject: [PATCH] 增加分享设备的时候，判断当前房间分享设备总数，从而决定是否需要增加或者移除房间分享
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
index 8514193..bce99bf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
@@ -99,7 +99,7 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = fan.collection
+ IsSelected = fan.collect
};
controlView.AddChidren(btnCollection);
@@ -109,7 +109,7 @@
Y = Application.GetRealHeight(100),
Width = Application.GetRealWidth(198),
Height = Application.GetRealWidth(198),
- IsSelected = fan.on_off == "on",
+ IsSelected = fan.trait_on_off.curValue.ToString() == "on",
SelectedImagePath = "FunctionIcon/Electrical/FanIconBg.png",
UnSelectedImagePath = "FunctionIcon/Electrical/FanIconBgGray.png",
};
@@ -146,6 +146,7 @@
MinValue = 1,
MaxValue = 7,
Progress = 0,
+ SeekBarPadding = Application.GetRealWidth(20),
};
controlView.AddChidren(barGradualChange);
@@ -160,14 +161,14 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = fan.on_off == "on"
+ IsSelected = fan.trait_on_off.curValue.ToString() == "on"
};
controlView.AddChidren(btnSwitch);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView(fan, actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView_FunctionTop(fan, actionRefresh);
}
--
Gitblit v1.8.0