From b8c54a7e4048317fc0f33c63a802d60396f82eb0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 十二月 2022 17:31:59 +0800
Subject: [PATCH] 2022年12月07日17:31:56
---
HDL_ON/UI/MainPage.cs | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 4fd5acb..3d3d5ad 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.6.2";
+ public static string VersionString = "1.6.3";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -58,6 +58,10 @@
/// 0:鏃犵綉缁�
/// </summary>
public static int InternetStatus = 2;
+ /// <summary>
+ /// 杩炴帴mqtt娆℃暟
+ /// </summary>
+ public static int LinkHdlMqttCount = 0;
/// <summary>
/// 鏄惁杩涘叆鍚庡彴
/// </summary>
@@ -116,6 +120,7 @@
SPK.AirFreshStandard,SPK.HvacAirFresh,
SPK.AirSwitch,
SPK.PanelSocket,SPK.ElectricSocket,
+ SPK.MechanicalArm,SPK.IpCam_Imou,
};
@@ -395,30 +400,30 @@
{
Entity.FunctionList.List.Clear();
Entity.SpatialInfo.CurrentSpatial.Clear();
- ///绛夊緟鑾峰彇浣忓畢淇℃伅
- Application.RunOnMainThread(() =>
- {
- if (waitPage != null)
+ ///绛夊緟鑾峰彇浣忓畢淇℃伅
+ Application.RunOnMainThread(() =>
{
- waitPage.RemoveFromParent();
- waitPage = null;
- }
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
- //璺宠浆椤甸潰----
- UserBasePage = new UserPage();
- BasePageView.AddChidren(UserBasePage);
- UserBasePage.LoadPage();
- BasePageView.PageIndex = 0;
+ //璺宠浆椤甸潰----
+ UserBasePage = new UserPage();
+ BasePageView.AddChidren(UserBasePage);
+ UserBasePage.LoadPage();
+ BasePageView.PageIndex = 0;
- if (isFirstOpen)
- {
- //鍚姩瀵嗙爜楠岃瘉
- new AppUnlockPage().LoadPage(isFirstOpen);
- }
- //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
- pageShowEvent?.Invoke();
- pageShowEvent = null;
- });
+ if (isFirstOpen)
+ {
+ //鍚姩瀵嗙爜楠岃瘉
+ new AppUnlockPage().LoadPage(isFirstOpen);
+ }
+ //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
+ pageShowEvent?.Invoke();
+ pageShowEvent = null;
+ });
}
catch (Exception ex)
{
@@ -427,14 +432,14 @@
finally
{
Application.RunOnMainThread(() =>
- {
- if (downloadData)
- {
- DB_ResidenceData.Instance.EixtAccount();
- ///鍒濆鍖朼pp鏁版嵁
- Common.ApiUtlis.Ins.DownloadData();
- };
- });
+ {
+ if (downloadData)
+ {
+ DB_ResidenceData.Instance.EixtAccount();
+ ///鍒濆鍖朼pp鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
+ };
+ });
}
}).Start();
--
Gitblit v1.8.0