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 | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 18e95f8..ea6db63 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -67,7 +67,7 @@
}
string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
LoadDeviceFunctionControlZone();
- function.SaveFunctionData();
+ function.SaveFunctionData(true);
new PublicAssmebly().TipMsgAutoClose(msg, true);
};
}
@@ -81,7 +81,7 @@
scene.collect = false;
string msg = scene.name + Language.StringByID(StringId.CollectionCancelled);
LoadSceneFunctionControlZone();
- scene.SaveSceneData();
+ scene.CollectScene();
new PublicAssmebly().TipMsgAutoClose(msg, true);
};
}
@@ -282,6 +282,7 @@
//鎴块棿鍒犻櫎浜嬩欢
Action backAction = () => {
+ RegisterGetPushMessageAction();
GetUnreadPushMessages();
};
@@ -403,7 +404,7 @@
{
try
{
- return Utlis.UnixToDateTimeWithFormatMS(time, "HH:mm");
+ return Utlis.ToFriendlyDisplay(time);
}
catch (Exception ex)
{
@@ -411,6 +412,29 @@
}
}
+ /// <summary>
+ /// 娉ㄥ唽鏀跺埌鎺ㄩ�佺洃鍚�
+ /// </summary>
+ void RegisterGetPushMessageAction()
+ {
+ Action RegisterGetPushMessageAction = () => {
+ if (bodyView != null)
+ {
+ //Utlis.WriteLine("GetPushMessageAction H鏀跺埌鎺ㄩ��");
+ GetUnreadPushMessages();
+ }
+ };
+ HDLCommon.GetPushMessageAction = RegisterGetPushMessageAction;
+ }
+
+ /// <summary>
+ /// 鍙栨秷鏀跺埌鎺ㄩ�佺洃鍚�
+ /// </summary>
+ void UnregisterGetPushMessageAction()
+ {
+ HDLCommon.GetPushMessageAction = null;
+ }
+
#endregion
}
--
Gitblit v1.8.0