From eb51679c618d5027070fbd6f3c0519f0f17e7d7d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:07:53 +0800
Subject: [PATCH] Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 8f844bd..7664076 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using Shared;
@@ -157,7 +158,7 @@
{
string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, true);
- Control.Send(function);
+ Control.ins.ControlScene(function as Scene);
};
btnCoverd.MouseUpEventHandler = eventHandler;
btnName.MouseUpEventHandler = eventHandler;
@@ -177,11 +178,9 @@
new System.Threading.Thread(() =>
{
function.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
- //Control.Send(CommandType_A.write, function);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", function.trait_on_off.value.ToString());
- Control.SendWriteCommand(function, d);
-
+ Control.ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
};
@@ -215,7 +214,7 @@
curtain.percent = 0;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off",curtain.trait_on_off.value.ToString());
- Control.SendWriteCommand(curtain, d);
+ Control.ins.SendWriteCommand(curtain, d);
};
btnOpen.MouseDownEventHandler = (sender, e) =>
@@ -229,7 +228,7 @@
curtain.percent = 100;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.value.ToString());
- Control.SendWriteCommand(curtain, d);
+ Control.ins.SendWriteCommand(curtain, d);
};
}
--
Gitblit v1.8.0