合并了徐梅的按键面板绑定

黄学彪

2019-09-30 404cdc88627f942df7944af04ee05b9d527752d6

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

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

    /// 关于的画面

    /// </summary>

    public class AbountForm : UserCenterCommonForm

    public class AbountForm : EditorCommonForm

    {

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

        /// <summary>

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

        /// Closes the form.

        /// </summary>

        public override void CloseForm(bool isCloseForm = true)

        public override void CloseForm()

        {

#if Android

            if(isUpdating==true)

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

                        SetDownLoadBtnNoVisible();

                        CommonPage.CancelDownLoadApkAsync();

                        base.CloseForm(isCloseForm);

                        base.CloseForm();

                    }

                    else

                    {

@@ -91,10 +91,10 @@
            else

            {

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

                base.CloseForm(isCloseForm);

                base.CloseForm();

            }

#elif iOS

           base.CloseForm(isCloseForm);

           base.CloseForm();

#endif

        }

        /// <summary>
@@ -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();