yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,734 Commits 1 Branch 0 Tags
1e9d2d0006c601d91416049938cdbe553c52bb2d
Commit Graph

314 Commits

Author SHA1 Message Date
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
lixiaopeng
1b1724668c [dev_arch_opt_3.0] 优化魔方 2023-02-21 18:33:27 +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
df3e018c30 [2.13.0-arch-opt]v2x code style 2023-02-17 20:25:26 +08:00
donghongyu
cba1b8c1aa 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/view/SweeperTrafficDataView.java
 2023-02-17 14:23:49 +08:00
zhongchao
23c7346fa2 [2.13.2-arch-opt] cherry pick 2.13.2-sop 2023-02-16 19:52:45 +08:00
lixiaopeng
fa6907b05e Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-15 19:14:42 +08:00
lixiaopeng
cca871bb83 [dev_arch_opt_3.0] 添加obu升级功能 2023-02-15 19:14:34 +08:00
donghongyu
68512b8a93 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 2023-02-15 16:37:39 +08:00
zhongchao
7b85574d62 :[2.13.0-arch-opt] bug fix 2023-02-15 16:15:28 +08:00
lixiaopeng
397801697b [dev_arch_opt_3.0] 优化车模偶现的闪烁问题 2023-02-15 11:48:27 +08:00
zhongchao
32991f784d [2.13.0-arch-opt] binding car add config 2023-02-14 18:50:49 +08:00
donghongyu
190eca3493 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 2023-02-13 18:47:04 +08:00
chenfufeng
c0b85f8d2c [Opt]全览模式、Koom初始化内聚到各自模块 2023-02-13 17:39:04 +08:00
lixiaopeng
b6a01e5d8e [dev_arch_opt_3.0] 优化下载apk调用 2023-02-10 18:42:55 +08:00
xuxinchao
90d1c7b49d [opt3.0]HttpDns改版接口补交 2023-02-10 17:52:03 +08:00
zhongchao
78849ef5d7 [2.13.0-arch-opt] mofang view and status bar opt , pnvView add catch in enum 2023-02-09 19:53:10 +08:00
lixiaopeng
3775693a5d Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-09 15:00:09 +08:00
lixiaopeng
7e25e5b43d [dev_arch_opt_3.0] 去掉之前obu的v2i总的回调数据 2023-02-09 15:00:02 +08:00
zhongchao
79ee956859 [2.13.0-arch-opt] gradle fix 2023-02-08 17:17:37 +08:00
donghongyu
f4507a7d0f Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 
# Conflicts:
#	OCH/mogo-och-sweeper/build.gradle
#	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
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.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/presenter/SweeperPresenter.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
#	OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
 2023-02-08 14:40:42 +08:00
zhongchao
8490801138 [2.13.0-arch-opt] move impl of modules from hmi to app 2023-02-07 22:12:04 +08:00
donghongyu
d8e2029fa5 [dev_arch_opt_3.0] 
[Change]
[
1、彻底解决地图跳变问题，原因是因为位置转变GCJ02时候将经纬度设置回去了，从而引起位置异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-07 20:57:49 +08:00
donghongyu
daf51c78ce [dev_arch_opt_3.0] 
[Change]
[
1、删除地图中废弃的定位回掉方法
2、修改小地图监听位置更改的方式，设置为10HZ，更新地图解决跳变问题
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-07 18:45:58 +08:00
zhongchao
1548c607da [2.13.0-arch-opt] merge 2023-02-07 15:06:28 +08:00
zhongchao
40e9fdb708 [2.13.0-arch-opt] merge 2023-02-02 20:59:42 +08:00
donghongyu
111940123f [dev_arch_opt_3.0] 
[Change]
[
1、完成工控机数据和高德GPS地图数据的数据中心，以及工控机数据超时后的自动切换为高德地图GPS数据
定位监听已重构，CallerChassisLocationGCJ20ListenerManager---高的坐标系，CallerChassisLocationWGS84ListenerManager--高精坐标系，之前代码已修改，大家后续项目中根据需要进行订阅，如需控制频率可在订阅时
// 设置数据回调频率，单位HZ，1HZ的周期是1秒；50HZ的周期是1/50=0.02秒；10HZ的周期是1/10=0.1秒。
CallerChassisLocationWGS84ListenerManager.setListenerHz(Companion.functionName, 20)
CallerChassisLocationGCJ20ListenerManagersetListenerHz(Companion.functionName, 20)
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-02 19:24:38 +08:00
donghongyu
fdecd41783 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/view/SweeperTrafficLightView.kt
 2023-02-01 19:41:41 +08:00
donghongyu
4e9ca58409 [dev_arch_opt_3.0] 
[Change]
[
1、增加控制定位HZ的回调用
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-01 18:35:39 +08:00
donghongyu
417db47d77 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/view/SweeperLimitingVelocityView.kt
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
#	OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
 2023-01-31 17:25:18 +08:00
chenfufeng
dcc98b078b [Opt3.0]新增StartUp模块并调整启动顺序 2023-01-31 15:32:17 +08:00
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
zhongchao
6d3eeaca50 [2.13.0-arch-opt] merge 2023-01-30 10:47:39 +08:00
zhongchao
0e7664615f [2.13.0-arch-opt] clean 2023-01-25 23:24:52 +08:00
zhongchao
c011549e44 [2.13.0-arch-opt] merge 2023-01-25 23:14:44 +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
donghongyu
6d37f3ed28 [dev_arch_opt_3.0] 
[Change]
[
1、合并3.0分支
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-17 19:44:44 +08:00
donghongyu
eaa2260016 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/fragment/SweeperFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.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
#	app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
#	core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
#	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-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt
#	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-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt
#	core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/MyMessageFactory.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/VehicleStateMessage.java
 2023-01-17 18:09:06 +08:00
donghongyu
3ae9cda2f7 [dev_arch_opt_3.0] 
[Change]
[
1、修复合并Master冲突
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-16 14:23:25 +08:00
zhongchao
245bde74d2 [2.13.0-arch-opt] add note 2023-01-14 14:24:23 +08:00
zhongchao
63d9459352 [2.13.0-arch-opt]rm v2x unuse 2023-01-14 12:16:59 +08:00
donghongyu
1f3a71e782 [dev_arch_opt_3.0] 
[Change]
[
1、增加忽略
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-13 15:52:22 +08:00
zhongchao
d8728fe8c9 [2.13.0-arch-opt] move binding car to deva tools 2023-01-12 10:11:23 +08:00
donghongyu
193454cc6c [dev_arch_opt_3.0] 
[Change]
[
1、修改底盘数据Gnss回调为定位回调
2、增加WGS84转GCJ02高德坐标系方法
3、增加底盘数据转换为GCJ02坐标系后的回调
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-11 19:28:34 +08:00
xinfengkun
c656ceea58 [清扫车]贴边数据回调和电量回调 2023-01-11 11:50:19 +08:00
donghongyu
3a0d94e9a7 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' into dev_arch_opt_3.0 
# Conflicts:
#	OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
#	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-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoHandAdasMsgManager.java
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
#	core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt
#	core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt
#	gradle.properties
#	libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java
 2023-01-09 18:42:03 +08:00