Commit Graph

771 Commits

Author SHA1 Message Date
董宏宇
17478da011 Merge branch 'qa_1.1.8' into dev
# Conflicts:
#	modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
#	skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png
#	skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png
2020-12-01 14:53:19 +08:00
董宏宇
a5e7b71d95 Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode
# Conflicts:
#	modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
#	skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml
2020-12-01 14:48:25 +08:00
董宏宇
daaf2fe35c 修复了周边道路事件数量播报错误问题 2020-12-01 14:45:14 +08:00
董宏宇
c94894729d Merge branch 'qa_1.1.8' into dev
# Conflicts:
#	skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml
2020-11-30 20:11:19 +08:00
董宏宇
9d2b8d7c8b Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode 2020-11-30 20:10:46 +08:00
董宏宇
18c31db124 修复bug 2020-11-30 20:10:14 +08:00
董宏宇
5d62028b2e Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode
# Conflicts:
#	modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
#	skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml
2020-11-30 18:03:47 +08:00
董宏宇
6b58a86040 去掉限制 2020-11-30 18:02:43 +08:00
liujing
7fa0ebdcf2 no message 2020-11-30 14:47:21 +08:00
董宏宇
2248fc2ded Merge branch 'qa_1.1.8' into dev
# Conflicts:
#	gradle.properties
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
2020-11-30 14:42:52 +08:00
董宏宇
a0758236d9 Merge remote-tracking branch 'origin/dev' into qa_1.1.8_easy_mode
# Conflicts:
#	gradle.properties
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
2020-11-30 14:27:13 +08:00
董宏宇
ad39b0da19 修复
http://jira.zhidaohulian.com/browse/D80XCD-1608
2020-11-30 12:26:16 +08:00
董宏宇
c9af523a75 对事件的处理进行异常包裹,保证程序不异常崩溃
appName=蘑菇出行
versionCode=8001873
sn=ZD802B1932L00622
versionName=8.0.7.1173
DISPLAY=K2101_ZD_S112101.20200521.21553235
appPackageName=com.mogo.launcher.app
TIME=1606470575675
fileName=debug-app-crash-com.mogo.launcher.app-2020-11-27-17-49-35.log
java.lang.ClassCastException: java.lang.String cannot be cast to java.lang.Object[]
	at android.util.ArrayMap.allocArrays(ArrayMap.java:185)
	at android.util.ArrayMap.put(ArrayMap.java:444)
	at android.os.Bundle.putSerializable(Bundle.java:643)
	at android.content.Intent.putExtra(Intent.java:5866)
	at com.mogo.module.v2x.scenario.impl.V2XScenarioManager.lambda$handlerMessage$0$V2XScenarioManager(V2XScenarioManager.java:68)
	at com.mogo.module.v2x.scenario.impl.-$$Lambda$V2XScenarioManager$7EW5DB57RlPpJUn77fU606mlAJk.run(lambda)
	at com.mogo.module.v2x.utils.V2XUtils.runOnUiThread(V2XUtils.java:164)
	at com.mogo.module.v2x.scenario.impl.V2XScenarioManager.handlerMessage(V2XScenarioManager.java:61)
	at com.mogo.module.v2x.listener.V2XMessageListener_401005.lambda$handleSeekHelp$1(V2XMessageListener_401005.java:89)
	at com.mogo.module.v2x.listener.-$$Lambda$V2XMessageListener_401005$7Frk0OhryomEqYMaU1gKqg_o7N4.run(lambda)
	at android.os.Handler.handleCallback(Handler.java:733)
	at android.os.Handler.dispatchMessage(Handler.java:95)
	at android.os.Looper.loop(Looper.java:136)
	at android.app.ActivityThread.main(ActivityThread.java:5057)
	at java.lang.reflect.Method.invokeNative(Native Method)
	at java.lang.reflect.Method.invoke(Method.java:515)
	at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:860)
	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:676)
	at dalvik.system.NativeStart.main(Native Method)
2020-11-30 12:13:12 +08:00
liujing
76f1d2cb1b UI 2020-11-29 10:57:55 +08:00
lixiaopeng
e1a07f66f7 opt 2020-11-27 11:48:55 +08:00
liujing
633462de3a 出行动态副标题,UI微调 2020-11-27 11:04:27 +08:00
liujing
7f5fba2ca5 出行动态副标题,UI微调 2020-11-27 11:03:08 +08:00
liujing
633fc5dcff [fix]查询出行动态tts语音播报重复 2020-11-26 17:28:33 +08:00
liujing
3eaad34ed7 [fix]查询出行动态tts语音播报重复 2020-11-26 17:27:53 +08:00
liujing
8fadd5e4d9 周边事件子类tts播报 2020-11-26 15:44:16 +08:00
liujing
7e3c9a4a63 周边事件子类tts播报 2020-11-26 15:43:42 +08:00
liujing
9a30630f81 视频播放,第一帧抽图异步 2020-11-25 21:31:09 +08:00
wangcongtao
25d8962a05 Merge remote-tracking branch 'origin/dev' into dev 2020-11-25 21:17:18 +08:00
wangcongtao
e89d4058d2 优化代码 2020-11-25 21:17:12 +08:00
tongchenfei
b673ba2e84 Merge remote-tracking branch 'origin/dev' into dev 2020-11-25 20:01:54 +08:00
tongchenfei
d2493253d1 opt compile warn 2020-11-25 20:01:31 +08:00
董宏宇
18152b7407 关闭M1中的事件面板按钮 2020-11-25 18:22:31 +08:00
董宏宇
b0639d0a83 关闭日志 2020-11-25 17:30:57 +08:00
董宏宇
eb74ce01b1 调整UGC判断顺序 2020-11-25 16:57:18 +08:00
董宏宇
33aedd3aef 优化了道路事件的触发算法,主要分为以下步骤:
触发道路事件的条件:
0、道路事件必须有朝向,角度>=0;
1、距离《500
2、道路事件方向与当前行驶方向角度偏《20度以内
3、当前车辆行驶方向与事件位置之间夹角《20度
2020-11-25 16:39:34 +08:00
董宏宇
2462e754d4 关闭了调试日志 2020-11-25 11:42:02 +08:00
董宏宇
8db87d0127 关闭了调试日志 2020-11-25 10:44:49 +08:00
董宏宇
b79ba57557 修改绘制线颜色 2020-11-24 21:01:54 +08:00
董宏宇
8581edf1e8 修改动画图 2020-11-24 19:34:28 +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
wangcongtao
54a04f2bae 修改 MAIN_PAGE_CREATED 状态值及其相关逻辑 2020-11-24 10:22:47 +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
董宏宇
dfaabd36a2 针对M1关闭了疲劳驾驶检测 2020-11-23 17:21:52 +08:00
董宏宇
1ac7cb7af6 对M1低配车机增加了限制
不可接收道路求助
2020-11-23 17:18:12 +08:00
liujing
beb429d3af [add] 心形资源替换-事件面板适配新UI 2020-11-23 16:42:00 +08:00
liujing
b0491943cb tts-打开事件面板联调 2020-11-23 15:46:07 +08:00
liujing
35b6feb349 tts播报-唤醒查询事件面板内容 2020-11-23 10:28:50 +08:00