From f7063b6fb7b46e3612afb1c6bb426c94fb92593d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 10 一月 2023 14:44:32 +0800
Subject: [PATCH] 设备加载优化
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index ec6a2eb..020be35 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using HDL_ON.DAL;
+using HDL_ON.DAL.Server;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -11,7 +12,7 @@
namespace HDL_ON.UI
{
- public partial class HomePage : VerticalRefreshLayout
+ public partial class HomePage : VerticalScrolViewLayout// VerticalRefreshLayout
{
#region 鎺т欢鍒楄〃
@@ -132,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)
@@ -145,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()
@@ -179,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,
@@ -193,7 +200,49 @@
int ddd = 0;
btnResidenceName.MouseUpEventHandler = (sender, e) =>
{
+ //827a98c98da7469b8bc19bb6a3c7651906
+ //St_00009073b431d8b2490c9df0c5cb0e73
+ //Com.Hdl.HdlToLc.InitData(Shared.Application.Activity,false, "827a98c98da7469b8bc19bb6a3c7651906");
+ //Com.Hdl.HdlToLc.OpenActivity();
+ new System.Threading.Thread(() =>
+ {
+ var http = new HttpServerRequest();
+ var pack = http.GetLcSubAccountToken();
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ if(pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
+ });
+ }
+ 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();
+ Application.RunOnMainThread(() =>
+ {
+ //Com.Utils.HdlToLcUtils.Instance.OpenActivity();
+ //Com.Utils.HdlToLcUtils.Instance.Play()
+ var backTemp = new AddLcCam();
+ backTemp.backAction = () =>
+ {
+ //Load3tyBrandDeviceList();
+ };
+ Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
+
+ });
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
+ });
+ }
+ })
+ { IsBackground = true }.Start();
};
#endif
@@ -559,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);
@@ -1234,11 +1283,11 @@
var btnLogo = new Button()
{
- Y = Application.GetRealWidth(85),
+ Y = Application.GetRealHeight(65),
UnSelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
SelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
Width = Application.GetRealWidth(80),
- Height = Application.GetRealWidth(37),
+ Height = Application.GetRealHeight(37),
};
view.AddChidren(btnLogo);
--
Gitblit v1.8.0