1.增加盟讯公司业务逻辑相关适配 前后端增加配置参数“ISMX”进行控制
2.前端websocket取消心跳机制(原有心跳和断线重连当服务端网线断开后需要等tcp保活期到期后才能发现重连),自己实现心跳和重连 3.前端关闭后任占用后台线程问题修复
This commit is contained in:
@ -3,8 +3,10 @@ using System.Collections.Generic;
|
||||
using System.Configuration;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Management.Instrumentation;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
|
||||
namespace 货架标准上位机
|
||||
{
|
||||
@ -13,5 +15,20 @@ namespace 货架标准上位机
|
||||
/// </summary>
|
||||
public partial class App : Application
|
||||
{
|
||||
protected override void OnStartup(StartupEventArgs e)
|
||||
{
|
||||
base.OnStartup(e);
|
||||
|
||||
if (LocalFile.Config.IsMx)
|
||||
{
|
||||
MainWindow = new MXMainWindow();
|
||||
}
|
||||
else
|
||||
{
|
||||
MainWindow = new MainWindow1();
|
||||
}
|
||||
MainWindow.ShowDialog();
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user