Commit Graph

103 Commits

Author SHA1 Message Date
xinfengkun
ab2d990fa4 修改合并代码出错导致 m1档位对自动驾驶有限制问题 2023-03-22 11:10:39 +08:00
yangyakun
2acddc210f [gradle]
[dali、yantai add noop]
2023-03-16 11:34:43 +08:00
wangmingjun
053ae16fd1 [M2] 视频绘制选opengl,走马灯 2023-03-11 11:51:06 +08:00
aibingbing
390eec6ec9 refactor: 金旅星辰乘客屏 修改成双屏,并播放宣传视频; 2023-03-07 22:59:36 +08:00
yangyakun
6929663286 [m1]
[1.1.2]
[去掉bus 开沃车型]
2023-03-07 22:31:35 +08:00
yangyakun
5284216e8a [m1]
[1.1.2]
[接驳烟台打包过滤条件]
2023-03-07 15:15:52 +08:00
yangyakun
d1179c0ca6 [m1]
[1.1.2]
[接驳烟台打包]
2023-03-07 15:11:30 +08:00
yangyakun
215f94f1c6 [m1]
[1.1.2]
[打包过滤]
2023-03-03 12:04:34 +08:00
wangmingjun
25e81e96e8 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0
# Conflicts:
#	app/build.gradle
#	app/functions/och.gradle
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt
2023-03-02 21:06:00 +08:00
donghongyu
d94e0c405b [dev_arch_opt_3.0]
[Change]
[
1、增加清扫车多屏幕支持
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-03-02 14:36:50 +08:00
xinfengkun
0b8193d24c [m1]清扫车放开档位限制,同步配置文件 2023-03-01 15:42:22 +08:00
xinfengkun
734b7d60ba [opt3.0]清扫车放开档位限制 2023-03-01 15:37:13 +08:00
yangyakun
6c1de0de21 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-02-28 21:22:57 +08:00
yangyakun
3c332847f7 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/productFlavors/fOchBusPassengerM1.gradle
2023-02-28 21:22:06 +08:00
xinfengkun
9216aa99f4 [opt3.0][mogo-adas]修改m1不能启动自动驾驶的档位 2023-02-28 18:15:12 +08:00
xinfengkun
205746164b [m1]修改m1不能启动自动驾驶的档位 2023-02-28 17:15:50 +08:00
xinfengkun
df50a24958 [m1][app] 修改配置文件错误 2023-02-28 16:55:20 +08:00
wangmingjun
7d95f59572 bus 编译错误 2023-02-28 15:17:58 +08:00
xinfengkun
0d83e54d43 [m1][app] 修改配置文件错误 2023-02-28 10:09:07 +08:00
wangmingjun
1ea0f88c53 解决编译错误 2023-02-27 21:40:19 +08:00
wangmingjun
7ea3604ad2 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!626
2023-02-27 13:01:22 +00:00
wangmingjun
10f561ba26 [shuttle] 乘客屏方向 2023-02-27 21:00:41 +08:00
xinfengkun
e423e5b4ff Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-27 17:40:33 +08:00
xinfengkun
ec1a00b0b6 [m1][mogo-adas] 不能启动自动驾驶档位参数修改成BuildConfig可配置模式 2023-02-27 17:40:22 +08:00
wangmingjun
1c6f6d43f8 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!620
2023-02-27 07:40:16 +00:00
yangyakun
123e490057 [m2]
[1.0.0]
[过滤条件修改]
2023-02-27 15:25:34 +08:00
yangyakun
c45d0e7840 [m1]
[1.1.2]
[m1 页面]
2023-02-23 21:51:36 +08:00
wangmingjun
ebc4e6a5dc [charter] m1司机端初始化 2023-02-22 21:16:11 +08:00
yangyakun
2ecf3e3ebd [m1]
[1.1.2]
包车结构
2023-02-22 11:13:05 +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
yangyakun
09485a49dc [m1]
[1.0.2]
[添加状态栏替换开关]
2023-02-16 17:04:11 +08:00
yangyakun
2cd8e27f75 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-16 14:14:26 +08:00
yangyakun
840af54c8d [m1]
[1.0.2]
[状态栏透明度、2560x1600 图片缩放过小]
2023-02-16 14:14:00 +08:00
wangmingjun
ceb07db52e [M2] M2 接驳司机端config配置 2023-02-16 11:17:17 +08:00
wangmingjun
e25e506725 [M2] M2 视频播放 2023-02-15 18:42:13 +08:00
yangyakun
6e5254af97 [m1]
[1.0.2]
[url 修改]
2023-02-15 15:26:33 +08:00
wangmingjun
6d75a0602f Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-15 10:57:06 +08:00
wangmingjun
4381a006b0 [M2] shuttle适配私有化和3.0架构 2023-02-15 10:56:00 +08:00
yangyakun
bfe65e75eb Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-15 10:18:54 +08:00
yangyakun
87a2c2201a [m1]
[1.0.2]
[url 全部由urlConfg.json 来进行配置]
2023-02-14 19:29:38 +08:00
zhongchao
32991f784d [2.13.0-arch-opt] binding car add config 2023-02-14 18:50:49 +08:00
yangyakun
eee29a65eb [m1]
[1.0.0]
[订单逻辑添加]
2023-02-11 14:49:41 +08:00
yangyakun
0d863ebb09 [m1]
[1.0.0]
[添加url+flavors过滤单独抽出文件]
2023-02-11 10:33:04 +08:00
wangmingjun
bc0f8e8ec4 [M2] 1、图/视频轮播opt 2、m2竖屏 2023-02-09 20:59:18 +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
9f92fdecd9 [dev_arch_opt_3.0]
[Change]
[
1、productFlavors渠道中增加动态控制屏幕方向的参数,SCREEN_ORIENTATION:landscape--强制横屏,portrait--强制竖屏
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-09 15:20:30 +08:00
yangyakun
bc24620f7c Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/productFlavors/fPadLenovo.gradle
2023-02-01 12:54:53 +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