From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 7b59c9e..5e0a123 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 = (function as Music.A31MusicModel);//褰撳墠鎾斁鍣�
+ Music.A31MusicModel.Current.functionMusic =function;//褰撳墠鎾斁鍣�
var a31PlayMusicPage = new Music.A31PlayMusicPage();
MainPage.BasePageView.AddChidren(a31PlayMusicPage);
a31PlayMusicPage.Show();
@@ -196,6 +196,10 @@
var airFresh2 = new AirFreshRelayControlPage();
airFresh2.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.DoorLock:
+ var doorLockPage = new DoorLockListPage();
+ doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
}
};
return eventHandler;
--
Gitblit v1.8.0