From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 94 ++++++++++++++++++++++++++---------------------
1 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 5ba2bed..219f44d 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -28,18 +28,21 @@
#endregion
List<Function> functionList;
+ int titleId;
public FunctionPage()
{
bodyView = this;
functionList = new List<Function>();
+
}
- public void LoadPage(int titleId)
+ public void LoadPage(int titleId_out)
{
+ this.titleId = titleId_out;
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- if (titleId == StringId.Lights)
+ if (titleId == StringId.Lights && !DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
{
Action action = () =>
{
@@ -141,17 +144,11 @@
if (titleId == StringId.Lights)
{
+ functionList.AddRange(FunctionList.List.groupControls);
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)
@@ -197,28 +194,13 @@
LoadDialog_ChangeFloor();
- #region 鍔犺浇缁勫悎璋冨厜鍦烘櫙
- if (titleId == StringId.Lights)
- {
- foreach (var lightScene in FunctionList.List.scenes)
- {
- if (lightScene.sceneType == SceneType.LightScene)
- if (lightScene != null)
- {
- functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
- var sceneRow = new SceneControlZone(lightScene);
- functionListView.AddChidren(sceneRow);
- sceneRow.LoadView();
- }
- }
- }
- #endregion
+
}
/// <summary>
/// 鏄剧ず鐨勮澶囩殑鎬绘暟
/// </summary>
- int showCount = 0;
+ int showCount = -1;
/// <summary>
/// 鍔犺浇鍔熻兘row
/// </summary>
@@ -236,18 +218,34 @@
{
if (!isAppend)
{
- showCount = 0;
+ showCount = -1;
functionListView.RemoveAll();
+ #region 鍔犺浇缁勫悎璋冨厜鍦烘櫙
+ if (titleId == StringId.Lights)
+ {
+ foreach (var lightScene in FunctionList.List.scenes)
+ {
+ if (lightScene.sceneType == SceneType.LightScene)
+ if (lightScene != null)
+ {
+ var sceneRow = new SceneControlZone(lightScene);
+ functionListView.AddChidren(sceneRow);
+ sceneRow.LoadView();
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+ }
+ }
+ }
+ #endregion
}
- int i = 0;
- foreach (var function in showList)
+ for (var i = 0;i<50;i++)
+ //foreach (var function in showList)
{
- i++;
- if (i > 50)
+ showCount++;
+ if (showCount >= showList.Count)
{
break;
}
- showCount++;
+ var function = showList[showCount];
if (function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
{
@@ -255,7 +253,7 @@
}
if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
- var functionDiv = new FunctionControlZone(function)
+ var functionDiv = new FunctionControlZone(function,null)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -267,11 +265,12 @@
Tag = function.spk + function.sid
};
functionDiv.LoadFunctionDiv();
+ functionDiv.OrderEvent = OrderEvent;
functionListView.AddChidren(functionDiv);
}
else if (function.spk == SPK.IpCam_Imou)
{
- var functionDiv = new FunctionControlZone(function)
+ var functionDiv = new FunctionControlZone(function,null)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -288,7 +287,7 @@
}
else
{
- var functionDiv = new FunctionControlZone(function)
+ var functionDiv = new FunctionControlZone(function,null)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -300,6 +299,7 @@
Tag = function.spk + function.sid
};
functionDiv.LoadFunctionDiv();
+ functionDiv.OrderEvent = OrderEvent;
functionListView.AddChidren(functionDiv);
}
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
@@ -312,12 +312,8 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "鍔犺浇鏇村",
+ TextID = StringId.LoadMore,
};
- if (Language.CurrentLanguage != "Chinese")
- {
- btnAppend.Text = "Load more";
- }
functionListView.AddChidren(btnAppend);
btnAppend.MouseUpEventHandler = (sender, e) =>
{
@@ -346,7 +342,21 @@
})
{ IsBackground = true }.Start();
}
-
+ /// <summary>
+ /// 鎺掑簭浜嬩欢
+ /// </summary>
+ void OrderEvent()
+ {
+ Action action = () =>
+ {
+ functionList = functionList.OrderBy(o => o.FunctionOrderNumber).ToList();
+ ShowFunctionRow(functionList);
+ };
+ var skipView = new OrderFunctionPage();
+ MainPage.BasePageView.AddChidren(skipView);
+ skipView.LoadPage(functionList, action);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
///// <summary>
///// 鍔犺浇鍔熻兘绫诲瀷鎺у埗鍗＄墖
--
Gitblit v1.8.0