Commit Graph

10392 Commits

Author SHA1 Message Date
董宏宇
ffc511b969 升级了kotlin_version 2020-10-27 15:06:33 +08:00
tongchenfei
c18eafb463 opt 2020-10-27 14:20:10 +08:00
lixiaopeng
057d36d1ab opt 2020-10-27 11:58:25 +08:00
wangcongtao
df227f72ee Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-27 11:57:42 +08:00
wangcongtao
83a004f62b dev 2020-10-27 11:57:34 +08:00
unknown
b264599f4a Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-10-27 10:57:24 +08:00
unknown
924aeac847 change the jump to next step 2020-10-27 10:57:12 +08:00
liujing
a682e420c3 应用列表图片替换 2020-10-27 10:46:46 +08:00
liujing
4faabb01e0 Merge branch 'vv' into demo/shunyi_vr_map 2020-10-27 10:46:24 +08:00
liujing
2cfab84f5b 应用列表图片替换 2020-10-27 10:45:43 +08:00
unknown
984e61db92 Merge branch 'demo/shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into demo/shunyi_vr_map 2020-10-27 10:15:41 +08:00
unknown
c2fb78ee09 WebSocket Impl code style 2020-10-27 10:15:20 +08:00
tongchenfei
568c119a0a Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-27 10:11:56 +08:00
tongchenfei
c7fbc3a6c6 opt traffic light 2020-10-27 10:11:29 +08:00
unknown
19c4859a71 fix bug 2020-10-27 10:11:09 +08:00
unknown
0fe86044ea add websocket url 2020-10-26 20:37:16 +08:00
unknown
bd17de71e0 Merge branch 'demo/shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into demo/shunyi_vr_map 2020-10-26 16:15:05 +08:00
unknown
319cadb930 changed msgType of websocket 2020-10-26 16:14:34 +08:00
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