Commit Graph

1682 Commits

Author SHA1 Message Date
tongchenfei
9484199a2b Merge branch 'qa_m1m3' into dev
# Conflicts:
#	app/functions/eventpanel.gradle
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
2020-08-04 17:59:37 +08:00
tongchenfei
a4bffbf30d ui fix 2020-08-04 17:45:39 +08:00
wangcongtao
bb64154f79 opt 2020-08-04 16:04:03 +08:00
wangcongtao
4930524644 Merge branch 'feature/qa_f' into dev
# Conflicts:
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
2020-08-04 15:46:45 +08:00
董宏宇
40923afb16 「修复」
合并冲突
2020-08-04 15:12:19 +08:00
董宏宇
7805ababac Merge remote-tracking branch 'origin/dev' into dev 2020-08-04 15:04:10 +08:00
董宏宇
17052d869c 「修复」
合并冲突
2020-08-04 15:03:07 +08:00
董宏宇
a0fac7cb75 Merge branch 'qa_1.1' into dev
# Conflicts:
#	app/functions/eventpanel.gradle
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
2020-08-04 14:57:25 +08:00
wangcongtao
4bab2f4728 按home悬浮窗无法关闭历史消息的问题。 2020-08-04 14:49:25 +08:00
董宏宇
0b2e3ee690 「修复」
其它车主求助的tts播报下沉到了广播给ADAS的模块中
2020-08-04 14:33:18 +08:00
wangcongtao
5294a6447b opt 2020-08-04 14:00:33 +08:00
wangcongtao
16c659f87b Merge branch 'qa_1.1' into dev 2020-08-03 21:26:03 +08:00
wangcongtao
8d2d6f95f4 修改独立app页面销毁后部分监听没有注销的问题 2020-08-03 21:20:49 +08:00
wangcongtao
7f93590d8c 修改独立app页面销毁后部分监听没有注销的问题 2020-08-03 21:12:59 +08:00
wangcongtao
4d4e3fb9ec opt 2020-08-03 11:32:22 +08:00
wangcongtao
2f208636c8 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-08-03 11:10:44 +08:00
wangcongtao
b67c443818 merge 2020-08-03 11:09:09 +08:00
tongchenfei
49fbbe905a 解决机器上未装酷我音乐导致的崩溃问题 2020-08-03 10:49:40 +08:00
wangcongtao
d31873526f Merge branch 'qa' into feature/qa_f 2020-08-03 10:02:30 +08:00
tongchenfei
aeb2f766da 修改acc_off后,点击弹窗不出来的问题 2020-08-03 09:51:53 +08:00
wangcongtao
85485670d3 merge from qa 2020-08-03 09:38:38 +08:00
wangcongtao
b7f33115bd 去掉吐司 2020-08-02 20:06:30 +08:00
wangcongtao
9169046175 处理分体机acc状态和诺维达accDelay的情况 2020-08-02 19:57:39 +08:00
wangcongtao
ed6cc20a92 避免acc相同状态被发两次 2020-08-02 18:44:44 +08:00
wangcongtao
af6e2b00f9 开机或者accOn不能加载道路事件的问题。 2020-08-02 17:18:29 +08:00
wangcongtao
d349675ad9 bugfix 2020-07-31 18:06:15 +08:00
wangcongtao
090fa1ada3 Merge branch 'feature/qa_f' into dev 2020-07-31 18:01:48 +08:00
wangcongtao
68ab0c30ea 按虚拟home键无法销毁消息列表的问题。 2020-07-31 17:58:26 +08:00
tongchenfei
a77a8db0d8 opt 2020-07-31 15:13:58 +08:00
wangcongtao
6a369d17df 1. 定位按钮加入设置地图中心点的功能。 2020-07-31 15:08:04 +08:00
wangcongtao
e16fff638c 将推送代码接入主工程 2020-07-31 13:22:26 +08:00
wangcongtao
433d1db7d0 Merge branch 'feature/qa_f' into dev 2020-07-31 12:35:10 +08:00
wangcongtao
1bf436d826 1. 解决push推送相关问题。 2020-07-31 12:29:53 +08:00
wangcongtao
8f99e04a87 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-07-31 11:10:05 +08:00
wangcongtao
1153813221 融合高德广播和语音指令控制地图的逻辑 2020-07-31 11:09:45 +08:00
unknown
ad1d86b2d7 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-07-30 19:24:21 +08:00
unknown
5785b80d47 Merge branch 'qa_byd' into dev 2020-07-30 19:24:07 +08:00
wangcongtao
45bcbaf979 升级passport相关sdk、修改地图"继续导航"指令问题 2020-07-30 17:44:37 +08:00
wangcongtao
d6c66f171d merge from qa 2020-07-30 16:17:01 +08:00
wangcongtao
1a6def7798 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-07-30 16:08:40 +08:00
wangcongtao
754a17a31d Merge branch 'feature/qa_f' into dev 2020-07-30 16:07:48 +08:00
wangcongtao
70db00b5b5 Merge branch 'qa' into feature/qa_f 2020-07-30 16:07:16 +08:00
wangcongtao
fc9b41b1f3 bugfix 2020-07-30 16:05:40 +08:00
tongchenfei
68443c043f bug fix 2020-07-30 15:48:58 +08:00
tongchenfei
3ed51c3947 bug fix 2020-07-30 15:26:46 +08:00
董宏宇
dce0487f35 Merge branch 'qa_1.1' into dev_1.1.2 2020-07-30 15:08:15 +08:00
董宏宇
fd9e96e510 增加了疲劳驾驶和道路求助的布局优化 2020-07-30 15:07:29 +08:00
董宏宇
2d731b6a99 Merge branch 'dev' into dev_1.1.2 2020-07-30 14:31:49 +08:00
董宏宇
08ca140c6f 完成了他人故障求助的展示逻辑统一 2020-07-30 14:31:12 +08:00
wangcongtao
b437e2d1fd Merge branch 'qa_byd' into dev 2020-07-30 11:05:04 +08:00