From e66503d70f26a3109fbadf47abcb8ba31d619e3c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 10 三月 2023 16:56:03 +0800
Subject: [PATCH] 2023年03月10日16:56:00
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 103 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 49d4fc1..e682ffb 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Threading;
+using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using Shared;
@@ -11,7 +12,7 @@
/// <summary>
/// 鍔熻兘鎺у埗鐣岄潰璺宠浆浜嬩欢
/// </summary>
- public EventHandler<MouseEventArgs> LoadEvent_SkipFunctionControlPage(Function function, Button btnCollectionIcon, Button btnName, Button btnFromFloor
+ public EventHandler<MouseEventArgs> LoadEvent_SkipFunctionControlPage(Function function, Button btnCollectionIcon, Button btnName, Button btnFromFloor, Comerom comerom,Action action
)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
@@ -38,6 +39,12 @@
rgbView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
+ case SPK.LightRGBW:
+ var rgbwView = new RGBWPage(function);
+ MainPage.BasePageView.AddChidren(rgbwView);
+ rgbwView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
case SPK.LightDimming:
var dimmerView = new DimmerPage(function);
MainPage.BasePageView.AddChidren(dimmerView);
@@ -57,9 +64,15 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.CurtainRoller:
- var rollingShutterView = new RollingShutterPage(function);
+ var rollingShutterView = new VenetianBlindsPage(function);
MainPage.BasePageView.AddChidren(rollingShutterView);
rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.CurtainShades:
+ var curtainShadesView = new RollingShutterPage(function);
+ MainPage.BasePageView.AddChidren(curtainShadesView);
+ curtainShadesView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.CurtainDream:
@@ -123,6 +136,10 @@
case SPK.ElectricTuyaWaterValve2:
var tyWaterValve = new TuyaWaterValvePage();
tyWaterValve.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.MechanicalArm:
+ var mechanicalArmPage = new MechanicalArmPage();
+ mechanicalArmPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.ElectricTuyaWeepRobot:
case SPK.ElectricTuyaWeepRobot2:
@@ -168,6 +185,7 @@
doorwindowPage.ShowColltionButton = false;
doorwindowPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.SensorMmvPose:
case SPK.SenesorMegahealth:
case SPK.SenesorMegahealth2:
var smPage = new SenesorMegahealthPage();
@@ -214,6 +232,89 @@
var doorLockPage = new DoorLockPage();
doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.IpCam_Imou:
+#if __IOS__
+#else
+ FunctionList.List.GetIpCamImouList();
+ if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
+ {
+ var waitPage = new Loading();
+ MainPage.BaseView.AddChidren(waitPage);
+ waitPage.Start("");
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ var http = new HttpServerRequest();
+ var pack = http.GetLcSubAccountToken();
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ if (pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
+ });
+ }
+ Application.RunOnMainThread(() =>{
+ try
+ {
+ Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
+ Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
+ }
+ catch (Exception ex)
+ {
+
+ }
+ });
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
+ });
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("鍔犺浇涔愭鎽勫儚澶村紓甯�");
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+ else
+ {
+ try
+ {
+ Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
+ }
+ catch (Exception ex)
+ {
+
+ }
+ }
+#endif
+ break;
+ case SPK.VideoDoorLock: {
+ //钀ょ煶瑙嗛闂ㄩ攣
+ var form = new VideoDoorLockPage(function, btnName, btnFromFloor,comerom,action);
+ MainPage.BasePageView.AddChidren(form);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ form.Show();
+ }
+ break;
}
};
return eventHandler;
--
Gitblit v1.8.0