Commit Graph

771 Commits

Author SHA1 Message Date
wangcongtao
63daee6eb0 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map
# Conflicts:
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
2020-12-14 19:19:21 +08:00
wangcongtao
578a5fc383 opt 2020-12-14 19:16:40 +08:00
liujing
333e93e54a [fix]偶现崩溃 2020-12-14 17:41:48 +08:00
lixiaopeng
feac7a579d opt 2020-12-14 15:37:06 +08:00
liujing
84c9e50550 事件弹框margin_top 2020-12-14 15:06:41 +08:00
liujing
dbf76f50b6 [add] 违章停车 踩动画 2020-12-14 14:45:48 +08:00
liujing
832ed39fcd [add] 直播框VR适配 2020-12-13 13:42:13 +08:00
董宏宇
bc861c6d68 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-13 11:43:55 +08:00
董宏宇
3f3dfdb1ac 解决
java.lang.NullPointerException: Attempt to invoke virtual method 'com.mogo.map.search.geo.MogoRegeocodeAddress com.mogo.map.search.geo.MogoRegeocodeResult.getRegeocodeAddress()' on a null object reference
2020-12-13 11:43:45 +08:00
liujing
98d4719dc8 Merge branch 'dev_merge_shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_merge_shunyi_vr_map 2020-12-13 11:22:38 +08:00
liujing
4f402328d3 [add] 点赞+踩 vr下禁用动画 2020-12-13 11:22:16 +08:00
wangcongtao
43a046b719 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map
# Conflicts:
#	libraries/map-custom/build.gradle
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java
2020-12-13 11:06:21 +08:00
wangcongtao
564b1356a1 地图依赖重构 2020-12-13 11:04:44 +08:00
liujing
5a20d8636a 动画结束后图片替换 2020-12-11 21:49:13 +08:00
董宏宇
21e93d5d52 修复他人发起求助的window没有定时关闭 2020-12-11 20:54:30 +08:00
董宏宇
e20f401dc9 合并解决冲突 2020-12-11 20:39:42 +08:00
董宏宇
e246a48bb7 Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map
# Conflicts:
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
2020-12-11 20:37:59 +08:00
liujing
c88ba91711 [add] 事件弹框点赞/踩 点击替换图片 2020-12-11 20:35:41 +08:00
董宏宇
25ce5ea5af 修复了VR模式切换导致window展示异常的bug 2020-12-11 20:35:23 +08:00
liujing
1d4fcc3a6e 接收求助弹框头像左侧圆角 2020-12-10 16:04:44 +08:00
liujing
0ef4820e09 [事件弹框图片左侧圆角设置] 2020-12-10 13:43:49 +08:00
liujing
8013ff1d48 no message 2020-12-09 17:08:07 +08:00
liujing
ff507d9f6d [add] 视频播放器vr模式UI 2020-12-09 17:04:18 +08:00
liujing
9219681413 no message 2020-12-09 16:40:00 +08:00
liujing
bdd1a2c2bf [add] 接收他人求助弹框-缺导航到按钮 2020-12-09 16:40:00 +08:00
liujing
cf02246aab [add] 禁止停车弹框-缺icon 2020-12-09 16:04:35 +08:00
liujing
f9a172f5c1 [add] v2x弹框UI MogoImageView缺少圆角设置 2020-12-09 15:10:59 +08:00
liujing
068d74cd1b [add] 事件弹框UI 2020-12-09 11:49:59 +08:00
董宏宇
8f02c3dfb3 解决了出行动态中道路事件重复存储的问题 2020-12-09 11:14:40 +08:00
董宏宇
6fee5deaca 解决求助场景的内存泄露 2020-12-08 20:50:44 +08:00
liujing
7479149783 [add] vr模式事件弹框背景色添加-xml文件添加 2020-12-08 19:39:12 +08:00
liujing
b8ab1ce5e7 [fix] 偶现崩溃 2020-12-08 17:00:14 +08:00
董宏宇
150ae21b89 增加了VR模式的适配方案 VH 采用三木运算判断当前模式,动态加载不同layout 2020-12-08 16:47:56 +08:00
wangcongtao
78646d6842 opt 2020-12-08 14:08:53 +08:00
董宏宇
376f651a66 尝试修复bug
http://jira.zhidaohulian.com/browse/E84XAD-250
2020-12-07 14:54:53 +08:00
董宏宇
85eeac93d5 尝试修复bug
http://jira.zhidaohulian.com/browse/E84XAD-255
2020-12-07 14:29:09 +08:00
董宏宇
5f758908c6 Merge remote-tracking branch 'origin/qa_1.1.8_easy_mode' into qa_1.1.8_easy_mode 2020-12-07 12:09:05 +08:00
董宏宇
5daf86a25e 修复bug
http://jira.zhidaohulian.com/browse/E84XAD-250?filter=-1
2020-12-07 12:08:56 +08:00
lixiaopeng
178db17c2f opt 2020-12-07 12:06:53 +08:00
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
董宏宇
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