From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 9a2f9e3..782e8c7 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -111,7 +111,7 @@
Y = Application.GetRealHeight(46),
Width = Application.GetRealWidth(6),
Height = Application.GetRealWidth(6),
- BackgroundColor = CSS_Color.MainColor,
+ BackgroundColor = CSS_Color.LinkTipFail,
Radius = (uint)Application.GetRealWidth(3),
};
topView.AddChidren(btnLinkStateTip);
@@ -131,15 +131,13 @@
topView.AddChidren(btnResidenceName);
#if DEBUG
- //鍚姩a缃戝叧mqtt
- //btnResidenceName.MouseUpEventHandler = (sender, e) =>
- //{
- // System.Threading.Tasks.Task.Run(
- // async () => { await Mqtt_A_Protocol.StartMqtt();
- // });
- //};
- btnResidenceName.MouseUpEventHandler = (sender, e) => {
- Control.SearchLocalGateway();
+ //鎼滅储缃戝叧
+ btnResidenceName.MouseUpEventHandler = (sender, e) =>
+ {
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ DriverLayer.Control.Ins.SearchLoaclGateway();
+ });
};
#endif
@@ -346,6 +344,12 @@
{
MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
}
+
+
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ //DriverLayer.Control.Ins.SearchLoaclGateway();
+ });
}
/// <summary>
@@ -697,14 +701,14 @@
btnPower.IsSelected = false;
Music.SendMethod.Pause(a31player);
a31player.A31PlayStatus.status = "pause";
- a31player.trait_on_off.value = "off";
+ a31player.trait_on_off.curValue = "off";
}
else
{
btnPower.IsSelected = true;
Music.SendMethod.Play(a31player);
a31player.A31PlayStatus.status = "play";
- a31player.trait_on_off.value = "on";
+ a31player.trait_on_off.curValue = "on";
}
UpdataFunctionStates(a31player);
};
--
Gitblit v1.8.0