Commit Graph

1884 Commits

Author SHA1 Message Date
renwj
ff13e5d893 [dev_opt_2.15.0] 将patch模块的依赖放到app模块中 2023-03-07 17:27:24 +08:00
lixiaopeng
591c3c2339 [dev_arch_opt_3.0] 优化运营面板 2023-03-07 16:25:58 +08:00
renwj
3c58608ca6 [dev_opt_2.15.0] patch升级代码提交 2023-03-07 15:08:54 +08:00
xuxinchao
84eb439850 [m1]消息盒子增加停车预告运营消息 2023-03-07 14:45:18 +08:00
donghongyu
fa0555082a [dev_arch_opt_3.0]
[Change]
[
1、增加动态配置消息重心按钮背景资源
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-03-06 18:28:43 +08:00
zhongchao
91547ae873 [2.13.0-arch-opt] func build change 2023-03-06 18:10:01 +08:00
renwj
e18e871ee5 [dev_arch_opt_3.0] 移除无用代码,减小包体积 2023-03-06 17:03:24 +08:00
renwj
f9b91f6722 Revert "[dev_arch_opt_3.0][减小包体积] 移除无用的代码; 将abi改成armeabi-v7a"
This reverts commit b8d9e549bf.
2023-03-06 17:00:03 +08:00
renwj
b8d9e549bf [dev_arch_opt_3.0][减小包体积] 移除无用的代码; 将abi改成armeabi-v7a 2023-03-06 15:12:21 +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
6018926211 [2.13.0-arch-opt] thread change to main 2023-03-03 18:16:18 +08:00
zhongchao
835a547ad8 [2.13.0-arch-opt] code opt 2023-03-03 18:16:18 +08:00
lixiaopeng
0bc8b79b73 [dev_arch_opt_3.0] 去掉运营面板无用的开关控制 2023-03-03 16:33:43 +08:00
yangyakun
73082244c1 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/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-03 14:54:30 +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
donghongyu
1080307662 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-03-02 20:06:30 +08:00
donghongyu
5bde1bc81e [dev_arch_opt_3.0]
[Change]
[
1、修复多屏幕因连接屏幕树数量不够导致启动异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-03-02 20:06:23 +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
donghongyu
d94e0c405b [dev_arch_opt_3.0]
[Change]
[
1、增加清扫车多屏幕支持
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-03-02 14:36:50 +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
xuxinchao
c94043344e [dev_arch_opt_3.0]版本号显示View改为两行显示 2023-02-28 17:12:38 +08:00
lixiaopeng
31cfcbe406 [dev_arch_opt_3.0] 添加清扫车模型处理,修改调试面板obu显示 2023-02-28 16:22:14 +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
xuxinchao
604b7e9632 [dev_arch_opt_3.0]消息盒子运营消息增加靠边停车和还车 2023-02-27 16:52:20 +08:00
lixiaopeng
9777008d46 [dev_arch_opt_3.0] 添加必要的日志 2023-02-27 15:19:45 +08:00
lixiaopeng
6af8c12967 [dev_arch_opt_3.0] 优化代码 2023-02-25 20:11:05 +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
a6642b5a7c [dev_arch_opt_3.0] 联调完成obu升级功能 2023-02-24 17:54:36 +08:00
lixiaopeng
d058bcace0 优化obu升级逻辑 2023-02-24 17:32:37 +08:00
lixiaopeng
8275d7f192 和obu联调升级功能完成 2023-02-24 15:36:40 +08:00
renwj
d8d05f10f5 [dev_arch_opt_3.0]lamda编译失败 2023-02-24 11:49:52 +08:00
zhongchao
7dee39dac6 [2.13.0-arch-opt] impl remove from data-center 2023-02-23 20:34:17 +08:00
xuxinchao
1a4006cec6 [opt3.0]fix消息盒子提示红点默认展示的问题 2023-02-23 18:48:33 +08:00
xuxinchao
d353fa99e5 [m1 1.0.0]fix消息盒子提示红点默认展示的问题 2023-02-23 18:42:59 +08:00
lixiaopeng
2d4e88394e 统一ip的调用 2023-02-23 14:52:49 +08:00
lixiaopeng
2efb14e5f5 调试升级接口 2023-02-23 14:43:00 +08:00
zhongchao
dbb62bbe04 [2.13.0-arch-opt] remove unuse code and add trace log 2023-02-22 19:50:13 +08:00
xuxinchao
088be3f4fb [dev_arch_opt_3.0]录包工具三期 2023-02-22 18:44:33 +08:00
donghongyu
4cb32ec4a6 [dev_arch_opt_3.0]
[Change]
[
1、合并3.0分支
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-22 17:56:14 +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
xuxinchao
956a1a2712 [opt3.0]运营面板UI调整 2023-02-22 14:52:00 +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
xuxinchao
57316383c4 [opt3.0]消息盒子 2023-02-22 11:47:37 +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