 lixioayao
|
090768e8e8
Merge branch 'open_rate'
|
5 years ago |
|
lixioayao
|
2384e034be
1.修复呼叫 2.修复盲区 3.修复1318掘进机
|
5 years ago |
|
lixioayao
|
50cf9a6048
1.增加1318特殊处理 2.修复呼叫协议 3.禁区修复
|
5 years ago |
|
lixioayao
|
209f8b23dd
增加推送开关信号需求
|
5 years ago |
|
lixioayao
|
114bdef5f5
解决采煤机飞
|
5 years ago |
|
lixioayao
|
f132e641a2
人员升井时，补全历史轨迹
|
5 years ago |
|
lixioayao
|
2db512afb4
增加车辆平滑日志
|
5 years ago |
 liheting
|
bc1966e5b9
Merge branch 'master' of chensongchao/ya-serv into master
|
5 years ago |
 chensongchao
|
97fdf20069
移除优先级最高，放在最前面
|
5 years ago |
|
chensongchao
|
6e82aeecb3
his_location中last_time 升井没有赋值,修改功能
|
5 years ago |
|
chensongchao
|
fada8bb7d8
his_location中last_time 升井没有赋值更新
|
5 years ago |
|
lixioayao
|
fb80b587d7
fix confict
|
5 years ago |
|
lixioayao
|
82c7bb3a4d
增加平滑日志输出
|
5 years ago |
|
lixioayao
|
a6fa880eec
增加区域逻辑，考勤和猴车使用区域定位，其他使用分站区域定位
|
5 years ago |
|
chensongchao
|
14d0e6f136
his_location中last_time 升井没有赋值更新
|
5 years ago |
 zzj
|
f8a7010db8
大小分站TOF协议优化后的相关代码调整，message.cpp未改完。
|
5 years ago |
 zzj
|
3aa9439302
Merge branch 'master' of liulei/ya-serv into master
|
5 years ago |
 liulei
|
b14d65d3a6
去掉多余分号
|
5 years ago |
|
liulei
|
2410432e2b
修改两路径连续时不能合并 的问题
|
5 years ago |
|
liulei
|
a53d8f938b
修改路径计算时角度计算和重合计算的bug
|
5 years ago |
|
liulei
|
83a431ae09
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
zzj
|
1124ee27d9
区域超时时间统一为分钟单位。
|
5 years ago |
|
lixioayao
|
55736fca68
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
lixioayao
|
8ae89da21e
增加一人多卡开关配置
|
5 years ago |
|
zzj
|
e997a03dc3
修复bug.
|
5 years ago |
|
lixioayao
|
2edc1affc2
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
lixioayao
|
87789b1172
解决一人多卡bug
|
5 years ago |
|
liulei
|
754a3d5209
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
zzj
|
683ee52f14
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
5 years ago |
|
zzj
|
1a95147fdb
----
|
5 years ago |
