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

851 Commits

Author SHA1 Message Date
donghongyu
09bf91e2f2 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-05 11:15:07 +08:00
renwj
c57d307f87 [2.13.0]修正leakcanary在monkey测试中出现的崩溃 2022-12-05 10:47:54 +08:00
donghongyu
078cb8a024 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-05 10:40:31 +08:00
renwj
03ef756253 [v2.13.0]误合代码恢复 2022-12-05 10:11:29 +08:00
donghongyu
feeecbb564 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt
 2022-12-02 19:53:12 +08:00
zhongchao
095c926fb6 [2.13.0]fix bug of netty status of view and close the spi real time 2022-12-02 19:13:34 +08:00
donghongyu
346bbfb0c2 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
#	foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
 2022-12-02 17:35:53 +08:00
zhongchao
0476280f63 [2.13.0] remove unuse code 2022-12-02 15:11:16 +08:00
zhongchao
60094ced77 add socket status listener and remove unfitable code 2022-12-02 11:03:37 +08:00
donghongyu
c0db312f04 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-01 19:09:33 +08:00
zhongchao
e646d4367b add config upload server 2022-12-01 17:38:16 +08:00
donghongyu
47d53432a8 [2.13.0] 
[Change]
[处理合并异常]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-12-01 13:27:22 +08:00
donghongyu
6d32688dd6 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt
 2022-12-01 10:38:40 +08:00
donghongyu
2974edc51c [2.13.0] 
[Change]
[增加多CPU架构支持]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-12-01 10:37:32 +08:00
zhongchao
fbb15bcf47 [2.13.0] change the host const loc 2022-11-30 16:23:40 +08:00
zhongchao
0d6938262c [2.13.0] change the host location and fix bug of token problem 2022-11-30 16:23:40 +08:00
zhongchao
621c8f36d2 [2.13.0] fix bug of sn token invoke 2022-11-30 12:59:28 +08:00
donghongyu
084a13f584 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
 2022-11-29 18:06:42 +08:00
donghongyu
ee44bc0470 [2.13.0] 
[Change]
[修复应用身份的配置问题导致Bus无法区分]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-11-29 16:01:36 +08:00
zhongchao
c8d9832181 [2.13.0] fix bug of fw trace log and update main log func 2022-11-29 15:13:17 +08:00
donghongyu
47161b4648 [2.13.0] 
[Change]
[完成多物理设备和单设备多屏幕的工程适配；
待解决，需要处理两个身份通讯问题适配]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-11-28 22:35:19 +08:00
donghongyu
5f1ecdd51f [2.13.0] 
[Change]
[合并司机端、乘客端为一个应用，适用于异屏、异显、异交互]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-11-28 19:55:00 +08:00
zhongchao
5389db47c4 [2.13.0] merge 2.13.0 branch 2022-11-21 18:32:51 +08:00
zhongchao
ad2d2c2cdf [2.13.0-merge]yakun and code style 2022-11-21 18:07:52 +08:00
zhongchao
1fec32f633 merge 2022-11-21 14:47:53 +08:00
yangyakun
1607c60435 Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
#	OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
#	OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	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/res/layout/view_auto_pilot_check.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml
#	gradle.properties
 2022-11-18 10:36:15 +08:00
donghongyu
947fb0b8fb 「Fix」 
1、修复自车位置没有被分发

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-11-17 20:26:16 +08:00
lixiaopeng
27e2aa93d9 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_robotaxi-d-app-module_mogo-obu-sdk_220926_2.11.1_temp 2022-11-16 21:38:13 +08:00
lixiaopeng
dcf780ed55 同步212 版本 2022-11-15 19:05:33 +08:00
pangfan
2b38bf67c0 Merge remote-tracking branch 'origin/release_robotaxi-d-app-module_2120_221017_2.12.0.1' 
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
 2022-11-15 11:23:39 +08:00
zhongchao
a836c31728 wait to finish 2022-11-10 10:54:57 +08:00
pangfan
a68463a813 Merge branch 'master' into 'release_robotaxi-d-app-module_2110_220915_2.11.0.1' 
# Conflicts:
#   app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#   core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
 2022-10-31 03:08:24 +00:00
yangyakun
79e4606461 土司 AlertDialog 修改 2022-10-30 23:44:10 +08:00
yangyakun
20509fce0c [2.8.0-f] 屏幕适配 2022-10-28 20:44:07 +08:00
renwj
0475c5d567 [线程优化]移除相关功能 2022-10-28 16:08:47 +08:00
zhongchao
30b3432cb1 .. 2022-10-28 14:38:53 +08:00
wangmingjun
704035eee3 Revert "Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into…" 
This reverts merge request !315
 2022-10-27 11:20:05 +00:00
renwj
6cdd58c070 [code]移掉线程优化相关的代码 2022-10-27 17:29:24 +08:00
lianglihui
69b65bcd59 2.11.0 上线注掉线程优化 2022-10-27 15:07:53 +08:00
renwj
32a2fdc91a [线程优化]线程优化release版本不可用 2022-10-21 15:17:04 +08:00
renwj
abbe06e8c4 [CrashFix]修正LeakCanary数据库由于多次close导致的崩溃 
[CrashFix]修正LeakCanary数据库由于多次close导致的崩溃
 2022-10-21 12:14:56 +08:00
renwj
5c14cd6531 [Plugin]引入LancetX轻量级AOP插件，方便操作字节码 2022-10-21 10:49:28 +08:00
renwj
1d0f1422d5 [V2X][Road]优化道路标记颜色逻辑 
[V2X][Road]优化道路标记颜色逻辑2
 2022-09-28 17:23:42 +08:00
aibingbing
0b84e309f8 Merge branch 'release_robosweeper-d_100-sweeper_220830_1.0.0.1_merge' into 'master' 
清扫车司机屏V1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!211
 2022-09-26 12:47:11 +00:00
aibingbing
6a21e175b4 Merge branch 'master' into release_robosweeper-d_100-sweeper_220830_1.0.0.1_merge 
# Conflicts:
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
#	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/map/MapPointCloudSubscriber.kt
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
#	gradle.properties
#	libraries/mogo-adas-data/src/main/proto/message_pad.proto
#	libraries/mogo-adas-data/src/main/proto/special_vehicle_task_cmd.proto
#	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
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
 2022-09-26 19:16:37 +08:00
renwj
e2b1a7d925 [线程优化]将版本声明成全局变量 2022-09-26 18:52:01 +08:00
zhongchao
a690584760 fix bug of car color and biz config upper case 2022-09-26 15:00:46 +08:00
renwj
87f34a6dbc [线程优化]升级版本 2022-09-22 10:20:12 +08:00
renwj
5fbef0e33f [线程优化]删除相关配置 2022-09-15 19:50:22 +08:00
lixiaopeng
f8442908cc 修改默认使用obu数据，数据类型修改， 2022-09-07 18:37:19 +08:00