Commit Graph

5865 Commits

Author SHA1 Message Date
wangcongtao
8cc40f1d79 dev 2020-10-26 14:52:23 +08:00
unknown
e3f303c2ca fix bug 2020-10-26 14:34:08 +08:00
unknown
e83544bf4e Merge branch 'demo/shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into demo/shunyi_vr_map 2020-10-26 12:01:05 +08:00
unknown
fc263810bf add websocket 2020-10-26 12:00:51 +08:00
tongchenfei
8e883853eb 去掉vip左下角展示 2020-10-26 11:01:12 +08:00
董宏宇
19bcc59a44 修正了UGC的图标问题 2020-10-26 10:37:25 +08:00
tongchenfei
a978851062 bug fix 2020-10-26 10:17:11 +08:00
tongchenfei
46f54ce1bc opt left notice 2020-10-25 17:28:54 +08:00
liujing
c718b05922 [fix] 手势冲突 2020-10-25 16:58:02 +08:00
liujing
9781efe2fa Merge branch 'oo' into dev 2020-10-25 16:49:28 +08:00
liujing
8dc285b3c6 上半区域点击不生效 2020-10-25 16:49:10 +08:00
tongchenfei
397c7f89b2 Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-25 16:45:39 +08:00
tongchenfei
d83fb24b4e opt left notice 2020-10-25 16:45:20 +08:00
liujing
b2348ebf96 Merge branch 'oo' into dev 2020-10-25 15:56:19 +08:00
liujing
e81ce223e9 [fix] 滑动崩溃 2020-10-25 15:56:09 +08:00
tongchenfei
3fad15ff4c 增加entrance 左侧提示容器 2020-10-25 15:53:22 +08:00
wangcongtao
e1756c5f34 dev 2020-10-25 15:51:28 +08:00
liujing
b9e45bda33 Merge branch 'oo' into dev 2020-10-25 14:44:01 +08:00
liujing
3771a9f64e loading progressbar色值修改 2020-10-25 14:43:50 +08:00
liujing
42e708a540 Merge branch 'oo' into dev 2020-10-25 14:24:34 +08:00
liujing
82410c20df 播放暂停图标使用默认 2020-10-25 14:24:25 +08:00
liujing
559131ba7d 恢复tanlu原点击事件<-长安分支 2020-10-25 13:14:28 +08:00
liujing
dae27c71d4 Merge branch 'oo' into dev 2020-10-25 13:11:18 +08:00
liujing
65968bae64 语音:查询我的分享 2020-10-25 13:10:59 +08:00
wangcongtao
771e5eed13 切换地图的逻辑修改 2020-10-25 11:08:46 +08:00
lixiaopeng
2c1605a60f opt ui 2020-10-25 11:05:29 +08:00
lixiaopeng
16afca4668 opt voice 2020-10-25 10:48:40 +08:00
董宏宇
4cb0b212c7 修改了请求接口的bug 2020-10-23 21:17:44 +08:00
董宏宇
d952f4b2a3 Merge remote-tracking branch 'origin/dev' into dev 2020-10-23 21:08:18 +08:00
董宏宇
fe6c626d26 完成了UGC模块
http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=42321443
2020-10-23 21:08:08 +08:00
liujing
cd2a141305 Merge branch 'pp' into dev 2020-10-23 20:53:27 +08:00
liujing
9b45e38d75 thumbImage loading二选一暂存 2020-10-23 20:53:12 +08:00
liujing
08d96c50ff Merge branch 'lk' into dev 2020-10-23 20:51:18 +08:00
liujing
390deeba22 [add] 添加加载中图片 2020-10-23 20:50:58 +08:00
董宏宇
2159c073a4 Merge remote-tracking branch 'origin/dev' into dev 2020-10-23 20:22:58 +08:00
董宏宇
73896a9484 完成了UGC模块
http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=42321443
2020-10-23 20:22:52 +08:00
liujing
c531b0646e Merge branch 'oi' into dev 2020-10-23 20:18:34 +08:00
liujing
73b6565c6f [add] 全屏显示+单击暂停和继续播放 2020-10-23 20:18:09 +08:00
tongchenfei
a6e8bddbc7 修改分享按钮和事件面板按钮位置 2020-10-23 18:49:56 +08:00
tongchenfei
e05e9aa542 修改topview在vr模式下的位置 2020-10-23 18:49:43 +08:00
tongchenfei
c944d8245f 修改分享按钮和事件面板按钮位置 2020-10-23 15:06:29 +08:00
tongchenfei
90e6e998e0 增加全局vr模式标识 2020-10-23 14:40:15 +08:00
liujing
c0a1870470 Merge branch 'hh' into dev 2020-10-23 13:43:15 +08:00
liujing
ffb9e84a1e 视频适配父布局 2020-10-23 13:42:57 +08:00
liujing
3720fb5c6b no message 2020-10-23 13:42:57 +08:00
liujing
d2ec559f03 [add] adapter 2020-10-23 13:42:57 +08:00
liujing
fddad1dd87 zancun 2020-10-23 13:42:57 +08:00
liujing
227d087c92 播放器初始化 2020-10-23 13:42:57 +08:00
liujing
c2c9a82705 no message 2020-10-23 13:42:57 +08:00
tongchenfei
9b9c1c764a Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-10-23 10:25:29 +08:00