From ea3086b6213645a2a8a31734153462c23c120c5d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 16 十月 2023 16:51:37 +0800
Subject: [PATCH] 2023年10月16日16:51:34
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 12a85bf..bfedba6 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -22,14 +22,30 @@
//璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
switch (function.spk)
{
+ case SPK.ElectricEnergy:
+ var skipView = new EnergyMainPage();
+ MainPage.BasePageView.AddChidren(skipView);
+ skipView.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
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);
MainPage.BasePageView.AddChidren(airSwitchPage);
airSwitchPage.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case SPK.AirSwitchP3:
+ var airSwitchP3Page = new AirSwitchP3Page(function);
+ MainPage.BasePageView.AddChidren(airSwitchP3Page);
+ airSwitchP3Page.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.LightSwitch:
@@ -153,11 +169,11 @@
break;
case SPK.MusicStandard:
case SPK.AvMusic:
- //Music.A31MusicModel.Current= new Music.A31MusicModel { functionMusic = function };//褰撳墠鎾斁鍣�
- //var a31PlayMusicPage = new Music.A31PlayMusicPage();
- //MainPage.BasePageView.AddChidren(a31PlayMusicPage);
- //a31PlayMusicPage.Show();
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ Music.A31MusicModel.Current = new Music.A31MusicModel { functionMusic = function };//褰撳墠鎾斁鍣�
+ var a31PlayMusicPage = new Music.A31PlayMusicPage();
+ MainPage.BasePageView.AddChidren(a31PlayMusicPage);
+ a31PlayMusicPage.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.LightCCT:
var TureView = new ColorTureLampPage(function);
@@ -166,6 +182,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);
@@ -238,10 +255,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;
@@ -249,8 +264,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))
@@ -334,6 +351,26 @@
form.Show();
}
break;
+ case SPK.AvZkAiks:
+ {
+ //褰遍煶涓帶
+ var form = new UI2.FuntionControlView.Aks.AksPage(function, btnName, btnFromFloor, comerom, action);
+ MainPage.BasePageView.AddChidren(form);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ form.Show();
+
+ }
+ break;
+ case SPK.ElectricalTvHisense:
+ {
+ //娴蜂俊鐢佃
+ var form = new UI2.FuntionControlView.HisenseTV.HisenseTvPage(function, btnName, btnFromFloor,btnCollectionIcon, comerom, action);
+ MainPage.BasePageView.AddChidren(form);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ form.Show();
+
+ }
+ break;
}
};
return eventHandler;
--
Gitblit v1.8.0