Commit Graph

5865 Commits

Author SHA1 Message Date
tongchenfei
788644b944 crash fix: try-catch住TopViewHelper里面一个ClassCastException 2020-11-02 15:41:32 +08:00
tongchenfei
be95baf109 Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 15:37:03 +08:00
tongchenfei
77f957e88d 增加poi点服务端可配功能 2020-11-02 15:36:33 +08:00
lixiaopeng
17015329c2 opt 2020-11-02 15:15:47 +08:00
liujing
bcb507fe11 Merge branch 'lk' into dev 2020-11-02 15:07:31 +08:00
liujing
7776432519 [add] 事件弹框 点赞动画 2020-11-02 15:07:14 +08:00
董宏宇
ddbfd28b46 Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 10:35:56 +08:00
董宏宇
a1f118990f 合并测试面板 2020-11-02 10:35:51 +08:00
lixiaopeng
597adb83d4 delete unused code 2020-11-02 10:21:06 +08:00
liujing
02e9533fbc Merge branch 'cc' into dev 2020-11-01 16:19:21 +08:00
liujing
238bd5e5a4 [fix]出行动态-白天模式UI 2020-11-01 16:19:07 +08:00
wangcongtao
b66783e40f Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-11-01 10:30:31 +08:00
wangcongtao
513952a709 balabala~~~ 2020-11-01 10:30:25 +08:00
董宏宇
6615ffcb30 完成了测试控制面板的分段控制展示 2020-10-30 20:14:16 +08:00
liujing
943f6d53c6 播放器高度 2020-10-30 17:24:06 +08:00
董宏宇
699dc5f942 Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-30 17:22:08 +08:00
tongchenfei
58bb6f3833 Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-30 17:20:48 +08:00
tongchenfei
350a3af59c 添加机器视角点击放大缩小功能 2020-10-30 17:20:32 +08:00
董宏宇
85e1574652 Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-30 16:37:53 +08:00
unknown
4cda009ab1 Merge branch 'demo/shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into demo/shunyi_vr_map 2020-10-30 16:25:31 +08:00
unknown
859eb86ece fix bug 2020-10-30 16:25:14 +08:00
liujing
2e69d630ca Merge branch 'pp' into dev 2020-10-30 16:14:46 +08:00
liujing
1eb7419b49 H5推送直播,暂无上滑关闭 2020-10-30 16:14:32 +08:00
tongchenfei
1aad4e8901 Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-30 14:44:48 +08:00
wangcongtao
6c01f8a2ec Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-30 14:44:17 +08:00
wangcongtao
58e0355da7 balabala~~~ 2020-10-30 14:44:07 +08:00
董宏宇
86df93bc3a Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-30 14:34:14 +08:00
董宏宇
d974f9913b 下沉VR场景的Marker绘制 2020-10-30 14:33:35 +08:00
tongchenfei
efe89862f7 Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-30 14:22:54 +08:00
tongchenfei
8a8c66ebb7 opt 2020-10-30 14:12:14 +08:00
liujing
43973b7128 小心心图片替换 2020-10-30 13:46:31 +08:00
liujing
206ee71f67 Merge branch 'pp' into dev 2020-10-30 13:45:40 +08:00
liujing
6e296b1de6 小心心图片替换 2020-10-30 13:45:24 +08:00
liujing
7aaa6cc3d5 弹框UI下沉commons 2020-10-30 11:31:38 +08:00
董宏宇
a7b8adbb0a 调整VR测试环境的Marker 2020-10-30 10:42:54 +08:00
tongchenfei
1c2c84a30d Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-30 10:19:34 +08:00
unknown
b8a9cf80ab Merge branch 'demo/shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into demo/shunyi_vr_map 2020-10-29 22:18:19 +08:00
unknown
0731e85f9b add loc 2020-10-29 22:18:00 +08:00
董宏宇
8d2150d97c 完成了测试控制面板的分段控制展示 2020-10-29 21:28:13 +08:00
tongchenfei
71e3e0d9af Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-29 21:23:35 +08:00
liujing
d0727f2254 推送直播,暂时保留了测试关闭按钮,暂时没有重复推送 2020-10-29 21:13:41 +08:00
liujing
7f9a336bc5 [add] 直播获取是把你 重试 白天模式 2020-10-29 20:49:28 +08:00
liujing
a22d9671c6 直播UI 2020-10-29 20:19:04 +08:00
董宏宇
b1a92fb0aa 降级自研地图,因为一直崩溃 2020-10-29 20:09:05 +08:00
tongchenfei
90c8e9f07a opt 2020-10-29 19:16:07 +08:00
liujing
681f7d7b6e Merge branch 'lk' into dev 2020-10-29 17:03:02 +08:00
liujing
ebce2c542b 去掉same判断 2020-10-29 17:03:00 +08:00
tongchenfei
0b4c78fe09 Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-29 16:43:45 +08:00
tongchenfei
a421f6c6ae opt traffic light 2020-10-29 16:41:42 +08:00
liujing
34718a8f6d Merge branch 'lk' into dev 2020-10-29 16:37:43 +08:00