From 4fef29b9ab9f2632f15a0d45005f92d91de5d4e5 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期四, 27 七月 2023 14:26:59 +0800
Subject: [PATCH] feature 萤石sdk更新
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 101 +++++++++++++++++++++-----------------------------
1 files changed, 42 insertions(+), 59 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 3bf20a9..649b4c8 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -238,6 +238,25 @@
}
/// <summary>
+ /// 鏇存柊鍔熻兘缁勬帶涓婚〉
+ /// </summary>
+ public static void RefreshGroupControlView()
+ {
+ if (bodyView != null)
+ {
+
+ if (FunctionList.List.groupControls.Count == 0)
+ {
+ bodyView.loadNavView();
+ bodyView.contentView.PageIndex = 0;
+ }
+ bodyView.LoadGroupControlFunctionControlZone();
+ }
+ }
+
+
+
+ /// <summary>
/// 鏇存柊杩炴帴鐘舵�佸浘鏍�
/// </summary>
void CheckLinkStatus()
@@ -269,9 +288,15 @@
{
Application.RunOnMainThread(() =>
{
- if (bodyView != null)
+ try
{
- bodyView.CheckLinkStatus();
+ if (bodyView != null)
+ {
+ bodyView.CheckLinkStatus();
+ }
+ }catch(Exception ex)
+ {
+ MainPage.Log($"LoadEvent_CheckLinkStatus : {ex.Message}");
}
});
}
@@ -319,58 +344,11 @@
/// </summary>
void LoadEvent_ChangeShowedFunctionType()
{
- btnChangeFunction.MouseUpEventHandler = (sender, e) =>
+
+ if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl && FunctionList.List.groupControls.Count>0)
{
- btnChangeFunction.IsSelected = true;
- btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeFunction.IsBold = true;
- btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeScene.IsSelected = false;
- btnChangeScene.IsBold = false;
- CurShowTypeIsFunction = true;
- contentView.PageIndex = 0;
- };
- //var client = new BlufiClient();
- //client.PostPackageLengthLimit = 128;
- //client.RequestDeviceScan();
- //client.RequestDeviceStatus();
- //client.BlufiDelegate.Blufi_DidReceiveDeviceScanResponse();
-
-
- btnChangeScene.MouseUpEventHandler = (sender, e) =>
- {
- btnChangeScene.IsSelected = true;
- btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeScene.IsBold = true;
- btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeFunction.IsSelected = false;
- btnChangeFunction.IsBold = false;
- CurShowTypeIsFunction = false;
- contentView.PageIndex = 1;
- };
-
- contentView.PageChange = (sender, e) =>
- {
- if (contentView.PageIndex == 0)
- {
- btnChangeFunction.IsSelected = true;
- btnChangeFunction.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeFunction.IsBold = true;
- btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeScene.IsSelected = false;
- btnChangeScene.IsBold = false;
- }
- else
- {
- btnChangeScene.IsSelected = true;
- btnChangeScene.TextSize = CSS.CSS_FontSize.HeadlineFontSize;
- btnChangeScene.IsBold = true;
- btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
- btnChangeFunction.IsSelected = false;
- btnChangeFunction.IsBold = false;
- }
- };
+ }
}
/// <summary>
@@ -612,6 +590,11 @@
// }
// Control.Ins.SendWriteCommand(function, d);
//}
+ else if (function.spk == SPK.GroupControl)
+ {
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ (function as GroupControl).Control(d);
+ }
else
{
d.Add("on_off", function.trait_on_off.curValue.ToString());
@@ -801,9 +784,9 @@
skipPage.LoadPage(backAction);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- btnMsgBg.MouseUpEventHandler = eventHandler;
- btnMsgTime.MouseUpEventHandler = eventHandler;
- btnMsg.MouseUpEventHandler = eventHandler;
+ //btnMsgBg.MouseUpEventHandler = eventHandler;
+ //btnMsgTime.MouseUpEventHandler = eventHandler;
+ //btnMsg.MouseUpEventHandler = eventHandler;
btnMsgIcon.MouseUpEventHandler = eventHandler;
}
@@ -888,8 +871,8 @@
void ShowMesBtnState(PushMessageInfo pushMessageInfo, bool allRead)
{
if (bodyView == null) return;
- btnMsg.Text = pushMessageInfo.messageTitle + ": " + pushMessageInfo.messageContent;
- btnMsgTime.Text = GetUnixToDateTime(pushMessageInfo.createTime);
+ //btnMsg.Text = pushMessageInfo.messageTitle + ": " + pushMessageInfo.messageContent;
+ //btnMsgTime.Text = GetUnixToDateTime(pushMessageInfo.createTime);
btnMsgIcon.IsSelected = !allRead;
}
@@ -899,8 +882,8 @@
void ResetMesBtnRead()
{
if (bodyView == null) return;
- btnMsg.Text = "...";
- btnMsgTime.Text = "00:00";
+ //btnMsg.Text = "...";
+ //btnMsgTime.Text = "00:00";
btnMsgIcon.IsSelected = false;
}
--
Gitblit v1.8.0