Commit Graph

13492 Commits

Author SHA1 Message Date
lixiaopeng
a3e889ed8b [dev_robotaxi-d-app-module_2132_221223_2.13.2] 统一taxi和bus obu的ip 2023-02-09 17:41:35 +08:00
lixiaopeng
a92732e704 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-09 16:27:27 +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
xinfengkun
53f2c79d4b [adas lib]工控机透传OBU V2I数据精度转换 2023-02-09 15:42:09 +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
zhongchao
5b467bffde [2.14.0] remove unuse code 2023-02-09 15:30:15 +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
zhongchao
0d13d80aa5 [2.14.0] add func of line id upload 2023-02-09 15:06:21 +08:00
lixiaopeng
3775693a5d Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-09 15:00:09 +08:00
lixiaopeng
7e25e5b43d [dev_arch_opt_3.0] 去掉之前obu的v2i总的回调数据 2023-02-09 15:00:02 +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
bxb
80954b63f8 [清扫车]代码合并冲突修改 2023-02-08 17:04:08 +08:00
zhongchao
61b81add48 [2.13.2-sop] fix bug of thread in visual and update map version 2023-02-08 16:03:21 +08:00
bxb
3ba25fff31 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye into dev_robosweeper-d_app-module_221230_1.1.0
 Conflicts:
	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
2023-02-08 16:02:01 +08:00
lixiaopeng
bc83dd608e [dev_arch_opt_3.0] 去掉obu 不在bus乘客显示的功能 2023-02-08 16:00:10 +08:00
bxb
e6a7d291c6 [清扫车]上装逻辑修改 2023-02-08 15:56:38 +08:00
donghongyu
f567b4f971 [dev_arch_opt_3.0]
[Change]
[
1、解决合并3.0的分支
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-08 15:37:16 +08:00
lixiaopeng
14c3d97296 [dev_arch_opt_3.0] 优化魔方长按 2023-02-08 15:10:15 +08:00
xuxinchao
0b40392b25 [2.14.0]BadCase三期-录包管理 2023-02-08 14:53:37 +08:00
donghongyu
f4507a7d0f Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts:
#	OCH/mogo-och-sweeper/build.gradle
#	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/BaseSweeperTabFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
#	OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
2023-02-08 14:40:42 +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
f8e74754f9 [2.14.0] wait to finish 2023-02-07 22:52:34 +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
zhongchao
fbd15b4db0 [2.13.3] add func btn of roma style change 2023-02-07 21:08:34 +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
xuxinchao
87543b9696 [2.14.0]BadCase三期-录包管理 2023-02-07 20:15:48 +08:00
renwj
044050a4e6 [2.14.0][build] 打包失败问题修正 2023-02-07 19:26:37 +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
lixiaopeng
4f4a337c1b [dev_robotaxi-d-app-module_2132_221223_2.13.2] 优化魔方的按键 2023-02-07 18:07:42 +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