Commit Graph

707 Commits

Author SHA1 Message Date
donghongyu
2fede9c8a7 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge 2022-02-16 19:44:08 +08:00
wangmingjun
2a8993c34c [Taxi/Bus Driver 2.5.1] 暂时不设置bus模型(因设置出现app闪退) 2022-02-16 17:46:38 +08:00
renwj
107d5f7d90 [BadCase]解决BadCase入口与OCH模块之间的显示问题
[BadCase]解决BadCase入口与OCH模块之间的显示问题

[BadCase]解决BadCase入口与OCH模块之间的显示问题

[BadCase]解决BadCase入口与OCH模块之间的显示问题
2022-02-16 09:59:17 +08:00
donghongyu
99a7436b07 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge
# Conflicts:
#	core/function-impl/mogo-core-function-map/build.gradle
2022-02-15 20:12:39 +08:00
renwj
2c5264fd3c [AndroidTest]添加RxJava背压测试 2022-02-15 16:34:07 +08:00
renwj
3f57a56047 [V2X]移除无用场景 2022-02-11 17:38:02 +08:00
renwj
8e5e2afd38 [V2X]移除无用场景 2022-02-10 19:45:05 +08:00
donghongyu
ff1a06268b Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge
# Conflicts:
#	app/build.gradle
#	core/function-impl/mogo-core-function-autopilot/build.gradle
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java
#	modules/mogo-module-adas/build.gradle
2022-02-09 10:59:31 +08:00
renwj
a8bcbdcc7f [ThreadOpt]线程池插件版本升级,修正RxJava定时器问题 2022-02-07 19:17:17 +08:00
donghongyu
e8e375f5ae Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge
# Conflicts:
#	app/build.gradle
2022-02-07 19:15:11 +08:00
pangfan
85a9db4d5e [OCH]OCH: 恢复使用统一versionName、versionCode,因jenkins打包限制。暂各需求分支各自修改versionName(Revert:RoboBus/Taxi业务根据flavor分别配置versionName、versionCode) 2022-02-07 15:53:12 +08:00
zhongchao
435f511416 add new func of track process of adas 2022-02-04 18:32:37 +08:00
pangfan
ce09488a29 [OCH]OCH: RoboBus/Taxi业务根据flavor分别配置versionName、versionCode 2022-01-28 16:16:22 +08:00
pangfan
24bb8752ad [Bus/TaxiDriver v2.5.1]OCH: OCH统一使用MoGoEagleEye的Bugly配置 2022-01-28 11:11:24 +08:00
donghongyu
900883260a [Upload]
增加了针对不同身份终端连接工控机的策略

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-27 20:15:19 +08:00
renwj
3b6814692d [BadCase]修正部分UI 2022-01-27 17:34:02 +08:00
renwj
2236fda2f2 [BadCase]日期格式统一 2022-01-27 14:52:44 +08:00
pangfan
8a4887947c [TaxiPassengerV1.0.0]OCH: 导入Taxi乘客app首版code 2022-01-26 16:56:15 +08:00
renwj
5002b28ef7 [V2X]弹窗互斥逻辑和更改道路事件展示弹窗的方式 2022-01-26 16:47:21 +08:00
pangfan
4081eef234 [251]OCH: update get BASE_URL method(基于env flavor) 2022-01-25 18:39:31 +08:00
donghongyu
71898883e5 [Upload]
//是否是演示(美化)模式,会存在SP中,方便做现场恢复
FunctionBuildConfig.isDemoMode
当前APP的身份模式
0 = 司机模式(默认)
1 = 乘客模式(部分功能受到影响)
FunctionBuildConfig.appIdentityMode

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-25 17:42:43 +08:00
wangmingjun
d2ab2e09aa [taxi/bus 2.5.1] application 区分och设置 2022-01-25 16:54:43 +08:00
wangmingjun
9397ec6e7f Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_251_220125_2.5.1 2022-01-25 16:47:25 +08:00
wangmingjun
e015ab91a1 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_251_220125_2.5.1
# Conflicts:
#	app/functions/och.gradle
2022-01-25 16:47:17 +08:00
renwj
a108a1f955 [BadCase]BadCase记录添加持久化逻辑 2022-01-25 16:38:10 +08:00
wangmingjun
8a33a15cd6 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_251_220125_2.5.1
# Conflicts:
#	settings.gradle
2022-01-25 16:35:46 +08:00
donghongyu
46bdb9d200 [Upload]
增加乘客渠道

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-25 16:33:27 +08:00
wangmingjun
fab30ebaaa [taxi/bus 2.5.1] 合并OCH到eagle, 暂时将release debuggable设置成true 2022-01-25 14:11:44 +08:00
donghongyu
2a6451f76c [Upload]
修复异常构建

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-21 17:43:12 +08:00
chenfufeng
c96dd9f2fa [Fix]域控制器未开启不让输入车速 2022-01-21 17:03:29 +08:00
renwenjie
48d9baa3bb [BadCase]代码提交 2022-01-19 15:54:30 +08:00
donghongyu
9237f1b773 [Fix]
处理合并异常

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-10 19:23:44 +08:00
donghongyu
d5aa714f21 Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt
#	gradle.properties
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
2022-01-10 19:07:35 +08:00
donghongyu
8faf47a41b Merge branch 'test_MogoAP_eagle-220_211207_8.0.15.2' 2022-01-10 19:02:43 +08:00
donghongyu
d342784146 [Add]
DebugView增加分支名称和HASH信息,方便跟踪问题

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-10 14:28:18 +08:00
renwj
204e6abc27 [ByteX][Systrace]添加插件,配合systrace检测工程侧性能问题
[ByteX][Systrace]添加插件,配合systrace检测工程侧性能问题
2022-01-06 15:03:31 +08:00
renwj
8eb3439bfd [ThreadOpt]替换RxJava和Kotlin协程CPU和IO类型线程池 2022-01-04 15:58:46 +08:00
donghongyu
1b8c47c617 Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	gradle.properties
#	modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
2021-12-31 15:25:55 +08:00
renwj
9bb0e94a78 [V2X模块重构]代码提交
[temp code]
2021-12-31 10:22:08 +08:00
lianglihui
fafeed6d87 8.0.17 apm 2021-12-30 18:42:22 +08:00
lianglihui
67e466bb49 8.0.17 apm 修改 2021-12-30 18:08:53 +08:00
donghongyu
4c1f76d053 Merge branch 'dev_MogoAP_eagle-220_211207_8.0.15'
# Conflicts:
#	core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
2021-12-29 18:10:18 +08:00
donghongyu
e41ec828f6 [New branch]
关闭部分日志
修复ADAS基础模块过快启动导致崩溃

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2021-12-29 17:45:39 +08:00
lianglihui
55ec24c258 8.0.17 apm 修改 2021-12-28 16:38:39 +08:00
xuxinchao
8682f9bcb2 模块代码迁移
将foudations包下的mogo-utils模块下的代码迁移到core包下的mogo-core-utils模块下
注:远程依赖库网约车模块目前使用的是foudations包下的mogo-utils模块下Logger,
目前看项目中无该网约车模块功能,暂时注释掉该模块
2021-12-28 14:52:30 +08:00
zhongchao
a6cd4afc6e add devatools 2021-12-23 18:01:57 +08:00
lixiaopeng
906deb2716 merge tanlu 2021-12-22 19:51:04 +08:00
donghongyu
b228c39f87 [Update]
关闭部分日志

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2021-12-22 19:31:26 +08:00
lixiaopeng
63b2631da7 opt tanlu 2021-12-22 19:02:51 +08:00
xuxinchao
4eb2277d79 APM添加自定义数据
1、添加serial自定义数据,值为SN号
2、添加MAP_SDK_VERSION自定义数据,值为地图版本号
2021-12-21 18:48:59 +08:00