From 8301df084faa8f43f4b9cb7f92088e5fd9e64524 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 十二月 2022 15:41:53 +0800
Subject: [PATCH] 大华摄像头更新
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index 6db4e38..87fe48e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -3,7 +3,9 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
+#if __Android__
using Java.Interop;
+#endif
using Shared;
namespace HDL_ON.UI
{
@@ -24,15 +26,24 @@
{
Action<string, string> action = (s, a) =>
{
- //var page = new AddDevciePage(brand);
- //MainPage.BasePageView.AddChidren(page);
- //page.LoadPage(contentView);
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- var backTemp = new AddLcCam();
- backTemp.backAction = () => {
- Load3tyBrandDeviceList();
- };
- Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
+ if (brand.productBrand == "")
+ {
+#if __ANDROID__
+ var backTemp = new AddLcCam();
+ backTemp.backAction = () =>
+ {
+ Load3tyBrandDeviceList();
+ };
+ Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
+#endif
+ }
+ else
+ {
+ var page = new AddDevciePage(brand);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage(contentView);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
};
new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action);
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
@@ -351,7 +362,7 @@
-
+#if __Android__
public class AddLcCam : Java.Lang.Object, Com.CallBack.IAddCamera
{
@@ -412,5 +423,15 @@
{
}
}
+#else
+ public class AddLcCam
+ {
+ public Action backAction;
+ public void Back()
+ {
+ backAction?.Invoke();
+ }
+ }
+#endif
}
--
Gitblit v1.8.0