From 16bea1d248f0010049bceaa562939297fa26b130 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 15:27:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch-2024' into wjc

---
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index da78089..59d643c 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -748,7 +748,7 @@
                     case ShowFunction.SecurityMonitoring:
                         if (!MainPage.NoLoginMode)
                         {
-                            if (OnAppConfig.Instance.RequestHttpsHost.Contains("bahrain"))
+                            if (OnAppConfig.Instance.RequestHttpsHost.Contains("bahrain") || !Common.ApiUtlis.Ins.hadInternet)
                             {
                                 functionCount = 0;
                             }
@@ -775,10 +775,16 @@
                         functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                         break;
                     case ShowFunction.VideoDoorLock:
-                        functionCount = FunctionList.List.GetVideoDoorLockList().Count;
-                        functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
-                            || obj.GetAttrState("status").ToString() == "normal_open").Count;
-
+                        if (Common.ApiUtlis.Ins.hadInternet)
+                        {
+                            functionCount = FunctionList.List.GetVideoDoorLockList().Count;
+                            functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
+                                || obj.GetAttrState("status").ToString() == "normal_open").Count;
+                        }
+                        else
+                        {
+                            functionCount = 0;
+                        }
                         break;
                     case ShowFunction.Aks:
                         functionCount = FunctionList.List.GetVideoControlsList().Count;
@@ -1479,7 +1485,7 @@
 
 //#if __Android__
                     //閫傞厤娌夋蹈寮忓鑸爮
-                    h5BasePage.Y = Application.GetRealHeight(20);
+                    h5BasePage.Y = Application.GetRealHeight(35);
                     h5BasePage.Height = Application.GetRealHeight(646);
 //#endif
                     MainPage.BasePageView.AddChidren(h5BasePage);

--
Gitblit v1.8.0