Commit Graph

3973 Commits

Author SHA1 Message Date
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
yangyakun
a92f1c07f0 [6.7.2]
[fix]
[重置数据]
2024-10-25 19:15:42 +08:00
yangyakun
38421638a1 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local
# Conflicts:
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningModel.kt
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt
2024-10-25 18:47:45 +08:00
yangyakun
f280f1bda0 [6.7.2]
[fea]
[线程检测]
2024-10-25 18:30:46 +08:00
donghongyu-pc
f282ff858c [6.7.2]
1、完成高精地图上3D元素动态替换,
2024-10-25 18:19:28 +08:00
yangyakun
ec6ee7d45c [6.7.2]
[fea]
[实时系统 完成任务需要网络]
2024-10-25 18:04:09 +08:00
donghongyu-pc
3c1e333625 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local 2024-10-25 17:52:25 +08:00
donghongyu-pc
41710d4507 Merge remote-tracking branch 'origin/dev_robotaxi-d_240912_6.7.2_local' into dev_robotaxi-d_240912_6.7.2_local 2024-10-25 17:52:14 +08:00
donghongyu-pc
ce79c18d09 [6.7.2]
1、升级换肤框架SDK,增加 app:isUseSkin="true" 属性用来开启换肤,防止换肤对代码动态设置的数据、图片造成冲刷。
2024-10-25 17:51:52 +08:00
yangyakun
76d1ec93b5 [6.7.2]
[fea]
[滑动出发和到站流程强制流转]
2024-10-25 17:29:13 +08:00
yangyakun
7e6ddbafb8 [6.7.0]
[fix]
[正在刷新直接返回成功]
2024-10-25 17:22:41 +08:00
yangyakun
bf2659d6e2 [6.7.2]
[fea]
[皮肤信息]
2024-10-25 16:47:28 +08:00
donghongyu-pc
77330ea364 Merge remote-tracking branch 'origin/dev_robotaxi-d_240912_6.7.2_local' into dev_robotaxi-d_240912_6.7.2_local 2024-10-25 14:58:15 +08:00
donghongyu-pc
32584b8979 [6.7.2]
1、修复配置的皮肤包MD5与云端文件不一样导致加载失败
2024-10-25 14:58:04 +08:00
yangyakun
f3910a1e56 [6.7.0]
[fix]
[正在刷新直接返回成功]
2024-10-25 14:27:23 +08:00
yangyakun
ca44fc3724 [6.7.0]
[fea]
[核销支持]
2024-10-25 14:27:00 +08:00
donghongyu-pc
d10d63835d Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local 2024-10-25 13:23:16 +08:00
yangyakun
9a2e6065c4 [6.7.0]
[fix]
[运营统计页面]
2024-10-25 12:28:42 +08:00
yangyakun
a1df14e290 [6.7.0]
[fix]
[核销问题]
2024-10-25 11:48:43 +08:00
donghongyu-pc
c54d035203 Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local 2024-10-25 11:12:42 +08:00
donghongyu-pc
dd58db2bac [6.7.2]
1、修复广告视频播放的占位图的皮肤适配。
2024-10-25 11:12:12 +08:00
yangyakun
05b39b7bc2 [6.7.0]
[适配]
[1536x2560 运营单]
2024-10-25 10:33:57 +08:00
donghongyu-pc
653a75d8e8 Merge remote-tracking branch 'origin/dev_robotaxi-d_240912_6.7.2_local' into dev_robotaxi-d_240912_6.7.2_local 2024-10-25 10:30:19 +08:00
donghongyu-pc
956d1652cc [6.7.2]
1、修复换肤SDK 在Fragment没有生效的问题,原因是使用的LayoutInflater不是hook后的需要替换为LayoutInflater.from(getContext())
2024-10-25 10:30:03 +08:00
donghongyu-pc
8794695c9d Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local
# Conflicts:
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt
2024-10-25 10:15:33 +08:00
yangyakun
a72a97ea8c [6.7.0]
[适配]
[1536x2560]
2024-10-25 09:52:44 +08:00
yangyakun
52ea40970b [6.7.0]
[fix]
[退出登录环境还原]
2024-10-24 15:40:04 +08:00
yangyakun
8935db43db [6.7.2]
[fea]
[退出登录环境还原]
2024-10-24 15:21:14 +08:00
donghongyu-pc
76f57f2991 Merge remote-tracking branch 'origin/dev_robotaxi-d_240912_6.7.2_local' into dev_robotaxi-d_240912_6.7.2_local 2024-10-24 13:59:08 +08:00
donghongyu-pc
cac58449d1 [6.7.2]
1、增加【德清*下渚湖】皮肤包
2024-10-24 13:58:43 +08:00
yangyakun
2a5293ab1b [6.7.2]
[fea]
[post 转get]
2024-10-24 13:56:16 +08:00
donghongyu-pc
3032702d53 [6.7.2]
1、完善易鑫皮肤包资源
2024-10-24 13:16:16 +08:00
donghongyu-pc
77a8ef20fb [6.7.2]
1、升级皮肤SDK,完成视频文件的raw拷贝
2、完成视频换肤资源替换
2024-10-24 12:51:29 +08:00
yangyakun
d603fa783a Merge remote-tracking branch 'origin/dev_robotaxi-d_240912_6.7.2_local' into dev_robotaxi-d_240912_6.7.2_local
# Conflicts:
#	OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java
2024-10-23 18:07:56 +08:00