From ea0b1e8e5f43c5fd0a7d479e25ede3b8cbea464a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 02 十二月 2024 17:17:19 +0800
Subject: [PATCH] tcp;可视对讲；
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 208 ++++++++++++++++++++++++++--------------------------
1 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 09ed33d..8fc33ea 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -5,6 +5,7 @@
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;
@@ -365,104 +366,30 @@
{
Height = Application.GetRealWidth(192),
Radius = (uint)Application.GetRealWidth(12),
- BackgroundColor = 0x19333333,
};
roomView.AddChidren(roomViewbgColor);
+
+ var nameView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(50),
+ BackgroundColor = 0x33000000,
+ Radius = (uint)Application.GetRealWidth(12),
+ };
+ roomView.AddChidren(nameView);
var btnFloorAndRoomName = new Button()
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(12 - 2),
+ Y = Application.GetRealWidth(12 - 2),
Width = Application.GetRealWidth(266),
- Height = Application.GetRealHeight(22 + 2 + 2),
+ Height = Application.GetRealWidth(22 + 2 + 2),
Text = room.floorName + room.roomName,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
- TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
+ TextSize = CSS_FontSize.SubheadingFontSize + OnAppConfig.Instance.FontAmplify,
IsBold = true,
};
- roomView.AddChidren(btnFloorAndRoomName);
-
- #region 鐜鏁版嵁
- //var environmentalView = new FrameLayout()
- //{
- // Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
- // Height = Application.GetRealHeight(32),
- // Tag = "EnvironmentalView",
- //};
- //roomView.AddChidren(environmentalView);
-
- //Button btnTempIcon = new Button()
- //{
- // X = Application.GetRealWidth(12),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
- //};
- //environmentalView.AddChidren(btnTempIcon);
-
- //var btnTempValues = new Button()
- //{
- // X = btnTempIcon.Right + Application.GetRealWidth(4),
- // Width = Application.GetRealWidth(30),
- // Gravity = Gravity.CenterVertical,
- // TextColor = CSS_Color.MainBackgroundColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = "--掳",
- // TextAlignment = TextAlignment.CenterLeft,
- // Tag = "TempValues"
- //};
- //environmentalView.AddChidren(btnTempValues);
-
- //Button btnHumidityIcon = new Button()
- //{
- // X = btnTempValues.Right + Application.GetRealWidth(2),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
- //};
- //environmentalView.AddChidren(btnHumidityIcon);
-
- //var btnHumidityValues = new Button()
- //{
- // X = btnHumidityIcon.Right + Application.GetRealWidth(4),
- // Width = Application.GetRealWidth(30),
- // Gravity = Gravity.CenterVertical,
- // TextColor = CSS_Color.MainBackgroundColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = "--%",
- // TextAlignment = TextAlignment.CenterLeft,
- // Tag = "HumidityValues"
- //};
- //environmentalView.AddChidren(btnHumidityValues);
-
- //Button btnPm25Icon = new Button()
- //{
- // X = btnHumidityValues.Right + Application.GetRealWidth(2),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
- //};
- //environmentalView.AddChidren(btnPm25Icon);
-
- //var btnPm25Values = new Button()
- //{
- // X = btnPm25Icon.Right + Application.GetRealWidth(4),
- // Width = Application.GetRealWidth(30),
- // Gravity = Gravity.CenterVertical,
- // TextColor = CSS_Color.MainBackgroundColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = "--",
- // TextAlignment = TextAlignment.CenterLeft,
- // Tag = "Pm25Values"
- //};
- //environmentalView.AddChidren(btnPm25Values);
- //roomView.AddChidren(environmentalView);
- #endregion
-
+ nameView.AddChidren(btnFloorAndRoomName);
var btnAllClose = new Button()
{
@@ -477,14 +404,7 @@
roomView.AddChidren(btnAllClose);
LoadEvent_CloseAllFunction(btnAllClose, room);
- //var btn = new Button()
- //{
- // Y = Application.GetRealWidth(192),
- // Height = Application.GetRealWidth(20),
- // BackgroundColor = CSS_Color.MainBackgroundColor,
- //};
- //roomView.AddChidren(btn);
- EventHandler <MouseEventArgs> roomRowClick = (sender, e) =>
+ roomViewbgColor.MouseUpEventHandler += (sender, e) =>
{
Action ReloadRoomName = () =>
{
@@ -509,10 +429,6 @@
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- roomViewbgColor.MouseUpEventHandler = roomRowClick;
- btnFloorAndRoomName.MouseUpEventHandler = roomRowClick;
-
-
}
/// <summary>
/// 璁拌浇灏忓浘鎴块棿row
@@ -679,6 +595,7 @@
{
case ShowFunction.Series:
functionCount = FunctionList.List.GetSeries().Count;
+ //functionOnCount = FunctionList.List.GetSeries().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
case ShowFunction.IpCam:
//functionCount = FunctionList.List.GetIpCamImouList().Count;
@@ -751,7 +668,14 @@
case ShowFunction.SecurityMonitoring:
if (!MainPage.NoLoginMode)
{
- functionCount = 1;
+ if (OnAppConfig.Instance.RequestHttpsHost.Contains("bahrain") || !Common.ApiUtlis.Ins.hadInternet)
+ {
+ functionCount = 0;
+ }
+ else
+ {
+ functionCount = FunctionList.List.GetEzMonitorList().Count;
+ }
}
break;
case ShowFunction.Sensor:
@@ -765,6 +689,22 @@
break;
case ShowFunction.SecurityCenter:
functionCount = FunctionList.List.securities.Count;
+ break;
+ case ShowFunction.Acst:
+ 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;
@@ -829,6 +769,7 @@
//涓嶉渶瑕佹樉绀鸿澶囧紑鐘舵�佹暟閲�;
Button btnFunctionCount=null;
if (item != ShowFunction.Aks
+ && item != ShowFunction.VideoDoorLock
&& item != ShowFunction.Environmental
&& item != ShowFunction.Sensor
&& item != ShowFunction.VideoIntercom
@@ -837,7 +778,7 @@
&& item != ShowFunction.Music
&& item != ShowFunction.EnergyMonitoring
&& item != ShowFunction.SecurityCenter
- && item != ShowFunction.IpCam
+ && item != ShowFunction.Acst && item != ShowFunction.IpCam
&& functionCount != 0)
{
btnFunctionCount = new Button()
@@ -1125,7 +1066,8 @@
break;
case ShowFunction.SecurityMonitoring:
btnName.TextID = StringId.EZVIZ;
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
HDLCommon.Current.Go2EZvizMonitor(bodyView);
};
break;
@@ -1151,6 +1093,63 @@
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:
btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/AksFunctionBg.png";
@@ -1168,7 +1167,8 @@
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�--(钀ょ煶瑙嗛闂ㄩ攣)璺宠浆鑷繁鐨勭晫闈�--鍩冨厠鏂奖闊充腑鎺�
- if ( item != ShowFunction.Aks
+ if (item != ShowFunction.VideoDoorLock
+ && item != ShowFunction.Aks
&& item != ShowFunction.Music
&& item != ShowFunction.Environmental
&& item != ShowFunction.SecurityMonitoring
@@ -1176,7 +1176,8 @@
//&& ShowFunction.EnergyMonitoring != item
&& ShowFunction.VideoIntercom != item
&& ShowFunction.SecurityCenter != item
- && ShowFunction.Series != item)
+ && ShowFunction.Series != item
+ && ShowFunction.Acst != item)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
@@ -1194,7 +1195,6 @@
}
index++;
}
-
s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight + Application.GetRealWidth(40);
--
Gitblit v1.8.0