Commit Graph

3569 Commits

Author SHA1 Message Date
liujing
fa7860d2a4 Merge branch 'ii' into dev 2020-10-21 17:05:04 +08:00
liujing
fc92c9b78b 探路视频依赖->v2x 2020-10-21 17:04:45 +08:00
wangcongtao
b22e63c7c9 bugfix: npe 2020-10-21 16:46:26 +08:00
tongchenfei
ed35b45551 Merge remote-tracking branch 'origin/dev' into dev 2020-10-21 15:49:04 +08:00
tongchenfei
c43257cbbc opt 查询热心指数语音 2020-10-21 15:48:47 +08:00
liujing
02a5117c0d Merge branch 'nn' into dev 2020-10-21 15:32:05 +08:00
liujing
00a9ec4fce 探路监听click道路事件->V2X 2020-10-21 15:31:55 +08:00
tongchenfei
3a47ef4a11 Merge remote-tracking branch 'origin/dev' into dev 2020-10-21 15:23:39 +08:00
tongchenfei
f52d4a94cb 优化拥堵策略上报逻辑 2020-10-21 15:23:19 +08:00
lixiaopeng
eedede61d1 opt 2020-10-21 15:10:14 +08:00
lixiaopeng
1d80b8145e opt 2020-10-21 11:45:57 +08:00
lixiaopeng
084da50100 add ugc upload 2020-10-21 11:45:23 +08:00
lixiaopeng
619ad60f18 opt search 2020-10-21 11:45:23 +08:00
liujing
8412a45238 Merge branch 'ra' into dev 2020-10-21 11:08:29 +08:00
liujing
38e5414abb rangingbar-padding 2020-10-21 11:08:24 +08:00
wangcongtao
3a77a42b5f Merge remote-tracking branch 'origin/dev' into dev 2020-10-21 11:06:13 +08:00
wangcongtao
d76cdb1eb3 opt 2020-10-21 11:06:06 +08:00
tongchenfei
88fc1d0d34 Merge remote-tracking branch 'origin/dev' into dev 2020-10-21 10:53:30 +08:00
tongchenfei
3b589efc03 修改分享按钮和事件面板按钮位置 2020-10-21 10:53:11 +08:00
wangcongtao
3c5a59cab1 优化地图手势操作和自动定位冲突 - 2 2020-10-21 10:45:35 +08:00
wangcongtao
70760cc0f7 Merge remote-tracking branch 'origin/dev' into dev 2020-10-21 09:58:49 +08:00
wangcongtao
05d4e71bf3 优化地图手势操作和自动定位冲突 2020-10-21 09:58:40 +08:00
liujing
3e753c1505 Merge branch 'vn' into dev 2020-10-20 20:52:26 +08:00
liujing
02d805ebc4 返回老版本-暂时不用 2020-10-20 20:52:04 +08:00
tongchenfei
9d0e7abc01 Merge branch 'dev_pull_unwake' into dev 2020-10-20 20:21:51 +08:00
tongchenfei
d158ab5ba2 抽离分享模块中的唤醒词和免唤醒指令,取消分享模块的baseModule 2020-10-20 20:21:06 +08:00
liujing
6f430c2699 Merge branch 'vi' into dev 2020-10-20 16:30:50 +08:00
liujing
fd11615922 播放器大小自定义!=视频size大小 2020-10-20 16:30:38 +08:00
liujing
a7effe362f TextureVideoView替换最新-大小有问题 2020-10-20 16:30:38 +08:00
wangcongtao
19ec14f83e 1.1.7业务开发 2020-10-20 15:08:40 +08:00
tongchenfei
d0b0cc1236 新建provider承载抽离免唤醒的逻辑 2020-10-20 14:57:48 +08:00
wangcongtao
61e769ce9f Merge remote-tracking branch 'origin/dev' into dev 2020-10-20 14:30:36 +08:00
tongchenfei
2946aa1774 Merge remote-tracking branch 'origin/dev' into dev 2020-10-20 14:27:01 +08:00
tongchenfei
76c73663e6 在StatusManager设置TopView的显示状态监听 2020-10-20 14:26:41 +08:00
wangcongtao
80b55951f9 Merge remote-tracking branch 'origin/dev' into dev 2020-10-20 11:21:21 +08:00
liujing
ac3e1a5798 Merge branch 'vi' into dev 2020-10-20 10:37:21 +08:00
liujing
9a59270ac5 path 2020-10-20 10:37:13 +08:00
liujing
413c6c719a Merge branch 'vi' into dev 2020-10-20 10:14:16 +08:00
liujing
c4fade6820 视频结束后显示第一帧图片全屏+重复播放 2020-10-20 10:14:06 +08:00
wangcongtao
2ecf7d2a48 opt 2020-10-20 10:03:11 +08:00
liujing
df5783820a Merge branch 'vi' into dev 2020-10-19 21:04:19 +08:00
liujing
afca3396fc 播放完后停在第一帧(缺少大小+再次播放逻辑) 2020-10-19 21:03:58 +08:00
liujing
c418ac9a5a Merge branch 'co' into dev 2020-10-19 19:21:02 +08:00
liujing
33006f843f 点击事件限制视频资源 2020-10-19 19:20:46 +08:00
liujing
ddc5ba8188 Merge branch 'road_video' into dev 2020-10-19 16:17:58 +08:00
liujing
6c0cd455a0 关闭按钮换位置 2020-10-19 16:17:40 +08:00
liujing
430388b61e 图片+视频(无进度和暂停) 2020-10-19 16:17:40 +08:00
liujing
3f28efaf3e 真实事件视频播放-无暂停 2020-10-19 16:17:40 +08:00
liujing
6aefb84316 no message 2020-10-19 16:17:40 +08:00
liujing
0c44ef65db 添加关闭按钮 2020-10-19 16:17:40 +08:00