From 51f5f7a47d394163dccf2441cd04c2a19ceeda34 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 一月 2024 09:41:59 +0800
Subject: [PATCH] Merge branch 'Dev-Google-V2.4.3' into Google-2023-11-17-1
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 104 ++++++---------------------------------------------
1 files changed, 13 insertions(+), 91 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 66b07f4..b5e6c38 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -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;
@@ -838,17 +842,15 @@
//涓嶉渶瑕佹樉绀鸿澶囧紑鐘舵�佹暟閲�;
Button btnFunctionCount=null;
- if (item != ShowFunction.Aks
- && item != ShowFunction.VideoDoorLock
- && item != ShowFunction.Environmental
+ if (
+ item != ShowFunction.Environmental
&& item != ShowFunction.Sensor
&& item != ShowFunction.VideoIntercom
- && item != ShowFunction.SecurityMonitoring
&& item != ShowFunction.FreshAir
&& item != ShowFunction.Music
&& item != ShowFunction.EnergyMonitoring
&& item != ShowFunction.SecurityCenter
- && item != ShowFunction.Acst && item != ShowFunction.IpCam
+ && item != ShowFunction.IpCam
&& functionCount != 0)
{
btnFunctionCount = new Button()
@@ -1134,13 +1136,6 @@
case ShowFunction.Panel:
btnName.TextID = StringId.Panel;
break;
- case ShowFunction.SecurityMonitoring:
- btnName.TextID = StringId.EZVIZ;
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- HDLCommon.Current.Go2EZvizMonitor(bodyView);
- };
- break;
case ShowFunction.Sensor:
btnName.TextID = StringId.Sensor;
functionPageTitleId = StringId.Sensor;
@@ -1163,89 +1158,16 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
break;
- case ShowFunction.Acst:
- btnName.TextID = StringId.Acst;
-
- Button btnJMLogo = new Button()
- {
- Y = specialList.Contains(index) ? Application.GetRealWidth(147) : Application.GetRealWidth(104),
- UnSelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
- Width = Application.GetRealWidth(105),
- Height = Application.GetRealWidth(57),
- };
- functionView.AddChidren(btnJMLogo);
-
- //Button btnAcstPower = new Button()
- //{
- // X = Application.GetRealWidth(120),
- // Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
- // Width = Application.GetRealWidth(32),
- // Height = Application.GetRealWidth(32),
- // SelectedImagePath = "Public/PowerOpen.png",
- // UnSelectedImagePath = "Public/PowerClose.png",
- // IsSelected = functionOnCount > 0,
- // Tag = item + "_AllControl",
- //};
- //functionView.AddChidren(btnAcstPower);
- //btnAcstPower.MouseUpEventHandler = (sender, e) =>
- //{
- // btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
- // string onoff = btnAcstPower.IsSelected ? "on" : "off";
- // Dictionary<string, string> d = new Dictionary<string, string>();
- // d.Add(FunctionAttributeKey.OnOff, onoff);
- // foreach (var temp in FunctionList.List.GetAcstParentList())
- // {
- // Control.Ins.SendWriteCommand(temp, d);
- // }
- //};
-
-
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var page = new AcstParentPage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- break;
- case ShowFunction.VideoDoorLock:
- //钀ょ煶瑙嗛闂ㄩ攣
- btnName.TextID = StringId.yingshishipinmensuo;
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var list =CommonMethod.Current.GetVideoDoorLockList();
- var form = new VideoDoorLockListPage(()=> {
- UpdateBottomView();
- });
- form.AddForm(list);
- };
- break;
- case ShowFunction.Aks:
- //鍩冨厠鏂奖闊充腑鎺�
- 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(() => {
- UpdateBottomView();
- });
- form.AddForm(list);
- };
- break;
-
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�--(钀ょ煶瑙嗛闂ㄩ攣)璺宠浆鑷繁鐨勭晫闈�--鍩冨厠鏂奖闊充腑鎺�
- if (item != ShowFunction.VideoDoorLock
- && item != ShowFunction.Aks
- && item != ShowFunction.Music
+ if ( item != ShowFunction.Music
&& item != ShowFunction.Environmental
- && item != ShowFunction.SecurityMonitoring
&& item != ShowFunction.DoorLock
//&& ShowFunction.EnergyMonitoring != item
&& ShowFunction.VideoIntercom != item
&& ShowFunction.SecurityCenter != item
&& ShowFunction.Series != item
- && ShowFunction.Acst != item)
+ )
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
--
Gitblit v1.8.0