wxr
2023-07-06 203c3a3ffde6259413d9743f6a723b95b1e7989c
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -23,8 +23,12 @@
                switch (function.spk)
                {
                    case SPK.GroupControl:
                         var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
                         dialog.ShowDialog();
                         //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);
@@ -166,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);
@@ -247,9 +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;
                        //Shared.Application.currentVC.NavigationController.NavigationBar.Hidden = false;
#else
                        FunctionList.List.GetIpCamImouList();
                        if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))