Commit Graph

132 Commits

Author SHA1 Message Date
董宏宇
ee96acf10e 完成不同类型Marker的展示 2020-01-09 19:18:06 +08:00
董宏宇
addf3ea68b 进行marker封装 2020-01-09 18:44:37 +08:00
董宏宇
2ed6b944c4 修复了因为其他模块没有设置moduleName导致Marker回调异常 2020-01-09 18:17:11 +08:00
董宏宇
7bead52ebc 完成marker回调传入数据 2020-01-09 16:46:15 +08:00
董宏宇
4f0cb3337c Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0
# Conflicts:
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
2020-01-09 16:38:26 +08:00
董宏宇
829d178622 完成marker回调传入数据 2020-01-09 16:37:58 +08:00
wangcongtao
fad82745a3 opt 2020-01-09 16:37:45 +08:00
董宏宇
ed98d3684f Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0
# Conflicts:
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
2020-01-09 16:35:19 +08:00
董宏宇
51b77c52e2 完成marker回调传入数据 2020-01-09 16:34:41 +08:00
wangcongtao
0c3563692f rc 2020-01-09 16:15:29 +08:00
wangcongtao
bd54995179 opt 2020-01-09 16:14:38 +08:00
董宏宇
8b54d9f1ad 增加了marker添加object绑定 2020-01-09 15:43:02 +08:00
董宏宇
0e22db83ab 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-09 15:10:08 +08:00
wangcongtao
4baa109049 Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0 2020-01-09 14:59:54 +08:00
wangcongtao
c48af40b32 opt 2020-01-09 14:59:46 +08:00
董宏宇
4600817725 增加了将Marker回调到卡片的操作 2020-01-09 14:54:59 +08:00
董宏宇
5b601b19ed Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-09 12:03:23 +08:00
董宏宇
42aa1959a5 增加了真实数据的marker绘制 2020-01-09 12:03:16 +08:00
lixiaopeng
b93a5f2bb6 fix conflict 2020-01-09 10:16:01 +08:00
wangcongtao
742b72d9e4 rc 2020-01-08 20:45:44 +08:00
董宏宇
c6b8eed614 增加了手动绘制marker的调用 2020-01-08 20:26:43 +08:00
wangcongtao
fff8c86d19 Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0 2020-01-08 20:21:20 +08:00
wangcongtao
5b5818e5fb opt 2020-01-08 20:21:11 +08:00
董宏宇
5fe6725e2d 对外开放了绘制marker的方法 2020-01-08 20:17:03 +08:00
董宏宇
a89cc03705 修复了Marker适配问题 2020-01-08 20:10:40 +08:00
董宏宇
a8c0997afb Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0 2020-01-08 18:43:48 +08:00
董宏宇
cd0b567ec7 修复了Marker适配问题 2020-01-08 18:43:38 +08:00
lixiaopeng
8bbb44a8c1 handle conflict 2020-01-08 18:18:20 +08:00
董宏宇
18317700ac 添加了绘制大而全的Marker点 2020-01-08 18:13:28 +08:00
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