代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 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 () =>

            {