yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,867 Commits 1 Branch 0 Tags
94de2bf3222c627008277f40e93d51543e8a9eff
Commit Graph

3550 Commits

Author SHA1 Message Date
yangyakun
0b8faa797e [1.0.0] 
[m1]
[dialogFragment 弹出底部bar的问题]
 2023-02-06 18:29:25 +08:00
xinfengkun
a613dcd259 [adas lib]能否启动自驾以及启动命令下发后成功或失败统计优化 2023-02-06 16:20:27 +08:00
wangmingjun
f8cb2e4389 [M2] M2 定位接口修改 2023-02-06 16:14:57 +08:00
yangyakun
1bf5ac91cf [1.0.0] 
[m1]
[监听回调添加频率现在1s5次]
 2023-02-06 15:08:56 +08:00
yangyakun
211c702fb0 [1.0.0] 
[m1]
[温度调整]
 2023-02-06 15:08:33 +08:00
yangyakun
8be7ac4f0e [1.0.0] 
[m1]
[空白点击关闭]
 2023-02-06 11:47:42 +08:00
yangyakun
272b1c16e8 [1.0.0] 
[m1]
[声音的部分调整]
 2023-02-06 10:47:56 +08:00
yangyakun
382fd6b95d [1.0.0] 
[m1]
[温度页面调整、灯光默认关闭]
 2023-02-06 10:18:56 +08:00
yangyakun
aefe51fa86 [1.0.0] 
[m1]
[温度页面]
 2023-02-04 18:04:32 +08:00
yangyakun
a9b6f886de 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-04 16:58:03 +08:00
yangyakun
e4f0492a2a [1.0.0] 
[m1]
[回写提示]
 2023-02-04 16:57:12 +08:00
bxb
1f43e60bff 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/view/SweeperTrafficLightView.kt
 2023-02-03 18:21:10 +08:00
bxb
d616e4bc6d [清扫车]上装面板基本逻辑和人工驾驶地图添加 2023-02-03 18:19:17 +08:00
wangmingjun
c4ee394cc0 [M2] M2 添加pnc,转向，红绿灯组件 2023-02-03 16:49:24 +08:00
yangyakun
ae2a06d050 文件夹修改导致'kotlin-android-extensions'出现的问题 2023-02-03 09:53:39 +08:00
yangyakun
8fb9a1d6cc Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-02 21:18:02 +08:00
yangyakun
49397cdc8b Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
#	app/src/main/AndroidManifest.xml
 2023-02-02 21:01:24 +08:00
