From a27183cc0ed72c43657c7e7c21370e6074dcc695 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期四, 27 七月 2023 13:50:29 +0800
Subject: [PATCH] merge to Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
index 5d5edce..863d94e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -95,6 +95,10 @@
Text = Language.StringByID(StringId.VersionNumber) + " " + MainPage.VersionString,
};
bodyView.AddChidren(btnOnVersion);
+ if(HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
+ {
+ btnOnVersion.Text += "(Test Server)";
+ }
var lineView = new FrameLayout()
@@ -230,7 +234,7 @@
/// </summary>
void OpenUrl()
{
- if (!string.IsNullOrEmpty(newAppVersion))
+ if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersion.Contains("http"))
{
HDLUtils.OpenUrl(newAppVersionUrl);
}
@@ -314,7 +318,7 @@
var newVersion = versionResult.version;
if (newVersion.CompareTo(MainPage.VersionString) > 0)
{
- newAppVersionUrl = versionResult.androidUrl;
+ newAppVersionUrl = versionResult.packageUrl;
return newVersion;
}
return "";
@@ -361,7 +365,7 @@
/// 妫�娴嬫柊鐗堟湰
/// </summary>
/// <returns>The https app version async.</returns>
- private AppVersionRes CheckAppVersion()
+ private AppVersionResNew CheckAppVersion()
{
try
{
@@ -373,7 +377,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;
--
Gitblit v1.8.0