Commit Graph

1367 Commits

Author SHA1 Message Date
xinfengkun
0d83e54d43 [m1][app] 修改配置文件错误 2023-02-28 10:09:07 +08:00
wangmingjun
1ea0f88c53 解决编译错误 2023-02-27 21:40:19 +08:00
wangmingjun
41427761a3 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_RoboBus_P_230220_1.0.1'
Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!629
2023-02-27 13:24:19 +00: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
wangmingjun
30125e28a7 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_RoboBus_P_230220_1.0.1'
Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!623
2023-02-27 12:44:22 +00: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
09a8303426 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-26 19:18:18 +08:00
yangyakun
c5ddb64496 [build 修改] 2023-02-26 18:58:12 +08:00
wangmingjun
667a0d4544 [charter] M1司机端 2023-02-25 19:37:52 +08:00
yangyakun
f6e749a2ac 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-25 10:33:06 +08:00
wangmingjun
9ec1bb321e Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_RoboBus_P_230220_1.0.1'
Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!618
2023-02-24 12:06:11 +00:00
yangyakun
645ebe1665 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	core/mogo-core-function-call/build.gradle
2023-02-24 18:51:07 +08:00
chenfufeng
1e7b13f151 [Feat]新增支持多语言的TTS
[Feat]新增支持多语言的TTS
2023-02-24 15:44:33 +08:00
yangyakun
c45d0e7840 [m1]
[1.1.2]
[m1 页面]
2023-02-23 21:51:36 +08:00
zhongchao
a8c80e8095 [2.13.0-arch-opt] add v2x sdk foundation gradle setting 2023-02-23 16:38:55 +08:00
yangyakun
f959d9e2fb [m1]
[1.1.2]
[切换新的结构]
2023-02-23 11:20:52 +08:00
wangmingjun
ebc4e6a5dc [charter] m1司机端初始化 2023-02-22 21:16:11 +08:00
zhongchao
dbb62bbe04 [2.13.0-arch-opt] remove unuse code and add trace log 2023-02-22 19:50:13 +08:00
yangyakun
2ecf3e3ebd [m1]
[1.1.2]
包车结构
2023-02-22 11:13:05 +08:00
wangmingjun
9454d547b6 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!581
2023-02-21 12:41:05 +00:00
zhongchao
db8bb54efa [2.13.0-arch-opt] .. 2023-02-21 20:11:18 +08:00
zhongchao
70630f2d5a [2.13.0-arch-opt] update socket ai cloud sdk version 2023-02-21 20:11:18 +08:00
wangmingjun
41e23861af Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
2023-02-20 10:39:15 +08:00
zhongchao
51f3308cb2 [2.13.0-arch-opt] remove v2x module and wait to union logic 2023-02-17 21:52:53 +08:00
zhongchao
d5474743bf [2.13.0-arch-opt] v2x remove 2023-02-17 21:32:22 +08:00
zhongchao
df3e018c30 [2.13.0-arch-opt]v2x code style 2023-02-17 20:25:26 +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
355eef7d09 [M2] M2 接驳司机端车模型暂时设置小巴车 2023-02-16 11:54:14 +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
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
zhongchao
7b85574d62 :[2.13.0-arch-opt] bug fix 2023-02-15 16:15:28 +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