From 6c71e8a178d9cb83a178f08e3411090fe8da505d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 五月 2024 15:33:33 +0800
Subject: [PATCH] 删除了萤石功能，埃克斯影音中控，海信电视，
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 81 ++--------------------------------------
1 files changed, 5 insertions(+), 76 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 59d643c..609c480 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -5,7 +5,6 @@
using HDL_ON.Entity;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Shared;
@@ -716,7 +715,7 @@
#region 鐢靛櫒
functionCount = FunctionList.List.GetElectricals().Count;
- functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.spk!=SPK.ElectricalTvHisense&&obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
//#if DEBUG
// functionCount = 1;
//#endif
@@ -745,19 +744,7 @@
break;
case ShowFunction.Panel:
break;
- case ShowFunction.SecurityMonitoring:
- if (!MainPage.NoLoginMode)
- {
- if (OnAppConfig.Instance.RequestHttpsHost.Contains("bahrain") || !Common.ApiUtlis.Ins.hadInternet)
- {
- functionCount = 0;
- }
- else
- {
- functionCount = 1;
- }
- }
- break;
+
case ShowFunction.Sensor:
functionCount = FunctionList.List.GetArmSensorList().Count;
break;
@@ -774,25 +761,7 @@
functionCount = FunctionList.List.GetAcstParentList().Count;
functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
- case ShowFunction.VideoDoorLock:
- 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;
- functionOnCount = 1;
- break;
-
-
-
+
}
if (functionCount == 0)
@@ -848,12 +817,9 @@
//涓嶉渶瑕佹樉绀鸿澶囧紑鐘舵�佹暟閲�;
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
@@ -1144,13 +1110,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;
@@ -1218,42 +1177,12 @@
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:
-
- 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(() => {
- 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
--
Gitblit v1.8.0