Commit Graph

74 Commits

Author SHA1 Message Date
yangyakun
94a19a0ad9 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
2023-02-16 19:10:22 +08:00
donghongyu
88ffcfdc71 [dev_arch_opt_3.0]
[Change]
[
1、优化在副屏幕启动调用个
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-16 18:45:04 +08:00
yangyakun
09485a49dc [m1]
[1.0.2]
[添加状态栏替换开关]
2023-02-16 17:04:11 +08:00
yangyakun
2cd8e27f75 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-16 14:14:26 +08:00
yangyakun
840af54c8d [m1]
[1.0.2]
[状态栏透明度、2560x1600 图片缩放过小]
2023-02-16 14:14:00 +08:00
wangmingjun
ceb07db52e [M2] M2 接驳司机端config配置 2023-02-16 11:17:17 +08:00
wangmingjun
e25e506725 [M2] M2 视频播放 2023-02-15 18:42:13 +08:00
yangyakun
6e5254af97 [m1]
[1.0.2]
[url 修改]
2023-02-15 15:26:33 +08:00
wangmingjun
6d75a0602f 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-15 10:57:06 +08:00
wangmingjun
4381a006b0 [M2] shuttle适配私有化和3.0架构 2023-02-15 10:56:00 +08:00
yangyakun
bfe65e75eb Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-15 10:18:54 +08:00
yangyakun
87a2c2201a [m1]
[1.0.2]
[url 全部由urlConfg.json 来进行配置]
2023-02-14 19:29:38 +08:00
zhongchao
32991f784d [2.13.0-arch-opt] binding car add config 2023-02-14 18:50:49 +08:00
yangyakun
eee29a65eb [m1]
[1.0.0]
[订单逻辑添加]
2023-02-11 14:49:41 +08:00
yangyakun
0d863ebb09 [m1]
[1.0.0]
[添加url+flavors过滤单独抽出文件]
2023-02-11 10:33:04 +08:00
wangmingjun
bc0f8e8ec4 [M2] 1、图/视频轮播opt 2、m2竖屏 2023-02-09 20:59:18 +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
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
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
94c6f2696c [gradle 渠道名修改]
[接驳车乘客端和bus乘客端代码合并通过AppIdentityModeUtils 来判断]
2023-01-31 16:53:38 +08:00
yangyakun
0714df0081 [gradle 渠道修改] 2023-01-31 14:52:21 +08:00
zhongchao
66db271f6c [2.13.0-arch-opt] merg 2023-01-30 22:29:40 +08:00
yangyakun
9aafa6d9a0 [1.0.0]
[m1]
[m1初始提交]
2023-01-29 16:26:14 +08:00
yangyakun
4eae9acbe9 [2.13.2]
[feature]
[接驳车和base添加重用代码basecommon文件夹]
2023-01-17 17:33:02 +08:00
wangmingjun
f36d467a92 [M2] 增加乘客屏M2 2023-01-16 19:18:27 +08:00
wangmingjun
9b503829c3 [merge] 合并接驳车代码 2023-01-16 17:27:27 +08:00
yangyakun
6787c122c2 [1.0.0]
[feature]
[判断是否是M1]
2023-01-16 15:44:31 +08:00
yangyakun
e565f0a403 [1.0.0]
[m1]
[乘客屏单独抽到base 下]
2023-01-13 19:34:09 +08:00
yangyakun
6862225384 [2.13.2][gradle] 命名修改 2023-01-13 11:16:34 +08:00
yangyakun
4674124add [dev_arch_opt_3.0]
[Change]
[修改业务线身份判断规则具体查看app\productFlavors\README.md]
2023-01-11 13:10:03 +08:00
yangyakun
dbf2f2e50b bus 司机乘客添加接驳flavor 2023-01-04 16:46:22 +08:00
donghongyu
f0fc8233f6 [1.1.0]
[Change]
[1、增加清扫车判断方法]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-03 20:02:21 +08:00
donghongyu
c776fcc532 [opt 3.0]
[Change]
[1、增加Taxi附屏宣传视频播放]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-12-29 14:43:24 +08:00
donghongyu
46d3a1b24b [opt 3.0]
[Change]
[1、先关闭了多个终端身份的启动逻辑,先适配「鹰眼」+宣传片的场景]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-12-29 12:05:56 +08:00
donghongyu
2974edc51c [2.13.0]
[Change]
[增加多CPU架构支持]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-12-01 10:37:32 +08:00
donghongyu
ee44bc0470 [2.13.0]
[Change]
[修复应用身份的配置问题导致Bus无法区分]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-11-29 16:01:36 +08:00
donghongyu
47161b4648 [2.13.0]
[Change]
[完成多物理设备和单设备多屏幕的工程适配;
待解决,需要处理两个身份通讯问题适配]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-11-28 22:35:19 +08:00
aibingbing
6a21e175b4 Merge branch 'master' into release_robosweeper-d_100-sweeper_220830_1.0.0.1_merge
# Conflicts:
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
#	core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapPointCloudSubscriber.kt
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
#	gradle.properties
#	libraries/mogo-adas-data/src/main/proto/message_pad.proto
#	libraries/mogo-adas-data/src/main/proto/special_vehicle_task_cmd.proto
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
2022-09-26 19:16:37 +08:00
yangyakun
2bf340dde4 [2.10.0] 遗留gradle修改、隐藏debug 2022-08-25 12:01:49 +08:00
wangmingjun
ab50e2358b [清扫车 ] sweepers->sweeper 2022-08-17 15:26:35 +08:00
wangmingjun
37d2e738a7 [清扫车 Sweepers 1.0.0] init Sweepers 2022-08-16 20:36:18 +08:00
yangyakun
b93bf36bf5 每次从桌面进入都会到首页的配置修改
关闭视频播放页不再通过startActivity传递(防止中间黑屏)
2022-07-15 19:03:03 +08:00
xuxinchao
2583333174 美化模式
1、美化模式去掉SP缓存,只需要本地内存保存即可
2、美化模式默认设为关闭
2022-06-13 19:28:46 +08:00
donghongyu
dd8f1d53ff 「Change」
调试面板增加了指定端口号连接工控机,防止办公室环境出现抢占IP情况

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-04-02 17:33:40 +08:00
pangfan
931ecf9597 [BusPassenger v1.0.0]Bus乘客端恢复为"乘客"角色(APP_IDENTITY_MODE改回0xA1) 2022-04-02 10:53:58 +08:00
pangfan
bf21cb1dac [BusPassenger v1.0.0]Bus乘客端module init(v1.0.0实际在单屏车上做为司机端使用,APP_IDENTITY_MODE暂改为0xA0) 2022-03-30 11:28:17 +08:00
donghongyu
e447fb1a3e [Change]
增加未知类型绘制开关按钮
增加未知类型计数

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-01 18:46:47 +08:00
pangfan
95776f95a8 [v2.5.4]OCH: 司机/乘客-Taxi/Bus身份区分逻辑优化 2022-02-28 16:31:27 +08:00
donghongyu
64f886b741 [Change]
修改默认连接ip防止办公室冲突

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-25 18:16:53 +08:00
donghongyu
26b1982c51 [Change]
开始直播功能开发

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-24 18:42:25 +08:00