yangyakun
|
b24e2443f3
|
Merge branch 'dev_robotaxi-d_231205_6.2.6' into dev_robotaxi-d_231218_6.2.6
# Conflicts:
# OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
|
2023-12-18 11:28:25 +08:00 |
|
yangyakun
|
58a35b2bfc
|
[6.2.6]
[taxi-u-p]
[路程信息]
|
2023-12-18 08:51:46 +08:00 |
|
aibingbing
|
0871d7c9d8
|
[宣传视频] refactor: taxi无人化乘客屏 增加数据后台可配置，本次本地数据抽取到json配置文件中，因为之前taxi都是视频文件且可全屏，本次新增图片展示但是增加限制图片不可全屏；
|
2023-12-15 20:51:31 +08:00 |
|
aibingbing
|
2a9e9b5314
|
[Sweeper] refactor: 删除无用文件；
|
2023-12-15 17:45:18 +08:00 |
|
aibingbing
|
4675d14fe8
|
[宣传视频] refactor: 宣传视频播放重构，B2乘客屏使用common中组件，同时activity因为涉及网络请求不适合放入单独进程，先放入主进程；
|
2023-12-15 17:42:55 +08:00 |
|
aibingbing
|
713fca2df3
|
Merge branch 'dev_robotaxi-d_231206_6.2.4' into dev_robotaxi-d_231206_6.2.4_video_refactor
|
2023-12-15 16:31:20 +08:00 |
|
aibingbing
|
14c6ef8029
|
[宣传视频] refactor: 宣传视频播放重构 step4, 相关类和文件重新命名 ;
|
2023-12-15 16:30:22 +08:00 |
|
aibingbing
|
bb44cc3d6f
|
[宣传视频] refactor: 宣传视频播放重构 step3 ;
|
2023-12-14 19:26:51 +08:00 |
|
aibingbing
|
cdbba2af3a
|
[宣传视频] refactor: 宣传视频播放重构 step3 ;
|
2023-12-14 19:24:48 +08:00 |
|
zhongchao
|
360e3ac169
|
[6.2.4]merge
|
2023-12-14 15:28:45 +08:00 |
|
xinfengkun
|
f1113767c1
|
[626][adas] 能否启动自驾检测接口新增原始数据字段
|
2023-12-13 18:16:50 +08:00 |
|
aibingbing
|
600548ea9d
|
[宣传视频] refactor: 宣传视频播放重构 step2 ;
|
2023-12-12 18:12:13 +08:00 |
|
aibingbing
|
606cab9fe0
|
[宣传视频] refactor: 宣传视频播放重构 step1 ;
|
2023-12-11 20:09:50 +08:00 |
|
yangyakun
|
af7d211ad0
|
[6.2.6]
[taxi-u-p]
[启动自驾和手机号验证]
|
2023-12-11 19:16:55 +08:00 |
|
zhongchao
|
62fd8336d6
|
[6.2.4] code clean
|
2023-12-08 11:27:01 +08:00 |
|
yangyakun
|
03eab8ba7f
|
[6.2.4]
[charter]
[还车成功后退出自驾]
|
2023-12-08 09:50:43 +08:00 |
|
yangyakun
|
8a636d1e5c
|
[6.2.4]
[fix]
[set value]
|
2023-12-08 09:50:37 +08:00 |
|
yangyakun
|
69ff9ff4f5
|
[6.2.4]
[charter]
[还车成功后退出自驾]
|
2023-12-07 19:30:46 +08:00 |
|
aibingbing
|
0c6b9229df
|
[Taxi无人化] refactor: DebugView 增加展示 轨迹保存时间，最新数据查询成功时间 等信息展示和优化；
|
2023-12-07 18:43:11 +08:00 |
|
zhongchao
|
2643dc2332
|
[6.2.4] code style
|
2023-12-07 17:31:35 +08:00 |
|
zhongchao
|
96304d6541
|
[6.2.4] fix sonarbug
|
2023-12-07 17:07:46 +08:00 |
|
yangyakun
|
02199849e9
|
[6.2.4]
[fix]
[set value]
|
2023-12-07 17:03:09 +08:00 |
|
yangyakun
|
a778d20c44
|
[6.2.6]
[taxi_u_p]
[mv rename fix]
|
2023-12-07 16:30:53 +08:00 |
|
yangyakun
|
3654798303
|
[6.2.6]
[taxi_u_p]
[mv rename]
|
2023-12-07 16:11:21 +08:00 |
|
yangyakun
|
9291445f9a
|
[6.2.6]
[taxi_u_p]
[arrived dest]
|
2023-12-07 15:36:59 +08:00 |
|
yangyakun
|
e449b8a00d
|
[6.2.6]
[bus_p_m2]
[接口适配完毕]
|
2023-12-07 10:28:16 +08:00 |
|
yangyakun
|
4e32d0bd29
|
[6.2.6]
[bus_p_m2]
[页面创建完成]
|
2023-12-06 20:42:31 +08:00 |
|
yangyakun
|
51c16b55d4
|
[6.2.6]
[bus_p]
[mv file]
|
2023-12-06 19:24:13 +08:00 |
|
yangyakun
|
e3fffc0ac6
|
[6.2.4]
[bus_p_jl]
[mv file]
|
2023-12-06 17:42:09 +08:00 |
|
yangyakun
|
39863abe1e
|
[6.2.4]
[shuttle_p_m2]
[turnlight]
|
2023-12-06 16:45:07 +08:00 |
|
zhongchao
|
9bda271c10
|
[6.2.4] union v2x and init trace file and extends trace of common param
|
2023-12-06 16:45:04 +08:00 |
|
xuxinchao
|
50613f6502
|
Merge branch 'dev_robotaxi-d_231201_6.2.4_dev' into dev_robotaxi-d_231206_6.2.4
|
2023-12-06 16:43:12 +08:00 |
|
yangyakun
|
420cecaf93
|
[6.2.4]
[shuttle_p_m2]
[move file]
|
2023-12-06 16:35:50 +08:00 |
|
aibingbing
|
75bc00f935
|
[自主算路验证] fix: 选择灰度列表activity高度展示不全问题，原因是虚拟键盘的影响；
|
2023-12-06 14:56:44 +08:00 |
|
yangyakun
|
bfa28c1269
|
[6.2.4]
[bus、shuttle]
[结束任务时 取消自驾]
|
2023-12-06 14:54:09 +08:00 |
|
yangyakun
|
331e95de0d
|
[6.2.6]
[shuttle-jl]
[rename]
|
2023-12-06 14:19:59 +08:00 |
|
yangyakun
|
d6ed5d59cb
|
[6.2.6]
[shuttle-jl]
[灯UI och]
|
2023-12-06 13:50:27 +08:00 |
|
yangyakun
|
1b676d34a3
|
[6.2.6]
[shuttle-jl]
[切换位置]
|
2023-12-06 10:30:00 +08:00 |
|
yangyakun
|
4e107b54e7
|
[6.2.6]
[shuttle-jl]
[资源整理]
|
2023-12-05 19:08:02 +08:00 |
|
zhongchao
|
5b40018700
|
[6.2.4] fix bug of request in main thread
|
2023-12-05 14:30:10 +08:00 |
|
yangyakun
|
ae0c0cf7e6
|
[6.2.6]
[common]
[合并]
|
2023-12-05 11:37:14 +08:00 |
|
aibingbing
|
05ed63a358
|
Merge branch 'dev_robotaxi-d_231129_6.2.2_routing_verify' into dev_robotaxi-d_231201_6.2.2
# Conflicts:
# core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
|
2023-12-04 20:58:15 +08:00 |
|
aibingbing
|
9b4b7e99b6
|
[自主算路验证] refactor: 算路验证模式 高德导航距离，时间不准问题；
|
2023-12-04 20:15:35 +08:00 |
|
aibingbing
|
f53b6ed553
|
[自主算路验证] feat: 增加 验证时起点和终点 高精地图Marker ;
|
2023-12-04 17:00:29 +08:00 |
|
yangyakun
|
cce998c410
|
Merge branch 'release_robotaxi-d_231031_6.2.0.2' into 6.2.0_merge_master
# Conflicts:
# OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java
# OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
# OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java
# OCH/sweeper/sweeper/build.gradle
# OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
# OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java
# app/script/functions/och.gradle
# app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
# core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
# core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
# core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
# core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
|
2023-12-04 11:01:17 +08:00 |
|
aibingbing
|
04e7e20c37
|
[自主算路验证] fix: 进行模式切换后 无人化页面 不能刷新问题，原因为Model，ViewModel，Fragment的绑定问题，当Fragment重建后绑定了新ViewModel, 同时Model是单例，但是Model绑定的ViewModel还是上一个，就会导致数据传递到ViewModel后不能正确传递给新Fragment;
refactor: TaskWithOrder equals 时字段问题；
refactor: 模式切换 和 登出 类似，有些变量需要同等重置；
|
2023-12-01 21:45:52 +08:00 |
|
aibingbing
|
9a6af41952
|
[自主算路验证] fix: debug包不展示mock按钮；
|
2023-12-01 17:24:13 +08:00 |
|
aibingbing
|
45c4ac8652
|
Merge branch 'dev_robotaxi-d_231031_6.2.0' into dev_robotaxi-d_231129_6.2.2_routing_verify
|
2023-12-01 13:31:43 +08:00 |
|
zhongchao
|
39cb22cc59
|
[6.2.0] union the sp call
|
2023-12-01 11:48:25 +08:00 |
|
aibingbing
|
5ae0afeb2c
|
Merge branch 'dev_robotaxi-d_231031_6.2.0' into dev_robotaxi-d_231129_6.2.2_routing_verify
|
2023-11-30 19:30:20 +08:00 |
|