From d76b0e40e5bb127fd33aa1f7842447a1df0628d5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 30 七月 2023 22:16:34 +0800
Subject: [PATCH] Update PublicAssmeblyBLL.cs
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 113 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 15 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..7bc7270 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -3,11 +3,16 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
+#if __Android__
using Java.Interop;
+using Android.Content;
+using Hdl.Onpro;
+#endif
using Shared;
namespace HDL_ON.UI
{
- public class DeviceListPage : FrameLayout
+ public class DeviceListPage : FrameLayout
{
FrameLayout bodyView;
VerticalRefreshLayout contentView;
@@ -24,15 +29,10 @@
{
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);
+ 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;
@@ -60,7 +60,8 @@
{
var waitPage = new Loading();
waitPage.Start();
- new System.Threading.Thread(() => {
+ new System.Threading.Thread(() =>
+ {
try
{
var pm = new HttpServerRequest();
@@ -78,7 +79,7 @@
}
else
{
- var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices),160)
+ var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices), 160)
{
Gravity = Gravity.CenterHorizontal,
};
@@ -97,7 +98,8 @@
}
finally
{
- Application.RunOnMainThread(() => {
+ Application.RunOnMainThread(() =>
+ {
if (waitPage != null)
{
waitPage.RemoveFromParent();
@@ -114,6 +116,10 @@
bool isFrist = true;
foreach (var device in deviceList)
{
+ //if (!this.CheckSupportDevice(device))
+ //{
+ // continue;
+ //}
var row = new RowLayout()
{
Height = Application.GetRealHeight(50),
@@ -169,7 +175,8 @@
};
row.AddChidren(btnName);
- btnName.MouseUpEventHandler = (sender, e) => {
+ btnName.MouseUpEventHandler = (sender, e) =>
+ {
switch (device.spk)
{
case SPK.IrModule:
@@ -189,6 +196,7 @@
};
break;
case SPK.SensorEnvironment:
+ case SPK.SensorEnvironmentHailin:
case SPK.SensorEnvironment2:
case SPK.SensorEnvironment3:
var smPage1 = new SensorEnvironmentManagerPage();
@@ -197,6 +205,21 @@
{
contentView.BeginHeaderRefreshing();
};
+ break;
+ case SPK.VideoDoorLock:
+ {
+ CommonMethod.Current.MainThread(() =>
+ {
+ //钀ょ煶瑙嗛闂ㄩ攣
+ var form = new VideoDoorLockPage(device, btnName, new Button(), CommonMethod.Comerom.sanfan, () =>
+ {
+ row.RemoveFromParent();
+ });
+ MainPage.BasePageView.AddChidren(form);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ form.Show();
+ });
+ }
break;
}
};
@@ -268,7 +291,8 @@
Width = Application.GetRealWidth(150),
};
row.AddChidren(btnEdit);
- btnEdit.MouseUpEventHandler = (sender, e) =>{
+ btnEdit.MouseUpEventHandler = (sender, e) =>
+ {
Action<string> callBack = (str) =>
{
if (string.IsNullOrEmpty(str))
@@ -338,6 +362,23 @@
}
+ /// <summary>
+ /// 妫�鏌ユ槸鍚︽敮鎸�
+ /// </summary>
+ /// <param name="function"></param>
+ /// <returns></returns>
+ bool CheckSupportDevice(Function function)
+ {
+
+ if (function == null) return false;
+ if (function.spk == SPK.VideoDoorLock)
+ {
+ return false;
+ }
+ return true;
+
+ }
+
}
@@ -351,6 +392,23 @@
+#if __Android__
+
+ //[Android.Content.BroadcastReceiver(Enabled = true, Exported = false)]
+ //public class ImouReceiver : Android.Content.BroadcastReceiver
+ //{
+ // public override void OnReceive(Context context, Intent intent)
+ // {
+ // if (intent != null)
+ // {
+ // string action = intent.Action;
+ // if (action == "hdlUserDeviceBind")
+ // {
+ // string value = intent.GetStringExtra("data");
+ // }
+ // }
+ // }
+ //}
public class AddLcCam : Java.Lang.Object, Com.CallBack.IAddCamera
{
@@ -413,4 +471,29 @@
}
}
+ public class BindDeviceFeedback : Java.Lang.Object, Hdl.Onpro.IRegisterDeviceFeedback
+ {
+ public Action<string,string> tipAction;
+
+ public void Feedback(string method, string msg)
+ {
+ tipAction?.Invoke(method, msg);
+ }
+ }
+
+#else
+ public class AddLcCam
+ {
+ public Action backAction;
+
+ public void Back()
+ {
+ backAction?.Invoke();
+ }
+ }
+#endif
+
+
+
+
}
--
Gitblit v1.8.0