Commit Graph

1063 Commits

Author SHA1 Message Date
yangyakun
c201f3f0cf [m1 1.0.0]
[控制车辆设置]
2023-01-31 20:57:58 +08:00
yangyakun
9d599bfe1b [m1 1.0.0]
[车辆控制灯光控制]
2023-01-31 19:43:25 +08:00
yangyakun
94c6f2696c [gradle 渠道名修改]
[接驳车乘客端和bus乘客端代码合并通过AppIdentityModeUtils 来判断]
2023-01-31 16:53:38 +08:00
yangyakun
0714df0081 [gradle 渠道修改] 2023-01-31 14:52:21 +08:00
yangyakun
4e9d237d3b Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
2023-01-30 15:12:39 +08:00
yangyakun
b9213fee35 [1.0.0]
[m1]
[适配+部分页面]
2023-01-30 12:08:59 +08:00
zhongchao
6d3eeaca50 [2.13.0-arch-opt] merge 2023-01-30 10:47:39 +08:00
yangyakun
a9291ac5bc [1.0.0]
[m1]
[背景透明]
2023-01-29 18:48:45 +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
yangyakun
947517f98b Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-01-29 16:28:47 +08:00
yangyakun
9aafa6d9a0 [1.0.0]
[m1]
[m1初始提交]
2023-01-29 16:26:14 +08:00
zhongchao
8433d0c8de [2.13.0-arch-opt] hmi proxy replace to view 2023-01-29 16:25:06 +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
donghongyu
981b876a76 [dev_arch_opt_3.0]
[Change]
[
1、删除旧版本定位注册
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-28 18:40:32 +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
yangyakun
4eae9acbe9 [2.13.2]
[feature]
[接驳车和base添加重用代码basecommon文件夹]
2023-01-17 17:33:02 +08:00
wangmingjun
f36d467a92 [M2] 增加乘客屏M2 2023-01-16 19:18:27 +08:00
wangmingjun
fca1b294b7 [merge] merge origin branch 2023-01-16 17:45:21 +08:00
wangmingjun
9b503829c3 [merge] 合并接驳车代码 2023-01-16 17:27:27 +08:00
yangyakun
e471ad0f61 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-01-16 16:32:36 +08:00
donghongyu
4c30b63dfc [dev_arch_opt_3.0]
[Change]
[
1、更替项目中用到的高德地图的地方,使用IMoGoChassisLocationGCJ02Listener
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-16 16:01:19 +08:00
yangyakun
d5b5cc2c66 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-01-13 19:35:59 +08:00
yangyakun
e565f0a403 [1.0.0]
[m1]
[乘客屏单独抽到base 下]
2023-01-13 19:34:09 +08:00
donghongyu
dd8428fb97 [dev_arch_opt_3.0]
[Change]
[
1、修改了高精地图的设置外部坐标的方法
2、修改了基础、出租车、Bus小地图中的位置回调,使用IMoGoChassisLocationGCJ02Listener。
3、TODO 有些需要高德地图的地方需要改为使用IMoGoChassisLocationGCJ02Listener,WGS84的坐标使用IMoGoChassisLocationWGS84Listener
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-13 17:44:04 +08:00
wangmingjun
c0274167f4 [1.0.0] opt 2023-01-13 17:36:18 +08:00
wangmingjun
0b8a0dcdf9 [1.0.0] "无人驾驶"改为"自动驾驶" 2023-01-13 15:19:27 +08:00
zhongchao
183c5b806f [2.13.2-arch-opt] remove unuse res of v2x 2023-01-13 15:18:34 +08:00
wangmingjun
aaf9ec52fd [1.0.0] 接驳车登陆页面背景 2023-01-11 19:33:22 +08:00
wangmingjun
2e8db449f7 [1.0.0] 接驳车乘客屏接口完成 2023-01-11 10:26:42 +08:00
donghongyu
084efad76a Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' into dev_arch_opt_3.0
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
2023-01-09 19:47:47 +08:00
bxb
bd31ae6f35 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 2023-01-09 18:50:02 +08:00
bxb
639a528246 清扫车左上状态UI布局修改 2023-01-09 18:49:47 +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
xinfengkun
c2c4d3c6d2 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robosweeper-d_app-module_221230_1.1.0 2023-01-09 17:59:37 +08:00
xinfengkun
23b96286ee [pb12][清扫车新老底盘兼容] 清扫车分支 老地盘数据转新地盘数据 2023-01-09 16:58:46 +08:00
bxb
240a4bb09f 清扫车日志tag相关添加 2023-01-09 16:36:24 +08:00
wangmingjun
6fe28c8dab [1.0.0] 接驳车接口接入 2023-01-06 20:21:01 +08:00
bxb
d48c59f1bf 清扫车灯态UI修改 2023-01-06 10:58:32 +08:00
yangyakun
2371fbba6e [feature] 网络接口实现赋值时机修改 2023-01-06 10:51:33 +08:00
donghongyu
22198c92ec [dev_arch_opt_3.0]
[Change]
[1、解决清扫车状态同步注册未修改bug]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-05 19:32:11 +08:00
donghongyu
cf94486dfd [dev_arch_opt_3.0]
[Change]
[1、分离清扫车(福田)清扫控制系统状态监听,单独回调]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-05 18:57:20 +08:00
yangyakun
2f5bc5784b [feature] 登录接口分散到bus和taxi乘客端 2023-01-05 18:39:45 +08:00
donghongyu
9a6102a4c6 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-01-05 18:17:33 +08:00
donghongyu
5fcc0f42ea [dev_arch_opt_3.0]
[Change]
[1、分离工控机引导线、全路径规划]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-05 18:17:27 +08:00
wangmingjun
5c93b9604f [opt ] 判断乘客屏使用AppIdentityModeUtils.isPassenger方法 2023-01-05 16:41:03 +08:00
wangmingjun
f7dd5731eb [1.0.0] 接驳车opt 2023-01-05 16:25:28 +08:00
wangmingjun
4f29f4b358 [1.0.0] 增加接驳车 2023-01-05 16:04:04 +08:00
donghongyu
06810f339c [dev_arch_opt_3.0]
[Change]
[1、将Call中注册,反注册操作下沉CallerBase]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-04 20:00:32 +08:00