From 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:16:00 +0800
Subject: [PATCH] Merge branch 'NewFilePath'
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 8fbad13..ea6db63 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -81,7 +81,7 @@
scene.collect = false;
string msg = scene.name + Language.StringByID(StringId.CollectionCancelled);
LoadSceneFunctionControlZone();
- scene.SaveSceneData(true);
+ scene.CollectScene();
new PublicAssmebly().TipMsgAutoClose(msg, true);
};
}
@@ -404,7 +404,7 @@
{
try
{
- return Utlis.UnixToDateTimeWithFormatMS(time, "HH:mm");
+ return Utlis.ToFriendlyDisplay(time);
}
catch (Exception ex)
{
@@ -417,13 +417,14 @@
/// </summary>
void RegisterGetPushMessageAction()
{
- //HDLCommon.GetPushMessageAction = () => {
- // if (bodyView != null)
- // {
- // Utlis.WriteLine("GetPushMessageAction H鏀跺埌鎺ㄩ��");
- // GetUnreadPushMessages();
- // }
- //};
+ Action RegisterGetPushMessageAction = () => {
+ if (bodyView != null)
+ {
+ //Utlis.WriteLine("GetPushMessageAction H鏀跺埌鎺ㄩ��");
+ GetUnreadPushMessages();
+ }
+ };
+ HDLCommon.GetPushMessageAction = RegisterGetPushMessageAction;
}
/// <summary>
@@ -431,7 +432,7 @@
/// </summary>
void UnregisterGetPushMessageAction()
{
- //HDLCommon.GetPushMessageAction = null;
+ HDLCommon.GetPushMessageAction = null;
}
#endregion
--
Gitblit v1.8.0