From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 155 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 47a64cc..3db5ac0 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -38,8 +38,33 @@
public void LoadPage(int titleId)
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
+ if (titleId == StringId.Lights)
+ {
+ Action action = () =>
+ {
+ Action<Scene > refreshAction = (outScene) => {
+ if (outScene != null)
+ {
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+
+ var sceneRow = new SceneControlZone(outScene);
+ functionListView.AddChidren(sceneRow);
+ sceneRow.LoadView();
+ }
+ };
+
+ var skipView = new AddLightScene(new List<Function>(), new Scene() { sceneType = SceneType.LightScene }, refreshAction);
+ MainPage.BasePageView.AddChidren(skipView);
+ skipView.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_LightFunction(action);
+ }
+ else
+ {
+ new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
+ }
/// <summary>
/// 鎴块棿鍐呭鏄剧ず鍖哄煙
/// </summary>
@@ -84,6 +109,17 @@
if (titleId == StringId.Lights)
{
functionList.AddRange(FunctionList.List.GetLightList());
+ var lightScene = FunctionList.List.scenes.FindAll((obj) => obj.sceneType == SceneType.LightScene);
+
+ foreach (var scene in lightScene)
+ {
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+
+ var sceneRow = new SceneControlZone(scene);
+ functionListView.AddChidren(sceneRow);
+ sceneRow.LoadView();
+ }
+
}
else if (titleId == StringId.AC)
{
@@ -128,7 +164,10 @@
functionListView.RemoveAll();
foreach (var function in showList)
{
-
+ if(function.spk == SPK.SensorDryContact|| function.spk == SPK.SensorDryContact2)
+ {
+ continue;
+ }
if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
var functionDiv = new FunctionControlZone(function)
@@ -166,6 +205,120 @@
}
+ ///// <summary>
+ ///// 鍔犺浇鍔熻兘绫诲瀷鎺у埗鍗＄墖
+ ///// </summary>
+ //public void LoadSceneRow(Scene scene)
+ //{
+ // var bodyDiv = new FrameLayout()
+ // {
+ // Gravity = Gravity.CenterHorizontal,
+ // Width = Application.GetRealWidth(343),
+ // Height = Application.GetRealHeight(116),
+ // Radius = (uint)Application.GetMinRealAverage(12),
+ // BorderColor = 0x00FFFFFF,
+ // BorderWidth = 1,
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ // Tag = "Scene-" + scene.sid
+ // };
+ // functionListView.AddChidren(bodyDiv);
+
+ // var btnIcon = new Button()
+ // {
+ // X = Application.GetRealWidth(10),
+ // Y = Application.GetRealHeight(15),
+ // Width = Application.GetRealWidth(32),
+ // Height = Application.GetRealWidth(32),
+ // };
+ // bodyDiv.AddChidren(btnIcon);
+
+ // var btnName = new Button()
+ // {
+ // X = Application.GetRealWidth(8 + 10 + 32),
+ // Y = Application.GetRealHeight(10),
+ // Width = Application.GetRealWidth(200),
+ // Height = Application.GetRealHeight(24),
+ // Text = scene.name,
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.TextFontSize,
+ // };
+ // bodyDiv.AddChidren(btnName);
+
+ // var btnFromFloor = new Button()
+ // {
+ // X = Application.GetRealWidth(8 + 10 + 32),
+ // Y = Application.GetRealHeight(10 + 24),
+ // Width = Application.GetRealWidth(200),
+ // Height = Application.GetRealHeight(18),
+ // Text = scene.GetRoomListName(),
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.PromptingColor1,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // };
+ // bodyDiv.AddChidren(btnFromFloor);
+
+ // var btnCollectionIcon = new Button()
+ // {
+ // X = Application.GetRealWidth(299),
+ // Y = Application.GetRealHeight(10),
+ // Width = Application.GetMinRealAverage(40),
+ // Height = Application.GetMinRealAverage(40),
+ // SelectedImagePath = "Collection/CollectionIcon.png",
+ // UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
+ // IsSelected = scene.collect
+ // };
+ // bodyDiv.AddChidren(btnCollectionIcon);
+
+ // btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
+ // if (scene.sceneType == SceneType.MovieScene)
+ // {
+ // var movieIcon = new Button()
+ // {
+ // X = Application.GetRealWidth(52),
+ // Y = Application.GetRealHeight(14),
+ // Width = Application.GetRealWidth(16),
+ // Height = Application.GetRealWidth(16),
+ // UnSelectedImagePath = "FunctionIcon/Scene/MovieMark.png",
+ // };
+ // bodyDiv.AddChidren(movieIcon);
+ // btnName.X = Application.GetRealWidth(52 + 16);
+ // }
+ // //鍔犺浇鍦烘櫙鎺у埗浜嬩欢
+ // LoadEvent_ControlScene(btnName, btnFromFloor, bodyDiv, scene);
+
+ // LoadEvent_FunctionCollection(btnCollectionIcon, scene);
+ //}
+
+
+ ///// <summary>
+ ///// 鍔犺浇鍔熻兘鏀惰棌鎸夐挳浜嬩欢
+ ///// </summary>
+ //void LoadEvent_FunctionCollection(Button btnCollectionIcon, Scene scene)
+ //{
+ // btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
+ // {
+ // btnCollectionIcon.IsSelected = scene.collect = !btnCollectionIcon.IsSelected;
+ // scene.CollectScene();
+ // };
+ //}
+ ///// <summary>
+ ///// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
+ ///// </summary>
+ //void LoadEvent_ControlScene(Button btnName, Button btnFromFloor, FrameLayout bodyDiv, Scene scene)
+ //{
+ // EventHandler<MouseEventArgs> upEvent = (sender, e) => {
+ // DriverLayer.Control.Ins.ControlScene(scene);
+ // string msg = scene.name + Language.StringByID(StringId.AlreadyOpened);
+ // new PublicAssmebly().TipMsgAutoClose(msg, false);
+ // };
+ // btnName.MouseUpEventHandler = upEvent;
+ // btnFromFloor.MouseUpEventHandler = upEvent;
+ // bodyDiv.MouseUpEventHandler = upEvent;
+ //}
+
+
+
/// <summary>
/// 浣忓畢鍒楄〃鐐瑰嚮浜嬩欢
/// </summary>
--
Gitblit v1.8.0