From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
old mode 100755
new mode 100644
index 929b8ce..1097fdd
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -259,6 +259,11 @@
/// <param name="pra">璇锋眰鐨勫弬鏁�</param>
public static bool CheckNotEorrorMsg(ResponsePack revertObj, string RequestName, List<string> listNotShowError = null, object pra = null)
{
+ if (listNotShowError != null && listNotShowError.Contains("NotCheck") == true)
+ {
+ //涓嶆娴�
+ return true;
+ }
if (revertObj == null)
{
Application.RunOnMainThread(() =>
@@ -416,7 +421,7 @@
catch (Exception ex)
{
//鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
+ var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
alert.Show();
//Log鍑哄姏
@@ -451,7 +456,7 @@
catch (Exception ex)
{
//鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
+ var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
alert.Show();
//Log鍑哄姏
@@ -517,6 +522,7 @@
HdlGatewayLogic.Current.SynchronizeDbGateway();
//浠庢湰鍦伴噸鏂板姞杞藉叏閮ㄧ殑鎴块棿
Common.Room.RefreshAllRoomByLocation();
+
}
/// <summary>
@@ -612,8 +618,7 @@
//鍏抽棴鎵�鏈夋帴鏀�
HdlGatewayReceiveLogic.Current.RemoveAllEvent();
//娓呴櫎鍗囩骇鍒楄〃
- FirmwareUpdateResourse.dicDeviceUpdateList.Clear();
- FirmwareUpdateResourse.dicGatewayUpdateList.Clear();
+ FirmwareUpdateResourse.dicUpdateList.Clear();
HdlThreadLogic.Current.RunThread(async () =>
{
@@ -884,6 +889,8 @@
//寮�鍚嚜鍔ㄥ浠芥彁绀�
HdlAutoBackupLogic.ShowAutoBackupPromptedForm();
}
+ //鏄剧ず寮曞鐣岄潰
+ ShowGuideForm(result);
}
//APP缂撳瓨鍔犺浇瀹屾垚
UserCenterResourse.Option.AppCanSignout = true;
@@ -1178,6 +1185,36 @@
#endregion
+ #region 鈻� 寮曞鐣岄潰___________________________
+
+ /// <summary>
+ /// 鏄剧ず寮曞鐣岄潰
+ /// </summary>
+ /// <param name="result">鍚屾缁撴灉 -1锛氬紓甯� 0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝� 1锛氭甯稿悓姝� 2:娌℃湁鑷姩澶囦唤鏁版嵁</param>
+ private static void ShowGuideForm(int result)
+ {
+ var checkFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, DirNameResourse.GuideFile);
+ if (System.IO.File.Exists(checkFile) == true)
+ {
+ //涓嶉渶瑕佹樉绀�
+ return;
+ }
+ if (result == 2 && Config.Instance.Home.IsOthreShare == false)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var form = new Guide.GuideHouseForm();
+ form.ShowFrom();
+ });
+ }
+
+ //鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚寮曞)
+ var file = System.IO.File.Create(checkFile);
+ file.Close();
+ }
+
+ #endregion
+
#region 鈻� 16杩涘埗杞寲_________________________
/// <summary>
--
Gitblit v1.8.0