yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,152 Commits 1 Branch 0 Tags
d1179c0ca616d31880b4cdc0e0dd1d2a9b2dfd0d
Commit Graph

1001 Commits

Author SHA1 Message Date
yangyakun
d1179c0ca6 [m1] 
[1.1.2]
[接驳烟台打包]
 2023-03-07 15:11:30 +08:00
wangmingjun
854b9af5e5 [M1] 烟台私有化 + 多语音 2023-03-03 23:59:05 +08:00
wangmingjun
f5c5f1536c 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 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
#	app/build.gradle
#	app/functions/och.gradle
#	app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
 2023-03-03 17:29:34 +08:00
wangmingjun
7bca36646f [M2] 找回telematicConstant类 2023-03-03 17:19:57 +08:00
wangmingjun
8a1616f94a Merge branch 'dev_RoboBus_P_230220_1.0.1' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' 
# Conflicts:
#   app/build.gradle
 2023-03-03 07:34:23 +00:00
yangyakun
e8a5f2097d [m1] 
[1.1.2]
[merge error]
 2023-03-03 15:16:33 +08:00
yangyakun
a0bcbb5cb8 [m1] 
[1.1.2]
[dimension 修改]
 2023-03-03 14:56:52 +08:00
yangyakun
73082244c1 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/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-03 14:54:30 +08:00
donghongyu
60c33ac089 [dev_arch_opt_3.0] 
[Change]
[
1、解决少引用import android.content.Context
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-03-03 14:37:03 +08:00
renwj
3605f62e6c [dev_arch_opt_3.0]捕获aispeech相关崩溃 2023-03-03 12:21:30 +08:00
yangyakun
215f94f1c6 [m1] 
[1.1.2]
[打包过滤]
 2023-03-03 12:04:34 +08:00
wangmingjun
c84f56a08b 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!642
 2023-03-02 13:52:45 +00: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
zhongchao
3d7be57c71 [2.13.0-arch-opt] merge 2023-03-02 19:54:16 +08:00
wangmingjun
0b862f6363 [M2] 1、视频渲染方式 2、走马灯效果 2023-03-02 14:48:04 +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
yangyakun
eeff0d2e46 [m1] 
[1.1.2]
[tts 临时导入]
 2023-03-01 21:52:07 +08:00
wangmingjun
0a4b4132af 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!637
 2023-03-01 08:57:54 +00:00
yangyakun
ffee21ad6f Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-01 15:55:11 +08:00
yangyakun
b822934ba7 [m1] 
[1.1.2]
[到达站点、启动自驾、结束订单、tts、车模修改]
 2023-03-01 15:54:36 +08:00
xinfengkun
0b8193d24c [m1]清扫车放开档位限制，同步配置文件 2023-03-01 15:42:22 +08:00
xinfengkun
d1fac54bc8 [m1]清扫车放开档位限制，同步配置文件 2023-03-01 15:40:17 +08:00
xinfengkun
734b7d60ba [opt3.0]清扫车放开档位限制 2023-03-01 15:37:13 +08:00
yangyakun
9ca0e19490 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-03-01 10:43:15 +08:00
yangyakun
81dcad204c [gradle] 
[去掉assemble 过滤]
 2023-03-01 10:41:46 +08:00
wangmingjun
76a5e7e005 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!635
 2023-02-28 13:43:09 +00: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
wangmingjun
b75071fb64 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!631
 2023-02-28 10:12:17 +00: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
yangyakun
8288d24f12 [m2] 
[1.0.2]
[gradle 打包]
 2023-02-28 11:05:14 +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
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