请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

old mode 100644
new mode 100755
@@ -45,7 +45,7 @@
        /// </summary>

        public AbountForm()

        {

            


        }

        /// <summary>

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

@@ -150,23 +150,25 @@
            var versionFL = new FrameLayout

            {

                Y = Application.GetRealHeight(510),

                Height = Application.GetRealHeight(300),

                //Height = Application.GetRealHeight(300),

                Height = Application.GetRealHeight(300-127-12),

                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor

            };

            bodyFrameLayout.AddChidren(versionFL);



            var SLARow = new DeviceInfoRow(12);

            SLARow.Init();

            SLARow.SetTipTitle(R.MyInternationalizationString.SLA);

            SLARow.NameText.TextAlignment = TextAlignment.CenterRight;

            versionFL.AddChidren(SLARow);

            SLARow.ClickBtn.MouseUpEventHandler += (sender, e) =>

            {

                var slaForm = new SLAForm();

                slaForm.AddForm();

            };

            //var SLARow = new DeviceInfoRow(12);

            //SLARow.Init();

            //SLARow.SetTipTitle(R.MyInternationalizationString.SLA);

            //SLARow.NameText.TextAlignment = TextAlignment.CenterRight;

            //versionFL.AddChidren(SLARow);

            //SLARow.ClickBtn.MouseUpEventHandler += (sender, e) =>

            //{

            //    var slaForm = new SLAForm();

            //    slaForm.AddForm();

            //};



            updateRow = new DeviceInfoRow(12 + 127 + 12);

            //updateRow = new DeviceInfoRow(12 + 127 + 12);

            updateRow = new DeviceInfoRow(12);

            updateRow.Init();

            updateRow.SetTipTitle(R.MyInternationalizationString.UpdateVersion);

            updateRow.NameText.TextAlignment = TextAlignment.CenterRight;

@@ -180,7 +182,7 @@
                UpdateVersion();

            };



           


            updatingBtn = new Button()

            {

                Y = Application.GetRealHeight(994),

@@ -194,7 +196,7 @@
                Gravity=Gravity.CenterHorizontal

            };

            bodyFrameLayout.AddChidren(updatingBtn);

           


            SetDownLoadBtnNoVisible();

            CheckVersion();

        }

@@ -246,32 +248,30 @@
        {

#if iOS

            try

            {
                CommonPage.Loading.Start();
                var versionResult = await RequestHttpsiOSAppVersionAsync();
                if (versionResult == null || versionResult.Results == null)
                {
                    return false;
                }
                var results = Newtonsoft.Json.Linq.JArray.Parse(versionResult.Results.ToString());
                if (results[0] == null)
                {
                    return false;
                }
                var newVersion = results[0]["version"]?.ToString();
                var updateContent = results[0]["releaseNotes"]?.ToString();
                if (newVersion != CommonPage.CodeIDString)
                {
                    return true;
                }
                return false;
            }
            catch
            {
                return false;

            }

                
            {

                    var versionResult = await RequestHttpsiOSAppVersionAsync();

                    if (versionResult == null || versionResult.Results == null)

                    {

                        return false;

                    }

                    var results = Newtonsoft.Json.Linq.JArray.Parse(versionResult.Results.ToString());

                    if (results[0] == null)

                    {

                        return false;

                    }

                    var newVersion = results[0]["version"]?.ToString();

                    var updateContent = results[0]["releaseNotes"]?.ToString();

                    if (newVersion != CommonPage.CodeIDString)

                    {

                        return true;

                    }

                    return false;

                }

                catch

                {

                   return false;

                }



#elif Android

            try

            {