合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

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

old mode 100644
new mode 100755
@@ -246,31 +246,31 @@
        {

#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;

            }

            {

                    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;

                    }

                    retuun false;

                }

                catch

                {

            return false;



                }

                

#elif Android

            try

@@ -300,7 +300,7 @@
        private async void UpdateVersion()

        {

#if iOS

            OpenUrl();

            CommonPage.Instance.OpenUrl();

#elif Android

            try

            {

@@ -351,7 +351,7 @@
        /// 获取iOS-APP版本信息

        /// </summary>

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

        public async System.Threading.Tasks.Task<Common.ResponseEntity.ResultPack> RequestHttpsiOSAppVersionAsync()

        public async System.Threading.Tasks.Task<ResponseEntity.ResultPack> RequestHttpsiOSAppVersionAsync()

        {

            try

            {

@@ -361,7 +361,7 @@
                {

                    return null;

                }

                return Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResultPack>(Encoding.UTF8.GetString(result));

                return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponseEntity.ResultPack>(Encoding.UTF8.GetString(result));

            }

            catch

            {