Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs

@@ -19,6 +19,7 @@
        /// <para> 0:更新状态正常变化,后面的值为状态变更的文本翻译</para>

        /// <para> 1:升级成功</para>

        /// <para> 2:主动终止升级</para>

        /// <para> 3:从等待中取消(目前还没有用)</para>

        /// </summary>

        public Action<int, string> UpdateStatuChangedEvent = null;

        /// <summary>

@@ -92,7 +93,9 @@
                {

                    FirmwareUpdateResourse.dicDeviceUpdateList.Remove(otaDevice.DeviceAddr);

                }

                //取消

                this.UpdateStatu = UpdateStatuMode.None;

                this.UpdateStatuChangedEvent?.Invoke(3, "");

                return;

            }

            //如果它有状态，则表示之前它被什么错误中断了

@@ -577,20 +580,17 @@
                //移除事件

                HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(otaDevice);



                Application.RunOnMainThread(() =>

                {

                    //设置进度值直接为100%

                    this.ProgressEvent?.Invoke(100);

                    //状态变更

                    this.IsFinishUpdate = true;

                    //升级完成

                    this.UpdateStatu = UpdateStatuMode.UpdateFinish;

                //设置进度值直接为100%

                this.ProgressEvent?.Invoke(100);

                //状态变更

                this.IsFinishUpdate = true;

                //升级完成

                this.UpdateStatu = UpdateStatuMode.UpdateFinish;



                    HdlFirmwareUpdateLogic.DoUpdateNextFirmware();

                HdlFirmwareUpdateLogic.DoUpdateNextFirmware();



                    //设备升级成功!

                    this.UpdateStatuChangedEvent?.Invoke(1, Language.StringByID(R.MyInternationalizationString.uDeviceUpdateSuccess));

                });

                //设备升级成功!

                this.UpdateStatuChangedEvent?.Invoke(1, Language.StringByID(R.MyInternationalizationString.uDeviceUpdateSuccess));

            });

        }