From 6692d867a0876b014be3cbd64bc3a237a026dc2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 18 十月 2022 09:57:15 +0800
Subject: [PATCH] 修改安卓隐私确认弹窗，隐私协议英文的问题
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 6438837..732abb2 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -38,6 +38,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 +63,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:
@@ -125,7 +143,7 @@
break;
case SPK.MusicStandard:
case SPK.AvMusic:
- //Music.A31MusicModel.Current.functionMusic =function;//褰撳墠鎾斁鍣�
+ //Music.A31MusicModel.Current= new Music.A31MusicModel { functionMusic = function };//褰撳墠鎾斁鍣�
//var a31PlayMusicPage = new Music.A31PlayMusicPage();
//MainPage.BasePageView.AddChidren(a31PlayMusicPage);
//a31PlayMusicPage.Show();
@@ -141,6 +159,11 @@
var pirPage = new SensorPirPage();
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();
@@ -160,7 +183,6 @@
case SPK.SenesorMegahealth:
case SPK.SenesorMegahealth2:
var smPage = new SenesorMegahealthPage();
- smPage.ShowColltionButton = false;
smPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.SensorGas:
@@ -181,6 +203,10 @@
case SPK.HvacAC:
var acPage = new AcControlPage();
acPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+ case SPK.HvacCac:
+ var cacPage = new CacControlPage();
+ cacPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.IrLearn:
var irLearinPage = new IrLearnPage();
@@ -205,4 +231,4 @@
return eventHandler;
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0