Commit Graph

11614 Commits

Author SHA1 Message Date
wangmingjun
bb3d44e452 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-10 19:37:43 +08:00
wangmingjun
77c49061a9 [M2] 1、图/视频轮播优化 2023-02-10 19:37:34 +08:00
yangyakun
dee933fe9d Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-10 15:13:16 +08:00
yangyakun
e6413c71c7 [m1]
[1.0.0]
[添加日志]
2023-02-10 15:02:03 +08:00
yangyakun
6d7f7309c6 [m1]
[1.0.0]
[回写并展示禁止再向底盘传递数据]
2023-02-09 23:42:54 +08:00
wangmingjun
bc0f8e8ec4 [M2] 1、图/视频轮播opt 2、m2竖屏 2023-02-09 20:59:18 +08:00
yangyakun
c388eec1f0 [m1]
[1.0.0]
[暖风机禁止温度选择、关闭空调状态设置温度、设置、风速 不进行数据传递]
2023-02-09 18:30:45 +08:00
wangmingjun
e39a0cba18 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/productFlavors/fMultiDisplayOchBus.gradle
#	app/productFlavors/fMultiDisplayOchTaxi.gradle
#	app/productFlavors/fOchBus.gradle
#	app/productFlavors/fOchBusPassengerM1.gradle
#	app/productFlavors/fOchSweeper.gradle
#	app/productFlavors/fOchTaxi.gradle
#	app/productFlavors/fOchTaxiPassenger.gradle
2023-02-09 16:04:05 +08:00
wangmingjun
b4199874cf [M2] M2 广告模块opt 2023-02-09 15:48:48 +08:00
yangyakun
2f524d2ed0 [m1]
[1.0.0]
[灯光会写完成]
2023-02-09 15:38:42 +08:00
donghongyu
67b0980cd8 [dev_arch_opt_3.0]
[Change]
[
1、增加副屏幕启动页面的工具及说明书
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-09 15:36:05 +08:00
donghongyu
9f92fdecd9 [dev_arch_opt_3.0]
[Change]
[
1、productFlavors渠道中增加动态控制屏幕方向的参数,SCREEN_ORIENTATION:landscape--强制横屏,portrait--强制竖屏
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-09 15:20:30 +08:00
yangyakun
5edd005b30 [m1]
[1.0.0]
[瞬间点击触发]
2023-02-09 15:06:30 +08:00
donghongyu
8cb4374cd0 [dev_arch_opt_3.0]
[Change]
[
1、增加读取getprop,获取设备sn、型号
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-09 13:56:11 +08:00
wangmingjun
d850462bff Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!512
2023-02-09 03:27:24 +00:00
donghongyu
b032c79777 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-02-08 20:47:22 +08:00
donghongyu
89b038054d [dev_arch_opt_3.0]
[Change]
[
1、关闭一些狂刷的日志
2、增加EB5获取SN的方法,但系统有限制,需要先adb root ;setenforce 0 ,需要等系统厂商修改下
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-08 20:47:16 +08:00
zhongchao
b9a966bd41 [2.13.0-arch-opt] track obj open loc 2023-02-08 18:01:04 +08:00
yangyakun
93a3ccb09b Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-08 17:23:21 +08:00
xinfengkun
8109320ecf [adas lib]金旅M1 顶灯1 顶灯2控制方法拆解 2023-02-08 17:21:22 +08:00
zhongchao
79ee956859 [2.13.0-arch-opt] gradle fix 2023-02-08 17:17:37 +08:00
lixiaopeng
bc83dd608e [dev_arch_opt_3.0] 去掉obu 不在bus乘客显示的功能 2023-02-08 16:00:10 +08:00
lixiaopeng
14c3d97296 [dev_arch_opt_3.0] 优化魔方长按 2023-02-08 15:10:15 +08:00
donghongyu
a1506c731c [dev_arch_opt_3.0]
[Change]
[
1、解决地图加载异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-08 11:34:54 +08:00
yangyakun
3caf13d71b [m1]
[1.0.0]
[距离ui]
2023-02-08 00:30:49 +08:00
zhongchao
2ea96f15a2 [2.13.0-arch-opt] fix bug of day light mode in map and battery charge 2023-02-07 22:40:14 +08:00
yangyakun
71b66d87c7 [m1]
[1.0.0]
[och delete IMogoStatusChangedListener,add Map view and debugview toggle]
2023-02-07 22:13:20 +08:00
zhongchao
8490801138 [2.13.0-arch-opt] move impl of modules from hmi to app 2023-02-07 22:12:04 +08:00
donghongyu
81a22a63cf [dev_arch_opt_3.0]
[Change]
[
1、修复同步定位gcj02异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 21:18:27 +08:00
donghongyu
96fe00083f [dev_arch_opt_3.0]
[Change]
[
1、关闭经纬度记录操作
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 21:05:02 +08:00
donghongyu
1dcfe9c551 [dev_arch_opt_3.0]
[Change]
[
1、修改小地图缩放比例
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 21:04:11 +08:00
donghongyu
d8e2029fa5 [dev_arch_opt_3.0]
[Change]
[
1、彻底解决地图跳变问题,原因是因为位置转变GCJ02时候将经纬度设置回去了,从而引起位置异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 20:57:49 +08:00
donghongyu
daf51c78ce [dev_arch_opt_3.0]
[Change]
[
1、删除地图中废弃的定位回掉方法
2、修改小地图监听位置更改的方式,设置为10HZ,更新地图解决跳变问题
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 18:45:58 +08:00
yangyakun
4d70be9cad Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-07 16:58:12 +08:00
yangyakun
96f33bc3df Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-07 16:57:41 +08:00
chenfufeng
7ae724c3f0 [Opt]小地图Fragment改为View 2023-02-07 16:29:55 +08:00
donghongyu
68f40db975 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java
2023-02-07 15:47:18 +08:00
donghongyu
d0ce252b4d [dev_arch_opt_3.0]
[Change]
[
1、删除废弃地图中的方法
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 15:44:58 +08:00
zhongchao
01c0cd54ac [2.13.0-arch-opt] merge 2023-02-07 15:19:44 +08:00
zhongchao
555bdc3bcb [2.13.0-arch_opt] sweep add map view 2023-02-07 15:06:33 +08:00
zhongchao
1548c607da [2.13.0-arch-opt] merge 2023-02-07 15:06:28 +08:00
zhongchao
a382fc36c1 [2.13.0-arhc-opt] merge 2023-02-07 15:00:25 +08:00
lixiaopeng
ed71827687 [dev_arch_opt_3.0] 拆分通过工控机的v2i事件的回调方法 2023-02-07 14:21:47 +08:00
wangmingjun
bf171e25bd [M2] M2 图片+视频轮播opt 2023-02-06 21:01:23 +08:00
wangmingjun
eb929dec00 [M2] M2 行程信息UI初稿 2023-02-06 19:38:28 +08:00
wangmingjun
95e41e4e94 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-06 19:37:36 +08:00
yangyakun
fcffab4db0 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-06 18:50:17 +08:00
chenfufeng
2c6684b617 [Opt]全览模式View和业务分离 2023-02-06 18:45:38 +08:00
xinfengkun
2ce02f2a5b [ADAS LIB][opt3.0]更新监控字段 2023-02-06 18:40:47 +08:00
yangyakun
0b8faa797e [1.0.0]
[m1]
[dialogFragment 弹出底部bar的问题]
2023-02-06 18:29:25 +08:00