From 8960f866958ece0900b0ee13e70c9320507f98db Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 二月 2023 18:50:23 +0800
Subject: [PATCH] 2023年02月07日18:50:21

---
 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 104 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index d94d5a1..3a74f8e 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;
 
@@ -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,21 @@
                         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:
+                        var curtainDreamView = new CurtainDreamPage(function);
+                        MainPage.BasePageView.AddChidren(curtainDreamView);
+                        curtainDreamView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                         MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                         break;
                     case SPK.FloorHeatStandard:
@@ -117,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:
@@ -142,6 +165,11 @@
                         pirPage.ShowColltionButton = false;
                         pirPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                         break;
+                    case SPK.SensorHelp:
+                        var helpPage = new PanelHelpPage();
+                        helpPage.ShowColltionButton = false;
+                        helpPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+                        break;
                     case SPK.SensorWater:
                         var waterPage = new SensorWaterImmersionPage();
                         waterPage.ShowColltionButton = false;
@@ -157,10 +185,10 @@
                         doorwindowPage.ShowColltionButton = false;
                         doorwindowPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                         break;
+                    case SPK.SensorMmvPose:
                     case SPK.SenesorMegahealth:
                     case SPK.SenesorMegahealth2:
                         var smPage = new SenesorMegahealthPage();
-                        smPage.ShowColltionButton = false;
                         smPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                         break;
                     case SPK.SensorGas:
@@ -204,11 +232,81 @@
                         var doorLockPage = new DoorLockPage();
                         doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                         break;
-                    case SPK.SensorHelp:
-                        var panelHelpPage = new HDL_ON.UI.UI2.FuntionControlView.Panel.PanelHelpPage();
-                        panelHelpPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+                    case SPK.IpCam_Imou:
+                        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));
+                                            });
+                                        }
+#if __ANDROID__
+                                    Application.RunOnMainThread(() =>
+                                        {
+                                            try
+                                            {
+                                                Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
+                                                Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
+                                            }
+                                            catch (Exception ex)
+                                            {
+
+                                            }
+                                        });
+#endif
+                                }
+                                    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)
+                            {
+
+                            }
+                        }
                         break;
-                         
                 }
             };
             return eventHandler;

--
Gitblit v1.8.0