From 9508510f0b27da3278fa1161eb2ba3dd1e3e2030 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 26 七月 2023 13:14:00 +0800
Subject: [PATCH] 2023年07月26日13:12:21
---
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 80 ++++++++++++++++++++++++++++++---------
1 files changed, 61 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
index 8fd0334..863d94e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -47,6 +47,7 @@
public void LoadPage()
{
new TopViewDiv(bodyView, Language.StringByID(StringId.About)).LoadTopView();
+ this.BackgroundColor = CSS_Color.MainBackgroundColor;
Button btnOnIcon = new Button()
{
@@ -94,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()
@@ -105,26 +110,26 @@
bodyView.AddChidren(lineView);
#region 鍔熻兘浠嬬粛
- var functionView = new ListCellView()
- {
- Y = lineView.Bottom,
- };
- bodyView.AddChidren(functionView);
- functionView.BtnTilte.TextID = StringId.FunctionIntroduced;
- Action functionAction = () =>
- {
- var mPage = new FunctionIntroductionPage();
- MainPage.BasePageView.AddChidren(mPage);
- mPage.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- functionView.GoAction = functionAction;
+ //var functionView = new ListCellView()
+ //{
+ // Y = lineView.Bottom,
+ //};
+ //bodyView.AddChidren(functionView);
+ //functionView.BtnTilte.TextID = StringId.FunctionIntroduced;
+ //Action functionAction = () =>
+ //{
+ // var mPage = new FunctionIntroductionPage();
+ // MainPage.BasePageView.AddChidren(mPage);
+ // mPage.LoadPage();
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //};
+ //functionView.GoAction = functionAction;
#endregion
#region 鎶曡瘔
var complaintsView = new ListCellView()
{
- Y = functionView.Bottom,
+ Y = lineView.Bottom,
};
bodyView.AddChidren(complaintsView);
complaintsView.BtnTilte.TextID = StringId.Complaints;
@@ -184,6 +189,43 @@
#endregion
privacyPolicyView.GoAction = privacyPolicyAction;
CheckIfNeedUpdateAsync();
+
+#if __IOS__
+ #region 鍥轰欢鍗囩骇
+ var firUpdateView = new ListCellView()
+ {
+ Y = privacyPolicyView.Bottom,
+ };
+ firUpdateView.BtnTilte.TextID = StringId.FirmwareUpdate;
+ bodyView.AddChidren(firUpdateView);
+ Action firmwareUpdateAction = () =>
+ {
+ var mPage = new HDL_ON.UI.UI2.PersonalCenter.AboutOn.FirmwareUpdateView();
+ MainPage.BasePageView.AddChidren(mPage);
+ mPage.ShowPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ firUpdateView.GoAction = firmwareUpdateAction;
+ #endregion
+
+
+ #region HomeKit鏀寔璇存槑
+ var homeKitView = new ListCellView()
+ {
+ Y = firUpdateView.Bottom,
+ };
+ bodyView.AddChidren(homeKitView);
+ homeKitView.BtnTilte.TextID = StringId.SupportHomeKitNotes;
+ Action homeKitSupportViewAction = () => {
+ var mPage = new HDL_ON.UI.UI2.PersonalCenter.AboutOn.SupportHomeKitNotesPage();
+ MainPage.BasePageView.AddChidren(mPage);
+ mPage.ShowPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ homeKitView.GoAction = homeKitSupportViewAction;
+ #endregion
+#endif
+
}
@@ -192,7 +234,7 @@
/// </summary>
void OpenUrl()
{
- if (!string.IsNullOrEmpty(newAppVersion))
+ if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersion.Contains("http"))
{
HDLUtils.OpenUrl(newAppVersionUrl);
}
@@ -276,7 +318,7 @@
var newVersion = versionResult.version;
if (newVersion.CompareTo(MainPage.VersionString) > 0)
{
- newAppVersionUrl = versionResult.androidUrl;
+ newAppVersionUrl = versionResult.packageUrl;
return newVersion;
}
return "";
@@ -323,7 +365,7 @@
/// 妫�娴嬫柊鐗堟湰
/// </summary>
/// <returns>The https app version async.</returns>
- private AppVersionRes CheckAppVersion()
+ private AppVersionResNew CheckAppVersion()
{
try
{
@@ -335,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