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

158 Commits

Author SHA1 Message Date
yangyakun
00a0a67bf7 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-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
#	core/function-impl/mogo-core-function-map/src/main/res/values/attrs.xml
 2023-02-17 17:42:29 +08:00
donghongyu
89ed9838a3 [dev_arch_opt_3.0] 
[Change]
[
1、修复EB5副屏幕启动失效问题
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-17 14:21:18 +08:00
yangyakun
94a19a0ad9 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 
# Conflicts:
#	app/productFlavors/fMultiDisplayOchBus.gradle
#	app/productFlavors/fMultiDisplayOchTaxi.gradle
 2023-02-16 19:10:22 +08:00
donghongyu
88ffcfdc71 [dev_arch_opt_3.0] 
[Change]
[
1、优化在副屏幕启动调用个
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-16 18:45:04 +08:00
donghongyu
e0007ad81b [dev_arch_opt_3.0] 
[Change]
[
1、增加获取序列化后的副屏幕列表方法
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-16 16:13:01 +08:00
yangyakun
51abbbf68c Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-16 14:14:13 +08:00
yangyakun
ec7ef2161d [1.0.0] 
[m1]
[文案修改、时间显示时分秒]
 2023-02-16 07:56:44 +08:00
donghongyu
be7f5d419a [dev_arch_opt_3.0] 
[Change]
[
1、暂时不使用存储的sn，方便测试
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-15 20:59:01 +08:00
donghongyu
3ac41c9c27 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-02-15 20:49:34 +08:00
donghongyu
1e0f64a374 [dev_arch_opt_3.0] 
[Change]
[
1、增加获取设备SN日志输出
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-15 20:49:27 +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
wangmingjun
f2ba02ad59 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!523
 2023-02-15 09:18:47 +00:00
donghongyu
b572b1e999 [dev_arch_opt_3.0] 
[Change]
[
1、优化获取设备SN标志，设备序列号>AndroidID>随机ID
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-15 16:25:29 +08:00
yangyakun
c5c5699b47 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-12 12:33:45 +08:00
donghongyu
f9357ef20a [dev_arch_opt_3.0] 
[Change]
[
1、增加简易的APP列表页面，应对M1、M2没有安装Launcher的情况，入口为长按版本号View
2、增加了启动应用是否是桌面应用检测，提示工作人员将鹰眼设置为桌面应用
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-10 12:42:27 +08:00
wangmingjun
e39a0cba18 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 
# Conflicts:
#	app/productFlavors/fMultiDisplayOchBus.gradle
#	app/productFlavors/fMultiDisplayOchTaxi.gradle
#	app/productFlavors/fOchBus.gradle
#	app/productFlavors/fOchBusPassengerM1.gradle
#	app/productFlavors/fOchSweeper.gradle
#	app/productFlavors/fOchTaxi.gradle
#	app/productFlavors/fOchTaxiPassenger.gradle
 2023-02-09 16:04:05 +08:00
donghongyu
67b0980cd8 [dev_arch_opt_3.0] 
[Change]
[
1、增加副屏幕启动页面的工具及说明书
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-09 15:36:05 +08:00
donghongyu
8cb4374cd0 [dev_arch_opt_3.0] 
[Change]
[
1、增加读取getprop，获取设备sn、型号
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-09 13:56:11 +08:00
wangmingjun
d850462bff 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!512
 2023-02-09 03:27:24 +00:00
donghongyu
89b038054d [dev_arch_opt_3.0] 
[Change]
[
1、关闭一些狂刷的日志
2、增加EB5获取SN的方法，但系统有限制，需要先adb root ;setenforce 0 ，需要等系统厂商修改下
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-08 20:47:16 +08:00
yangyakun
96f33bc3df Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-07 16:57:41 +08:00
donghongyu
d0ce252b4d [dev_arch_opt_3.0] 
[Change]
[
1、删除废弃地图中的方法
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-07 15:44:58 +08:00
yangyakun
b9213fee35 [1.0.0] 
[m1]
[适配+部分页面]
 2023-01-30 12:08:59 +08:00
wangmingjun
9b503829c3 [merge] 合并接驳车代码 2023-01-16 17:27:27 +08:00
yangyakun
6787c122c2 [1.0.0] 
[feature]
[判断是否是M1]
 2023-01-16 15:44:31 +08:00
yangyakun
6862225384 [2.13.2][gradle] 命名修改 2023-01-13 11:16:34 +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
yangyakun
4674124add [dev_arch_opt_3.0] 
[Change]
[修改业务线身份判断规则具体查看app\productFlavors\README.md]
 2023-01-11 13:10:03 +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
bxb
240a4bb09f 清扫车日志tag相关添加 2023-01-09 16:36:24 +08:00
donghongyu
f0fc8233f6 [1.1.0] 
[Change]
[1、增加清扫车判断方法]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-03 20:02:21 +08:00
donghongyu
0e1041db59 [1.1.0] 
[Change]
[1、增加清扫车判断方法]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-03 20:01:00 +08:00
donghongyu
4cf6a0c5d8 [opt 3.0] 
[Change]
[1、增加Bus司机端、Bus乘客端，Taxi司机端、Taxi乘客端判断方法]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-12-29 19:52:47 +08:00
zhongchao
681629c032 [2.13.0-arch-opt] locationUtil move 2022-12-29 17:43:25 +08:00
chenfufeng
ae7e608ce0 [opt3.0]下沉工具类到mogo-core-utils模块 2022-12-20 18:05:37 +08:00
xinfengkun
586849dac9 [opt3.0][adas-other] 移除lib-adas-other 2022-12-19 18:55:06 +08:00
lixiaopeng
f58df1636d [2.13.0 优化美化模式显示，添加魔方显示状态，重构蓝牙连接功能] 2022-12-07 20:18:18 +08:00
renwj
f5317d90eb [2.13.0]移除GPS权限获取时申请[在其它应用上层显示]权限 2022-12-07 17:49:20 +08:00
zhongchao
e646d4367b add config upload server 2022-12-01 17:38:16 +08:00
wangmingjun
55a29607c9 [2.13.0] 悬浮窗权限问题兼容 2022-11-30 19:47:32 +08:00
xuxinchao
2f9034a1ac [2.13.0]消息盒子司机端 2022-11-30 09:04:42 +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
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
yangyakun
4be507613b StatusBar 高度计算 设置background后需要重新设置padding 2022-11-18 12:49:34 +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
lixiaopeng
1ec0c6189c Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_robotaxi-d-app-module_2110_220915_2.11.0_cmdb 2022-11-16 21:49:06 +08:00
lixiaopeng
dcf780ed55 同步212 版本 2022-11-15 19:05:33 +08:00