From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 72 +++++++++++-------------------------
1 files changed, 22 insertions(+), 50 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index f45fb41..ca78386 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -3,7 +3,6 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using Shared;
-using static HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod;
namespace HDL_ON.UI
{
@@ -13,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) =>
@@ -29,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;
@@ -103,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);
@@ -141,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();
@@ -169,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);
@@ -228,7 +227,7 @@
break;
case SPK.AcIr:
case SPK.AcStandard:
- case SPK.HvacAC:
+ case SPK.HvacAC:case SPK.HvacAcPanel:
var acPage = new AcControlPage();
acPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
@@ -239,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();
@@ -290,7 +289,8 @@
new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
});
}
- Application.RunOnMainThread(() =>{
+ Application.RunOnMainThread(() =>
+ {
try
{
@@ -342,34 +342,6 @@
}
}
#endif
- break;
- case SPK.VideoDoorLock: {
- //钀ょ煶瑙嗛闂ㄩ攣
- var form = new VideoDoorLockPage(function, btnName, btnFromFloor,comerom,action);
- MainPage.BasePageView.AddChidren(form);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- 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;
}
};
--
Gitblit v1.8.0