合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

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

                    }

                    return false;

                }

                catch

                {

            return false;



                }

                

#elif Android

            try