Commit Graph

6230 Commits

Author SHA1 Message Date
wangcongtao
f696a5b8f7 解决死锁问题 2021-01-06 18:33:16 +08:00
wangcongtao
e5cd503e5d 解决死锁问题 2021-01-06 18:30:08 +08:00
tongchenfei
01133958a6 修改websocket Host和entrance host 2021-01-06 18:13:42 +08:00
wangcongtao
f6de91ba96 代码优化 2021-01-06 17:13:22 +08:00
wangcongtao
5130eac507 bugfix: #116 2021-01-06 17:11:06 +08:00
wangcongtao
e3a8e56337 修复M3无法启动问题 2021-01-06 16:59:49 +08:00
unknown
e43b0e5f3a Merge branch 'dev_mogo_httpdns' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_mogo_httpdns 2021-01-06 16:57:40 +08:00
unknown
b45118e8aa update callchat 2021-01-06 16:56:59 +08:00
wangcongtao
85f893d80b Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 2021-01-06 16:55:15 +08:00
wangcongtao
bccfd46b97 修复M3无法启动问题 2021-01-06 16:55:08 +08:00
lixiaopeng
b3b445c9ec modify host 2021-01-06 16:51:23 +08:00
unknown
1f5b8413c2 update vr-map version 2021-01-06 16:39:55 +08:00
unknown
7ec82cb2ab merhe 2021-01-06 16:32:29 +08:00
unknown
8ae45dc878 fix bug of callchat 2021-01-06 16:31:32 +08:00
unknown
04e882f4f2 Merge branch 'qa_1.1.9' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.9 2021-01-06 16:25:50 +08:00
unknown
a017a5b0d1 fix bug of callchat 2021-01-06 16:25:28 +08:00
tongchenfei
4557919dae Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-06 16:05:21 +08:00
tongchenfei
dd5e85039f opt topview 2021-01-06 16:05:15 +08:00
wangcongtao
b2c8c35efb Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9 2021-01-06 14:57:16 +08:00
wangcongtao
bbd26cfbf5 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-06 14:55:11 +08:00
wangcongtao
c6ce25c983 解决m3上无法启动的问题 2021-01-06 14:55:05 +08:00
unknown
5d6d56035a merge 2021-01-06 14:19:11 +08:00
unknown
0727bac8d0 update callchat 2021-01-06 14:18:21 +08:00
tongchenfei
b1fdb1fd31 添加host常量 2021-01-06 11:55:52 +08:00
董宏宇
28d7d97238 解决,M3、M4 因为hook 无法启动的bug 2021-01-06 11:55:17 +08:00
董宏宇
19a3144f3d Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-06 11:54:24 +08:00
unknown
f8154df5d0 update callchat 2021-01-06 11:50:57 +08:00
wangcongtao
53e2a7ab4e 更新车聊聊版本 2021-01-06 11:45:36 +08:00
董宏宇
8ac19f35e1 解决,M3、M4 因为hook 无法启动的bug 2021-01-06 11:43:05 +08:00
wangcongtao
b25b4732c5 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-06 11:29:15 +08:00
wangcongtao
3e26011821 更新地图版本 2021-01-06 11:29:09 +08:00
董宏宇
7ab78ebc67 解决地图样式没有更新问题 2021-01-06 10:48:14 +08:00
董宏宇
81f0742808 解决地图样式没有更新问题 2021-01-06 10:47:23 +08:00
wangcongtao
e6600df3a3 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9
# Conflicts:
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
2021-01-05 19:27:13 +08:00
wangcongtao
40afbccfcc 合并分支 2021-01-05 19:24:19 +08:00
unknown
8be440d6b2 proguard 2021-01-05 19:18:12 +08:00
wangcongtao
804fd1a7cf 更新车聊聊版本 2021-01-05 19:08:52 +08:00
wangcongtao
a1f3842985 升级地图sdk 2021-01-05 18:03:31 +08:00
tongchenfei
aa95ab8f87 优化没有获取到路由表情况下httpdns返回值 2021-01-05 17:58:30 +08:00
wangcongtao
5d97189f2f 修改模块include 2021-01-05 17:52:31 +08:00
tongchenfei
a121f3d2bd httpdns singleton 2021-01-05 14:02:48 +08:00
lixiaopeng
a8d6d0df81 opt 2021-01-05 11:34:43 +08:00
wangcongtao
e94036f85e 更新切换道路匹配测试逻辑调用方法 2021-01-05 11:14:30 +08:00
wangcongtao
1b061c938a Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-05 11:04:55 +08:00
wangcongtao
5cbb771469 添加切换道路匹配测试逻辑 2021-01-05 11:04:49 +08:00
unknown
50b7f00cdf .. 2021-01-05 10:51:49 +08:00
tongchenfei
6a9e2392ec Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-05 10:46:59 +08:00
unknown
100c40c325 add new proguard rules in smp 2021-01-05 10:46:16 +08:00
tongchenfei
52827bbfbb bugfix: #103 红绿灯不消失,修改成无数据后1s,红绿灯数据隐藏 2021-01-05 10:45:59 +08:00
wangcongtao
62c8dc6e87 更新地图sdk 2021-01-05 10:41:02 +08:00