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 | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 3b857f1..782e8c7 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -136,7 +136,6 @@
{
System.Threading.Tasks.Task.Run(() =>
{
- DB_ResidenceData.residenceData.GatewayType = 0;
DriverLayer.Control.Ins.SearchLoaclGateway();
});
};
@@ -349,8 +348,7 @@
System.Threading.Tasks.Task.Run(() =>
{
- DB_ResidenceData.residenceData.GatewayType = 0;
- DriverLayer.Control.Ins.SearchLoaclGateway();
+ //DriverLayer.Control.Ins.SearchLoaclGateway();
});
}
@@ -703,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