Commit Graph

2908 Commits

Author SHA1 Message Date
liujing
33510075fe 车友列表左右留白-待调 2020-11-24 21:17:51 +08:00
liujing
92f5e94183 [add] 命名+UI微调 2020-11-24 21:13:37 +08:00
董宏宇
b79ba57557 修改绘制线颜色 2020-11-24 21:01:54 +08:00
liujing
0dcccf3ff5 事件面板.9资源替换+点击状态 2020-11-24 20:37:36 +08:00
liujing
d601da968a 资源移到common 2020-11-24 20:32:56 +08:00
liujing
45022944c3 [rm] .9图替换 2020-11-24 20:15:20 +08:00
liujing
7603b827a7 [add] 回自车 取消求助点击状态.9添加 2020-11-24 20:01:39 +08:00
董宏宇
21c9d1a8ea Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00000.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00001.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00002.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00003.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00004.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00005.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00006.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00007.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00008.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00009.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00010.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00011.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00012.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00013.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00015.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00017.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00018.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00019.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00020.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00023.png
2020-11-24 19:35:21 +08:00
董宏宇
8581edf1e8 修改动画图 2020-11-24 19:34:28 +08:00
liujing
c9bbbdb73d [add] 自车求助图片资源+白天模式点击状态.9 2020-11-24 18:48:14 +08:00
wangcongtao
897902d8ed Merge remote-tracking branch 'origin/dev' into dev 2020-11-24 17:38:10 +08:00
wangcongtao
3a3467138a 修改guide模块依赖,解决1+16上adas不显示的问题。 2020-11-24 17:38:02 +08:00
tongchenfei
4caecb5eb2 Merge remote-tracking branch 'origin/dev' into dev 2020-11-24 17:29:17 +08:00
tongchenfei
8eaee0f0c0 opt 2020-11-24 17:29:03 +08:00
tongchenfei
7301b59527 增加对话框蒙层颜色深度 2020-11-24 17:28:28 +08:00
董宏宇
c9fdc878c3 对match的布局增加tools:layout_height="wrap_content"方便预览 2020-11-24 17:15:21 +08:00
董宏宇
a9147810d4 微调UI 2020-11-24 17:12:42 +08:00
董宏宇
2e0f316c37 Merge remote-tracking branch 'origin/dev' into dev 2020-11-24 17:09:24 +08:00
董宏宇
0427fb2e09 将添加F车机道路事件及他车求助的动画UI 2020-11-24 17:09:17 +08:00
lixiaopeng
ec01c30028 opt 2020-11-24 17:01:48 +08:00
董宏宇
30df5fdba7 Merge remote-tracking branch 'origin/dev' into dev 2020-11-24 16:12:04 +08:00
董宏宇
52d9fb7cf2 修改UI,增加了疲劳驾驶中道路推荐中的关闭按钮 2020-11-24 16:11:59 +08:00
liujing
d59cb13600 [r] 关闭按钮图片资源替换 2020-11-24 15:22:40 +08:00
lixiaopeng
e8d8eabf99 opt 2020-11-24 15:15:31 +08:00
wujifei
7d834587b9 new#初始化initVehicleTeamContainer 2020-11-24 13:18:33 +08:00
wujifei
0624065eb8 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
2020-11-24 13:16:51 +08:00
wujifei
babbbde037 new#初始化initVehicleTeamContainer 2020-11-24 13:14:37 +08:00
unknown
efc3fc75f0 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-11-24 10:38:05 +08:00
unknown
62e5660f4e 1+16 调整 2020-11-24 10:37:12 +08:00
wangcongtao
54a04f2bae 修改 MAIN_PAGE_CREATED 状态值及其相关逻辑 2020-11-24 10:22:47 +08:00
wangcongtao
56bb283d86 修改周边事件打开指令逻辑、去除小智形象逻辑2 2020-11-24 10:08:35 +08:00
wangcongtao
e5c7440a63 Merge remote-tracking branch 'origin/dev' into dev 2020-11-24 09:48:17 +08:00
wangcongtao
f7efe8c0f9 新增卡片策略播报埋点、去掉小智形象逻辑 2020-11-24 09:48:08 +08:00
liujing
1dd5dfb276 Merge branch 'kj' into dev 2020-11-23 20:36:35 +08:00
liujing
8377c26cb2 语音打开事件面板 2020-11-23 20:35:53 +08:00
unknown
d982d19598 changed the callchat impl and update 2020-11-23 19:50:20 +08:00
unknown
3480101096 pull merge 2020-11-23 18:38:44 +08:00
董宏宇
54977b02f7 Merge remote-tracking branch 'origin/dev' into dev 2020-11-23 18:02:35 +08:00
董宏宇
6975317012 修复语音指令导致ADAS频闪bug 2020-11-23 18:02:31 +08:00
wangcongtao
b52757b224 Merge remote-tracking branch 'origin/dev' into dev 2020-11-23 17:50:05 +08:00
wangcongtao
0a3c77cef0 1. 优化模块加载、去掉部分逻辑、升级socket版本号 2020-11-23 17:49:55 +08:00
董宏宇
dfaabd36a2 针对M1关闭了疲劳驾驶检测 2020-11-23 17:21:52 +08:00
董宏宇
6fed0039f6 Merge remote-tracking branch 'origin/dev' into dev 2020-11-23 17:18:16 +08:00
董宏宇
1ac7cb7af6 对M1低配车机增加了限制
不可接收道路求助
2020-11-23 17:18:12 +08:00
liujing
f68acde0c4 no message 2020-11-23 17:14:31 +08:00
lixiaopeng
b34f0cf907 opt 2020-11-23 17:11:33 +08:00
董宏宇
3c5b3bf21b Merge remote-tracking branch 'origin/dev' into dev 2020-11-23 17:10:31 +08:00
董宏宇
673abf4fc8 修复语音小智也走主页面的生命周期,导致会关闭EventPanel的问题 2020-11-23 17:10:21 +08:00
liujing
9d5fc0f33e 分享色值-点击状态修改 2020-11-23 17:05:39 +08:00
liujing
8aa6d9236a 分享按钮色值修改 2020-11-23 16:46:02 +08:00