Commit Graph

4300 Commits

Author SHA1 Message Date
lixiaopeng
3f910b3909 opt 2020-12-04 19:38:03 +08:00
董宏宇
c566e3aca3 修复因为合并点击marker弹窗导致事件也加入到了,出行动态,面板的bug 2020-12-04 18:00:24 +08:00
董宏宇
39770450c4 修复极简版本周边事件面板关闭按钮被显示出来的bug 2020-12-04 15:31:47 +08:00
lixiaopeng
802420c673 opt 2020-12-03 20:50:03 +08:00
unknown
98f760c049 Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8 2020-12-02 22:18:49 +08:00
unknown
78b0072b43 turn off log when release 2020-12-02 22:18:38 +08:00
wujifei
297e8fb365 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8
# Conflicts:
#	gradle.properties
2020-12-02 20:40:22 +08:00
wujifei
269653b4b6 new#适配车队相关UI 2020-12-02 20:39:41 +08:00
unknown
65a437cdec Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8 2020-12-02 17:39:17 +08:00
unknown
52306421b2 .. 2020-12-02 17:39:04 +08:00
wangcongtao
48d9cc33ef Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-02 17:12:07 +08:00
wangcongtao
88382b8b5a 解决动画执行中偶现npe的问题 2020-12-02 17:11:59 +08:00
unknown
a73252c90d merge 2020-12-02 16:28:00 +08:00
unknown
9adc21b2b1 update 2020-12-02 16:27:22 +08:00
wujifei
9f53621f4e Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8
# Conflicts:
#	gradle.properties
2020-12-02 16:15:35 +08:00
wujifei
527f7c3991 new#适配车队相关UI 2020-12-02 16:14:54 +08:00
unknown
e6f4685759 Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8 2020-12-02 15:13:38 +08:00
unknown
379258a6ad fix UI 2020-12-02 15:13:28 +08:00
wujifei
a3780815ea Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-02 12:53:39 +08:00
wujifei
ec739eb87f new#适配车队相关页面 2020-12-02 12:53:07 +08:00
unknown
29e0a2eb41 Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8 2020-12-02 11:55:47 +08:00
unknown
b33e93ed8b add interceptor and update callchat 2020-12-02 11:55:12 +08:00
wangcongtao
dc7c1eff4f Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-02 09:52:54 +08:00
wangcongtao
bb6491bf7a 解决判断错误的问题 2020-12-02 09:52:46 +08:00
unknown
744a921e4c fix bug 2020-12-01 22:37:28 +08:00
unknown
736466274d merge 2020-12-01 21:26:04 +08:00
unknown
60842014a3 fix bug 2020-12-01 21:24:38 +08:00
tongchenfei
3e0f2a3bc9 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8
# Conflicts:
#	gradle.properties
2020-12-01 20:56:14 +08:00
tongchenfei
1fb34c93d0 修改车聊聊白天模式北京 2020-12-01 20:55:10 +08:00
wangcongtao
8e06f5d132 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-01 20:43:23 +08:00
wangcongtao
a0a009037c 升级passportsdk版本 2020-12-01 20:43:13 +08:00
unknown
548d3f54c4 Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8 2020-12-01 20:12:43 +08:00
unknown
720783cf1e update 2020-12-01 20:12:25 +08:00
tongchenfei
d60ce9c095 修改头像显示问题 2020-12-01 20:08:14 +08:00
unknown
e71e232927 update callchat 2020-12-01 19:43:20 +08:00
unknown
fad74288f5 Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8 2020-12-01 17:16:15 +08:00
unknown
4fdb501686 update callchat and remove unuse code 2020-12-01 17:16:03 +08:00
lixiaopeng
042cdf7cab opt 2020-12-01 16:50:53 +08:00
tongchenfei
b89c256b71 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-01 16:02:16 +08:00
tongchenfei
93bdd4b42a opt ui:
1. 头像大小及边框
2. toast白天模式背景色
2020-12-01 15:55:43 +08:00
unknown
c8b47e9185 Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8 2020-12-01 15:35:25 +08:00
unknown
ca6cce5266 update callchat ot fix hangUp 2020-12-01 15:34:59 +08:00
wangcongtao
7ff66bf9f9 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-01 15:33:48 +08:00
wangcongtao
15c92b9226 解决车聊聊卸载后,语音唤醒导致的问题 2020-12-01 15:33:39 +08:00
董宏宇
dae7cc8c1d Merge branch 'dev' into qa_1.1.8 2020-12-01 15:19:30 +08:00
wangcongtao
5917993249 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-12-01 15:15:44 +08:00
wangcongtao
676cd58852 解决语音sdk注销时的异常 2020-12-01 15:15:13 +08:00
liujing
f2b6e920a4 ui-空页面控件色值-类型修改(button有阴影) 2020-12-01 15:14:22 +08:00
liujing
e1f4d353ec Merge branch 'hh' into qa_1.1.8 2020-12-01 15:13:54 +08:00
liujing
add563af69 ui-空页面控件色值-类型修改(button有阴影) 2020-12-01 15:13:30 +08:00