yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,087 Commits 1 Branch 0 Tags
38897b664f0fea8f36421dc3b467ab67f059d2de
Commit Graph

13087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
xuxinchao
f907f24b6a Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0 2023-04-19 11:42:16 +08:00
xuxinchao
0c4d329626 [dev_robobus-d_230413_3.1.0]消息盒子更改消息队列处理方式，队列方式 2023-04-19 11:41:18 +08:00
wangmingjun
873e26f7d6 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!761
 2023-04-19 03:07:54 +00:00
wangmingjun
f2cc1d1827 [3.1.0] dali/yantai online 司机端二维码链接修复 2023-04-19 11:06:09 +08:00
renwj
bf00ddcab3 [2.15.0] 优化UiThreadHandler和ThreadUtils往主线程消息队列添加消息的方式，添加最新和排队两种方式 2023-04-19 09:06:06 +08:00
yangyakun
8076f0d0fc Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0 2023-04-18 18:13:22 +08:00
yangyakun
79af3a3317 [bugfix] 
[车模被动态替换]
 2023-04-18 16:47:40 +08:00
zhongchao
ef65f44fbb Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0 2023-04-18 16:47:19 +08:00
zhongchao
bc2a57e05e [3.1.0]reject the stop and restart of socket 2023-04-18 16:43:12 +08:00
chenfufeng
c7303eca7f [2.15.0][Fix]解决首次安装App时无法获得高德定位导致的高精地图缓存问题 2023-04-18 11:46:12 +08:00
chenfufeng
f8ebfe416c [2.15.0][Fix]解决首次安装App时无法获得高德定位导致的高精地图缓存问题 2023-04-18 11:44:59 +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
xuxinchao
c3badacbbc [dev_robobus-d_230413_3.1.0]fix不处于平行驾驶状态下弱网也提示平行驾驶接管更改 2023-04-17 18:30:24 +08:00
yangyakun
1d0030f9dd [bugfix] 
[视频源修改、添加双视频]
 2023-04-17 17:22:32 +08: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
c30851958e [bugfix] 
[3.1.0]
[pnc]
 2023-04-17 15:10:53 +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
xuxinchao
49eaecb096 [dev_robobus-d_230413_3.1.0]fix不处于平行驾驶状态下弱网也提示平行驾驶接管补交 2023-04-17 12:32:52 +08:00
yangyakun
6203738612 [m2] 
[3.1.0]
[pnc]
 2023-04-17 12:19:10 +08:00
xuxinchao
f655da0bde [dev_robobus-d_230413_3.1.0]fix不处于平行驾驶状态下弱网也提示平行驾驶接管提示 2023-04-17 11:31:13 +08:00
yangyakun
464ef23c54 [m2] 
[3.1.0]
[动画展示和隐藏]
 2023-04-17 11:23:30 +08:00
wangmingjun
5171cb0a92 Merge branch 'dev_robobus-d_230413_3.1.0' into 'dev_robobus-p_230413_2.1.0' 
[dev_robobus-d_230413_3.1.0]fix车速设置光标位置问题追加

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!759
 2023-04-14 12:13:23 +00:00
yangyakun
9936fb84ac [m2] 
[3.1.0]
[动画展示和隐藏]
 2023-04-14 17:23:12 +08:00
xuxinchao
e59d32e7d1 [dev_robobus-d_230413_3.1.0]fix车速设置光标位置问题追加 2023-04-14 16:16:34 +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
9a18a7c49b Merge branch 'dev_robobus-d_230413_3.1.0' into 'dev_robobus-p_230413_2.1.0' 
[3.1.0] M1处理自动驾驶按钮bug

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!757
 2023-04-14 04:05:00 +00:00
wangmingjun
c70680db9d [3.1.0] M1处理自动驾驶按钮bug 2023-04-14 12:02:42 +08:00
yangyakun
04898e25b7 Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0 
# Conflicts:
#	gradle.properties
 2023-04-14 11:53:51 +08:00
yangyakun
8cf62c11c0 Merge remote-tracking branch 'origin/dev_robobus-d_230413_3.1.0' into dev_robobus-d_230413_3.1.0 2023-04-14 11:48:34 +08:00
xuxinchao
943abe3171 [dev_robobus-d_230413_3.1.0]fix车速设置光标位置问题 2023-04-14 11:43:23 +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
pangfan
2496875fb6 [大理/烟台交付]release v2.1.0 2023-04-13 20:47:39 +08:00
pangfan
dbb5707239 [大理/烟台交付]release v3.1.0 2023-04-13 20:46:49 +08:00
yangyakun
6d82c8c67a Merge branch 'dev_robobus-d_230322_3.0.0' into dev_robobus-p_230322_2.0.0 2023-04-13 19:13:32 +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
zhongchao
78dfd5f83f [3.0.0]reload 3d res ,can't merge res of 3d 2023-04-13 18:33:15 +08:00
zhongchao
98599f0739 [3.0.0] cherry pick 2.15.0 func of map and fix bug of log 2023-04-13 18:06:54 +08:00
wangmingjun
3bd4c6e450 Merge branch 'dev_robobus-d_230322_3.0.0' into 'dev_robobus-p_230322_2.0.0' 
Dev robobus d 230322 3.0.0

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!755
 2023-04-13 09:38:43 +00: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
81e778aa84 [video] 
[视频链接回滚]
 2023-04-13 11:32:27 +08:00
yangyakun
1ff26bf25b [video] 
[视频播放不能设置一个不让轮播不起来]
 2023-04-13 10:20:31 +08:00