Commit cdab78be LN

1

1 个父辈 e0cf11a4
...@@ -15,7 +15,7 @@ namespace SmartShelf.DeviceLibrary ...@@ -15,7 +15,7 @@ namespace SmartShelf.DeviceLibrary
{ {
private static int ServerPort = ConfigAppSettings.GetIntValue(Setting_Init.ServerPort); private static int ServerPort = ConfigAppSettings.GetIntValue(Setting_Init.ServerPort);
// private static readonly ILog LOGGER = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog LOGGER = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public static string BoxName = "单色灯料架"; public static string BoxName = "Shelf";
public static string CID = ""; public static string CID = "";
private static System.Timers.Timer timersTimer; private static System.Timers.Timer timersTimer;
...@@ -83,11 +83,11 @@ namespace SmartShelf.DeviceLibrary ...@@ -83,11 +83,11 @@ namespace SmartShelf.DeviceLibrary
} }
CID = ConfigAppSettings.GetValue(Setting_Init.Store_CID); CID = ConfigAppSettings.GetValue(Setting_Init.Store_CID);
BoxName = (" 单色灯料架_" + CID + " ").ToUpper(); //BoxName = (" 单色灯料架").ToUpper();
if (LEDManager.DeviceLedType.Equals(1) || LEDManager.DeviceLedType.Equals(2)) //if (LEDManager.DeviceLedType.Equals(1) || LEDManager.DeviceLedType.Equals(2))
{ //{
BoxName = (" 三色灯料架_" + CID + " ").ToUpper(); // BoxName = (" 三色灯料架").ToUpper();
} //}
LogUtil.info(BoxName + "加载完成!"); LogUtil.info(BoxName + "加载完成!");
Init(); Init();
...@@ -157,14 +157,14 @@ namespace SmartShelf.DeviceLibrary ...@@ -157,14 +157,14 @@ namespace SmartShelf.DeviceLibrary
{ {
if (!LEDManager.CurrLedStatus.Equals(2)) if (!LEDManager.CurrLedStatus.Equals(2))
{ {
LEDManager.OpenStatusLights("green"); // LEDManager.OpenStatusLights("green");
} }
} }
else else
{ {
if (!LEDManager.CurrLedStatus.Equals(1)) if (!LEDManager.CurrLedStatus.Equals(1))
{ {
LEDManager.OpenStatusLights("yellow"); // LEDManager.OpenStatusLights("yellow");
} }
} }
...@@ -191,6 +191,8 @@ namespace SmartShelf.DeviceLibrary ...@@ -191,6 +191,8 @@ namespace SmartShelf.DeviceLibrary
//rest/api/v1/shelf/allPosOff? color = green 指定灭灯的颜色,如果为空,所有灯全部熄灭 //rest/api/v1/shelf/allPosOff? color = green 指定灭灯的颜色,如果为空,所有灯全部熄灭
private static string ServerOnReceived(string reqPath, string paramStr) private static string ServerOnReceived(string reqPath, string paramStr)
{ {
LogUtil.info("ServerOnReceived [" + reqPath + "] [" + paramStr + "] ");
paramStr = paramStr.Replace("%23", "#");
try try
{ {
Dictionary<string, string> paramMap = GetParam(paramStr); Dictionary<string, string> paramMap = GetParam(paramStr);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!