From 5b79523a11f79631b04d062e0c0009f98b75bde7 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 12 七月 2024 15:23:41 +0800
Subject: [PATCH] Update HDL_APP_Project.sln
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 2f1ba90..890027e 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
{
@@ -22,6 +21,12 @@
//璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
switch (function.spk)
{
+ case SPK.ElectricEnergy:
+ var skipView = new EnergyMainPage();
+ MainPage.BasePageView.AddChidren(skipView);
+ skipView.LoadPage();
+ 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();
@@ -163,7 +168,7 @@
break;
case SPK.MusicStandard:
case SPK.AvMusic:
- Music.A31MusicModel.Current = new Music.A31MusicModel { functionMusic = function };//褰撳墠鎾斁鍣�
+ Music.A31MusicModel.Current = new Music.A31MusicModel { functionMusic = function ,LastDateTime = DateTime.Now};//褰撳墠鎾斁鍣�
var a31PlayMusicPage = new Music.A31PlayMusicPage();
MainPage.BasePageView.AddChidren(a31PlayMusicPage);
a31PlayMusicPage.Show();
@@ -336,14 +341,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;
}
};
--
Gitblit v1.8.0