Commit Graph

219 Commits

Author SHA1 Message Date
wangcongtao
7de1dc472e dev 2020-10-27 17:34:37 +08:00
unknown
984e61db92 Merge branch 'demo/shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into demo/shunyi_vr_map 2020-10-27 10:15:41 +08:00
unknown
c2fb78ee09 WebSocket Impl code style 2020-10-27 10:15:20 +08:00
tongchenfei
568c119a0a Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-27 10:11:56 +08:00
tongchenfei
c7fbc3a6c6 opt traffic light 2020-10-27 10:11:29 +08:00
unknown
19c4859a71 fix bug 2020-10-27 10:11:09 +08:00
unknown
bd17de71e0 Merge branch 'demo/shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into demo/shunyi_vr_map 2020-10-26 16:15:05 +08:00
unknown
319cadb930 changed msgType of websocket 2020-10-26 16:14:34 +08:00
wangcongtao
8cc40f1d79 dev 2020-10-26 14:52:23 +08:00
unknown
e3f303c2ca fix bug 2020-10-26 14:34:08 +08:00
unknown
e83544bf4e Merge branch 'demo/shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into demo/shunyi_vr_map 2020-10-26 12:01:05 +08:00
unknown
fc263810bf add websocket 2020-10-26 12:00:51 +08:00
tongchenfei
397c7f89b2 Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-25 16:45:39 +08:00
tongchenfei
d83fb24b4e opt left notice 2020-10-25 16:45:20 +08:00
tongchenfei
3fad15ff4c 增加entrance 左侧提示容器 2020-10-25 15:53:22 +08:00
wangcongtao
e1756c5f34 dev 2020-10-25 15:51:28 +08:00
wangcongtao
771e5eed13 切换地图的逻辑修改 2020-10-25 11:08:46 +08:00
tongchenfei
90e6e998e0 增加全局vr模式标识 2020-10-23 14:40:15 +08:00
wangcongtao
6fe11bf8a1 修改adas接口 2020-10-21 17:56:46 +08:00
wangcongtao
4cb82bbedb opt 2020-10-19 09:55:57 +08:00
wangcongtao
e092bb4489 Merge branch 'dev' into demo/shunyi_v2v_merge
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	config.gradle
#	foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values/dimens.xml
#	modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
#	modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
#	modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-v2x/src/main/res/values/dimens.xml
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
#	upload.sh
2020-10-18 16:40:27 +08:00
wangcongtao
32bb60c3b0 远程控制adas 2020-10-18 11:51:09 +08:00
wangcongtao
44fc7eb6a1 删除无用类
优化地图中心点按照productFlavor来进行选择
2020-10-09 14:15:54 +08:00
wangcongtao
0d84238be4 1. UI 走查修改
2. 其他修复。
2020-09-28 20:11:29 +08:00
wangcongtao
53d1ac0b3f 1. 独立app内存泄漏优化 2020-09-27 19:16:54 +08:00
wangcongtao
d723ade861 Merge remote-tracking branch 'origin/dev' into dev 2020-09-25 11:16:18 +08:00
wangcongtao
3c8745ad8a 1. 高德导航引导按钮白天模式
2. 解决后台被杀后无法操作地图的问题
2020-09-25 11:15:35 +08:00
unknown
b12416edd8 changed the sp_guide to module_common 2020-09-25 11:13:16 +08:00
wangcongtao
d33741db28 1. 车聊聊电话和音乐浮窗的互斥
2. 添加模块资源释放回调
2020-09-24 16:59:17 +08:00
unknown
7d2c709d35 fix bug 2020-09-24 14:57:26 +08:00
unknown
a6e1824258 add context Holder and remove guide condition 2020-09-24 14:29:13 +08:00
wangcongtao
9b8695b96f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values/dimens.xml
2020-09-23 14:06:55 +08:00
wangcongtao
eb511fa3c1 stash 2020-09-22 20:22:48 +08:00
yangjingjing
77741092cd Merge remote-tracking branch 'origin/demo/shunyi_v2v_merge' into demo/shunyi_v2v_merge 2020-09-18 19:02:18 +08:00
yangjingjing
fc9cf0d6fc 重构obu模块,新增udp通信 2020-09-18 19:02:05 +08:00
lixiaopeng
3775b0c367 opt tanlu and share 2020-09-18 17:45:03 +08:00
wangcongtao
43641e4b01 Merge branch 'dev' into demo/shunyi_v2v_merge 2020-09-18 16:56:20 +08:00
wangcongtao
adddde3db3 重新依赖悬浮控件模块 2020-09-18 16:13:54 +08:00
wangcongtao
f700d3a88b Merge branch 'demo/shunyi_v2v_merge' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into demo/shunyi_v2v_merge 2020-09-18 10:12:00 +08:00
tongchenfei
cef6858c75 更新钛方科技sdk 2020-09-17 21:40:34 +08:00
wangcongtao
92bbd4ef65 Merge branch 'dev' into demo/shunyi_v2v_merge 2020-09-14 14:11:03 +08:00
tongchenfei
56154c268e 修改故障求助type类型 2020-09-11 17:28:21 +08:00
wangcongtao
0a41173d07 Merge remote-tracking branch 'origin/demo/shunyi_v2v_merge' into demo/shunyi_v2v_merge
# Conflicts:
#	modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
2020-09-10 16:32:43 +08:00
wangcongtao
4335e68acc 1. 解决高德地图导航实例无法inflate的问题
2. 在主页中加载换肤模块
2020-09-10 11:31:17 +08:00
unknown
08c8e3711e add global guide sp configure 2020-09-09 16:59:27 +08:00
tongchenfei
a4b6783fc0 添加分享框设置服务端接口支持,待联调 2020-09-08 17:23:33 +08:00
tongchenfei
fe5d11dcb4 Merge branch 'tmp_dev_auto_share_dialog' into dev 2020-09-07 17:11:08 +08:00
tongchenfei
ed27d34827 完成分享对话框动态添加的功能,待接入服务端 2020-09-07 17:10:13 +08:00
tongchenfei
b7092f5774 Merge branch 'demo/shunyi_v2v' into demo/shunyi_v2v_merge
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
#	modules/mogo-module-search/build.gradle
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
2020-09-04 17:32:26 +08:00
wangcongtao
87bb6f0a36 换肤 2020-09-04 17:13:35 +08:00