Commit Graph

12455 Commits

Author SHA1 Message Date
tongchenfei
9d88bafa91 bugfix: crash 2020-09-14 12:54:25 +08:00
liujing
94f9b07bd1 fix null crash 2020-09-14 12:04:26 +08:00
liujing
852865230d fix null crash 2020-09-14 12:04:11 +08:00
liujing
9352279219 Merge branch 'null' into dev 2020-09-14 12:03:44 +08:00
liujing
a26113133b fix null crash 2020-09-14 12:03:04 +08:00
lixiaopeng
54c04d26ea opt ui 2020-09-11 17:47:34 +08:00
tongchenfei
a6d2c6f6f7 Merge remote-tracking branch 'origin/qa_1.1.5_2' into qa_1.1.5_2 2020-09-11 17:28:35 +08:00
tongchenfei
56154c268e 修改故障求助type类型 2020-09-11 17:28:21 +08:00
jiaguofeng
fcfa151e41 fix move 2020-09-11 17:27:00 +08:00
wangcongtao
6c40e1669a Merge branch 'qa_1.1.5_2' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_1.1.5_2 2020-09-11 15:46:55 +08:00
wangcongtao
9e5833db73 fix: bugly#7002 & #15002 2020-09-11 15:46:39 +08:00
wangcongtao
15e1b3f9b9 fix: bugly#11002 2020-09-11 15:46:25 +08:00
wangcongtao
e952dec73b fix: bugly#7002 & #15002 2020-09-11 15:44:40 +08:00
wangcongtao
fbd808cdcf Merge remote-tracking branch 'origin/qa_light' into qa_light 2020-09-11 15:37:38 +08:00
wangcongtao
d7ee06d806 fix: bugly#11002 2020-09-11 15:37:32 +08:00
liujing
ae8907c01e 点赞数UI微调 2020-09-11 15:17:17 +08:00
liujing
5a65c0fad9 点赞数UI微调 2020-09-11 15:17:08 +08:00
liujing
817b80b421 Merge branch 'ui' into dev 2020-09-11 15:16:00 +08:00
liujing
53093aa5f6 点赞数UI微调 2020-09-11 15:15:16 +08:00
wangcongtao
b257744d84 删除adas算法控制方法调用 2020-09-11 15:12:07 +08:00
wangcongtao
99297cfad5 删除adas算法控制方法调用 2020-09-11 15:05:54 +08:00
tongchenfei
57abac7138 Merge remote-tracking branch 'origin/qa_1.1.5_2' into qa_1.1.5_2 2020-09-11 15:04:09 +08:00
tongchenfei
7d9291fd4f bugfix: 修复在guide界面按back键后,adas界面不显示的问题 2020-09-11 15:03:55 +08:00
wangcongtao
b7a024f0fc 解决天气类型无法获取导致的npe 2020-09-11 14:49:44 +08:00
liujing
c42e41cb8b D热心指数图片大小 2020-09-11 14:45:51 +08:00
liujing
520d9aad31 Merge branch 'ii' into dev 2020-09-11 14:45:22 +08:00
liujing
392c03585c D热心指数图片大小 2020-09-11 14:44:55 +08:00
wangcongtao
be3bedc129 Merge remote-tracking branch 'origin/qa_1.1.5_2' into qa_1.1.5_2 2020-09-11 14:43:10 +08:00
wangcongtao
a069837e75 解决天气类型无法获取导致的npe 2020-09-11 14:43:05 +08:00
tongchenfei
0089308e56 opt: adas窗口不出来 2020-09-11 14:39:38 +08:00
tongchenfei
f1276dacd3 删除/build文件 2020-09-11 11:40:20 +08:00
tongchenfei
b199b39752 Merge branch 'qa_1.1.5_1' into qa_1.1.5_2
# Conflicts:
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
2020-09-11 11:37:57 +08:00
lixiaopeng
29b9a10f32 opt 2020-09-11 11:07:43 +08:00
tongchenfei
e97369a692 opt 2020-09-11 10:02:46 +08:00
unknown
06f40ce649 Merge branch 'dev' into demo/shunyi_v2v_merge 2020-09-10 17:56:12 +08:00
unknown
4cdc98a2f5 Merge branch 'demo/shunyi_v2v_merge' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into demo/shunyi_v2v_merge 2020-09-10 17:55:14 +08:00
wangcongtao
ebbbef1517 Merge branch 'dev' into demo/shunyi_v2v_merge 2020-09-10 17:54:24 +08:00
unknown
802d0bef7b gradle problem 2020-09-10 17:53:12 +08:00
unknown
cd5aa2e2e9 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-10 17:51:30 +08:00
unknown
2ebc574309 changed the mark point name 2020-09-10 17:51:16 +08:00
tongchenfei
024c387545 Merge remote-tracking branch 'origin/dev' into dev 2020-09-10 17:41:57 +08:00
tongchenfei
9c7a5db517 去掉道路事件上报时的poiType判断 2020-09-10 17:41:39 +08:00
lixiaopeng
766e84b66f opt ui 2020-09-10 17:05:51 +08:00
lixiaopeng
aaac882bf5 opt ui 2020-09-10 17:05:51 +08:00
unknown
b7dd49e7b3 fix bug and replace the png 2020-09-10 17:05:51 +08:00
tongchenfei
5b1af43808 opt 2020-09-10 17:05:51 +08:00
lixiaopeng
7496ce8abd opt ui 2020-09-10 17:03:57 +08:00
unknown
9e7259eb6b Merge branch 'dev' into demo/shunyi_v2v_merge 2020-09-10 16:56:29 +08:00
lixiaopeng
dbc9b9212d opt ui 2020-09-10 16:39:08 +08:00
wangcongtao
0a41173d07 Merge remote-tracking branch 'origin/demo/shunyi_v2v_merge' into demo/shunyi_v2v_merge
# Conflicts:
#	modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	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
2020-09-10 16:32:43 +08:00