From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 3b857f1..15575da 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -136,8 +136,9 @@
{
System.Threading.Tasks.Task.Run(() =>
{
- DB_ResidenceData.residenceData.GatewayType = 0;
- DriverLayer.Control.Ins.SearchLoaclGateway();
+ DriverLayer.Control.Ins.OpenUdp(6000);
+ //DB_ResidenceData.residenceData.GatewayType = 0;
+ //DriverLayer.Control.Ins.SearchLoaclGateway();
});
};
#endif
@@ -349,8 +350,7 @@
System.Threading.Tasks.Task.Run(() =>
{
- DB_ResidenceData.residenceData.GatewayType = 0;
- DriverLayer.Control.Ins.SearchLoaclGateway();
+ //DriverLayer.Control.Ins.SearchLoaclGateway();
});
}
@@ -703,14 +703,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