Commit Graph

3821 Commits

Author SHA1 Message Date
unknown
5d5ba33e91 add sn in websocket up stream 2020-10-27 19:28:03 +08:00
unknown
eea5688f15 reset websocket port to 14001 2020-10-27 16:45:21 +08:00
unknown
9f7a4a3a46 code style 2020-10-27 16:04:34 +08:00
tongchenfei
f03c67685e Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-27 15:57:27 +08:00
tongchenfei
2dce3f8254 opt 2020-10-27 15:53:34 +08:00
董宏宇
ffc511b969 升级了kotlin_version 2020-10-27 15:06:33 +08:00
tongchenfei
c18eafb463 opt 2020-10-27 14:20:10 +08:00
lixiaopeng
057d36d1ab opt 2020-10-27 11:58:25 +08:00
wangcongtao
df227f72ee Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map 2020-10-27 11:57:42 +08:00
wangcongtao
83a004f62b dev 2020-10-27 11:57:34 +08:00
liujing
4faabb01e0 Merge branch 'vv' into demo/shunyi_vr_map 2020-10-27 10:46:24 +08:00
liujing
2cfab84f5b 应用列表图片替换 2020-10-27 10:45:43 +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
0fe86044ea add websocket url 2020-10-26 20:37:16 +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
8e883853eb 去掉vip左下角展示 2020-10-26 11:01:12 +08:00
tongchenfei
a978851062 bug fix 2020-10-26 10:17:11 +08:00
tongchenfei
46f54ce1bc opt left notice 2020-10-25 17:28:54 +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
lixiaopeng
2c1605a60f opt ui 2020-10-25 11:05:29 +08:00
tongchenfei
a6e8bddbc7 修改分享按钮和事件面板按钮位置 2020-10-23 18:49:56 +08:00
tongchenfei
e05e9aa542 修改topview在vr模式下的位置 2020-10-23 18:49:43 +08:00
tongchenfei
c944d8245f 修改分享按钮和事件面板按钮位置 2020-10-23 15:06:29 +08:00
tongchenfei
90e6e998e0 增加全局vr模式标识 2020-10-23 14:40:15 +08:00
jiaguofeng
97a363338a fix marker click 2020-10-22 20:55:31 +08:00
wangcongtao
aafd2cd5db opt 2020-10-22 14:17:12 +08:00
wangcongtao
6fe11bf8a1 修改adas接口 2020-10-21 17:56:46 +08:00
wangcongtao
d65bb46121 opt 2020-10-21 16:15:25 +08:00
wangcongtao
1e6ec497de 优化地图控制 2020-10-21 11:47:06 +08:00
wangcongtao
9d937d4777 修改adas依赖版本 2020-10-19 13:55:02 +08:00
wangcongtao
4bb08e21db del build dir 2020-10-19 09:56:27 +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
83f78f8288 去掉默认值 2020-10-18 14:44:06 +08:00
wangcongtao
7e40437f6a Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-10-18 11:51:18 +08:00
wangcongtao
32bb60c3b0 远程控制adas 2020-10-18 11:51:09 +08:00
liujing
0dcd2af5df Merge branch 'ad' into dev 2020-10-16 18:51:36 +08:00