Commit Graph

1040 Commits

Author SHA1 Message Date
lixiaopeng
c486752f7f opt m3 2020-09-25 16:27:22 +08:00
unknown
7803709366 merge 2020-09-24 20:01:51 +08:00
unknown
94fab70704 fix bug 2020-09-24 19:58:22 +08:00
lixiaopeng
3fbcfde8f4 opt 2020-09-24 18:04:16 +08:00
wangcongtao
87bc02aeda Merge remote-tracking branch 'origin/dev' into dev 2020-09-24 15:10:48 +08:00
wangcongtao
b993d77be1 目的地车友白天模式及其他 2020-09-24 15:10:41 +08:00
unknown
a6e1824258 add context Holder and remove guide condition 2020-09-24 14:29:13 +08:00
wangcongtao
cdfa224fc2 整理项目模块依赖,并上传2.0.0版本到maven 2020-09-23 17:38:59 +08:00
wangcongtao
eb511fa3c1 stash 2020-09-22 20:22:48 +08:00
tongchenfei
d811751442 obu数据自测 2020-09-22 17:46:39 +08:00
tongchenfei
c63c5ea87b 1. 增加site维度,用来区分顺义还是苏州,主要是为了区分obu
2. 调试接收obu数据后的流程,基本调通
2020-09-22 10:59:38 +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
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
c9a1225df5 rc 2020-09-18 10:11:46 +08:00
wangcongtao
d83800427f merge 2020-09-18 10:01:53 +08:00
tongchenfei
dfc6fbcce9 Merge remote-tracking branch 'origin/qa_1.1.5_2' into qa_1.1.5_2 2020-09-15 23:31:52 +08:00
tongchenfei
60cf80d004 bugfix: 在桌面发出唤醒指令“上报路况”,不生效 2020-09-15 23:31:21 +08:00
unknown
411bfa191e fix bug of track point 2020-09-15 20:11:45 +08:00
wangcongtao
12f325c325 opt 2020-09-15 15:39:25 +08:00
wangcongtao
154ac337c2 修复由白天黑夜模式回调引起的问题:事件点会被清空。 2020-09-15 09:49:16 +08:00
wangcongtao
fe72696a8a 修复由白天黑夜模式回调引起的问题:事件点会被清空。 2020-09-14 21:00:40 +08:00
unknown
64d8970b14 changed the guide sp is true when guideModule has no load 2020-09-14 19:34:54 +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
e91aa136c4 合并黑夜白天模式等需求 2020-09-10 16:27:01 +08:00
wangcongtao
4335e68acc 1. 解决高德地图导航实例无法inflate的问题
2. 在主页中加载换肤模块
2020-09-10 11:31:17 +08:00
wangcongtao
5e4551404c Merge remote-tracking branch 'origin/dev' into dev 2020-09-10 10:17:26 +08:00
wangcongtao
a4cd94d06b opt 2020-09-10 10:17:19 +08:00
lixiaopeng
2b60f7ea3b restore code 2020-09-09 17:35:27 +08:00
wangcongtao
e3eed35123 新增bugly 2020-09-09 14:43:03 +08:00
wangcongtao
c9020f159e 添加leakcanery 2020-09-07 15:03:58 +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
tongchenfei
ef5c3d306e 添加钛方科技碰撞报警相关逻辑,主要增加碰撞阈值设置临时入口和碰撞报警事件转发 2020-09-04 16:56:07 +08:00
unknown
efa77e3f17 add guide 2020-09-04 16:39:01 +08:00
lixiaopeng
c819a1e198 opt ui 2020-09-02 15:07:55 +08:00
wangcongtao
a48e13c59c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	skin/mogo-skin-light/build.gradle
2020-09-01 14:26:48 +08:00
tongchenfei
72dda574d4 Merge branch 'qa_1.1.5_1' into dev
# Conflicts:
#	.idea/codeStyles/Project.xml
2020-08-31 17:41:22 +08:00
wangcongtao
9562aa61ad 调整leakcanery版本,新增模块白天模式资源 2020-08-31 15:53:44 +08:00
wangcongtao
97ce18650b 拆分换肤逻辑 2020-08-31 14:55:02 +08:00
董宏宇
7918bdb791 Fix current car seek help status refresh 2020-08-31 11:51:00 +08:00
wangcongtao
94c9c5cbc6 Merge branch 'feature/dev_skin' into dev 2020-08-31 10:23:28 +08:00
wangcongtao
eadede21f2 测试模式切换 2020-08-28 19:56:38 +08:00
wangcongtao
6abe68b77d 添加皮肤模块 - 2 2020-08-28 15:16:03 +08:00
wangcongtao
8794ad282a 添加皮肤模块 2020-08-28 14:07:49 +08:00
tongchenfei
84932707a1 Merge branch 'dev' into dev_custom_map 2020-08-28 11:12:14 +08:00
wangcongtao
b7110045e6 皮肤设置修改 2020-08-27 14:00:49 +08:00
tongchenfei
999b59fed7 思必驰实现道路事件上报免唤醒转唤醒 2020-08-26 16:24:08 +08:00
wangcongtao
29f0552d8e 1. 补充编译flavor类型 2020-08-25 16:56:33 +08:00