请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

old mode 100644
new mode 100755
@@ -167,18 +167,6 @@
        }



        /// <summary>

        /// CheckVersion

        /// </summary>

        private void CheckVersion()

        {

            new System.Threading.Thread(async () =>

            {

                
            })

            { IsBackground = true }.Start();



        }

        /// <summary>

        /// 设置进度控件不可见

        /// </summary>

        private void SetDownLoadBtnNoVisible()

@@ -204,34 +192,34 @@
        {

#if iOS

            try

            {
                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.CompareTo(CommonPage.CodeIDString) > 0)
                {
                    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.CompareTo(CommonPage.CodeIDString) > 0)

                    {

                        return true;

                    }

                    return false;

                }

                catch

                {

                   return false;

                }



#elif Android

            try

            {

                var versionResult = await RequestHttpsAndroidAppVersionAsync();

                var versionResult = RequestHttpsAndroidAppVersionAsync();

                if (versionResult == null)

                {

                    return false;

@@ -267,7 +255,7 @@
                };

                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);



                var bytesTotalLengthResult = await CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DownloadPlatformUploadFirmwarePreLength", Encoding.UTF8.GetBytes(requestJson));

                var bytesTotalLengthResult = CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DownloadPlatformUploadFirmwarePreLength", Encoding.UTF8.GetBytes(requestJson));

                if (bytesTotalLengthResult == null || bytesTotalLengthResult.ResponseData == null)

                {

                    CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.UpdateAppFail);

@@ -366,7 +354,7 @@
        /// 获取 Android-APP 版本信息

        /// </summary>

        /// <returns>The https app version async.</returns>

        private async System.Threading.Tasks.Task<Common.ResponseEntity.ApkInfoOBJ> RequestHttpsAndroidAppVersionAsync()

        private Common.ResponseEntity.ApkInfoOBJ RequestHttpsAndroidAppVersionAsync()

        {

            try

            {

@@ -376,7 +364,7 @@
                    RequestVersion = CommonPage.CodeIDString

                };

                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestOBJ);

                var result = await CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DetectionPlatformUploadFirmware", System.Text.Encoding.UTF8.GetBytes(requestJson));

                var result = CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DetectionPlatformUploadFirmware", System.Text.Encoding.UTF8.GetBytes(requestJson));

                if (result == null)

                {

                    return null;