Merge branch 'Dev-Wxr'

wxr

2023-06-05 753e67c3705dddb8e913bd853db151f94f81d600

 HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs

@@ -47,6 +47,7 @@
        public void LoadPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.About)).LoadTopView();
            this.BackgroundColor = CSS_Color.MainBackgroundColor;

            Button btnOnIcon = new Button()
            {
@@ -229,7 +230,7 @@
        /// </summary>
        void OpenUrl()
        {
            if (!string.IsNullOrEmpty(newAppVersion))
            if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersion.Contains("http"))
            {
                HDLUtils.OpenUrl(newAppVersionUrl);
            }
@@ -313,7 +314,7 @@
                var newVersion = versionResult.version;
                if (newVersion.CompareTo(MainPage.VersionString) > 0)
                {
                    newAppVersionUrl = versionResult.androidUrl;
                    newAppVersionUrl = versionResult.packageUrl;
                    return newVersion;
                }
                return "";
@@ -360,7 +361,7 @@
        /// 检测新版本
        /// </summary>
        /// <returns>The https app version async.</returns>
        private AppVersionRes CheckAppVersion()
        private AppVersionResNew CheckAppVersion()
        {
            try
            {
@@ -372,7 +373,7 @@
                        return null;
                    }

                    var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(result.Data.ToString());
                    var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(result.Data.ToString());
                    return responeData;
                }
                return null;