From 6ad070dbf9a88bb95a6eb38ed40e91959ca56115 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 10 一月 2023 10:18:25 +0800
Subject: [PATCH] 空调控制界面优化
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 832ac88..020be35 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -12,7 +12,7 @@
namespace HDL_ON.UI
{
- public partial class HomePage : VerticalRefreshLayout
+ public partial class HomePage : VerticalScrolViewLayout// VerticalRefreshLayout
{
#region 鎺т欢鍒楄〃
@@ -133,9 +133,17 @@
MainPage.CurPageIndex = 0;
try
{
- this.BeginHeaderRefreshingAction = () =>
+ bodyView.RemoveAll();
+
+ VerticalRefreshLayout refreshLayout = new VerticalRefreshLayout()
{
- this.EndHeaderRefreshing();
+ Height = Application.GetRealHeight(216),
+ BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
+ };
+ bodyView.AddChidren(refreshLayout);
+ refreshLayout.BeginHeaderRefreshingAction = () =>
+ {
+ refreshLayout.EndHeaderRefreshing();
Common.ApiUtlis.Ins.DownloadData();
LoadContentView();
if(!CurShowTypeIsFunction)
@@ -146,14 +154,12 @@
#region topView
- bodyView.RemoveAll();
topView = new FrameLayout()
{
Height = Application.GetRealHeight(216),
- BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
};
- bodyView.AddChidren(topView);
+ refreshLayout.AddChidren(topView);
Button btnTop;
btnTop = new Button()
@@ -180,7 +186,7 @@
//X = Application.GetRealWidth(16),
Y = btnResidenceName.Bottom,
Height = Application.GetRealWidth(14),
- BackgroundColor = CSS_Color.LinkTipFail,
+ //BackgroundColor = CSS_Color.LinkTipFail,
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.MainBackgroundColor,
@@ -208,10 +214,9 @@
{
Application.RunOnMainThread(() =>
{
- new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触");
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
});
}
- Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
@@ -233,7 +238,7 @@
{
Application.RunOnMainThread(() =>
{
- new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触({pack.Code})");
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
});
}
})
@@ -603,7 +608,7 @@
/// </summary>
void LoadContentView()
{
- if (!Common.ApiUtlis.Ins.DownloadDataComplete)
+ if (!Common.ApiUtlis.Ins.DownloadDataComplete && !MainPage.NoLoginMode)
{
var waitPage = new Loading();
MainPage.BaseView.AddChidren(waitPage);
--
Gitblit v1.8.0