Commit Graph

449 Commits

Author SHA1 Message Date
yangyakun
d32d904239 Merge branch 'release_robobus-d_230413_3.1.0.1'
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
#	core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
#	gradle.properties
2023-04-23 14:28:19 +08:00
donghongyu
faa191d8f9 「dev_robobus-d_230322_3.0.0」
1、增加
    lintOptions {
        abortOnError false
    }
2023-04-10 14:24:03 +08:00
xuxinchao
75536bda37 [dev_robobus-d_230322_3.0.0]云调度增加重启自驾功能 2023-04-02 00:34:19 +08:00
yangyakun
b0359c5627 [merge2master] 2023-03-28 17:32:58 +08:00
yangyakun
0a5221353f merge special relase to m1-p 2023-03-27 20:46:10 +08:00
xuxinchao
26f49ac7cc [dev_robobus-d_230322_3.0.0]云调度和Bus乘客端消息盒子 2023-03-23 20:40:21 +08:00
wangmingjun
7cc8498704 Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!729
2023-03-22 10:20:36 +00:00
renwj
8988688660 [dev_arch_opt_3.0] 添加严格模式,方便检测主线程耗时操作 2023-03-16 19:12:52 +08:00
zhongchao
ca7d0f3517 [m1-p-1.1.0]fixbug of debug setting view 2023-03-16 17:13:26 +08:00
wangmingjun
b0be8d5326 Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!692
2023-03-15 14:31:26 +00:00
lixiaopeng
fdbc224adc [dev_arch_opt_3.0] 添加obu信息展示,待联调 2023-03-15 17:19:43 +08:00
bxb
e75fc7567a Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts:
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt
2023-03-08 19:25:46 +08:00
wangmingjun
39afcde96c Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!657
2023-03-07 16:33:22 +00:00
xinfengkun
e7ea7ae9f4 [opt3.0_back_camera] 福田清扫车后摄像头数据接收 2023-03-06 16:26:23 +08:00
wangmingjun
eaae7a4033 Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!652
2023-03-03 15:05:33 +00:00
zhongchao
835a547ad8 [2.13.0-arch-opt] code opt 2023-03-03 18:16:18 +08:00
bxb
e4f0e4be87 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 2023-03-03 10:46:39 +08:00
wangmingjun
25e81e96e8 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0
# Conflicts:
#	app/build.gradle
#	app/functions/och.gradle
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt
2023-03-02 21:06:00 +08:00
zhongchao
3d7be57c71 [2.13.0-arch-opt] merge 2023-03-02 19:54:16 +08:00
xuxinchao
730ee8c8df [dev_arch_opt_3.0]fix调试面板,点击打开历史,APP崩溃 2023-03-02 17:28:47 +08:00
yangyakun
93932684a8 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-01 21:12:46 +08:00
bxb
314e8b9c77 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts:
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
2023-03-01 19:59:48 +08:00
lixiaopeng
29494b8503 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-03-01 11:42:05 +08:00
lixiaopeng
b1fe51d182 [dev_arch_opt_3.0] 添加obu 的versionName 2023-03-01 11:41:57 +08:00
bxb
0e75ce4cc8 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
2023-03-01 09:35:07 +08:00
yangyakun
3c332847f7 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/productFlavors/fOchBusPassengerM1.gradle
2023-02-28 21:22:06 +08:00
zhongchao
85a6305319 [2.13.0-arch-opt] obu warning v2v and socket toast 2023-02-28 20:14:07 +08:00
wangmingjun
ce976b979b Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!625
2023-02-27 12:52:01 +00:00
xuxinchao
c6f0ecc04a [dev_arch_opt_3.0]录包管理部分代码合并 2023-02-27 17:27:52 +08:00
yangyakun
645ebe1665 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	core/mogo-core-function-call/build.gradle
2023-02-24 18:51:07 +08:00
lixiaopeng
ae44ee9ba4 [dev_arch_opt_3.0] 添加删除文件逻辑 2023-02-24 18:16:54 +08:00
lixiaopeng
a6642b5a7c [dev_arch_opt_3.0] 联调完成obu升级功能 2023-02-24 17:54:36 +08:00
lixiaopeng
8275d7f192 和obu联调升级功能完成 2023-02-24 15:36:40 +08:00
zhongchao
7dee39dac6 [2.13.0-arch-opt] impl remove from data-center 2023-02-23 20:34:17 +08:00
xuxinchao
088be3f4fb [dev_arch_opt_3.0]录包工具三期 2023-02-22 18:44:33 +08:00
donghongyu
1e9d2d0006 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
2023-02-22 17:03:24 +08:00
renwj
b8cbf7bb15 [dev_arch_opt_3.0]Apm上传APPID与Docker版本及服务端环境绑定 2023-02-22 16:37:26 +08:00
yangyakun
d77b6742e1 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-22 14:45:26 +08:00
chenfufeng
f78a32bbbc [Opt3.0][Update]新增planning命令的接口 2023-02-22 14:44:27 +08:00
wangmingjun
9454d547b6 Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!581
2023-02-21 12:41:05 +00:00
lixiaopeng
fb4a5f1e7b Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-21 18:33:36 +08:00
lixiaopeng
1b1724668c [dev_arch_opt_3.0] 优化魔方 2023-02-21 18:33:27 +08:00
donghongyu
b976791e0e [dev_arch_opt_3.0]
[Change]
[
1、解除数据中心对高德地图的依赖
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-21 18:17:01 +08:00
xinfengkun
961e1eb102 [opt3.0][adas lib] 自动驾驶启动统计对象下沉到adas-data中 2023-02-21 16:58:06 +08:00
yangyakun
0d084aefc2 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java
2023-02-21 16:28:51 +08:00
xinfengkun
b192238894 [opt3.0][adas lib] 1.能否启动自驾检测接口兼容MAP250以下版本;2.获取车机基础信息接口增加多次获取逻辑,目前会尝试3次获取;3.修改错别字 2023-02-21 15:35:52 +08:00
chenfufeng
76f3470d74 [Opt3.0]暴露接口给上层业务使用 2023-02-21 12:14:47 +08:00
lixiaopeng
41ca720502 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-21 10:30:59 +08:00
lixiaopeng
82b8a08320 [dev_arch_opt_3.0] 优化obu 2023-02-21 10:30:53 +08:00
yangyakun
511ed5fa71 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-20 19:28:36 +08:00