From d4811b7d34b45ff6b21b97f11da128b5572ec526 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 03 三月 2021 16:03:03 +0800
Subject: [PATCH] 20210303-1
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 140 +++++++++++++++++++++++++++++-----------------
1 files changed, 89 insertions(+), 51 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index daf89de..c090e78 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -27,20 +27,20 @@
/// </summary>
void CheckLinkStatus()
{
- if (Control.Ins.GatewayOnline)
+ if (!Control.Ins.GatewayOnline_Local && !Control.Ins.GatewayOnline_Cloud)
{
- if (Control.Ins.IsRemote)
- {
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
- }
- else
- {
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
- }
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
}
else
{
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
+ if (Control.Ins.GatewayOnline_Local)
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipLocal;
+ }
+ else
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
+ }
}
}
@@ -56,28 +56,6 @@
bodyView.CheckLinkStatus();
}
});
-
- //if (bodyView != null)
- //{
- // Application.RunOnMainThread(() =>
- // {
- // if (Control.Ins.GatewayOnline)
- // {
- // if (Control.Ins.IsRemote)
- // {
- // bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
- // }
- // else
- // {
- // bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
- // }
- // }
- // else
- // {
- // bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
- // }
- // });
- //}
}
/// <summary>
@@ -88,7 +66,7 @@
btn.MouseUpEventHandler += (sender, e) =>
{
function.collect = false;
- if (function.functionCategory == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
+ if (function.Spk_Prefix == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
{
if ((function as Music.A31MusicModel).ServerClientType == 1)
{
@@ -98,7 +76,7 @@
}
string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
LoadDeviceFunctionControlZone();
- function.SaveFunctionData(true);
+ function.CollectFunction();
new PublicAssmebly().TipMsgAutoClose(msg, true);
};
}
@@ -133,7 +111,15 @@
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) =>
{
@@ -177,7 +163,7 @@
/// </summary>
public static void UpdataFunctionStates(Function function)
{
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread((Action)(() =>
{
try
{
@@ -187,7 +173,16 @@
{
if (view.Tag.ToString() == function.sid)
{
- var state = function.trait_on_off.curValue.ToString() == "on";
+ var state = false;
+ if (function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades || function.spk == SPK.CurtainTrietex ||
+ function.spk == SPK.CurtainSwitch)//绐楀笜璁惧鏍规嵁鐧惧垎姣斿垽鏂紑鍏崇姸鎬�
+ {
+ state = function.GetAttrState(FunctionAttributeKey.Percent) != "0";
+ }
+ else
+ {
+ state = function.trait_on_off.curValue.ToString() == "on";
+ }
for (int i = 0; i < view.ChildrenCount; i++)
{
if (view.GetChildren(i).GetType() == typeof(Button))
@@ -196,13 +191,16 @@
btn.IsSelected = state;
if (btn.Tag != null && btn.Tag.ToString() == "state")
{
- if (function.functionCategory == FunctionCategory.Music)
+ if (function.Spk_Prefix == FunctionCategory.Music)
{
btn.Text = (function as Music.A31MusicModel).A31PlayStatus.Title;
}
else
{
- btn.Text = function.lastState;
+ if (function.spk != SPK.LightSwitch)
+ {
+ btn.Text = function.lastState;
+ }
}
}
}
@@ -215,7 +213,7 @@
{
MainPage.Log($"HomePage updata funciton states error {ex.Message}");
}
- });
+ }));
}
/// <summary>
@@ -336,36 +334,76 @@
/// </summary>
void LoadEvent_ControlCurtain(Curtain curtain, Button btnClose, Button btnOpen)
{
- btnClose.MouseDownEventHandler = (sender, e) =>
- {
- btnClose.IsSelected = true;
- };
btnClose.MouseUpEventHandler = (sender, e) =>
{
- btnClose.IsSelected = false;
+ btnClose.IsSelected = true;
curtain.trait_on_off.curValue = "off";
curtain.percent = 0;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
- btnOpen.MouseDownEventHandler = (sender, e) =>
- {
- btnOpen.IsSelected = true;
- };
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- btnOpen.IsSelected = false;
+ btnOpen.IsSelected = true;
curtain.trait_on_off.curValue = "on";
curtain.percent = 100;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
}
/// <summary>
+ /// 鍔犺浇鏅捐。鏋舵帶鍒朵簨浠�
+ /// </summary>
+ void LoadEvent_ControlClothesHanger(Function function,Button btnUp,Button btnDown)
+ {
+ btnUp.MouseDownEventHandler = (sender, e) =>
+ {
+ btnUp.IsSelected = true;
+ };
+ btnUp.MouseUpEventHandler = (sender, e) =>
+ {
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ btnUp.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
+ function.SetAttrState(FunctionAttributeKey.Position, "up");
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Position, "up");
+ Control.Ins.SendWriteCommand(function, d);
+ };
+
+ btnDown.MouseDownEventHandler = (sender, e) =>
+ {
+ btnDown.IsSelected = true;
+ };
+ btnDown.MouseUpEventHandler = (sender, e) =>
+ {
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ btnDown.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
+ function.SetAttrState(FunctionAttributeKey.Position, "down");
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Position, "down");
+ Control.Ins.SendWriteCommand(function, d);
+ };
+ }
+
+ /// <summary>
/// 鍔犺浇璺宠浆淇℃伅涓績椤甸潰
/// </summary>
void LoadEvent_GotoMessageCenterPage()
--
Gitblit v1.8.0