From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
index 9b068fd..fa1831f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/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,
@@ -134,9 +147,9 @@
versionUpdateView.BtnTilte.TextID = StringId.VersionUpdate;
Action versionUpdateAction = () =>
{
- //OpenUrl();
-
- TestDDDDD();
+ OpenUrl();
+ //TestDDDDD();
+ //HDLCommon.Current.CheckIfNeedForceUpdate();
};
versionUpdateView.GoAction = versionUpdateAction;
#endregion
@@ -226,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 "";
@@ -270,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)
@@ -288,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;
@@ -299,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,
--
Gitblit v1.8.0