Commit Graph

739 Commits

Author SHA1 Message Date
zhongchao
632ececb99 add MoGoAiCloud sdk --> socket passport replace origin logic 2021-02-23 11:20:39 +08:00
wangcongtao
376e6c6826 merge 2021-02-20 15:00:16 +08:00
wangcongtao
9d0bcff478 opt 2021-02-20 13:55:23 +08:00
wangcongtao
31cbb3d13c adas update version 1 2021-02-03 15:14:11 +08:00
wangcongtao
7b9daf7d58 提取资源到res目录
新增地图打开鹰眼模式接口
新增自动进入鹰眼模式逻辑
2021-02-02 17:56:39 +08:00
wangcongtao
10026ea062 Merge branch 'qa_merge_shunyi_vr_map' into dev2 2021-02-02 11:19:32 +08:00
wangcongtao
64b21da1f4 opt 2021-02-02 11:18:43 +08:00
wangcongtao
3f83ed844e opt 2021-01-29 18:20:36 +08:00
wangcongtao
233ba7b89f Merge branch 'qa_merge_shunyi_vr_map' into dev2
# Conflicts:
#	config.gradle
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
2021-01-26 09:26:48 +08:00
wangcongtao
0d0c39af67 opt 2021-01-25 18:42:18 +08:00
wangcongtao
0c77c3b98f opt 2021-01-22 23:31:17 +08:00
wangcongtao
87607058cb ui opt 2021-01-22 16:48:02 +08:00
wangcongtao
996da7802a opt 2021-01-21 16:57:44 +08:00
wangcongtao
425ddf1489 opt 2021-01-21 15:01:05 +08:00
wangcongtao
27d568a328 opt 2021-01-20 14:08:00 +08:00
wangcongtao
386e882133 opt 2021-01-19 20:26:53 +08:00
wangcongtao
e4719cee47 Merge branch 'qa_1.1.9' into dev2 2021-01-14 17:59:09 +08:00
wangcongtao
b00985eb82 ui opt 2021-01-14 15:59:56 +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
aa83ad8e8c new dev branch 2021-01-14 14:20:30 +08:00
wangcongtao
a3a22b6bf1 Merge branch 'qa_merge_shunyi_vr_map' into dev2 2021-01-14 14:17:59 +08:00
wangcongtao
1b2f72092a 内存泄漏问题优化 2021-01-11 18:55:38 +08:00
unknown
9e9bbf6469 note the log in websocket msg handler and RTKLoc 2021-01-11 13:57:38 +08:00
wangcongtao
17545b09bb opt 2021-01-10 10:38:54 +08:00
tongchenfei
8acdfbbe2e merge branch 2021-01-07 19:33:30 +08:00
tongchenfei
a4b693062a 添加部分域名 2021-01-07 19:27:44 +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
tongchenfei
057d0e2eb2 添加部分域名 2021-01-07 10:46:44 +08:00
wangcongtao
3a83102f35 opt 2021-01-06 19:49:41 +08:00
wangcongtao
b2c8c35efb Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9 2021-01-06 14:57:16 +08:00
wangcongtao
c6ce25c983 解决m3上无法启动的问题 2021-01-06 14:55:05 +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
e94036f85e 更新切换道路匹配测试逻辑调用方法 2021-01-05 11:14:30 +08:00
wangcongtao
5cbb771469 添加切换道路匹配测试逻辑 2021-01-05 11:04:49 +08:00
unknown
ee9ff0c457 Merge branch 'dev_1.1.9' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_1.1.9 2021-01-05 10:11:49 +08:00
unknown
17cd8c57e3 proguard 2021-01-04 16:29:06 +08:00
wangcongtao
6661db0e83 opt 2021-01-04 14:37:39 +08:00
董宏宇
9557606c03 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-31 10:08:36 +08:00
wangcongtao
63002f1bd6 bugfix 2020-12-30 16:49:01 +08:00
wangcongtao
6f16239630 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-30 14:43:37 +08:00
wangcongtao
a7181b0598 bugfix 2020-12-30 14:12:28 +08:00
wangcongtao
342311b6f9 Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9 2020-12-29 16:43:56 +08:00
wangcongtao
d631c8c823 添加语音 2020-12-29 16:16:52 +08:00
wangcongtao
8c96077182 优化 2020-12-29 10:40:44 +08:00
wangcongtao
7fa38d9080 升级自研地图sdk版本
修改他车动画时间
2020-12-27 15:57:35 +08:00
wangcongtao
066c14f928 升级自研地图sdk版本 2020-12-25 10:02:33 +08:00
wangcongtao
438936225c Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-22 19:22:44 +08:00
wangcongtao
e7d4c19d8f 修改在线车辆刷新 2020-12-22 19:22:38 +08:00