From d311d7f4da4538481938389cc5f2d37c62de3ef3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 16 十二月 2020 10:32:56 +0800
Subject: [PATCH] 2020-12-16 1.解决iOS打开App中断手机音乐播放问题。2.增加长按信息中心全部按钮，复制提取推送ID方便测试推送。
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
index 4f3d6d0..b8af979 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
@@ -18,7 +18,7 @@
{
if (bodyView == null)
return;
- bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.value.ToString() == "on";
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
@@ -38,6 +38,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = socketFunction.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = socketFunction.GetRoomListName();
+ socketFunction.SaveFunctionData(true);
};
}
@@ -47,8 +48,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = socketFunction.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- socketFunction.SaveFunctionData();
+ btnCollection.IsSelected = socketFunction.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ socketFunction.SaveFunctionData(true);
};
}
@@ -63,10 +64,10 @@
new System.Threading.Thread(() =>
{
- socketFunction.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ socketFunction.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, this.socketFunction);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", socketFunction.trait_on_off.value.ToString());
+ d.Add("on_off", socketFunction.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(socketFunction, d);
})
{ IsBackground = true }.Start();
@@ -77,10 +78,10 @@
new System.Threading.Thread(() =>
{
- socketFunction.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ socketFunction.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, this.socketFunction);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", socketFunction.trait_on_off.value.ToString());
+ d.Add("on_off", socketFunction.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(socketFunction, d);
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0