Commit Graph

11483 Commits

Author SHA1 Message Date
donghongyu
ac5fa85186 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
#	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/view/SweeperLimitingVelocityView.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
#	OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
2023-01-30 11:58:56 +08:00
donghongyu
74f1f3b0d3 [dev_arch_opt_3.0]
[Change]
[
1、删除build无用文件
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-30 11:57:31 +08:00
bxb
ff750e7d00 [清扫车]清扫车当前任务选择菜单布局处理 2023-01-30 11:39:57 +08:00
lixiaopeng
382f109b7f Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-01-30 11:31:21 +08:00
lixiaopeng
aa3455a5ab 添加更新速度来源的注释 2023-01-30 11:31:13 +08:00
renwj
25585416ad [dev_arch_opt_3.0]替换高精坐标替换高德坐标方法调用 2023-01-30 11:30:21 +08:00
chenfufeng
0bcf3a677c [Opt]解决合并过程中的问题 2023-01-30 11:10:04 +08:00
chenfufeng
bac6a2f8c9 [2.13.2][opt]全览地图中经纬度数据根据坐标系字段进行兼容转换 2023-01-30 11:10:04 +08:00
chenfufeng
5a73a9baf2 [2.13.2][feat]V2X事件汇总的消息加入消息盒子 2023-01-30 11:10:04 +08:00
chenfufeng
a841735ac4 [2.13.2][Opt]查询性能监控的时机后置 2023-01-30 11:10:04 +08:00
chenfufeng
7cad199cfd [2.13.2][fix]解决数据库崩溃的问题 2023-01-30 11:10:04 +08:00
chenfufeng
13cebf3b06 [2.13.2][feat]新增全览V2X事件的日志 2023-01-30 11:10:04 +08:00
chenfufeng
ce2fdf57de [v2.13.2][Fix]解决Room崩溃问题 2023-01-30 11:10:04 +08:00
chenfufeng
dc50835178 [Opt]新增全览V2X事件的日志 2023-01-30 11:10:04 +08:00
chenfufeng
62909feccb [Opt]消息盒子中数据区分数据来源 2023-01-30 11:10:04 +08:00
chenfufeng
982fa018c9 [Opt]优化耗时和降频刷新 2023-01-30 11:10:04 +08:00
renwj
a353fcb025 [dev_arch_opt_3.0]线程优化相关初始化代码回退 2023-01-30 11:01:13 +08:00
zhongchao
6d3eeaca50 [2.13.0-arch-opt] merge 2023-01-30 10:47:39 +08:00
donghongyu
964cd61f1b Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-01-30 10:36:19 +08:00
renwj
4e8f8f0864 [dev_arch_opt_3.0]修正编译和运行时异常 2023-01-30 10:34:39 +08:00
renwj
d3cd1bf0f9 [dev_arch_opt_3.0]修正编译错误 2023-01-30 10:27:18 +08:00
renwj
7ae3e13fab [dev_arch_opt_3.0][merge]合并2.13.2分支代码 2023-01-29 18:01:44 +08:00
lixiaopeng
2a9111c996 fixed conflict 2023-01-29 17:33:43 +08:00
lixiaopeng
b60fbb2613 合并2.13.2的obu验收相关功能 2023-01-29 17:23:41 +08:00
zhongchao
8433d0c8de [2.13.0-arch-opt] hmi proxy replace to view 2023-01-29 16:25:06 +08:00
donghongyu
79ac7817be Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-01-29 15:44:40 +08:00
donghongyu
741fe10d40 [dev_arch_opt_3.0]
[Change]
[
1、临时修改清扫车异常,如果合并到dev_robosweeper-d_app-module_221230_1.1.0分支,这里修改可以不提交
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-29 15:44:35 +08:00
bxb
21a7e59b82 [清扫车]删除无用代码及其修改部分逻辑 2023-01-29 11:28:08 +08:00
xinfengkun
a5a8157f6d [pb9][v2i透传] 工控机透传OBU V2I数据接口 2023-01-29 11:12:31 +08:00
donghongyu
9a5def9afa [dev_arch_opt_3.0]
[Change]
[
1、删除旧版地图本定位注册
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-28 19:44:46 +08:00
lixiaopeng
68a00f1239 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-01-28 19:03:02 +08:00
lixiaopeng
c223edae68 [dev_arch_opt_3.0] 合并老的obu 2023-01-28 19:02:54 +08:00
donghongyu
981b876a76 [dev_arch_opt_3.0]
[Change]
[
1、删除旧版本定位注册
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-28 18:40:32 +08:00
bxb
ab27f9ee44 [清扫车]删除无用的代码和资源文件 2023-01-28 14:20:31 +08:00
zhongchao
0e7664615f [2.13.0-arch-opt] clean 2023-01-25 23:24:52 +08:00
zhongchao
27044ebeee [2.13.0-arch-opt] remove relative of code 2023-01-25 23:15:54 +08:00
zhongchao
40d2977027 [2.13.0-arch-opt] fix bug of view long click 2023-01-25 23:14:49 +08:00
zhongchao
c011549e44 [2.13.0-arch-opt] merge 2023-01-25 23:14:44 +08:00
zhongchao
2265a5ffb8 [2.13.0-arch-opt] merge 2023-01-25 23:13:23 +08:00
zhongchao
7000b84f68 [2.13.0-arch-opt] merge 2023-01-25 23:11:25 +08:00
xuxinchao
b7f2e55185 [dev_arch_opt_3.0]
[Change]
[
1、补交更改接口地址将需要进行DNS转换的接口和部分通用接口统一由服务端进行中转解析
]
2023-01-24 11:39:56 +08:00
xuxinchao
429e232c99 [dev_arch_opt_3.0]
[Change]
[
1、更改接口地址将需要进行DNS转换的接口和部分通用接口统一由服务端进行中转解析
]
2023-01-19 16:24:02 +08:00
bxb
363a7da7c6 [清扫车]右下角人工驾驶小地图布局搭建 2023-01-19 15:11:34 +08:00
bxb
655a92f8e0 [清扫车]删除无用的资源文件 2023-01-19 11:56:05 +08:00
bxb
f399210880 [清扫车][ 1、修复合并3.0出现的页面逻辑冲突] 2023-01-18 15:45:49 +08:00
bxb
a38ecbb5c3 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye 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
2023-01-18 15:08:51 +08:00
bxb
57a02e188b [清扫车]清扫车菜单栏布局搭建和相关Java类转成kotlin 2023-01-18 14:52:12 +08:00
bxb
a2c1971630 Rename .java to .kt 2023-01-18 14:52:12 +08:00
donghongyu
ebfd541567 [dev_arch_opt_3.0]
[Change]
[
1、修复合并3.0出现的页面逻辑冲突
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-18 11:58:47 +08:00
donghongyu
7b0fab135c Merge remote-tracking branch 'origin/dev_robosweeper-d_app-module_221230_1.1.0' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts:
#	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/BaseSweeperTabFragment.java
2023-01-18 10:36:57 +08:00