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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs

@@ -51,7 +51,7 @@
            frameBack.BackgroundColor = UserCenterColor.Current.White;
            frameBack.Gravity = Gravity.CenterHorizontal;
            frameBack.Y = Application.GetRealHeight(683);
            frameBack.Radius = (uint)Application.GetMinRealAverage(6);
            frameBack.Radius = 6;
            bodyFrameLayout.AddChidren(frameBack);

            //进度显示文本
@@ -121,6 +121,8 @@
            //更新状态变化的事件

            updateLogic.UpdateStatuChangedEvent += (div, msg) =>

            {

                HdlThreadLogic.Current.RunMain(() =>

                {

                if (div == -1)

                {

                    //异常

@@ -145,6 +147,7 @@
                    //主动终止升级

                    this.CloseForm();

                }

                });

            };

            //进度值改变事件

            updateLogic.ProgressEvent += (value) =>

@@ -183,7 +186,9 @@
        public override void CloseForm()

        {

            //安卓可以点击系统的返回键

            UserView.HomePage.Instance.ScrollEnabled = true;

            Shared.Common.CommonPage.BackKeyCanClick = true;



            //升级对象

            if (FirmwareUpdateResourse.dicDeviceUpdateList.ContainsKey(deviceMac) == true

                && FirmwareUpdateResourse.dicDeviceUpdateList[deviceMac].IsFinishUpdate == true)