From 19b4abbebede2255b8d9f286105c7bf41d254429 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 29 十二月 2023 09:44:58 +0800
Subject: [PATCH] 金路备份
---
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 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..e63d631 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -46,13 +46,15 @@
/// </summary>
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.About)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.About));
+ topView.maginY = 10;
+ topView.LoadTopView();
this.BackgroundColor = CSS_Color.MainBackgroundColor;
Button btnOnIcon = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealWidth(106),
+ Y = Application.GetRealWidth(106+10),
Width = Application.GetRealWidth(58),
Height = Application.GetRealWidth(58),
UnSelectedImagePath = "OnIcon.png",
@@ -65,7 +67,7 @@
Y = Application.GetRealWidth(184),
Height = Application.GetRealWidth(28),
TextAlignment = TextAlignment.Center,
- Text = "On Pro",
+ Text = "浼樻暟鍏昏��",
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
IsBold = true,
@@ -95,7 +97,12 @@
Text = Language.StringByID(StringId.VersionNumber) + " " + MainPage.VersionString,
};
bodyView.AddChidren(btnOnVersion);
+ if(HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
+ {
+ btnOnVersion.Text += "(Test Server)";
+ }
+ return;
var lineView = new FrameLayout()
{
@@ -104,6 +111,7 @@
BackgroundColor = CSS_Color.DividingLineColor,
};
bodyView.AddChidren(lineView);
+
#region 鍔熻兘浠嬬粛
//var functionView = new ListCellView()
@@ -230,14 +238,14 @@
/// </summary>
void OpenUrl()
{
- if (!string.IsNullOrEmpty(newAppVersion))
+ if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersionUrl.Contains("http"))
{
HDLUtils.OpenUrl(newAppVersionUrl);
}
- else
- {
- Utlis.ShowTip(Language.StringByID(StringId.IsLatestVersion));
- }
+ //else
+ //{
+ // Utlis.ShowTip(Language.StringByID(StringId.IsLatestVersion));
+ //}
}
/// <summary>
@@ -314,7 +322,7 @@
var newVersion = versionResult.version;
if (newVersion.CompareTo(MainPage.VersionString) > 0)
{
- newAppVersionUrl = versionResult.androidUrl;
+ newAppVersionUrl = versionResult.packageUrl;
return newVersion;
}
return "";
@@ -361,7 +369,7 @@
/// 妫�娴嬫柊鐗堟湰
/// </summary>
/// <returns>The https app version async.</returns>
- private AppVersionRes CheckAppVersion()
+ private AppVersionResNew CheckAppVersion()
{
try
{
@@ -373,7 +381,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