tongchenfei
|
ac72a04995
|
合并obu部分代码
|
2020-08-19 20:42:17 +08:00 |
|
tongchenfei
|
5af67fecf4
|
Merge branch 'dev' into demo/shunyi_v2v_merge
|
2020-08-19 16:12:59 +08:00 |
|
tongchenfei
|
25a982337c
|
Merge branch 'qa_1.1.2' into dev
|
2020-08-19 15:47:55 +08:00 |
|
tongchenfei
|
c5a19ce714
|
Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev
|
2020-08-19 15:47:38 +08:00 |
|
tongchenfei
|
65b251d020
|
Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2
|
2020-08-19 15:07:02 +08:00 |
|
tongchenfei
|
b83bead690
|
增加日志抓取功能
|
2020-08-19 15:06:43 +08:00 |
|
wangcongtao
|
806d95a93b
|
顺义分支和dev分支合并
|
2020-08-19 14:54:15 +08:00 |
|
董宏宇
|
a401970f29
|
Merge branch 'dev_1.1.2' into qa_1.1.2
|
2020-08-19 14:54:09 +08:00 |
|
董宏宇
|
fc87a71579
|
Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2
|
2020-08-19 14:53:20 +08:00 |
|
董宏宇
|
efa2ec578f
|
修改了关闭窗体后修改状态的时机
|
2020-08-19 14:53:12 +08:00 |
|
liujing
|
a32181b580
|
图片替换,无用代码删除
|
2020-08-19 14:21:28 +08:00 |
|
liujing
|
098072fd7d
|
Merge branch 'ui' into qa_1.1.2
|
2020-08-19 14:21:12 +08:00 |
|
liujing
|
05285fa0b6
|
图片替换,无用代码删除
|
2020-08-19 14:21:03 +08:00 |
|
董宏宇
|
e89706a4d7
|
修改了关闭窗体后修改状态的时机
|
2020-08-19 14:15:12 +08:00 |
|
liujing
|
8d52789508
|
服务端返回字段大小写有误
|
2020-08-19 12:23:47 +08:00 |
|
liujing
|
562623f9eb
|
Merge branch 'ui' into qa_1.1.2
|
2020-08-19 12:23:31 +08:00 |
|
liujing
|
8544c19342
|
服务端返回字段大小写有误
|
2020-08-19 12:23:21 +08:00 |
|
wangcongtao
|
7727011de1
|
1. 1.1.3需求策略修改。
|
2020-08-19 11:48:25 +08:00 |
|
liujing
|
3612f2123f
|
ui
|
2020-08-19 10:25:40 +08:00 |
|
liujing
|
060eeb1328
|
Merge branch 'ui' into qa_1.1.2
|
2020-08-19 10:25:27 +08:00 |
|
liujing
|
aa67ca085f
|
ui
|
2020-08-19 10:25:18 +08:00 |
|
liujing
|
6136e323ab
|
UI
|
2020-08-18 21:28:47 +08:00 |
|
liujing
|
9adb62e51e
|
Merge branch 'ui' into qa_1.1.2
|
2020-08-18 21:28:29 +08:00 |
|
liujing
|
7b796c65ba
|
UI
|
2020-08-18 21:28:22 +08:00 |
|
liujing
|
fbbd976dc8
|
UI
|
2020-08-18 20:46:26 +08:00 |
|
liujing
|
5dc2f249fb
|
Merge branch 'ui' into qa_1.1.2
|
2020-08-18 20:46:09 +08:00 |
|
liujing
|
a45f82c70c
|
UI
|
2020-08-18 20:45:59 +08:00 |
|
liujing
|
898049190e
|
我的分享列表刷新时机
|
2020-08-18 19:56:21 +08:00 |
|
liujing
|
19d2ad4567
|
Merge branch 'ui' into qa_1.1.2
|
2020-08-18 19:55:29 +08:00 |
|
liujing
|
1d7c902703
|
我的分享列表刷新时机
|
2020-08-18 19:55:24 +08:00 |
|
lixiaopeng
|
2b3a58361c
|
opt ui
|
2020-08-18 17:25:26 +08:00 |
|
lixiaopeng
|
1853f50bbc
|
opt ui
|
2020-08-18 17:04:08 +08:00 |
|
liujing
|
07629acc3c
|
[add] 部分UI
|
2020-08-18 16:44:37 +08:00 |
|
liujing
|
ed61bef010
|
Merge branch 'ui' into qa_1.1.2
|
2020-08-18 16:43:48 +08:00 |
|
liujing
|
1af7263dad
|
[add] 部分UI
|
2020-08-18 16:43:30 +08:00 |
|
董宏宇
|
14d3ee444e
|
增加日志
|
2020-08-18 15:36:52 +08:00 |
|
董宏宇
|
d85c6c9d26
|
打开了日志输出
|
2020-08-18 15:29:45 +08:00 |
|
lixiaopeng
|
1b4c625dd9
|
opt
|
2020-08-18 14:48:29 +08:00 |
|
董宏宇
|
50e6eb5cf8
|
Merge branch 'dev_1.1.2' into dev
# Conflicts:
# modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorConst.java
# modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
|
2020-08-18 14:19:13 +08:00 |
|
董宏宇
|
94e8807dfd
|
Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2
|
2020-08-18 14:14:36 +08:00 |
|
董宏宇
|
11cf188cea
|
修复了调用接口addPoiInfoFabulous穿参数问题
|
2020-08-18 14:14:17 +08:00 |
|
tongchenfei
|
77785b3d0f
|
Merge branch 'qa_1.1.2' into dev
# Conflicts:
# modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorConst.java
# modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
|
2020-08-18 13:18:23 +08:00 |
|
tongchenfei
|
956330bf96
|
Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2
|
2020-08-18 13:13:29 +08:00 |
|
tongchenfei
|
7ebc0b0862
|
opt
|
2020-08-18 13:11:07 +08:00 |
|
wangcongtao
|
64cbbdc6ee
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-08-18 10:09:28 +08:00 |
|
wangcongtao
|
f25ed65f6a
|
1. 调整tts播报策略为默认
|
2020-08-18 10:09:09 +08:00 |
|
tongchenfei
|
6ccea8cca5
|
opt
|
2020-08-18 10:08:23 +08:00 |
|
wangcongtao
|
75fcf33a4a
|
Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev
|
2020-08-18 09:57:22 +08:00 |
|
wangcongtao
|
5d714a459f
|
1. 新增广播方式控制日志输出，便于release打包时调试
2. 优化accOff控制周边车友/事件播报：完全accOff之后才停止
|
2020-08-18 09:57:05 +08:00 |
|
tongchenfei
|
3b88859a32
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-08-18 09:49:08 +08:00 |
|