From c0c734d7a84cf7105401878ffc4b64cbb67621d1 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 01 十一月 2024 15:02:24 +0800
Subject: [PATCH] 更新极光Sdk531
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index 802c094..eab0505 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -1,9 +1,14 @@
锘縰sing System;
using System.Collections.Generic;
+#if __ANDROID__
+using Android.Content;
+#endif
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
+#if __IOS__
+#endif
namespace HDL_ON.UI
{
public class AddDevciePage : FrameLayout
@@ -11,6 +16,9 @@
FrameLayout bodyView;
IntegratedBrand brand;
VerticalRefreshLayout contentView;
+
+
+ public Action addDeviceCallback = null;
public AddDevciePage(IntegratedBrand integratedBrand)
{
@@ -20,13 +28,16 @@
public void LoadPage(VerticalRefreshLayout refreshView)
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView();
+
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice));
+ topView.maginY = 10;
+ topView.LoadTopView();
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
contentView = new VerticalRefreshLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64 + 10),
+ Height = Application.GetRealHeight(667 - 64 - 10),
VerticalScrollBarEnabled = false,
};
bodyView.AddChidren(contentView);
@@ -46,7 +57,8 @@
{
var waitPage = new Loading();
waitPage.Start();
- new System.Threading.Thread(() => {
+ new System.Threading.Thread(() =>
+ {
try
{
var pm = new HttpServerRequest();
@@ -89,6 +101,10 @@
bool isFrist = true;
foreach (var device in deviceList)
{
+ //if(device.spk == "peephole" || device.spk == "security.door.ezviz")
+ //{
+ // continue;
+ //}
FrameLayout row = new FrameLayout()
{
Height = Application.GetRealHeight(50),
@@ -119,7 +135,7 @@
Width = Application.GetRealWidth(32),
Height = Application.GetRealWidth(32),
Radius = (uint)Application.GetRealWidth(4),
- UnSelectedImagePath = $"FunctionIcon/Icon/{device.IconName}.png",
+ UnSelectedImagePath = $"FunctionIcon/Icon/{device.IconName}.png",
};
row.AddChidren(btnIcon);
Button btnRight = new Button()
@@ -143,30 +159,37 @@
};
row.AddChidren(btnName);
- btnName.MouseUpEventHandler = (sender, e) => {
+
+
+ btnName.MouseUpEventHandler = (sender, e) =>
+ {
switch (device.spk)
{
case SPK.IrModule:
var form = new AddMiniRemoteControlDirection1Page();
form.AddForm();
- form.AddDeviceEvent = (functionObj) => {
+ form.AddDeviceEvent = (functionObj) =>
+ {
refreshView.BeginHeaderRefreshing();
- };
+ };
break;
case SPK.SenesorMegahealth:
case SPK.SenesorMegahealth2:
case SPK.SensorMmvPose:
var form1 = new AddSenesorMegahealthDirection1Page();
form1.AddForm(device);
- form1.AddDeviceEvent = (functionObj) => {
+ form1.AddDeviceEvent = (functionObj) =>
+ {
refreshView.BeginHeaderRefreshing();
this.RemoveFromParent();
};
break;
case SPK.SensorEnvironment:
+ case SPK.SensorEnvironmentHailin:
var form2 = new AddSensorEnvironmentPage();
form2.AddForm(device);
- form2.AddDeviceEvent = (functionObj) => {
+ form2.AddDeviceEvent = (functionObj) =>
+ {
refreshView.BeginHeaderRefreshing();
this.RemoveFromParent();
};
@@ -175,11 +198,18 @@
case SPK.SensorEnvironment3:
var form3 = new AddQingpingSensorEnvirTipPage();
form3.AddForm(device);
- form3.AddDeviceEvent = (functionObj) => {
+ form3.AddDeviceEvent = (functionObj) =>
+ {
refreshView.BeginHeaderRefreshing();
this.RemoveFromParent();
};
break;
+ case SPK.Ev_Ipcam:
+ case SPK.VideoDoorLock:
+ case SPK.PeepholeEz:
+ case SPK.Peephole:
+ UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(device.spk,addDeviceCallback);
+ break;
}
};
}
--
Gitblit v1.8.0