From fd1f19e8479c764fa28b0da3a2f9b34a3debe772 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 03 八月 2023 21:47:04 +0800
Subject: [PATCH] 2023年08月03日21:47:02
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 85c52d9..4e8ddcf 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -771,6 +771,13 @@
#endif
functionOnCount = 1;
break;
+ case ShowFunction.Aks:
+ functionCount = FunctionList.List.GetVideoControlsList().Count;
+#if DEBUG
+ functionCount = 1;
+#endif
+ functionOnCount = 1;
+ break;
@@ -1201,10 +1208,24 @@
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(() => {
+ functionContentView?.RemoveFromParent();
+ this.RefreshFunctionView();
+ });
+ form.AddForm(list);
+ };
+ break;
}
- //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�--(钀ょ煶瑙嗛闂ㄩ攣)璺宠浆鑷繁鐨勭晫闈�
+ //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�--(钀ょ煶瑙嗛闂ㄩ攣)璺宠浆鑷繁鐨勭晫闈�--鍩冨厠鏂奖闊充腑鎺�
if (item != ShowFunction.VideoDoorLock
+ && item != ShowFunction.Aks
&& item != ShowFunction.Music
&& item != ShowFunction.Environmental
&& item != ShowFunction.SecurityMonitoring
@@ -1452,13 +1473,13 @@
Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>
{
- //var jObj = dictionary;
- //JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));
-
+#if __IOS__
+ JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));
+#else
var valuePairs = "";
dictionary.TryGetValue("method", out valuePairs);
JObject jObj = JObject.Parse(valuePairs);
-
+#endif
if (!jObj.ContainsKey("method") || !jObj.ContainsKey("data"))
{
@@ -1511,7 +1532,7 @@
s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight + Application.GetRealWidth(40);
- #endregion
+#endregion
}
--
Gitblit v1.8.0