From 6ec12a036c96a200fc0a941967d6b4d07592f863 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:31:17 +0800
Subject: [PATCH] Merge branch 'tzy' into NewFilePath
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 1baab0e..005478a 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.ToFriendlyDisplay(time);
+ return Utlis.UnixToDateTimeWithFormatMS(time, "HH:mm");
}
catch (Exception ex)
{
@@ -417,15 +417,13 @@
/// </summary>
void RegisterGetPushMessageAction()
{
- Action RegisterGetPushMessageAction = () => {
- if (bodyView != null)
- {
- //Utlis.WriteLine("GetPushMessageAction H鏀跺埌鎺ㄩ��");
- GetUnreadPushMessages();
- }
- };
-
- HDLCommon.GetPushMessageAction = RegisterGetPushMessageAction;
+ //HDLCommon.GetPushMessageAction = () => {
+ // if (bodyView != null)
+ // {
+ // Utlis.WriteLine("GetPushMessageAction H鏀跺埌鎺ㄩ��");
+ // GetUnreadPushMessages();
+ // }
+ //};
}
/// <summary>
@@ -433,7 +431,7 @@
/// </summary>
void UnregisterGetPushMessageAction()
{
- HDLCommon.GetPushMessageAction = null;
+ //HDLCommon.GetPushMessageAction = null;
}
#endregion
--
Gitblit v1.8.0