Commit Graph

4006 Commits

Author SHA1 Message Date
zhongchao
a72a136139 [master] merge 6.7.4 conflict gradle version 2024-11-11 14:27:10 +08:00
yangyakun
9acb081df3 [6.7.3]
[fix]
[saas 域名改回]
2024-11-11 10:02:37 +08:00
yangyakun
3a5ad523d3 [6.7.2]
[fix]
[line add、delete or update]
2024-11-11 10:00:41 +08:00
yangyakun
72a01b70c5 [6.7.2]
[fix]
[line add、delete or update]
2024-11-08 13:47:21 +08:00
yangyakun
5eaf62eee1 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.2_local' into dev_robotaxi-d_241105_6.7.4 2024-11-08 10:31:30 +08:00
yangyakun
57d895eae3 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.2_local' into dev_robobus-d_241028_6.7.3 2024-11-08 10:30:57 +08:00
yangyakun
772ec472d8 [6.7.2]
[fix]
[site add 、 delete or update]
2024-11-08 10:30:28 +08:00
yangyakun
fde87a128c [6.7.4]
[fix]
[env change reload skin]
2024-11-07 14:32:40 +08:00
yangyakun
e473f59eb4 [6.7.4]
[fix]
[env change reload skin]
2024-11-06 18:30:09 +08:00
yangyakun
e2f9ae73a4 [6.7.4]
[fix]
[除了saas 其他环境不加载皮肤]
2024-11-06 18:28:46 +08:00
yangyakun
1791fd28f2 [6.7.4]
[fix]
[核销添加失败处理]
2024-11-06 18:20:24 +08:00
yangyakun
3f76feb1aa [6.7.3]
[fix]
[核销接口]
2024-11-06 17:50:27 +08:00
yangyakun
0c60dc7f22 [6.7.4]
[fix]
[dali ads]
2024-11-06 15:37:40 +08:00
yangyakun
ed17ad41e1 [6.7.4]
[fix]
[dali ads]
2024-11-06 11:57:54 +08:00
yangyakun
f48daea938 [6.7.4]
[fix]
[自驾条件]
2024-11-06 11:56:11 +08:00
yangyakun
71ad6e5601 [6.7.4]
[fix]
[自驾条件]
2024-11-06 11:38:56 +08:00
yangyakun
71ee720005 [6.7.2]
[fix]
[自驾状态展示]
2024-11-05 15:32:28 +08:00
yangyakun
41000e2503 [6.7.2]
[fix]
[saas t1 ui 变更]
2024-11-05 14:22:41 +08:00
yangyakun
a97ea710df [6.7.2]
[fix]
[漏掉b1 适配]
2024-11-04 19:14:10 +08:00
yangyakun
dd1e31186f [6.7.2]
[fix]
[tts ]
2024-11-04 16:26:06 +08:00
yangyakun
92b7b45426 [6.7.2]
[fix]
[强制isPlayTts 为true]
2024-11-04 14:34:58 +08:00
yangyakun
ccca938231 [6.7.2]
[fix]
[滑动出发后播放 下一站视频]
2024-11-04 10:26:12 +08:00
yangyakun
fb591a551a [6.7.2]
[fix]
[实时系统 处理错误]
2024-11-01 19:23:19 +08:00
yangyakun
a8329efb83 [6.7.2]
[fea]
[3d 模型变化]
2024-11-01 17:42:24 +08:00
yangyakun
32bba99307 [6.7.2]
[fix]
[content 变化]
2024-11-01 13:06:55 +08:00
yangyakun
33ad3c9d48 [6.7.2]
[fix]
[更新线路]
2024-11-01 12:10:41 +08:00
yangyakun
68b0e2f97a [6.7.2]
[fea]
[找回saas 到站播放站点视频]
2024-10-31 20:03:01 +08:00
yangyakun
7c1ca46ea7 [6.7.0]
[fix]
[核销接口变更]
2024-10-31 11:42:44 +08:00
yangyakun
376dda8e6d [6.7.0]
[fix]
[loading 级别变更]
2024-10-31 11:42:14 +08:00
donghongyu-pc
4710717adc Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local 2024-10-30 16:15:15 +08:00
yangyakun
44423cdbb9 [6.7.0]
[fix]
[司机屏 提升logding 的高度]
2024-10-30 16:04:26 +08:00
donghongyu-pc
566379a3c5 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local 2024-10-30 15:31:36 +08:00
xuxinchao
f4b6405852 [6.7.0]登录页跳转系统页回来后展示修改 2024-10-30 14:04:04 +08:00
yangyakun
833fac0f90 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local
# Conflicts:
#	OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt
2024-10-30 10:26:05 +08:00
yangyakun
48c7a2e4a1 [6.7.2]
[fix]
[车辆模型错误]
2024-10-30 10:16:51 +08:00
donghongyu-pc
473d9bb991 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local
# Conflicts:
#	OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
#	OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2HPMapFragment.kt
#	OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java
#	OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt
2024-10-30 10:08:40 +08:00
renwj
540763df8f [6.7.0][HDMap][Overlay] 优化地图marker的处理逻辑;当地图控件从窗口中移除时,断开Java层与Marker之间的引用,规避内存泄露 2024-10-29 22:29:51 +08:00
donghongyu-pc
019d9b7314 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local
# Conflicts:
#	OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt
2024-10-29 17:49:38 +08:00
yangyakun
3e41bb5fa0 [6.7.2]
[fix]
[添加登录日志]
2024-10-29 17:33:01 +08:00
donghongyu-pc
80db26c489 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local 2024-10-29 14:26:26 +08:00
yangyakun
7376bd272e [6.7.2]
[fix]
[找回高精地图轨迹展示]
2024-10-29 13:21:59 +08:00
donghongyu-pc
becc43c132 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local 2024-10-29 11:48:48 +08:00
yangyakun
9547efe0de [6.7.2]
[fix]
[context 错误]
2024-10-29 10:47:01 +08:00
yangyakun
c32ca5ba0e [6.7.2]
[fix]
[动态获取]
2024-10-28 19:04:12 +08:00
donghongyu-pc
46a0aa6300 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local
# Conflicts:
#	OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
2024-10-28 18:42:54 +08:00
yangyakun
4e948fb357 [6.7.2]
[login]
[注册和反注册]
2024-10-28 18:39:36 +08:00
donghongyu-pc
6a84a43386 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local 2024-10-28 17:32:39 +08:00
yangyakun
87a9cc78c9 [6.7.2]
[fea]
[log]
2024-10-28 17:13:25 +08:00
yangyakun
58b15deea0 [6.7.2]
[fix]
[内存泄漏检测]
2024-10-28 17:12:52 +08:00
donghongyu-pc
edc52a2399 [6.7.2]
1、修改遺漏的 string 资源换肤
2024-10-28 10:38:05 +08:00