Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project...

wei

2021-08-27 eda3fb873e59544ff36301b51e05aef64f87b0f9

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

@@ -71,6 +71,19 @@
            };
            bodyView.AddChidren(btnOnTitle);

#if DEBUG
            //btnOnIcon.MouseUpEventHandler += (sender, e) =>
            //{
            //    ESOnVideo.Current.Test();
            //};

            //btnOnTitle.MouseUpEventHandler += (sender, e) =>
            //{
            //    ESOnVideo.Current.Test(false);
            //};

#endif

            Button btnOnVersion = new Button()
            {
                Y = btnOnTitle.Bottom,
@@ -136,6 +149,7 @@
            {
                OpenUrl();
                //TestDDDDD();
                //HDLCommon.Current.CheckIfNeedForceUpdate();
            };
            versionUpdateView.GoAction = versionUpdateAction;
            #endregion
@@ -225,15 +239,15 @@
#else
            try
            {
                var versionResult = GetAndroidAppVersion();
                var versionResult = CheckAppVersion();
                if (versionResult == null)
                {
                    return "";
                }
                var newVersion = versionResult.NewVersion;
                var newVersion = versionResult.version;
                if (newVersion.CompareTo(MainPage.VersionString) > 0)
                {
                    newAppVersionUrl = versionResult.NewVersionUrl;
                    newAppVersionUrl = versionResult.androidUrl;
                    return newVersion;
                }
                return "";
@@ -269,17 +283,22 @@
            }
        }

#else
        //#else




#endif

        /// <summary>
        /// 获取 Android-APP 版本信息
        /// 检测新版本
        /// </summary>
        /// <returns>The https app version async.</returns>
        private APPVersion GetAndroidAppVersion()
        private AppVersionRes CheckAppVersion()
        {
            try
            {
                var result = new HttpServerRequest().GetAppVersion();
                var result = new HttpServerRequest().CheckAppVersion();
                if (result.Code == StateCode.SUCCESS)
                {
                    if (result.Data == null)
@@ -287,7 +306,7 @@
                        return null;
                    }

                    var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<APPVersion>(result.Data.ToString());
                    var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(result.Data.ToString());
                    return responeData;
                }
                return null;
@@ -298,15 +317,12 @@
            }
        }


#endif

        int updateType = 0;
        void TestDDDDD()
        {
            updateType = 1;

            ForceUpdateInfo forceUpdateInfo = new ForceUpdateInfo()
            UpdateDialogInfo forceUpdateInfo = new UpdateDialogInfo()
            {
                UpdateType = updateType,
                NewVersionUrl = Constant.URL_APPSTORE,