From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 929b8ce..337b878 100755
--- 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(() =>
@@ -612,8 +617,7 @@
//鍏抽棴鎵�鏈夋帴鏀�
HdlGatewayReceiveLogic.Current.RemoveAllEvent();
//娓呴櫎鍗囩骇鍒楄〃
- FirmwareUpdateResourse.dicDeviceUpdateList.Clear();
- FirmwareUpdateResourse.dicGatewayUpdateList.Clear();
+ FirmwareUpdateResourse.dicUpdateList.Clear();
HdlThreadLogic.Current.RunThread(async () =>
{
--
Gitblit v1.8.0