Explorar el Código

屏显调试与测试完成,待同步至葛店现场

yc_t hace 6 años
padre
commit
942a73d906

BIN
parkMonitor/sdk/broadcast/broadcastDLL.dll


+ 22 - 5
parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -14,6 +14,7 @@ using parkMonitor.Database2;
 using MySql.Data.MySqlClient;
 using parkMonitor.server.NumMachine;
 using parkMonitor.server.broadcastModule;
+using BroadcastModule;
 
 namespace parkMonitor.server.CoreThread
 {
@@ -334,7 +335,10 @@ namespace parkMonitor.server.CoreThread
                     Console.WriteLine(EntityForCore.ins.centerXLimit);
                     BroadcastLinker.dispForAWhile(1, "x轴超限", 6, false);
                     //BroadcastLinker.ins.DispString(1, "x轴超限", 6);
-                    BroadcastLinker.ins.AudioPlay("请注意");
+                    if (BroadcastLinker.ins != null)
+                    {
+                        BroadcastLinker.ins.Play(0, BroadcastBoard.PlayMode.audio, "请注意");
+                    }
                     temp += 1;
                 }
                 if (data.centerY > EntityForCore.ins.centerYLimit)
@@ -342,7 +346,10 @@ namespace parkMonitor.server.CoreThread
                     Console.WriteLine(EntityForCore.ins.centerYLimit);
                     BroadcastLinker.dispForAWhile(2, "y轴超限", 6, false);
                     //BroadcastLinker.ins.DispString(2, "y轴超限", 6);
-                    BroadcastLinker.ins.AudioPlay("请注意");
+                    if (BroadcastLinker.ins != null)
+                    {
+                        BroadcastLinker.ins.Play(0, BroadcastBoard.PlayMode.audio, "请注意");
+                    }
                     temp += 2;
                 }
                 if (data.angleA > EntityForCore.ins.angleALimit)
@@ -350,7 +357,10 @@ namespace parkMonitor.server.CoreThread
                     Console.WriteLine(EntityForCore.ins.angleALimit);
                     BroadcastLinker.dispForAWhile(3, "角度超限", 6, false);
                     //BroadcastLinker.ins.DispString(3, "角度超限", 6);
-                    BroadcastLinker.ins.AudioPlay("请注意");
+                    if (BroadcastLinker.ins != null)
+                    {
+                        BroadcastLinker.ins.Play(0, BroadcastBoard.PlayMode.audio, "请注意");
+                    }
                     temp += 4;
                 }
             }
@@ -916,7 +926,10 @@ namespace parkMonitor.server.CoreThread
                 //{
                 BroadcastLinker.dispForAWhile(0, "停车完成", 10, true);
                 //BroadcastLinker.ins.DispString(0, "停车完成", 6);
-                BroadcastLinker.ins.AudioPlay("操作成功");
+                if (BroadcastLinker.ins != null)
+                {
+                    BroadcastLinker.ins.Play(0, BroadcastBoard.PlayMode.audio, "操作成功");
+                }
                 //    Thread.Sleep(5000);
                 //BroadcastLinker.OriginState();
                 //});
@@ -1137,6 +1150,7 @@ namespace parkMonitor.server.CoreThread
         {
             //UILogServer.ins.info("取车流程:" + queueCmd.LicenseNum + "开始");
             BroadcastLinker.dispForAWhile(0, "取车开始", 10, false);
+            BroadcastLinker.dispForAWhile(1, queueCmd.LicenseNum, 10, false);
             Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "取车流程:" + queueCmd.LicenseNum + "开始");
             Vehicle vehiclelist = null;                 //待取车辆信息
             ControlMessage cm = null;
@@ -1272,7 +1286,10 @@ namespace parkMonitor.server.CoreThread
 
             BroadcastLinker.dispForAWhile(0, "取车完成", 10, true);
             //BroadcastLinker.ins.DispString(0, "停车完成", 6);
-            BroadcastLinker.ins.AudioPlay("谢谢惠顾,一路顺风");
+            if (BroadcastLinker.ins != null)
+            {
+                BroadcastLinker.ins.Play(0, BroadcastBoard.PlayMode.audio, "谢谢惠顾,一路顺风");
+            }
             //    Thread.Sleep(5000);
             //BroadcastLinker.OriginState();
 

