From 43c70fc6de6ac0710c5e89b591c2d141c4e1ff93 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 03 一月 2024 16:45:32 +0800
Subject: [PATCH] 版本信息更新

---
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs |   52 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 71742c1..da78089 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -717,9 +717,9 @@
 
                         functionCount = FunctionList.List.GetElectricals().Count;
                         functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.spk!=SPK.ElectricalTvHisense&&obj.trait_on_off.curValue.ToString() == "on").Count;
-#if DEBUG
-                        functionCount = 1;
-#endif
+//#if DEBUG
+//                        functionCount = 1;
+//#endif
                         #endregion
                         break;
                     case ShowFunction.EnergyMonitoring:
@@ -748,7 +748,14 @@
                     case ShowFunction.SecurityMonitoring:
                         if (!MainPage.NoLoginMode)
                         {
-                            functionCount = 1;
+                            if (OnAppConfig.Instance.RequestHttpsHost.Contains("bahrain"))
+                            {
+                                functionCount = 0;
+                            }
+                            else
+                            {
+                                functionCount = 1;
+                            }
                         }
                         break;
                     case ShowFunction.Sensor:
@@ -775,9 +782,6 @@
                         break;
                     case ShowFunction.Aks:
                         functionCount = FunctionList.List.GetVideoControlsList().Count;
-#if DEBUG
-                        functionCount = 1;
-#endif
                         functionOnCount = 1;
                         break;
 
@@ -834,8 +838,10 @@
                     TextAlignment = TextAlignment.CenterLeft,
                     IsMoreLines = true,
                 };
-                functionView.AddChidren(btnName); 
+                functionView.AddChidren(btnName);
+
                 //涓嶉渶瑕佹樉绀鸿澶囧紑鐘舵�佹暟閲�;
+                Button btnFunctionCount=null;
                 if (item != ShowFunction.Aks
                     && item != ShowFunction.VideoDoorLock
                     && item != ShowFunction.Environmental
@@ -849,7 +855,7 @@
                     && item != ShowFunction.Acst && item != ShowFunction.IpCam
                     && functionCount != 0)
                 {
-                    Button btnFunctionCount = new Button()
+                    btnFunctionCount = new Button()
                     {
                         X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
                         Y = btnName.Bottom,
@@ -1213,21 +1219,21 @@
                         {
                             var list =CommonMethod.Current.GetVideoDoorLockList();
                             var form = new VideoDoorLockListPage(()=> {
-                                functionContentView?.RemoveFromParent();
-                                this.RefreshFunctionView();
+                                UpdateBottomView();
                             });
                             form.AddForm(list);
                         };
                         break;
                     case ShowFunction.Aks:
+
+                        btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/AksFunctionBg.png";
                         //鍩冨厠鏂奖闊充腑鎺�
                         btnName.TextID = StringId.jiatingyingyuan;
                         btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                         {
                             var list = HDL_ON.UI.UI2.FuntionControlView.Aks.AksCommonMethod.Current.GetVideoControlsList();
                             var form = new HDL_ON.UI.UI2.FuntionControlView.Aks.AksListPage(() => {
-                                functionContentView?.RemoveFromParent();
-                                this.RefreshFunctionView();
+                                UpdateBottomView();
                             });
                             form.AddForm(list);
                         };
@@ -1249,10 +1255,16 @@
                 {
                     btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                     {
+                        
                         var skipView = new FunctionPage();
                         MainPage.BasePageView.AddChidren(skipView);
                         skipView.LoadPage(functionPageTitleId);
                         MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                        skipView.DelAction += () =>
+                        {
+                           
+                            UpdateBottomView();
+                        };
                     };
                 }
                 index++;
@@ -1790,6 +1802,18 @@
         {
 
         }
-#endregion
+        #endregion
+
+        /// <summary>
+        /// 鏇存柊搴曢儴鐣岄潰
+        /// </summary>
+        void UpdateBottomView()
+        {
+            Application.RunOnMainThread(() =>
+            {
+                functionContentView?.RemoveFromParent();
+                this.RefreshFunctionView();
+            });
+        }
     }
 }

--
Gitblit v1.8.0