zhongchao
40e9fdb708 [2.13.0-arch-opt] merge 2023-02-02 20:59:42 +08:00
yangyakun
15df79ff01 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-02 20:58:35 +08:00
yangyakun
d032e77f6e dev_arch_opt_3.0]全局预览放入业务类中 2023-02-02 20:56:17 +08:00
wangmingjun
94c45440e2 [M2] M2 opt 2023-02-02 19:57:28 +08:00
donghongyu
111940123f [dev_arch_opt_3.0] 
[Change]
[
1、完成工控机数据和高德GPS地图数据的数据中心，以及工控机数据超时后的自动切换为高德地图GPS数据
定位监听已重构，CallerChassisLocationGCJ20ListenerManager---高的坐标系，CallerChassisLocationWGS84ListenerManager--高精坐标系，之前代码已修改，大家后续项目中根据需要进行订阅，如需控制频率可在订阅时
// 设置数据回调频率，单位HZ，1HZ的周期是1秒；50HZ的周期是1/50=0.02秒；10HZ的周期是1/10=0.1秒。
CallerChassisLocationWGS84ListenerManager.setListenerHz(Companion.functionName, 20)
CallerChassisLocationGCJ20ListenerManagersetListenerHz(Companion.functionName, 20)
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-02 19:24:38 +08:00
yangyakun
404f72ea3f [m1 1.0.0] 
[空调设置除了温度调整其他搞定]
 2023-02-02 17:33:44 +08:00
yangyakun
8814f5947d Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java
#	OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt
 2023-02-02 12:05:53 +08:00
yangyakun
2c5bbe1c17 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-02 12:02:37 +08:00
yangyakun
474b2d0d1d [m1 1.0.0] 
[剩余设置、图片替换]
 2023-02-02 11:53:39 +08:00
donghongyu
72bbf6b464 [dev_arch_opt_3.0] 
[Change]
[
1、解决红绿灯倒计时文字显示异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-01 20:20:49 +08:00
donghongyu
6bfef5fa43 [dev_arch_opt_3.0] 
[Change]
[
1、修复清扫车红绿灯展示
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-01 20:08:09 +08:00
xuxinchao
2ee6e2a417 [2.14.0]消息盒子 2023-02-01 19:55:29 +08:00
wangmingjun
faf0d0864e [2.14.0] bus乘客屏两个站点也计算两个站点之间的距离，不直接使用轨迹 2023-02-01 19:43:52 +08:00
donghongyu
fdecd41783 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt
 2023-02-01 19:41:41 +08:00
zhongchao
d7c5bf4e46 [2.13.0-arch-opt] fix bug of och-taxi xml 2023-02-01 18:19:31 +08:00
zhongchao
25663f087b [2.13.0-arch-opt] merge 2023-02-01 17:57:36 +08:00
xuxinchao
f9eeef8cb9 [Opt3.0]消息盒子 2023-02-01 16:26:53 +08:00
wangmingjun
a159035e10 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-01 14:04:34 +08:00
wangmingjun
faf01c7373 [opt] m2 2023-02-01 14:03:46 +08:00
yangyakun
bc24620f7c Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 
# Conflicts:
#	app/productFlavors/fPadLenovo.gradle
 2023-02-01 12:54:53 +08:00
yangyakun
c201f3f0cf [m1 1.0.0] 
[控制车辆设置]
 2023-01-31 20:57:58 +08:00
yangyakun
9d599bfe1b [m1 1.0.0] 
[车辆控制灯光控制]
 2023-01-31 19:43:25 +08:00
donghongyu
acd1b3b584 [dev_arch_opt_3.0] 
[Change]
[
1、修复依赖关系重复
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-31 18:53:35 +08:00
donghongyu
67e3fb6f6d Merge remote-tracking branch 'origin/dev_robosweeper-d_app-module_221230_1.1.0' into dev_robosweeper-d_app-module_221230_1.1.0 2023-01-31 17:55:15 +08:00
donghongyu
7ea53b06cc [dev_arch_opt_3.0] 
[Change]
[
1、修复限速合并冲突
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-31 17:55:08 +08:00
bxb
1bf71b4c38 [清扫车]任务列表切换到当前任务简单逻辑处理 2023-01-31 17:38:23 +08:00
donghongyu
417db47d77 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
#	OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
 2023-01-31 17:25:18 +08:00
donghongyu
c591a30752 [dev_arch_opt_3.0] 
[Change]
[
1、修复清扫车红绿灯View初始化异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-31 17:11:33 +08:00
xuxinchao
0a10c1876c [Opt3.0]消息盒子 2023-01-31 16:56:57 +08:00
yangyakun
94c6f2696c [gradle 渠道名修改] 
[接驳车乘客端和bus乘客端代码合并通过AppIdentityModeUtils 来判断]
 2023-01-31 16:53:38 +08:00
zhongchao
d3f0ac654b [2.13.0-arch-opt] fix bug of limit speed and move view 2023-01-31 15:28:42 +08:00
yangyakun
0714df0081 [gradle 渠道修改] 2023-01-31 14:52:21 +08:00
donghongyu
6bc41b01fa [dev_arch_opt_3.0] 
[Change]
[
1、TODO 清扫车限速有问题
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-31 11:45:10 +08:00