From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
index 94419b3..0a32222 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
@@ -8,7 +8,7 @@
{
#region 鎺т欢闆嗗悎
- FrameLayout bodyView;
+ static CurtainModulePage bodyView;
/// <summary>
/// 鍔熻兘鍚嶇О鎸夐挳
/// </summary>
@@ -40,7 +40,7 @@
#endregion
#region 鍖哄煙鍙橀噺
- Function function;
+ Curtain curtain;
Button btnCollection_Out;
Button btnFunctionName_Out;
Button btnFromFloor_Out;
@@ -49,10 +49,10 @@
/// </summary>
Action actionRefresh;
#endregion
- public CurtainModulePage(Function func)
+ public CurtainModulePage(Curtain func)
{
bodyView = this;
- function = func;
+ curtain = func;
}
public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
@@ -81,7 +81,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- Text = function.name,
+ Text = curtain.name,
};
controlView.AddChidren(btnFunctionName);
@@ -94,7 +94,7 @@
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = function.GetRoomListName()
+ Text = curtain.GetRoomListName()
};
controlView.AddChidren(btnFromFoorAndRoom);
@@ -106,9 +106,14 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = function.collection
+ IsSelected = curtain.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
btnCurtainBgIcon = new Button()
{
@@ -129,6 +134,7 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
+ IsSelected = curtain.trait_on_off.curValue.ToString() == "off",
};
controlView.AddChidren(btnCurtainClose);
@@ -140,6 +146,7 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainStopIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainStopOnIcon.png",
+ IsSelected = curtain.trait_on_off.curValue.ToString() == "stop",
};
controlView.AddChidren(btnCurtainStop);
@@ -151,11 +158,17 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
+ IsSelected = curtain.trait_on_off.curValue.ToString() == "on",
};
controlView.AddChidren(btnCurtainOpen);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(function, actionRefresh);
+ new TopViewDiv(bodyView,Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain, actionRefresh);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(curtain);
+ })
+ { IsBackground = true }.Start();
}
}
--
Gitblit v1.8.0