Commit Graph

87 Commits

Author SHA1 Message Date
董宏宇
9da178f77a 根据后台接口更新了字段的属性 2020-01-08 11:43:26 +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
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
董宏宇
c4253eac08 修改了MapMarker 中的数据实体的字段类型 2020-01-07 16:08:53 +08:00
董宏宇
7126c09ac0 修改了资源图 2020-01-07 12:26:10 +08:00
董宏宇
345b774462 Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-07 12:23:27 +08:00
lixiaopeng
6188c209c7 modify ui 2020-01-07 12:07:11 +08:00
董宏宇
21029dd352 修改了资源图 2020-01-07 11:40:11 +08:00
zhangyuanzhen
dca01fe24b Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0
# Conflicts:
#	app/build.gradle
#	modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
2020-01-06 21:02:21 +08:00
zhangyuanzhen
855b201298 调整搜索页面 2020-01-06 21:00:13 +08:00
董宏宇
a5d3e6f7a0 Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-06 19:58:33 +08:00
董宏宇
abba443edc 增加了地图Marker自定义组合控件 2020-01-06 19:58:30 +08:00
lixiaopeng
1985dac7f7 opt 2020-01-06 19:54:05 +08:00
董宏宇
e6898c7919 增加了大而全的数据实体 2020-01-06 19:53:47 +08:00
董宏宇
4687502b93 Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-06 19:53:11 +08:00
董宏宇
a42d627370 增加了大而全的数据实体 2020-01-06 19:53:07 +08:00
wangcongtao
09053f4a0b opt 2020-01-06 19:49:05 +08:00
董宏宇
3bbf28838f 添加了地图上的marker资源文件,编写了基础布局,资源由于阴影原因需要UI设计进行调整 2020-01-06 19:42:17 +08:00
zhangyuanzhen
dc2a65ce4a 搜索页面UI 2020-01-06 15:52:29 +08:00
zhangyuanzhen
9ad9722cd2 Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-06 15:04:14 +08:00