Commit Graph

342 Commits

Author SHA1 Message Date
董宏宇
c597a28bf4 Merge branch 'qa_1.1.7_fix' into dev
# Conflicts:
#	modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
#	modules/mogo-module-extensions/src/main/res/values/dimens.xml
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
2020-11-13 18:25:30 +08:00
liujing
6f3b4e6df3 [rm] 删除无用文件 2020-11-13 18:13:04 +08:00
liujing
5721256e8a [add] 取消求助黑白模式.9图 2020-11-13 10:56:53 +08:00
wangcongtao
7137b4e365 Merge remote-tracking branch 'origin/dev' into dev 2020-11-10 20:34:47 +08:00
liujing
f751e1a308 取消求助UI 2020-11-10 19:23:56 +08:00
liujing
8752c301ec 取消求助UI 2020-11-10 19:22:52 +08:00
wangcongtao
1f766eb906 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	gradle.properties
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
#	modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
2020-11-10 17:48:45 +08:00
liujing
7f5c114012 UI 出现动态 2020-11-10 17:21:15 +08:00
liujing
4748956c8f UI 出现动态 2020-11-10 17:20:46 +08:00
liujing
f995c71aa5 我的分析图片资源替换 2020-11-10 16:28:12 +08:00
liujing
5170fc3712 我的分析图片资源替换 2020-11-10 16:27:24 +08:00
董宏宇
d2856c7c48 解决
【蘑菇出行1.1.7】路况仍可以被重复点赞,且点赞语音播报不正确
http://jira.zhidaohulian.com/browse/FX-528
v2x事件弹窗点赞,点击第二次同样提示”以点赞“
http://jira.zhidaohulian.com/browse/D80XCD-1587
2020-11-09 12:46:04 +08:00
liujing
1f7e9ac17e [fix]暂停转圈圈的问题 2020-11-06 21:24:15 +08:00
liujing
0e7228493e [fix]暂停转圈圈的问题 2020-11-06 21:23:35 +08:00
unknown
04ac6c546b Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-11-06 15:10:53 +08:00
unknown
561155a901 add TrafficSearch provider 2020-11-06 15:10:35 +08:00
liujing
bffcd9dbbb 默认图去掉=>progressbar 2020-11-05 21:11:50 +08:00
liujing
65caeb4baf 默认图去掉=>progressbar 2020-11-05 21:11:13 +08:00
tongchenfei
cc1f887eae Merge remote-tracking branch 'origin/qa_1.1.7' into qa_1.1.7 2020-11-05 15:46:41 +08:00
tongchenfei
d839269d1d opt ui 2020-11-05 15:46:25 +08:00
liujing
e88cfb9011 [rm]m4 UI微调+视频暂停后点击播放按钮继续播放 2020-11-05 15:19:00 +08:00
liujing
77b8b79cc7 [rm]m4 UI微调+视频暂停后点击播放按钮继续播放 2020-11-05 15:18:15 +08:00
liujing
d948fc7652 圆角修改 2020-11-04 15:22:52 +08:00
liujing
5f5252a615 圆角修改 2020-11-04 15:22:21 +08:00
liujing
278eda4d02 视频播放器UI微调 2020-11-04 11:16:04 +08:00
liujing
fafe7d1669 视频播放器UI微调 2020-11-04 11:15:38 +08:00
liujing
18f37ab2fb 加载中图片添加,注释progressbar 2020-11-04 11:06:23 +08:00
liujing
13aee7ff13 加载中图片添加,注释progressbar 2020-11-04 11:05:58 +08:00
liujing
f24267ee7e [rm] 白黑关闭图片替换 2020-11-04 10:51:13 +08:00
liujing
1635001cb7 [rm] 白黑关闭图片替换 2020-11-04 10:50:31 +08:00
liujing
f02aaf75ff 视频播放器白+黑 2020-11-04 10:35:27 +08:00
liujing
59e5e85e95 视频播放器白+黑 2020-11-04 10:34:53 +08:00
liujing
fcf0d85c48 [add] 分享列表UI资源添加,视频消音播放 2020-11-03 15:53:22 +08:00
董宏宇
80f51fa5d1 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml
2020-11-03 13:37:05 +08:00
董宏宇
f6473a8d31 优化了点击道路事件的视频播放方式 2020-11-03 13:36:20 +08:00
liujing
89678a6b2d [add] 视频播放器关闭按钮修改 2020-11-03 10:04:33 +08:00
liujing
cbc575ccf3 v2x视频播放器白加黑 2020-11-02 17:25:27 +08:00
董宏宇
5dae299f87 优化页面UI 2020-11-02 16:47:33 +08:00
董宏宇
2fb027a159 Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 16:16:41 +08:00
董宏宇
866f919eb2 修改直播弹窗调用,增加了与导航布局无联动的弹窗组件调用 2020-11-02 16:16:36 +08:00
liujing
7776432519 [add] 事件弹框 点赞动画 2020-11-02 15:07:14 +08:00
董宏宇
ddbfd28b46 Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 10:35:56 +08:00
董宏宇
a1f118990f 合并测试面板 2020-11-02 10:35:51 +08:00
liujing
238bd5e5a4 [fix]出行动态-白天模式UI 2020-11-01 16:19:07 +08:00
董宏宇
6615ffcb30 完成了测试控制面板的分段控制展示 2020-10-30 20:14:16 +08:00
liujing
943f6d53c6 播放器高度 2020-10-30 17:24:06 +08:00
liujing
7aaa6cc3d5 弹框UI下沉commons 2020-10-30 11:31:38 +08:00
liujing
d0727f2254 推送直播,暂时保留了测试关闭按钮,暂时没有重复推送 2020-10-29 21:13:41 +08:00
liujing
7f9a336bc5 [add] 直播获取是把你 重试 白天模式 2020-10-29 20:49:28 +08:00
liujing
a22d9671c6 直播UI 2020-10-29 20:19:04 +08:00