From 343536d04f83c518043610ea297030b9c0ce029c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 10:44:15 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 18e95f8..8fbad13 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.SaveSceneData(true);
new PublicAssmebly().TipMsgAutoClose(msg, true);
};
}
@@ -282,6 +282,7 @@
//鎴块棿鍒犻櫎浜嬩欢
Action backAction = () => {
+ RegisterGetPushMessageAction();
GetUnreadPushMessages();
};
@@ -411,6 +412,28 @@
}
}
+ /// <summary>
+ /// 娉ㄥ唽鏀跺埌鎺ㄩ�佺洃鍚�
+ /// </summary>
+ void RegisterGetPushMessageAction()
+ {
+ //HDLCommon.GetPushMessageAction = () => {
+ // if (bodyView != null)
+ // {
+ // Utlis.WriteLine("GetPushMessageAction H鏀跺埌鎺ㄩ��");
+ // GetUnreadPushMessages();
+ // }
+ //};
+ }
+
+ /// <summary>
+ /// 鍙栨秷鏀跺埌鎺ㄩ�佺洃鍚�
+ /// </summary>
+ void UnregisterGetPushMessageAction()
+ {
+ //HDLCommon.GetPushMessageAction = null;
+ }
+
#endregion
}
--
Gitblit v1.8.0