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
2ea8e34a8d
Merge branch 'qa_merge_shunyi_vr_map' into dev2
2021-02-01 10:03:54 +08:00
wangcongtao
50c30eeea1
opt
2021-01-29 18:31:34 +08:00
wangcongtao
e2f87ae11b
Merge branch 'qa_merge_shunyi_vr_map' into dev2
2021-01-26 18:15:18 +08:00
wangcongtao
7f68d53d1f
优化
2021-01-26 18:13:31 +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
a60e69ad64
opt
2021-01-21 19:12:24 +08:00
wangcongtao
425ddf1489
opt
2021-01-21 15:01:05 +08:00
wangcongtao
c4fa38c55a
rc
2021-01-20 14:09:00 +08:00
wangcongtao
27d568a328
opt
2021-01-20 14:08:00 +08:00
wangcongtao
386e882133
opt
2021-01-19 20:26:53 +08:00
tongchenfei
d187af5d98
opt logic
2021-01-19 19:56:32 +08:00
tongchenfei
302b4c436c
Merge remote-tracking branch 'origin/dev2' into dev2
2021-01-18 18:25:10 +08:00
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
wangcongtao
e4719cee47
Merge branch 'qa_1.1.9' into dev2
2021-01-14 17:59:09 +08:00
wangcongtao
3e05bbe27c
ui opt:分体机部分按钮背景图替换
2021-01-14 17:53:15 +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
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
unknown
100c40c325
add new proguard rules in smp
2021-01-05 10:46:16 +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
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
