From 623b1b77900ca2804d76426e5e0c003249eef324 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 09 一月 2023 14:03:58 +0800
Subject: [PATCH] 方悦0.5精度空调
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 986ef9c..398e637 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()
@@ -195,8 +202,47 @@
{
//827a98c98da7469b8bc19bb6a3c7651906
//St_00009073b431d8b2490c9df0c5cb0e73
- Com.Hdl.HdlToLc.InitData(Shared.Application.Activity,false, "827a98c98da7469b8bc19bb6a3c7651906");
- Com.Hdl.HdlToLc.OpenActivity();
+ //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
@@ -562,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