From df93e50c747a585aa3acad599ba9be7d9617872d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 21 四月 2022 10:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 6438837..d94d5a1 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -125,7 +125,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();
@@ -182,6 +182,10 @@
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();
irLearinPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
@@ -200,9 +204,14 @@
var doorLockPage = new DoorLockPage();
doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.SensorHelp:
+ var panelHelpPage = new HDL_ON.UI.UI2.FuntionControlView.Panel.PanelHelpPage();
+ panelHelpPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
+
}
};
return eventHandler;
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0