Commit Graph

1206 Commits

Author SHA1 Message Date
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
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
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
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
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
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
zhongchao
db8bb54efa [2.13.0-arch-opt] .. 2023-02-21 20:11:18 +08: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
chenfufeng
c37d2b162d [2.14.0][Fix]解决高精地图缓存交互的问题 2023-02-21 17:12:35 +08:00
chenfufeng
0f17b2185f [2.14.0][Opt]升级高德地图版本新增对应功能 2023-02-21 17:12:35 +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
zhongchao
497573e1d0 [2.13.0-arch-opt] renote the versionCodeView to fix bug 2023-02-21 11:56:05 +08:00
yangyakun
e5b295d95d Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-21 09:44:24 +08:00
zhongchao
06df5b98dd [2.13.0-arch-opt] update aiCloudsdk version 2023-02-20 22:16:09 +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
zhongchao
31aa2ef23e [2.13.0-arch-opt]fix bug of analytics 2023-02-20 19:27:38 +08:00
zhongchao
312744e4ee [2.13.0-arch-opt]analytics move to foundation 2023-02-20 19:10:32 +08:00
zhongchao
ca1832210a [2.13.0-arch-opt] fix bug of pnc action view thread problem and config upload role problem ,plus remove impl of module-api and call 2023-02-20 16:41:12 +08:00
zhongchao
fe11d1fe6b [2.13.0-arch-opt] view check 2023-02-20 14:03:10 +08:00
wangmingjun
ea83dc42ca [M2]处理合并错误 2023-02-20 11:31:32 +08:00
wangmingjun
41e23861af Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
2023-02-20 10:39:15 +08:00