2019-12-30-1

WJC

2019-12-30 f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f

 ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs

@@ -10,7 +10,7 @@
    /// <summary>

    /// 关于的画面

    /// </summary>

    public class AbountForm : UserCenterCommonForm

    public class AbountForm : EditorCommonForm

    {

        #region **变量*****************************

        /// <summary>

@@ -53,20 +53,20 @@
        {

            instance = this;

        }

        /// <summary>
        /// 画面显示(底层会固定调用此方法，借以完成画面创建)
        /// </summary>
        public void ShowForm()
        {
            //设置标题信息
            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uVersionInformation));
            //初始化中部控件
            this.InitMiddleFrame();
        }
        /// <summary>

        /// 画面显示(底层会固定调用此方法，借以完成画面创建)

        /// </summary>

        public void ShowForm()

        {

            //设置标题信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uVersionInformation));

            //初始化中部控件

            this.InitMiddleFrame();

        }

        /// <summary>

        /// Closes the form.

        /// </summary>

        public override void CloseForm(bool isCloseForm = true)

        public override void CloseFormBefore()

        {

#if Android

            if(isUpdating==true)

@@ -80,7 +80,7 @@
                        updateBtn.Visible = true;

                        SetDownLoadBtnNoVisible();

                        CommonPage.CancelDownLoadApkAsync();

                        base.CloseForm(isCloseForm);

                        base.CloseFormBefore();

                    }

                    else

                    {

@@ -91,16 +91,16 @@
            else

            {

                Phone.UserView.HomePage.Instance.ScrollEnabled = true;

                base.CloseForm(isCloseForm);

                base.CloseFormBefore();

            }

#elif iOS

           base.CloseForm(isCloseForm);

           base.CloseFormBefore();

#endif

        }

        /// <summary>
        /// 初始化中部控件
        /// </summary>
        private void InitMiddleFrame()
        /// <summary>

        /// 初始化中部控件

        /// </summary>

        private void InitMiddleFrame()

        {

            var logoBtn = new Button()

            {

@@ -289,7 +289,7 @@
                    CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.UpdateAppFail);

                    return;

                }

                if (versionResult.FirmwareVersion != CommonPage.CodeIDString)

                if (int.Parse(versionResult.FirmwareVersion.Replace(".",""))  > int.Parse(CommonPage.CodeIDString.Replace(".","")))

                {

                    var alert = new Alert(Language.StringByID(R.MyInternationalizationString.UpdateContent), versionResult.Remarks, Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));

                    alert.Show();