Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -97,7 +97,7 @@
        /// </summary>
        private void ShowTopRightMenu()

        {

            var frame = new TopRightMenuControl(this, 1);

            var frame = new TopRightMenuControl(1);

            //历史版本

            var deviceMenu = Language.StringByID(R.MyInternationalizationString.uHistoryVersion);

            frame.AddRowMenu(deviceMenu, "", "", () =>

@@ -135,8 +135,10 @@
            {

                //界面右划不可

                UserView.HomePage.Instance.ScrollEnabled = false;

                Shared.Common.CommonPage.BackKeyCanClick = false;



                var form = new DeviceFirmwareUpdateForm();

                form.CloseFormByClickBack = false;

                form.AddForm(oTADevice, deviceFirmware);

                //完成升级事件

                form.FinishUpdateEvent += (() =>