Commit Graph

4190 Commits

Author SHA1 Message Date
liujing
1982a1793c UI 2020-11-30 15:17:18 +08:00
liujing
abea2fd9dd [add] 图片资源替换 2020-11-30 15:11:30 +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
董宏宇
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
69c526f63b Merge branch 'jh' into dev 2020-11-30 10:34:20 +08:00
liujing
514c31f4ee [add] 资源同步,删除重复资源:事件面板和目的地好友列表使用同一资源文件 2020-11-30 10:33:54 +08:00
wangcongtao
5773086c96 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-11-29 14:09:47 +08:00
wangcongtao
9bbfd2bf75 bugfix 2020-11-29 14:09:04 +08:00
liujing
dbc50ee7a5 语音打开事件面板,隐藏设置页 2020-11-29 11:41:25 +08:00
liujing
1fb2b461dd Merge branch 'km' into qa_1.1.8 2020-11-29 11:40:58 +08:00
liujing
ddb60eed71 语音打开事件面板,隐藏设置页 2020-11-29 11:40:38 +08:00
wangcongtao
7f81e21231 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-11-29 11:26:57 +08:00
wangcongtao
909c8794a5 UI opt 2020-11-29 11:26:51 +08:00
liujing
df8987a22c UI 2020-11-29 11:10:46 +08:00
liujing
1f2d212cba Merge branch 'gg' into dev 2020-11-29 11:10:26 +08:00
liujing
4c2e1632a6 UI 2020-11-29 11:10:05 +08:00
liujing
2b389e3441 Merge branch 'gg' into dev 2020-11-29 10:58:09 +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
7e7f22fa6e Merge branch 'gg' into dev 2020-11-29 10:46:15 +08:00
liujing
c279a641be [add] 分体机UI 资源替换,微调 2020-11-29 10:45:52 +08:00
unknown
bdebbdaffe fix bug of callchat 2020-11-27 18:06:34 +08:00
wujifei
7b95ad5e98 Merge remote-tracking branch 'origin/dev' into dev 2020-11-27 17:57:47 +08:00
wujifei
d627d182ff new#适配车队相关页面白天模式 2020-11-27 17:57:27 +08:00
unknown
cc3fe741e1 fix bug 2020-11-27 17:42:13 +08:00
unknown
e419e5fef3 update callchat 2020-11-27 16:56:49 +08:00
wangcongtao
cfb73c0222 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-11-27 16:51:50 +08:00
wangcongtao
375657ca58 去掉部分日志 2020-11-27 16:51:44 +08:00
tongchenfei
97b70dec59 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-11-27 16:14:29 +08:00
tongchenfei
5442ac5bb5 opt ui 分享弹框title左右图标 2020-11-27 16:14:20 +08:00
liujing
1b564ba775 [add] 关闭按钮白天 2020-11-27 16:12:16 +08:00
liujing
5fbf4055f6 Merge branch 'cl' into qa_1.1.8 2020-11-27 16:12:00 +08:00
liujing
ac5847d054 [add] 关闭按钮白天 2020-11-27 16:11:50 +08:00
wangcongtao
6243a1e970 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-11-27 16:02:48 +08:00
wangcongtao
18a2d8e4e1 内存优化 2020-11-27 16:02:41 +08:00
liujing
2927bd16c7 no message 2020-11-27 13:11:41 +08:00
liujing
defc8ffc32 Merge branch 'mm' into dev 2020-11-27 13:11:19 +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
wujifei
32c9bd83c2 new# CallChatApi.getInstance().getApiProvider()添加非空判断 2020-11-27 11:39:45 +08:00
wujifei
ee4d0f5d6c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
2020-11-27 11:38:24 +08:00
wujifei
e9e33c45c9 new# CallChatApi.getInstance().getApiProvider()添加非空判断 2020-11-27 11:37:06 +08:00
liujing
16f79844dc [add] F车机.9替换 2020-11-27 11:27:14 +08:00
liujing
ce047c1326 Merge branch 'ch' into qa_1.1.8 2020-11-27 11:26:54 +08:00
liujing
bc4e4e69e0 [add] F车机.9替换 2020-11-27 11:26:09 +08:00
liujing
633462de3a 出行动态副标题,UI微调 2020-11-27 11:04:27 +08:00
liujing
7879bee13d Merge branch 'kk' into dev 2020-11-27 11:03:54 +08:00
liujing
7f5fba2ca5 出行动态副标题,UI微调 2020-11-27 11:03:08 +08:00