Commit Graph

16867 Commits

Author SHA1 Message Date
wangcongtao
dff6c1d524 opt 2020-01-08 18:09:55 +08:00
wangcongtao
ccbc429601 Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0 2020-01-08 18:08:58 +08:00
wangcongtao
d5c87148a5 opt 2020-01-08 18:08:42 +08:00
lixiaopeng
8ffd520de0 add event 2020-01-08 17:43:24 +08:00
lixiaopeng
64d6debe70 opt switch logic 2020-01-08 16:32:55 +08:00
lixiaopeng
15557101c0 add share 2020-01-08 15:34:35 +08:00
wangcongtao
2b2e998421 opt 2020-01-08 15:23:15 +08:00
wangcongtao
e1942cd041 Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0 2020-01-08 15:15:17 +08:00
wangcongtao
ad03c651f2 opt 2020-01-08 15:13:56 +08:00
董宏宇
526379bd05 增加了Serializable 2020-01-08 14:52:46 +08:00
董宏宇
3f89696eed 增加了toString方法用于打印 2020-01-08 14:38:15 +08:00
wangcongtao
420098c704 Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0 2020-01-08 13:09:15 +08:00
wangcongtao
eadf510848 opt 2020-01-08 13:09:04 +08:00
董宏宇
88ff8f7eac Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-08 11:44:16 +08:00
董宏宇
9da178f77a 根据后台接口更新了字段的属性 2020-01-08 11:43:26 +08:00
wangcongtao
0d0ea458f6 rm build dir 2020-01-08 11:36:41 +08:00
wangcongtao
a48e901608 fix 2020-01-08 11:36:03 +08:00
董宏宇
6ffbdc3a20 Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-08 11:35:28 +08:00
董宏宇
511024bcb4 根据后台接口更新了字段的属性 2020-01-08 11:31:33 +08:00
zhangyuanzhen
b31ce2245b Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-08 11:18:57 +08:00
wangcongtao
0099781b6a opt 2020-01-08 11:18:39 +08:00
zhangyuanzhen
daefb1c07e Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-08 11:17:41 +08:00
wangcongtao
b0cf11bba0 dev 2020-01-08 11:17:29 +08:00
董宏宇
9e3e04fd81 Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-08 11:13:48 +08:00
zhangyuanzhen
6e844f0945 Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-08 11:13:00 +08:00
zhangyuanzhen
70f934d650 管理searchFragment 2020-01-08 11:12:56 +08:00
wangcongtao
6b1b06e0a8 dev 2020-01-08 11:10:40 +08:00
董宏宇
04796d2214 Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-08 11:03:17 +08:00
zhangyuanzhen
d56ae75456 Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-08 10:57:30 +08:00
zhangyuanzhen
b9ab72b8a7 rename nav to search 2020-01-08 10:57:25 +08:00
wangcongtao
46c713cdca opt 2020-01-08 10:54:59 +08:00
董宏宇
bc717a8f97 增加了默认的dimens 2020-01-08 10:37:16 +08:00
wangcongtao
58803435f0 Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0 2020-01-07 21:05:02 +08:00
wangcongtao
5799e932a6 opt 2020-01-07 21:04:56 +08:00
董宏宇
0dc62ca86f 修复protobuf转换问题 2020-01-07 20:08:55 +08:00
董宏宇
75d699ed9a Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
2020-01-07 19:50:29 +08:00
wangcongtao
d56a57b56d Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0 2020-01-07 19:38:55 +08:00
董宏宇
bfca96c8b1 增加了Marker长连接的绑定 2020-01-07 19:37:52 +08:00
lixiaopeng
6df49a93bc delete file 2020-01-07 19:20:10 +08:00
wangcongtao
83fa2e10be Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0 2020-01-07 19:09:10 +08:00
wangcongtao
3c921ff99b rc 2020-01-07 19:09:05 +08:00
董宏宇
f7dfd5ec95 修改了年龄段返回算法 2020-01-07 18:47:48 +08:00
董宏宇
6bf6e260e7 Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-07 18:37:44 +08:00
董宏宇
83ade400cf 修改了年龄段返回算法 2020-01-07 18:37:31 +08:00
lixiaopeng
aeb30c13d9 opt ui 2020-01-07 18:30:50 +08:00
wangcongtao
c69a959b6a dev 2020-01-07 17:56:33 +08:00
董宏宇
8c6cca4dec 加入了在线车辆模块 2020-01-07 17:49:45 +08:00
zhangyuanzhen
8209ca8f5e Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-07 17:41:21 +08:00
zhangyuanzhen
eb1053e4ba 增加历史列表 2020-01-07 17:41:17 +08:00
董宏宇
f5a0166701 修改了用户的年龄的数据类型为String 2020-01-07 16:35:13 +08:00