From a3dfbcd5218270f9a75e6e32807b08215270b657 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 11:48:23 +0800
Subject: [PATCH] Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 890027e..49f5304 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -12,7 +12,7 @@
/// <summary>
/// 鍔熻兘鎺у埗鐣岄潰璺宠浆浜嬩欢
/// </summary>
- public EventHandler<MouseEventArgs> LoadEvent_SkipFunctionControlPage(Function function, Button btnCollectionIcon, Button btnName, Button btnFromFloor, Comerom comerom,Action action
+ public EventHandler<MouseEventArgs> LoadEvent_SkipFunctionControlPage(Function function, Button btnCollectionIcon, Button btnName, Button btnFromFloor, Comerom comerom, Action action
)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
@@ -28,9 +28,9 @@
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 groupControlPage = new GroupControlPage_V2(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
+ //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;
@@ -102,7 +102,7 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case SPK.FloorHeatStandard:
- case SPK.HvacFloorHeat:
+ case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
var fhView = new FloorHeatingPage(function);
MainPage.BasePageView.AddChidren(fhView);
fhView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
@@ -140,27 +140,27 @@
var stbView = new StbPage(function);
MainPage.BasePageView.AddChidren(stbView);
stbView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- break;
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
case SPK.ElectricTuyaAirCleaner:
case SPK.ElectricTuyaAirCleaner2:
var airCleaner = new TuyaAirCleanerPage();
airCleaner.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
- break;
+ break;
case SPK.ElectricTuyaFan:
case SPK.ElectricTuyaFan2:
var tuyaFan = new TuyaFanPage();
tuyaFan.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
- case SPK.ElectricTuyaWaterValve:
- case SPK.ElectricTuyaWaterValve2:
- var tyWaterValve = new TuyaWaterValvePage();
- tyWaterValve.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ case SPK.ElectricTuyaWaterValve:
+ 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.MechanicalArm:
+ var mechanicalArmPage = new MechanicalArmPage();
+ mechanicalArmPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
case SPK.ElectricTuyaWeepRobot:
case SPK.ElectricTuyaWeepRobot2:
var weepRobot = new TuyaWeepRobotPage();
@@ -168,12 +168,12 @@
break;
case SPK.MusicStandard:
case SPK.AvMusic:
- Music.A31MusicModel.Current = new Music.A31MusicModel { functionMusic = function ,LastDateTime = DateTime.Now};//褰撳墠鎾斁鍣�
+ Music.A31MusicModel.Current = new Music.A31MusicModel { functionMusic = function, LastDateTime = DateTime.Now };//褰撳墠鎾斁鍣�
var a31PlayMusicPage = new Music.A31PlayMusicPage();
MainPage.BasePageView.AddChidren(a31PlayMusicPage);
a31PlayMusicPage.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- break;
+ break;
case SPK.LightCCT:
var TureView = new ColorTureLampPage(function);
MainPage.BasePageView.AddChidren(TureView);
@@ -238,7 +238,7 @@
case SPK.IrLearn:
var irLearinPage = new IrLearnPage();
irLearinPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
- break;
+ break;
case SPK.AirFreshJinmao:
case SPK.HvacAirFreshJinmao:
var airFresh1 = new AirFreshControlPage();
@@ -289,7 +289,8 @@
new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
});
}
- Application.RunOnMainThread(() =>{
+ Application.RunOnMainThread(() =>
+ {
try
{
--
Gitblit v1.8.0