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 |  230 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 175 insertions(+), 55 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 0af5488..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)
@@ -182,61 +179,184 @@
             {
                 functionList.AddRange(FunctionList.List.GetAirFreshList());
             }
-            functionList.OrderByDescending(o => o.controlCounter).ToList();
+            else if(titleId == StringId.MechanicalArm)
+            {
+                functionList.AddRange(FunctionList.List.GetMechanicalArmList());
+            }
+            else if(titleId == StringId.SecurityMonitoring)
+            {
+                functionList.AddRange(FunctionList.List.GetIpCamImouList());
+            }
+            functionList = functionList.OrderByDescending(o => o.controlCounter).ToList();
 
             ShowFunctionRow(functionList);
 
             LoadDialog_ChangeFloor();
-        }
 
+
+        
+
+        }
+        /// <summary>
+        /// 鏄剧ず鐨勮澶囩殑鎬绘暟
+        /// </summary>
+        int showCount = -1;
         /// <summary>
         /// 鍔犺浇鍔熻兘row
         /// </summary>
-        void ShowFunctionRow(List<Function> showList)
+        void ShowFunctionRow(List<Function> showList, bool isAppend = false)
         {
-            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)
-                    {
-                        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 = function.spk + function.sid
-                    };
-                    functionDiv.LoadFunctionDiv();
-                    functionListView.AddChidren(functionDiv);
-                }
-                else
-                {
-                    var functionDiv = new FunctionControlZone(function)
-                    {
-                        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);
-                }
-                functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
-            }
-        }
+            var waitPage = new Loading();
+            bodyView.AddChidren(waitPage);
+            waitPage.Start("");
 
+            new System.Threading.Thread(() =>
+            {
+                try
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (!isAppend)
+                        {
+                            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
+                        }
+                        for (var i = 0;i<50;i++)
+                        //foreach (var function in showList)
+                        {
+                            showCount++;
+                            if (showCount >= showList.Count)
+                            {
+                                break;
+                            }
+                            var function = showList[showCount];
+
+                            if (function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
+                            {
+                                continue;
+                            }
+                            if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
+                            {
+                                var functionDiv = new FunctionControlZone(function,null)
+                                {
+                                    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 = function.spk + function.sid
+                                };
+                                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
+                            {
+                                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();
+                                functionDiv.OrderEvent = OrderEvent;
+                                functionListView.AddChidren(functionDiv);
+                            }
+                            functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
+                        }
+                        if (showList.Count > showCount)
+                        {
+                            var btnAppend = new Button()
+                            {
+                                Height = Application.GetRealHeight(60),
+                                TextAlignment = TextAlignment.Center,
+                                TextSize = CSS_FontSize.SubheadingFontSize,
+                                TextColor = CSS_Color.FirstLevelTitleColor,
+                                TextID = StringId.LoadMore,
+                            };
+                            functionListView.AddChidren(btnAppend);
+                            btnAppend.MouseUpEventHandler = (sender, e) =>
+                            {
+                                btnAppend.RemoveFromParent();
+                                ShowFunctionRow(showList, true);
+                            };
+                        }
+
+                    });
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log("ShowFunctionRowError : " + ex.Message);
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
+                    });
+                }
+            })
+            { 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