Commit Graph

73 Commits

Author SHA1 Message Date
wangcongtao
e092bb4489 Merge branch 'dev' into demo/shunyi_v2v_merge
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	config.gradle
#	foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values/dimens.xml
#	modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
#	modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
#	modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-v2x/src/main/res/values/dimens.xml
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
#	upload.sh
2020-10-18 16:40:27 +08:00
lixiaopeng
5f341ff6ad opt ui 2020-10-15 18:25:07 +08:00
lixiaopeng
2e11b2e568 fixed conflict 2020-09-25 11:55:01 +08:00
lixiaopeng
5e812e2fea opt ui 2020-09-21 11:37:25 +08:00
lixiaopeng
de97724474 opt 2020-09-21 11:33:18 +08:00
lixiaopeng
5f5663d8ca opt image 2020-09-21 11:31:28 +08:00
lixiaopeng
b664e452b4 fixed conflict 2020-09-21 11:31:24 +08:00
lixiaopeng
941668a186 opt 2020-09-21 10:57:45 +08:00
lixiaopeng
27a352e354 opt image 2020-09-18 19:19:30 +08:00
liujing
3a616fa826 没有更多色值+小鹏UI 2020-09-18 18:35:08 +08:00
liujing
60f3ff8f76 没有更多色值+小鹏UI 2020-09-18 18:32:14 +08:00
lixiaopeng
d6a4ade3f2 opt m4 2020-09-18 18:02:42 +08:00
lixiaopeng
2053211498 opt ui 2020-09-17 21:16:24 +08:00
lixiaopeng
f3eaa3252b opt 2020-09-17 15:31:12 +08:00
lixiaopeng
c5033d05dd opt ui 2020-09-17 14:49:42 +08:00
lixiaopeng
49b9ffddb0 opt 2020-09-16 20:19:57 +08:00
lixiaopeng
c9aa94342e opt tanlu ui 2020-09-16 20:19:57 +08:00
lixiaopeng
fd79af32bf opt ui 2020-09-16 14:48:02 +08:00
lixiaopeng
dfd2a60115 opt 2020-09-16 12:27:05 +08:00
lixiaopeng
28729b7659 opt ui 2020-09-15 12:59:48 +08:00
lixiaopeng
98c2873243 opt 2020-09-14 20:29:16 +08:00
lixiaopeng
6801f5f50f opt tanlu ui 2020-09-14 13:22:35 +08:00
lixiaopeng
aaac882bf5 opt ui 2020-09-10 17:05:51 +08:00
lixiaopeng
6e6bc8a232 opt 2020-09-09 15:24:18 +08:00
lixiaopeng
c8fbce4de8 opt ui 2020-09-04 15:12:00 +08:00
tongchenfei
cb0e2bb8f7 Merge remote-tracking branch 'origin/dev' into dev 2020-09-03 15:46:54 +08:00
tongchenfei
1880d3dda2 添加分享成功和失败tip的图片 2020-09-03 14:59:01 +08:00
wangcongtao
c94b883182 store 2020-09-03 11:01:16 +08:00
lixiaopeng
b2072767da opt 2020-08-11 19:17:02 +08:00
tongchenfei
ee53d50cdb 迁移探路模块和tanlulib代码至此 2020-08-10 11:29:55 +08:00
wangcongtao
522c12ada5 opt' 2020-02-27 19:20:18 +08:00
lixiaopeng
f42ec6c65f opt ui 2020-02-17 19:03:52 +08:00
lixiaopeng
86161714f5 opt xx search poi 2020-02-16 14:56:44 +08:00
lixiaopeng
58e295ae04 opt ui 2020-02-14 18:00:50 +08:00
lixiaopeng
cc23c84d16 delete image animation 2020-02-13 16:10:55 +08:00
lixiaopeng
13bdfccdaf opt default show 2020-02-13 14:42:38 +08:00
wangcongtao
4eeea9e5d1 rc 2020-02-11 21:54:54 +08:00
wangcongtao
19156517ac replace page indicator style, add data manager interface, etc. 2020-02-11 21:52:38 +08:00
lixiaopeng
5d672686f3 fixed player not seek progress 2020-02-11 20:40:53 +08:00
lixiaopeng
da07dea2fa opt ui 2020-02-11 14:08:53 +08:00
lixiaopeng
69798b99b7 opt seekbar . 2020-02-11 09:56:07 +08:00
lixiaopeng
6869c155e6 add play voice 2020-02-10 15:08:09 +08:00
lixiaopeng
59dea59a34 opt videoplayer and modify navi 2020-02-07 15:49:00 +08:00
lixiaopeng
3decc815ac opt 2020-02-07 09:54:39 +08:00
lixiaopeng
05bfb55778 opt 2020-02-04 20:58:05 +08:00
lixiaopeng
a822cdac2c modify videoplayer and oil test 2020-02-04 17:56:48 +08:00
lixiaopeng
f78f899b75 opt 2020-01-19 16:51:11 +08:00
lixiaopeng
88ab4587af opt ui 2020-01-19 11:00:07 +08:00
lixiaopeng
5492e3e9a1 delete unused res and opt ui 2020-01-17 20:04:43 +08:00
lixiaopeng
fca7651927 opt share ui 2020-01-17 17:55:20 +08:00