yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,144 Commits 1 Branch 0 Tags
ed8900aab33c701a75b08ee5dc0f10a1224a9176
Commit Graph

12144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangmingjun
ed8900aab3 [charter] 添加获取当前时间 2023-03-06 17:41:32 +08:00
wangmingjun
e87c6b3417 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-06 17:29:45 +08:00
wangmingjun
eba6745983 [bus] 司机度端点击效果跟之前保持一致 2023-03-06 17:29:33 +08:00
yangyakun
4e337a22f6 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-06 17:21:30 +08:00
yangyakun
784d255c21 [m1] 
[1.1.2]
[关闭空调不修改状态]
 2023-03-06 17:19:54 +08:00
wangmingjun
ef0b645359 Merge branch 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-06 16:37:27 +08:00
wangmingjun
91ab0d0931 [shuttle/charter/bus] 1、解决司机端底部按钮阴影问题 2、M1司机端速度监听 3、M2乘客屏地图样式更改 2023-03-06 16:35:06 +08:00
xuxinchao
d2fd81d576 [m1]MIS和HttpDNS接口域名支持配置 2023-03-06 14:59:08 +08:00
yangyakun
1e2ed63ba6 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-06 11:54:00 +08:00
yangyakun
f706807228 [m1] 
[1.1.2]
[乘客屏到站结束自驾、启动自驾需要重置靠边停车状态]
 2023-03-06 11:53:46 +08:00
wangmingjun
082930ec9e [shuttle/charter] 解决司机端小地图车标问题 2023-03-06 11:21:53 +08:00
yangyakun
e9d2c5a7cb [m1] 
[1.1.2]
[距离问题、包含问题]
 2023-03-05 22:31:04 +08:00
yangyakun
9d5e66edc3 Rename .java to .kt 2023-03-05 22:31:04 +08:00
yangyakun
3f13c2491a [m1] 
[1.1.2]
[选择时最后一个站点自动选中]
 2023-03-05 20:08:18 +08:00
yangyakun
4cb527c7c9 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-05 20:01:24 +08:00
aibingbing
acaaac6b30 refactor: 网络状态 新增是否是以太网的判断； 2023-03-05 14:34:23 +08:00
yangyakun
165ba9b010 [m1] 
[1.1.2]
[结束订单进行靠边停车指令、全览添加终点站]
 2023-03-04 16:29:16 +08:00
yangyakun
281078ff48 [m1] 
[1.1.2]
[靠边停车后启动自驾需要重置靠边停车状态、确认线路和站点后弹出车控tab、添加靠边停车日志]
 2023-03-04 13:52:12 +08:00
wangmingjun
ac0f902240 [shuttle] 离站播报逻辑保持跟接驳一致 2023-03-04 08:36:50 +08:00
wangmingjun
854b9af5e5 [M1] 烟台私有化 + 多语音 2023-03-03 23:59:05 +08:00
wangmingjun
eaae7a4033 Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' 
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!652
 2023-03-03 15:05:33 +00:00
yangyakun
bd92b592c2 [m1] 
[1.1.2]
[订单结束、车辆未还页面变更、站点可以添加注释]
 2023-03-03 21:59:19 +08:00
zhongchao
6018926211 [2.13.0-arch-opt] thread change to main 2023-03-03 18:16:18 +08:00
zhongchao
835a547ad8 [2.13.0-arch-opt] code opt 2023-03-03 18:16:18 +08:00
wangmingjun
f5c5f1536c Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
#	app/build.gradle
#	app/functions/och.gradle
#	app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
 2023-03-03 17:29:34 +08:00
wangmingjun
7bca36646f [M2] 找回telematicConstant类 2023-03-03 17:19:57 +08:00
lixiaopeng
d30cbb2bda Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-03-03 17:02:43 +08:00
chenfufeng
525d1827df [Opt3.0]思必驰TTS兼容多语言的API 2023-03-03 17:02:51 +08:00
lixiaopeng
cc7591f918 [dev_arch_opt_3.0] 优化代码 2023-03-03 17:02:36 +08:00
chenfufeng
460f9b3d36 [Opt3.0]解决偶现连接不上的问题 2023-03-03 16:37:38 +08:00
lixiaopeng
0bc8b79b73 [dev_arch_opt_3.0] 去掉运营面板无用的开关控制 2023-03-03 16:33:43 +08:00
wangmingjun
8a1616f94a Merge branch 'dev_RoboBus_P_230220_1.0.1' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' 
# Conflicts:
#   app/build.gradle
 2023-03-03 07:34:23 +00:00
wangmingjun
2d6bb763db [M2] 找回telematicConstant类 2023-03-03 15:31:23 +08:00
yangyakun
e8a5f2097d [m1] 
[1.1.2]
[merge error]
 2023-03-03 15:16:33 +08:00
yangyakun
a0bcbb5cb8 [m1] 
[1.1.2]
[dimension 修改]
 2023-03-03 14:56:52 +08:00
yangyakun
73082244c1 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 
# Conflicts:
#	app/build.gradle
#	app/functions/och.gradle
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt
 2023-03-03 14:54:30 +08:00
wangmingjun
8d0d82459f [M2] 处理偶现结束订单乘客屏不更新问题 2023-03-03 14:41:28 +08:00
donghongyu
60c33ac089 [dev_arch_opt_3.0] 
[Change]
[
1、解决少引用import android.content.Context
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-03-03 14:37:03 +08:00
donghongyu
292d491bac Merge remote-tracking branch 'origin/dev_arch_opt_3.0_back_camera' into dev_arch_opt_3.0_back_camera 2023-03-03 14:22:19 +08:00
donghongyu
aea12d173a [dev_arch_opt_3.0] 
[Change]
[
1、修复多屏幕因连接屏幕树数量不够导致启动异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-03-03 14:21:50 +08:00
wangmingjun
5d794b1474 [M1 司机端] 修复到计时bug 2023-03-03 13:19:12 +08:00
renwj
3605f62e6c [dev_arch_opt_3.0]捕获aispeech相关崩溃 2023-03-03 12:21:30 +08:00
donghongyu
a8a0ff0ffd [dev_arch_opt_3.0] 
[Change]
[
1、修复多屏幕因连接屏幕树数量不够导致启动异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-03-03 12:19:25 +08:00
yangyakun
215f94f1c6 [m1] 
[1.1.2]
[打包过滤]
 2023-03-03 12:04:34 +08:00
zhongchao
6f76e38ec2 [2.13.0-arch-opt] fix bug of npc 2023-03-03 11:27:42 +08:00
yangyakun
96dc2b19c0 [m1] 
[1.1.2]
[引用问题]
 2023-03-03 09:19:05 +08:00
yangyakun
58acd2994b [m1] 
[1.1.2]
[业务BUSINESS_STRING包裹类修改]
 2023-03-03 08:42:22 +08:00
wangmingjun
c84f56a08b Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_RoboBus_P_230220_1.0.1' 
Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!642
 2023-03-02 13:52:45 +00:00
wangmingjun
3769f191c0 [M2] 处理轮询问题 2023-03-02 21:37:32 +08:00
wangmingjun
25e81e96e8 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 
# Conflicts:
#	app/build.gradle
#	app/functions/och.gradle
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt
 2023-03-02 21:06:00 +08:00