From dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 04 十二月 2020 16:06:47 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
index 6ad72a9..f0747c8 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -136,6 +136,7 @@
{
OpenUrl();
//TestDDDDD();
+ //HDLCommon.Current.CheckIfNeedForceUpdate();
};
versionUpdateView.GoAction = versionUpdateAction;
#endregion
@@ -225,15 +226,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 +270,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 +293,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 +304,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