1.增加盟讯公司业务逻辑相关适配 前后端增加配置参数“ISMX”进行控制
2.前端websocket取消心跳机制(原有心跳和断线重连当服务端网线断开后需要等tcp保活期到期后才能发现重连),自己实现心跳和重连 3.前端关闭后任占用后台线程问题修复
This commit is contained in:
@ -33,7 +33,7 @@ namespace 货架标准上位机.ViewModel
|
||||
ClientIp = shelfInfoModel.ClientIp;
|
||||
GroupName = shelfInfoModel.GroupName;
|
||||
IsBind = shelfInfoModel.IsBind;
|
||||
BindShelfCode = shelfInfoModel.BindShelfCode;
|
||||
BigShelfCode = shelfInfoModel.BigShelfCode;
|
||||
}
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@ namespace 货架标准上位机.ViewModel
|
||||
ClientIp = ClientIp,
|
||||
GroupName = GroupName,
|
||||
IsBind = IsBind,
|
||||
BindShelfCode = BindShelfCode,
|
||||
BigShelfCode = BigShelfCode,
|
||||
};
|
||||
}
|
||||
|
||||
@ -156,13 +156,13 @@ namespace 货架标准上位机.ViewModel
|
||||
}
|
||||
}
|
||||
|
||||
private string bindShelfCode;
|
||||
public string BindShelfCode
|
||||
private string bigShelfCode;
|
||||
public string BigShelfCode
|
||||
{
|
||||
get { return bindShelfCode; }
|
||||
get { return bigShelfCode; }
|
||||
set
|
||||
{
|
||||
SetProperty(ref bindShelfCode, value);
|
||||
SetProperty(ref bigShelfCode, value);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
Reference in New Issue
Block a user