代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

old mode 100755
new mode 100644
@@ -264,7 +264,7 @@
                    {

                        return true;

                    }

                    retuun false;

                    return false;

                }

                catch

                {

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

        {

#if iOS

            CommonPage.Instance.OpenUrl();

            OpenUrl();

#elif Android

            try

            {

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

        /// </summary>

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

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

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

        {

            try

            {

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

                    return null;

                }

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

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

            }

            catch

            {