From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
index 3c8eef1..1c96354 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
@@ -31,7 +31,8 @@
#endregion
#region 鍖哄煙鍙橀噺
- Fan fan;
+ Fan fanTemp = new Fan();
+ Function function;
Button btnCollection_Out;
Button btnFunctionName_Out;
Button btnFromFloor_Out;
@@ -44,7 +45,7 @@
public FanPage(Function func)
{
bodyView = this;
- fan = func as Fan;
+ function = func;
}
@@ -74,7 +75,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- Text = fan.name,
+ Text = function.name,
};
controlView.AddChidren(btnFunctionName);
@@ -87,7 +88,7 @@
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = fan.GetRoomListName()
+ Text = function.GetRoomListName()
};
controlView.AddChidren(btnFromFoorAndRoom);
@@ -99,9 +100,14 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = fan.collection
+ IsSelected = function.collect
};
controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
btnSwitchIcon = new Button()
{
@@ -109,7 +115,7 @@
Y = Application.GetRealHeight(100),
Width = Application.GetRealWidth(198),
Height = Application.GetRealWidth(198),
- IsSelected = fan.trait_on_off.value.ToString() == "on",
+ IsSelected = function.trait_on_off.curValue.ToString() == "on",
SelectedImagePath = "FunctionIcon/Electrical/FanIconBg.png",
UnSelectedImagePath = "FunctionIcon/Electrical/FanIconBgGray.png",
};
@@ -146,6 +152,7 @@
MinValue = 1,
MaxValue = 7,
Progress = 0,
+ SeekBarPadding = Application.GetRealWidth(20),
};
controlView.AddChidren(barGradualChange);
@@ -160,15 +167,19 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = fan.trait_on_off.value.ToString() == "on"
+ IsSelected = function.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(function, actionRefresh);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(function);
+ })
+ { IsBackground = true }.Start();
}
}
--
Gitblit v1.8.0