Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient

BPASmartClient.MorkS/Control_Morks.cs

@@ -690,6 +690,8 @@ namespace BPASmartClient.MorkS
                 //int SerialNum = Convert.ToInt32(mORKS.OutMealSortNum.ToString().Substring(0,(mORKS.OutMealSortNum.ToString().Length-1)));
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
+                //DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
+                //Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;

BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs

@@ -666,6 +666,8 @@ namespace BPASmartClient.MorkSUpgradedVer
                 WriteData("M10.1", false);
                 DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
                 VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
+                //DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");
+                //Plugin.GetInstance().GetPlugin<MQTTMgr>().Publish($"MORKS/VoiceCall/{DeviceId}", mORKS.OutMealSortNum.ToString());
                 mORKS.CookCompleteFlatBit = false;
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;

BPASmartClient/App.config

@@ -4,7 +4,7 @@
 
     <!--通用配置-->
     <!--<add key="ClientId" value="43"/>-->
-    <add key="IsEnableTest" value="true"/>
+    <add key="IsEnableTest" value="false"/>
 
     <!--测试环境-->
     <add key="apollouri" value="http://10.2.1.21:28080/"/>