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

1565 Commits

Author SHA1 Message Date
yangyakun
464ef23c54 [m2] 
[3.1.0]
[动画展示和隐藏]
 2023-04-17 11:23:30 +08:00
wangmingjun
c70680db9d [3.1.0] M1处理自动驾驶按钮bug 2023-04-14 12:02:42 +08:00
yangyakun
67e5531d80 Merge branch 'dev_minibus-d_230322_3.0.0' into dev_robobus-d_230413_3.1.0 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt
#	OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/constant/URLConst.kt
#	OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
#	OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
#	OCH/mogo-och-common-module/build.gradle
#	OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
#	app/config/tempConfig.json
#	app/config/urlConfig.json
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt
#	gradle.properties
 2023-04-14 10:40:00 +08:00
yangyakun
de89d77e49 [bugfix] 
[角标越界问题]
 2023-04-13 19:12:25 +08:00
yangyakun
059271cb86 [m2] 
[3.0.0]
[隐藏转向灯、添加伪圆角]
 2023-04-13 19:11:58 +08:00
wangmingjun
793d960140 Merge remote-tracking branch 'origin/dev_robobus-d_230322_3.0.0' into dev_robobus-d_230322_3.0.0 2023-04-13 17:10:45 +08:00
wangmingjun
1fcfe2af60 [bus/shuttle/charter/taxi] 各端fragment初始化bug 2023-04-13 17:10:38 +08:00
donghongyu
7c9fc5fae5 Merge remote-tracking branch 'origin/dev_robobus-d_230322_3.0.0' into dev_robobus-d_230322_3.0.0 2023-04-13 13:11:53 +08:00
yangyakun
fb1dc67d25 [m2] 
[3.0.0]
[广告视频从json配置文件获取视频]
 2023-04-12 20:49:30 +08:00
yangyakun
2067769d03 [delete function] 2023-04-12 17:58:57 +08:00
yangyakun
3aee93c15d [bugfix] 
[无法到站、到站后韩文空指针]
 2023-04-12 17:58:54 +08:00
yangyakun
0b3f264837 [3.0.0] 
[m2]
[ui修改、视频变更 b2视频和b1视频]
 2023-04-11 19:48:36 +08:00
yangyakun
7258c0ff07 [3.0.0] 
[m2]
[ui调整]
 2023-04-11 17:09:19 +08:00
yangyakun
ea6cba2ee5 [des] 
[och各个模式对应的module]
 2023-04-11 16:54:02 +08:00
xuxinchao
18cb9171b6 [dev_robobus-d_230322_3.0.0]Bus接驳乘客屏添加消息盒子 2023-04-11 16:29:20 +08:00
yangyakun
3620e039e5 [m1] 
[日志调整]
 2023-04-10 21:21:17 +08:00
yangyakun
382e8a32b7 Merge remote-tracking branch 'origin/dev_robobus-d_230322_3.0.0' into dev_robobus-d_230322_3.0.0 2023-04-10 21:17:09 +08:00
yangyakun
38009b33ac [m2] 
[3.0.0]
[ui调整]
 2023-04-10 21:16:38 +08:00
wangmingjun
9ae98eb279 [3.0.0] 处理包车司机端倒计时bug 2023-04-10 19:41:05 +08:00
wangmingjun
5caa72202f [3.0.0] 处理包车司机端倒计时bug 2023-04-10 19:38:35 +08:00
yangyakun
59d48423b6 [mini bus2.0.0] 处理包车韩语问题 2023-04-10 18:04:18 +08:00
wangmingjun
73abb50a44 Merge branch 'dev_minibus-p_230322_2.0.0' into 'dev_minibus-d_230322_3.0.0' 
# Conflicts:
#   gradle.properties
 2023-04-10 09:35:32 +00:00
wangmingjun
8038a94e26 [mini bus3.0.0] 司机端二维码合并问题处理 2023-04-10 17:30:41 +08:00
wangmingjun
6dab66de84 [shuttle] 韩语更新 2023-04-10 16:43:21 +08:00
yangyakun
5a15eb21eb [3.0.0] 
[韩语null、去掉多余的站]

# Conflicts:
#	OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt
 2023-04-10 16:42:26 +08:00
wangmingjun
01cd5e4848 [3.0.0] 司机端韩语 2023-04-10 16:39:28 +08:00
wangmingjun
1755396f72 [mini bus] merge 司机端二维码冲突 2023-04-10 16:36:11 +08:00
wangmingjun
9c0ba1f3b0 [2.0.0] 修复接驳乘客屏偶现路线不更新问题 2023-04-10 15:32:04 +08:00
donghongyu
faa191d8f9 「dev_robobus-d_230322_3.0.0」 
1、增加
    lintOptions {
        abortOnError false
    }
 2023-04-10 14:24:03 +08:00
yangyakun
029f578c76 Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-07 20:59:44 +08:00
yangyakun
7f67ea9027 [m2] 
[3.0.0]
[广告视频从json配置文件获取视频]
 2023-04-07 20:59:34 +08:00
yangyakun
61ee4d714a [m2] 
[3.0.0]
[文案修改、页面微调]
 2023-04-07 18:24:59 +08:00
wangmingjun
bbce5fee4c Merge branch 'dev_robobus-d_230322_3.0.0' into 'dev_robobus_network_weak_230323' 
Dev robobus d 230322 3.0.0

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!746
 2023-04-07 09:01:24 +00:00
yangyakun
aa7b51ca7a Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-07 16:30:59 +08:00
yangyakun
f689d7b0f5 [m2] 
[3.0.0]
[glsurfaceview 叠加导致圆角无法使用暂时使用不使用]
 2023-04-07 14:51:08 +08:00
wangmingjun
918352a0b4 [包车] 包车确认路线dialog文字过长 2023-04-07 14:38:01 +08:00
wangmingjun
620344482c [shuttle] 韩语更新 2023-04-07 14:01:20 +08:00
yangyakun
6fd058457d [m2] 
[3.0.0]
[间距]
 2023-04-07 12:08:47 +08:00
yangyakun
47acf3e503 [m2] 
[3.0.0]
[圆角修改]
 2023-04-07 10:10:30 +08:00
wangmingjun
01fde7ba85 [B1/B2]乘客屏路线状态更新 2023-04-06 21:02:13 +08:00
wangmingjun
d11710ee11 [M2]乘客屏错误修复 2023-04-06 15:59:18 +08:00
yangyakun
13b2ce9da2 Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-06 14:53:12 +08:00
yangyakun
7d4a9c1812 [m2] 
[3.0.0]
[上下添加背景]
 2023-04-06 14:52:54 +08:00
wangmingjun
fe98ec7a0f Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323 
# Conflicts:
#	OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
#	OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt
#	OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
 2023-04-06 11:00:07 +08:00
xuxinchao
8426cd715d [dev_robobus-d_230322_3.0.0]消息盒子V2X布局调整 2023-04-04 19:26:07 +08:00
yangyakun
4400b3d9ef [m2] 
[3.0.0]
[站点样式变更]
 2023-04-04 17:11:47 +08:00
yangyakun
6ba6d7233f [m2] 
[3.0.0]
[页面改版]
 2023-04-04 16:14:45 +08:00
yangyakun
f790a64f24 [m2] 
[3.0.0]
[页面改版]
 2023-04-04 10:18:18 +08:00
wangmingjun
21ac2f8f4a [shuttle-B1/B2] 弱网调试完成 2023-03-31 20:47:19 +08:00
wangmingjun
393c77c9b6 [3.0.0] merge dev_robobus_network_weak_230323 2023-03-31 18:46:21 +08:00