Commit Graph

748 Commits

Author SHA1 Message Date
donghongyu
82da081817 修復bug
http://jira.zhidaohulian.com/browse/E84XAD-245
2020-12-06 13:48:41 +08:00
donghongyu
2fea566c26 Merge remote-tracking branch 'origin/qa_1.1.8_easy_mode' into qa_1.1.8_easy_mode 2020-12-06 13:46:15 +08:00
donghongyu
6d5ef88ecb 修復bug
http://jira.zhidaohulian.com/browse/E84XAD-248
2020-12-06 12:40:47 +08:00
lixiaopeng
3272c60e46 opt 2020-12-06 12:10:11 +08:00
董宏宇
317ec9e659 Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode 2020-12-04 18:00:49 +08:00
董宏宇
c566e3aca3 修复因为合并点击marker弹窗导致事件也加入到了,出行动态,面板的bug 2020-12-04 18:00:24 +08:00
董宏宇
6deb58d5fc Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode 2020-12-04 15:32:18 +08:00
董宏宇
39770450c4 修复极简版本周边事件面板关闭按钮被显示出来的bug 2020-12-04 15:31:47 +08:00
董宏宇
b3bdc065ad Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode 2020-12-04 11:28:33 +08:00
lixiaopeng
802420c673 opt 2020-12-03 20:50:03 +08:00
董宏宇
8fea5fc210 修复
http://jira.zhidaohulian.com/browse/E84XAD-230
2020-12-03 18:39:43 +08:00
liujing
db74a482c1 ui-空页面控件色值-类型修改(button有阴影) 2020-12-01 15:14:32 +08:00
liujing
f2b6e920a4 ui-空页面控件色值-类型修改(button有阴影) 2020-12-01 15:14:22 +08:00
董宏宇
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
liujing
29ce6687a0 no message 2020-12-01 10:40:07 +08:00
liujing
95cff9dced no message 2020-12-01 10:39:48 +08:00
liujing
690706fa2d ui-去分享 2020-12-01 10:38:01 +08:00
liujing
bd9b13a5b9 ui-去分享 2020-12-01 10:37:21 +08:00
liujing
884586ce35 ui-分享列表 2020-11-30 21:14:12 +08:00
liujing
57376bce28 no message 2020-11-30 21:13:26 +08:00
liujing
0f9fc1adbd ui-分享列表 2020-11-30 21:11:31 +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
c93ea86080 出行动态UI 2020-11-30 17:45:57 +08:00
liujing
04820f0c2f 出行动态UI 2020-11-30 17:45:18 +08:00
liujing
637dfd2ff2 UI -圆角 间距 2020-11-30 15:42:03 +08:00
liujing
147dd85986 UI -圆角 间距 2020-11-30 15:39:46 +08:00
liujing
45c3085820 no message 2020-11-30 15:18:07 +08:00
liujing
abea2fd9dd [add] 图片资源替换 2020-11-30 15:11:30 +08:00
liujing
f9f87f262e [add] 图片资源替换 2020-11-30 15:11:03 +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
c6bdcc0eee [add] 资源同步,删除重复资源:事件面板和目的地好友列表使用同一资源文件 2020-11-30 10:34:43 +08:00
liujing
514c31f4ee [add] 资源同步,删除重复资源:事件面板和目的地好友列表使用同一资源文件 2020-11-30 10:33:54 +08:00
liujing
dbc50ee7a5 语音打开事件面板,隐藏设置页 2020-11-29 11:41:25 +08:00
liujing
ddb60eed71 语音打开事件面板,隐藏设置页 2020-11-29 11:40:38 +08:00
liujing
76f1d2cb1b UI 2020-11-29 10:57:55 +08:00
liujing
a1044030df [add] 分体机UI 资源替换,微调 2020-11-29 10:46:36 +08:00
liujing
c279a641be [add] 分体机UI 资源替换,微调 2020-11-29 10:45:52 +08:00
liujing
2927bd16c7 no message 2020-11-27 13:11:41 +08:00
liujing
0dca234b5d no message 2020-11-27 13:10:55 +08:00
lixiaopeng
e1a07f66f7 opt 2020-11-27 11:48:55 +08:00