Commit Graph

2634 Commits

Author SHA1 Message Date
董宏宇
9dd559e3e6 Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2 2020-08-10 20:14:15 +08:00
董宏宇
fb11aea16e 完成了出行面板列表的部分逻辑 2020-08-10 20:14:09 +08:00
lixiaopeng
6ac12a526c fix conflict 2020-08-10 19:40:53 +08:00
liujing
98900b516a Merge branch 'uii' into dev_1.1.2 2020-08-10 18:29:27 +08:00
liujing
9dea815ebd 加载更多动画 2020-08-10 18:29:25 +08:00
董宏宇
50800675ae 完成了事件面板中的ui 2020-08-10 18:01:12 +08:00
董宏宇
0d47a75eb9 Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2 2020-08-10 17:56:44 +08:00
董宏宇
2a82dda450 完成了事件面板中的ui 2020-08-10 17:56:37 +08:00
liujing
4505c39454 Merge branch 'uii' into dev_1.1.2 2020-08-10 17:35:00 +08:00
liujing
446ebe9e12 no message 2020-08-10 17:34:57 +08:00
liujing
d8e3c803f3 Merge branch 'uii' into dev_1.1.2 2020-08-10 17:28:31 +08:00
liujing
fe8a0a8fb1 分享列表UI 2020-08-10 17:28:28 +08:00
董宏宇
715fe3e0a6 Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2 2020-08-10 17:16:13 +08:00
董宏宇
585be68dab 优化了事件面板的整体展示tab切换功能 2020-08-10 17:16:06 +08:00
liujing
cb4b75de50 Merge branch 'uii' into dev_1.1.2 2020-08-10 17:12:58 +08:00
liujing
abef99be3d UI 2020-08-10 17:12:45 +08:00
liujing
47a2792a44 Merge branch 'uii' into dev_1.1.2 2020-08-10 17:09:15 +08:00
liujing
373291558e [add] 我的分享列表item-UI 2020-08-10 17:09:01 +08:00
tongchenfei
4e679994cd 修改F系列Launcher包名和比亚迪包名,配套修改高德api value 2020-08-10 16:34:13 +08:00
tongchenfei
f2c8ba17a4 修改F系列Launcher包名和比亚迪包名,配套修改高德api value 2020-08-10 16:29:10 +08:00
wangcongtao
643302b9aa opt 2020-08-10 15:54:58 +08:00
tongchenfei
5616b6a829 Merge branch 'dev_1.1.2' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_1.1.2
# Conflicts:
#	app/build.gradle
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
#	settings.gradle
2020-08-10 14:46:39 +08:00
tongchenfei
ec50a12a6c 添加探路api接口实现 2020-08-10 14:39:15 +08:00
liujing
8e975055cf Merge branch 'uii' into dev_1.1.2 2020-08-10 11:47:03 +08:00
liujing
35fd5bfccd [add] 我的分享-UI 2020-08-10 11:46:43 +08:00
tongchenfei
ee53d50cdb 迁移探路模块和tanlulib代码至此 2020-08-10 11:29:55 +08:00
董宏宇
811b9b93de Merge branch 'dev' into dev_1.1.2 2020-08-10 11:24:47 +08:00
董宏宇
7fed343580 Merge branch 'qa_1.1' into dev 2020-08-10 11:24:32 +08:00
董宏宇
43188780f4 升级版本 2020-08-10 11:23:50 +08:00
董宏宇
bdaadf792e 优化展示 2020-08-10 11:23:20 +08:00
董宏宇
72b860a050 Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2 2020-08-07 19:47:58 +08:00
董宏宇
77e2f29037 优化出行动态展示· 2020-08-07 19:47:50 +08:00
lixiaopeng
4a6382a38b modify interface 2020-08-07 19:19:17 +08:00
liujing
54a445af53 Merge branch 'ui' into dev_1.1.2 2020-08-07 19:10:31 +08:00
liujing
0753c50a4f 我的分享-UI 2020-08-07 19:10:23 +08:00
董宏宇
ad2a68f9df 优化了事件面板展示
启动页面展示,但是还是会出现加载进入后的图标下挫问题,待修复
2020-08-07 19:06:55 +08:00
wangcongtao
cd95145a78 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-08-07 17:34:43 +08:00
wangcongtao
063d7d595a Merge branch 'feature/qa_f' into dev 2020-08-07 17:34:13 +08:00
wangcongtao
cab0384f1d 打开部分地图操作免唤醒指令。 2020-08-07 17:20:28 +08:00
tongchenfei
dffd094b67 添加探路上报接口 2020-08-07 17:11:34 +08:00
董宏宇
793bb9a91d Merge branch 'dev' into dev_1.1.2 2020-08-07 16:35:46 +08:00
董宏宇
b5ce988808 Merge branch 'qa_1.1' into dev
# Conflicts:
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java
2020-08-07 16:34:25 +08:00
董宏宇
31c8779748 解决冲突 2020-08-07 16:33:13 +08:00
董宏宇
1d2ce159de 收起违章停车 的时候通知绘制大而全 2020-08-07 16:29:10 +08:00
wangcongtao
0cac655694 bugfix: npe interrupt
'work-thread-handler' thread
2020-08-07 16:28:23 +08:00
wangcongtao
8b7cfe4051 bugfix: npe interrupt
'work-thread-handler' thread
2020-08-07 16:23:03 +08:00
wangcongtao
1b68090976 opt 2020-08-07 15:24:09 +08:00
wangcongtao
037de4b504 opt 2020-08-07 15:23:31 +08:00
liujing
7e8626dc75 Merge branch 'ui' into dev_1.1.2 2020-08-07 15:09:27 +08:00
liujing
dfd1f27fc9 no message 2020-08-07 15:09:24 +08:00