From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 06 七月 2023 22:43:05 +0800
Subject: [PATCH] 门锁功能

---
 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 0fe6cc6..3488b00 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -22,6 +22,14 @@
                 //璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
                 switch (function.spk)
                 {
+                    case SPK.GroupControl:
+                         //var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
+                         //dialog.ShowDialog();
+                         var groupControlPage = new GroupControlPage_V2(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
+                        MainPage.BasePageView.AddChidren(groupControlPage);
+                        groupControlPage.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                        break;
                     case SPK.AirSwitch:
                         var airSwitchPage = new AirSwitchPage(function);
                         MainPage.BasePageView.AddChidren(airSwitchPage);
@@ -162,6 +170,7 @@
                         MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                         break;
                     case SPK.SensorPir:
+                    case SPK.SensorPirHold:
                         var pirPage = new SensorPirPage();
                         pirPage.ShowColltionButton = false;
                         pirPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
@@ -234,10 +243,8 @@
                         doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                         break;
                     case SPK.IpCam_Imou:
-
 #if __IOS__
-                        if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken == null)
-                        {//鏈垵濮嬪寲鎽勫儚澶�
+                        if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken == null){//鏈垵濮嬪寲鎽勫儚澶�
                             Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
                             Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString;
                             Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken;
@@ -245,8 +252,10 @@
                             Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList();
                         }
                         //璺宠浆澶у崕鎽勫儚澶�
+                        Shared.Application.currentVC.NavigationController.NavigationBar.BarTintColor = UIKit.UIColor.LightGray;
                         Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList();
                         Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToMonitorViewWithDeviceId(function.extDevId, function.name, Shared.Application.currentVC);
+                        //Shared.Application.currentVC.NavigationController.NavigationBar.Hidden = false;
 #else
                         FunctionList.List.GetIpCamImouList();
                         if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))

--
Gitblit v1.8.0