diff --git a/DLL/LightContrl.dll b/DLL/LightContrl.dll
index c8ffee3..08c0b30 100644
Binary files a/DLL/LightContrl.dll and b/DLL/LightContrl.dll differ
diff --git a/Epost.DAL/Epost.DAL.csproj b/Epost.DAL/Epost.DAL.csproj
index 4a3252a..ac985ff 100644
--- a/Epost.DAL/Epost.DAL.csproj
+++ b/Epost.DAL/Epost.DAL.csproj
@@ -82,7 +82,8 @@
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll
True
-
+
+ False
..\DLL\LightContrl.dll
diff --git a/Epost.TestToolsWeb/Controllers/ServerController.cs b/Epost.TestToolsWeb/Controllers/ServerController.cs
index 7990d90..dfc27d4 100644
--- a/Epost.TestToolsWeb/Controllers/ServerController.cs
+++ b/Epost.TestToolsWeb/Controllers/ServerController.cs
@@ -143,14 +143,15 @@ namespace Epost.DPS.Controllers
MainControl control = conlist.FirstOrDefault().maincontrol;
bool bo = false;
string Address = dt.Rows[0]["address"].ToString().Trim();
+ string resstr = string.Empty;
if (item.lightType == "0")
{
- bo = control.LED_OFF(ipaddress, Address);
+ bo = control.LED_OFF(ipaddress, Address,ref resstr);
}
else
{
- bo = control.LED_ON(ipaddress, Address, "3", "0" , item.lightColor.Trim());
+ bo = control.LED_ON(ipaddress, Address, ref resstr, "3", "0" , item.lightColor.Trim());
}
@@ -247,7 +248,8 @@ namespace Epost.DPS.Controllers
list.Add(show);
}
- bool bo = control.LED_By_Paragraph(ipaddress, address, list);
+ string resstr = string.Empty;
+ bool bo = control.LED_By_Paragraph(ipaddress, address, list,ref resstr);
if (bo)
{
res.resultCode = "0";
@@ -256,7 +258,7 @@ namespace Epost.DPS.Controllers
else
{
res.resultCode = "-1";
- res.resultMsg = "失败";
+ res.resultMsg = resstr;
return res;
}
diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user
index b1a2138..044be83 100644
--- a/Epost.TestToolsWeb/Epost.DPS.csproj.user
+++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user
@@ -11,7 +11,7 @@
False
600
E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml
- Release|Any CPU
+ Debug|Any CPU