Commit Graph

4055 Commits

Author SHA1 Message Date
liujing
9ece7af5ac [UI] 车友列表-F 2020-11-25 16:50:52 +08:00
unknown
93e81eee2e remove bizcallchat.gradle 2020-11-25 16:22:35 +08:00
unknown
11fa6fa8fa update callchat 2020-11-25 16:16:38 +08:00
unknown
0aa99ee38f Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-11-25 16:07:05 +08:00
unknown
45fdd0fad1 ........ 2020-11-25 16:06:52 +08:00
liujing
eaf7b65c26 Merge branch 'uu' into dev 2020-11-25 15:28:22 +08:00
liujing
6ad40202e9 [add] m-ui .9图替换 2020-11-25 15:27:55 +08:00
liujing
85631bb37d Merge branch 'add' into dev 2020-11-25 14:48:01 +08:00
liujing
e99ede6b7e [rm] .9资源替换,优化透明度 2020-11-25 14:47:42 +08:00
unknown
b085e49cc9 fix bug of gradle 2020-11-25 11:57:29 +08:00
unknown
6255f2b679 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-11-25 11:49:37 +08:00
unknown
75a7d57320 remove origin callchatting and replace by callchat 2020-11-25 11:49:27 +08:00
董宏宇
2462e754d4 关闭了调试日志 2020-11-25 11:42:02 +08:00
董宏宇
6a438b85b1 Merge remote-tracking branch 'origin/dev' into dev 2020-11-25 10:44:53 +08:00
董宏宇
8db87d0127 关闭了调试日志 2020-11-25 10:44:49 +08:00
liujing
27d628c209 Merge branch 'add' into dev 2020-11-25 10:40:37 +08:00
liujing
89f44f2228 自车求助静态图替换 2020-11-25 10:40:17 +08:00
liujing
33510075fe 车友列表左右留白-待调 2020-11-24 21:17:51 +08:00
liujing
d4857bf821 Merge branch 'add' into dev 2020-11-24 21:13:44 +08:00
liujing
92f5e94183 [add] 命名+UI微调 2020-11-24 21:13:37 +08:00
董宏宇
b79ba57557 修改绘制线颜色 2020-11-24 21:01:54 +08:00
liujing
4fc5031ded Merge branch 'add' into dev 2020-11-24 20:37:38 +08:00
liujing
0dcccf3ff5 事件面板.9资源替换+点击状态 2020-11-24 20:37:36 +08:00
liujing
9e75bb3a92 Merge branch 'add' into dev 2020-11-24 20:33:10 +08:00
liujing
d601da968a 资源移到common 2020-11-24 20:32:56 +08:00
liujing
ebd9716acb Merge branch 'add' into dev 2020-11-24 20:15:34 +08:00
liujing
45022944c3 [rm] .9图替换 2020-11-24 20:15:20 +08:00
liujing
ed5257103c Merge branch 'add' into dev 2020-11-24 20:01:56 +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
65398c4cfe Merge branch 'add' into dev 2020-11-24 18:48:34 +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
董宏宇
559a9b30bc 增加动态可开启的巡航播报设置 2020-11-24 16:57:19 +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
0d161b7569 Merge branch 'cl' into dev 2020-11-24 15:22:55 +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