yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,089 Commits 1 Branch 0 Tags
4268320dffe4cda65bbcdc82bba0ea084151dc97
Commit Graph

1732 Commits

Author SHA1 Message Date
aibingbing
4268320dff Merge branch 'release_sweeper-d_230328_3.0.0.1_bugfix' into 'master' 
[Sweeper] fix: 为了避免自车定位提前结束任务导致的溜车问题，这里删除自车定位触发到站;

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!768
 2023-05-10 10:25:00 +00:00
aibingbing
626737db2c fix: 为了避免自车定位提前结束任务导致的溜车问题，这里删除自车定位触发到站; 2023-05-04 14:37:37 +08:00
yangyakun
38897b664f Merge branch 'release_robobus-p_230413_2.1.0.1' 2023-04-23 14:28:53 +08:00
yangyakun
d32d904239 Merge branch 'release_robobus-d_230413_3.1.0.1' 
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
#	core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
#	gradle.properties
 2023-04-23 14:28:19 +08:00
wangmingjun
d0f2621773 Merge branch 'dev_robobus-d_230413_3.1.0' into 'dev_robobus-p_230413_2.1.0' 
Dev robobus d 230413 3.1.0

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!760
 2023-04-17 10:34:38 +00:00
yangyakun
b7a83dbfbb [bugfix] 
[删掉空格]
 2023-04-17 16:33:07 +08:00
yangyakun
1f1989174f Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0 
# Conflicts:
#	OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
 2023-04-17 15:16:03 +08:00
yangyakun
e0cac99c4d Merge remote-tracking branch 'origin/dev_robobus-d_230413_3.1.0' into dev_robobus-d_230413_3.1.0 2023-04-17 15:05:28 +08:00
wangmingjun
3a4867ee7c Merge branch 'dev_robobus-d_230413_3.1.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus-d_230413_3.1.0 2023-04-17 12:54:04 +08:00
wangmingjun
2fcd217c04 [3.1.0] m2路线id不同，清除全览轨迹 2023-04-17 12:53:56 +08:00
yangyakun
6203738612 [m2] 
[3.1.0]
[pnc]
 2023-04-17 12:19:10 +08:00
yangyakun
464ef23c54 [m2] 
[3.1.0]
[动画展示和隐藏]
 2023-04-17 11:23:30 +08:00
yangyakun
9936fb84ac [m2] 
[3.1.0]
[动画展示和隐藏]
 2023-04-14 17:23:12 +08:00
yangyakun
a0c1258d9f Merge remote-tracking branch 'origin/dev_robobus-p_230413_2.1.0' into dev_robobus-p_230413_2.1.0 2023-04-14 16:01:25 +08:00
yangyakun
1d49120170 [m2] 
[3.1.0]
[隐藏Ui]
 2023-04-14 16:01:15 +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