Commit Graph

373 Commits

Author SHA1 Message Date
wangcongtao
be3654f6c4 opt 2021-01-18 16:45:02 +08:00
tongchenfei
568ae741ee Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-18 10:11:56 +08:00
wangcongtao
53c0a936cf ui opt:分体机部分按钮背景图替换 2021-01-18 10:11:28 +08:00
tongchenfei
10200c3df6 添加网约车小巴初步实现 2021-01-15 20:28:24 +08:00
tongchenfei
f63579bd11 Merge dev_mogo_httpdns
there are some conflicts:
 both modified:   foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
        both modified:   gradle.properties
        both modified:   modules/mogo-module-share/consumer-rules.pro
        both modified:   modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
2021-01-14 14:45:53 +08:00
wangcongtao
3dbb6b5d50 bugfix: #138,内存泄漏问题 2021-01-08 11:25:09 +08:00
wangcongtao
dd6d7c6746 bugfix: #138,内存泄漏问题 2021-01-08 11:03:40 +08:00
tongchenfei
8acdfbbe2e merge branch 2021-01-07 19:33:30 +08:00
wangcongtao
8e5767fd6c Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9
# Conflicts:
#	services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java
2021-01-07 18:59:09 +08:00
wangcongtao
610d599d43 优化已知问题 2021-01-07 18:13:54 +08:00
lixiaopeng
241830b9b8 merge 2021-01-07 15:03:50 +08:00
tongchenfei
057d0e2eb2 添加部分域名 2021-01-07 10:46:44 +08:00
wangcongtao
3a83102f35 opt 2021-01-06 19:49:41 +08:00
tongchenfei
01133958a6 修改websocket Host和entrance host 2021-01-06 18:13:42 +08:00
lixiaopeng
b3b445c9ec modify host 2021-01-06 16:51:23 +08:00
wangcongtao
b2c8c35efb Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9 2021-01-06 14:57:16 +08:00
tongchenfei
b1fdb1fd31 添加host常量 2021-01-06 11:55:52 +08:00
wangcongtao
3e26011821 更新地图版本 2021-01-06 11:29:09 +08:00
wangcongtao
e6600df3a3 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9
# Conflicts:
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
2021-01-05 19:27:13 +08:00
wangcongtao
40afbccfcc 合并分支 2021-01-05 19:24:19 +08:00
wangcongtao
6661db0e83 opt 2021-01-04 14:37:39 +08:00
wujifei
c16ad2bce4 new#修改编译错误 2020-12-31 18:55:58 +08:00
wujifei
50e87ec043 new#优化代码 2020-12-31 18:07:57 +08:00
tongchenfei
1835c5070b Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2020-12-31 17:13:33 +08:00
tongchenfei
e270366602 1. opt ui
2. opt MapMarkerBaseView
2020-12-31 17:13:24 +08:00
董宏宇
cefd72e712 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-31 16:43:41 +08:00
董宏宇
d582bc3c41 将hook单独作为库引入 2020-12-31 16:43:05 +08:00
liujing
868705abc2 +目的地推荐停车场类型 2020-12-31 15:01:12 +08:00
wujifei
56ea4b7d98 new#增加tts播报 2020-12-31 14:41:38 +08:00
wujifei
402002bc7f new#基于目的地预判的道路事件提醒、路线推荐 2020-12-30 19:19:04 +08:00
wujifei
7d0562ecd7 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9
# Conflicts:
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRecommendRouteVH.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
2020-12-30 17:52:00 +08:00
wujifei
f80af8c3cf new#基于目的地预判的道路事件提醒、路线推荐 2020-12-30 17:47:33 +08:00
wangcongtao
c7b9d48d9a Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-30 14:54:01 +08:00
wangcongtao
a329707c08 vr模式下拦截某些操作 2020-12-30 14:51:08 +08:00
wangcongtao
6f16239630 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-30 14:43:37 +08:00
liujing
eff01b24fb [add] 贝塞尔曲线动画window层添加 2020-12-30 14:30:52 +08:00
wangcongtao
a7181b0598 bugfix 2020-12-30 14:12:28 +08:00
wujifei
cac40cbaa7 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-29 21:00:11 +08:00
wujifei
d352e5ee1f new#基于目的地预判的道路事件提醒、路线推荐 2020-12-29 20:59:49 +08:00
董宏宇
4148a2e158 Merge branch 'dev_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2020-12-29 20:02:48 +08:00
董宏宇
01afc151d9 增加了api说明 2020-12-29 19:50:33 +08:00
董宏宇
cab2517b1c 解决换肤框架与高德地图的冲突
直接通过内存地址替换整个 ArtMethod ,完成了高德地图方法的替换。
2020-12-29 18:44:01 +08:00
wangcongtao
044e19961c Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-28 10:58:38 +08:00
wangcongtao
ec08032339 opt 2020-12-27 16:05:14 +08:00
wangcongtao
7fa38d9080 升级自研地图sdk版本
修改他车动画时间
2020-12-27 15:57:35 +08:00
wangcongtao
6db6140ae4 显示设置
升级sdk版本
2020-12-25 21:12:57 +08:00
wangcongtao
066c14f928 升级自研地图sdk版本 2020-12-25 10:02:33 +08:00
wujifei
bddb1b68e7 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9 2020-12-24 17:42:11 +08:00
wujifei
f4cd26a6ce new#基于目的地预判的道路事件提醒、路线推荐 2020-12-24 17:41:51 +08:00
tongchenfei
ceaa1cd33a 1. 增加延时检测空接口访问
2. opt TopViewAnimHelper
2020-12-24 15:45:24 +08:00