+ 6 - 6
parkMonitor/server/NumMachine/NumMachine.cs

@@ -20,6 +20,7 @@ using parkMonitor.server.uiLogServer;
 using System.Configuration;
 using parkMonitor.LOG;
 using parkMonitor.server.broadcastModule;
+using BroadcastModule;
 
 namespace parkMonitor.server
 {
@@ -500,12 +501,11 @@ namespace parkMonitor.server
                                     LicBuffer.Enqueue((NumberMachineNode)node.Clone());
                                     if (node.id == 1)
                                     {
-                                        Task.Factory.StartNew(() => {
-                                            BroadcastLinker.ins.DispString(1, node.LicenseNum, 6);
-                                            BroadcastLinker.ins.AudioPlay(node.LicenseNum+",入场");
-                                            Thread.Sleep(5000);
-                                            BroadcastLinker.ins.DispDownStr(1, 0);
-                                        });
+                                        if (BroadcastLinker.ins != null)
+                                        {
+                                            BroadcastLinker.ins.Play(1, BroadcastBoard.PlayMode.temporary, node.LicenseNum, 15);
+                                            BroadcastLinker.ins.Play(0, BroadcastBoard.PlayMode.audio, node.LicenseNum + ",入场");
+                                        }
                                     }
                                 }
                             }

+ 29 - 27
parkMonitor/server/broadcastModule/broadcastModule.cs

@@ -20,43 +20,45 @@ namespace parkMonitor.server.broadcastModule
         /// </summary>
         public static void Start()
         {
-            try
+            Task.Factory.StartNew(() =>
             {
-                ip = ConfigurationManager.AppSettings["broadcastIP"];
-                port = Int32.Parse(ConfigurationManager.AppSettings["broadcastPort"]);
-                ins = new BroadcastBoard(ip, port);
-                ins.Refresh();
-                ins.AudioPlay("欢迎光临");
-                ins.DownloadString(0, "欢迎光临", 0);
-                ins.DownloadString(1, "智象停车", 0);
-                ins.DownloadString(2, "date", 0);
-                ins.DownloadString(3, "time", 0);
-                ins.DispDownStr(0, 0);
-                ins.DispDownStr(1, 0);
-                ins.DispDownStr(2, 0);
-                ins.DispDownStr(3, 0);
-            }
-            catch (Exception e) { Console.WriteLine(e.Message); ins = null; }
+                try
+                {
+                    ip = ConfigurationManager.AppSettings["broadcastIP"];
+                    port = Int32.Parse(ConfigurationManager.AppSettings["broadcastPort"]);
+                    ins = new BroadcastBoard(ip, port);
+                    ins.Refresh();
+                    ins.Play(0, BroadcastBoard.PlayMode.audio, "欢迎光临");
+                    //OriginState();
+                }
+                catch (Exception e) { Console.WriteLine(e.Message); ins = null; }
+            });
         }
 
         public static void dispForAWhile(int winID, string str, int delay, bool switchToOrigin)
         {
-            ins.DispString(winID, str, 10);
-            Task.Factory.StartNew(() =>
+            if (ins != null)
             {
-                if (switchToOrigin)
+                ins.Play(winID, BroadcastBoard.PlayMode.temporary, str, 5);
+                Task.Factory.StartNew(() =>
                 {
-                    Thread.Sleep(delay * 1000);
-                    OriginState();
-                }
-            });
+                    if (switchToOrigin)
+                    {
+                        Thread.Sleep(delay * 1000);
+                        OriginState();
+                    }
+                });
+            }
         }
         public static void OriginState()
         {
-            ins.DispDownStr(0, 0);
-            ins.DispDownStr(1, 0);
-            ins.DispDownStr(2, 0);
-            ins.DispDownStr(3, 0);
+            if (ins != null)
+            {
+                ins.Play(0, BroadcastBoard.PlayMode.readBuffer, "", 0, 0);
+                ins.Play(1, BroadcastBoard.PlayMode.readBuffer, "", 0, 0);
+                ins.Play(2, BroadcastBoard.PlayMode.readBuffer, "", 0, 0);
+                ins.Play(3, BroadcastBoard.PlayMode.readBuffer, "", 0, 0);
+            }
         }
     }
 }