From bfb3d0d4879dca8c59ff287c92f5113162f3a33a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 27 八月 2024 15:22:48 +0800
Subject: [PATCH] 代码备份
---
OnPro/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 111 +------------------------------------------------------
1 files changed, 3 insertions(+), 108 deletions(-)
diff --git a/OnPro/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/OnPro/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 7ff91dc..cd19410 100644
--- a/OnPro/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/OnPro/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -62,71 +62,14 @@
this.titleId = titleId_out;
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- if (titleId == StringId.Lights && !DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
- {
- 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();
- }
-
-
-
-#if DEBUG
- //Button testBtn = new Button()
- //{
- // X = Application.GetRealWidth(80),
- // Height = Application.GetRealHeight(64),
- // BackgroundColor = 0xFFFF0000
- //};
- //bodyView.AddChidren(testBtn);
- //int ddd = 0;
- //testBtn.MouseUpEventHandler = (sender, e) => {
- // ddd++;
-
- // Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
- // if (ddd % 2 == 0)
- // {
- // function_online.online = true;
- // }
- // else
- // {
- // function_online.online = false;
- // }
- // HomePage.LoadEvent_RefreshDevcieOnline(function_online);
- // FunctionPage.UpdataOnline(function_online);
- // RoomPage.UpdataOnline(function_online);
-
-
- //};
-#endif
+ new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
/// <summary>
/// 鎴块棿鍐呭鏄剧ず鍖哄煙
/// </summary>
var roomFloorChangeView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(74),
Height = Application.GetRealHeight(52),
};
bodyView.AddChidren(roomFloorChangeView);
@@ -167,10 +110,6 @@
//functionList.AddRange(FunctionList.List.groupControls);
functionList.AddRange(FunctionList.List.GetLightList());
}
- else if(titleId == StringId.HorseRaceLamp)
- {
- functionList.AddRange(FunctionList.List.GetSeries());
- }
else if (titleId == StringId.AC)
{
functionList.AddRange(FunctionList.List.GetAcList());
@@ -183,33 +122,9 @@
{
functionList.AddRange(FunctionList.List.GetFloorHeatingList());
}
- else if (titleId == StringId.Electric)
- {
- functionList.AddRange(FunctionList.List.GetElectricals());
- }
- else if (titleId == StringId.EnvironmentalScience)
- {
- functionList.AddRange(FunctionList.List.GetEnvirSensorsList());
- }
- else if (titleId == StringId.Sensor)
- {
- functionList.AddRange(FunctionList.List.GetArmSensorList());
- }
else if (titleId == StringId.FreshAir)
{
functionList.AddRange(FunctionList.List.GetAirFreshList());
- }
- else if (titleId == StringId.MechanicalArm)
- {
- functionList.AddRange(FunctionList.List.GetMechanicalArmList());
- }
- else if (titleId == StringId.SecurityMonitoring)
- {
- functionList.AddRange(FunctionList.List.GetIpCamImouList());
- }
- else if(titleId == StringId.EnergyMonitoring)
- {
- functionList.AddRange(FunctionList.List.GetEnergyList());
}
functionList = functionList.OrderByDescending(o => o.controlCounter).ToList();
@@ -271,10 +186,7 @@
}
var function = showList[showCount];
- if (function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
- {
- continue;
- }
+
if (function.spk == SPK.LightCCT || function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
var functionDiv = new FunctionControlZone(function,null)
@@ -291,23 +203,6 @@
functionDiv.LoadFunctionDiv();
functionDiv.OrderEvent = OrderEvent;
functionListView.AddChidren(functionDiv);
- }
- else if (function.spk == SPK.IpCam_Imou)
- {
- var functionDiv = new FunctionControlZone(function,null)
- {
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(96),
- Radius = (uint)Application.GetMinRealAverage(12),
- BorderColor = 0x00FFFFFF,
- BorderWidth = 1,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.spk + function.sid
- };
- functionDiv.LoadFunctionDiv();
- functionListView.AddChidren(functionDiv);
-
}
else
{
--
Gitblit v1.8.0