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

1493 Commits

Author SHA1 Message Date
zhongchao
2b6f280ae0 [2.13.2-arch-opt] fix bug of limit 2023-02-16 19:46:12 +08:00
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
zhongchao
63204a14ad [2.13.0-arch-opt]fix bug 2023-02-16 18:37:52 +08:00
wangmingjun
5fec54c0a0 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 16:45:41 +08:00
wangmingjun
674bef10f5 [处理bus司机端编译错误] 2023-02-16 16:45:12 +08:00
yangyakun
aaf16795cb [m1] 
[1.0.2]
[车模、地图定位]
 2023-02-16 15:43:10 +08:00
yangyakun
51abbbf68c Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-16 14:14:13 +08:00
yangyakun
840af54c8d [m1] 
[1.0.2]
[状态栏透明度、2560x1600 图片缩放过小]
 2023-02-16 14:14:00 +08:00
wangmingjun
f1db0fd613 [M2] M2 opt 2023-02-16 10:25:35 +08:00
yangyakun
ec7ef2161d [1.0.0] 
[m1]
[文案修改、时间显示时分秒]
 2023-02-16 07:56:44 +08:00
yangyakun
208dcf2699 [1.0.0] 
[m1]
[视频播放图片调整]
 2023-02-16 00:38:56 +08:00
zhongchao
4bec76e02d [2.13.0-arch-opt] fix bug of thread problem and add new func obu fusion and warning union 2023-02-15 21:09:19 +08:00
wangmingjun
84f38d0aba 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 21:00:27 +08:00
wangmingjun
b8c7334c92 [M2] M2 高精地图设置marker 2023-02-15 21:00:19 +08:00
yangyakun
dd60740ae0 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 20:10:58 +08:00
yangyakun
0385d6e7e9 [m1] 
[1.0.2]
[2s禁止开关灯、滚动设置]
 2023-02-15 20:10:44 +08:00
wangmingjun
142028bd75 [M2] M2 全览地图 2023-02-15 20:01:46 +08:00
renwj
e2707eaf33 [dev_arch_opt_3.0]优化顶视角切换逻辑 2023-02-15 19:54:24 +08:00
wangmingjun
e25e506725 [M2] M2 视频播放 2023-02-15 18:42:13 +08:00
wangmingjun
f2ba02ad59 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!523
 2023-02-15 09:18:47 +00:00
yangyakun
00204b31ed [m1] 
[1.0.2]
[默认速度、空调2s后进行失败提示]
 2023-02-15 16:40:21 +08:00
donghongyu
a7ab13c4c1 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-02-15 16:25:34 +08:00
donghongyu
b572b1e999 [dev_arch_opt_3.0] 
[Change]
[
1、优化获取设备SN标志，设备序列号>AndroidID>随机ID
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-15 16:25:29 +08:00
zhongchao
7b85574d62 :[2.13.0-arch-opt] bug fix 2023-02-15 16:15:28 +08:00
yangyakun
5116cf369b Merge branch 'dev_RoboBus_P_230213_1.0.2' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-15 15:37:28 +08:00
wangmingjun
3e2866f508 [M2] M2 UI 2023-02-15 15:13:58 +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
7bea175eaf Merge remote-tracking branch 'origin/dev_RoboBus_P_230213_1.0.2' into dev_RoboBus_P_230213_1.0.2 2023-02-15 10:17:56 +08:00
yangyakun
206f491751 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_RoboBus_P_230213_1.0.2 2023-02-15 08:06:15 +08:00
wangmingjun
336b6030b6 [M2] M2 opt 2023-02-14 21:00:13 +08:00
zhongchao
84d1de4079 [2.13.0-arch-opt] local code opt 2023-02-14 20:48:42 +08:00
zhongchao
7a44fc53b4 [2.13.0-arch-opt] turn light view opt and fix noop fragment bug 2023-02-14 20:27:25 +08:00
wangmingjun
528bd96049 [M2] M2 司机端乘客屏通信 2023-02-14 20:18:56 +08:00
yangyakun
87a2c2201a [m1] 
[1.0.2]
[url 全部由urlConfg.json 来进行配置]
 2023-02-14 19:29:38 +08:00
wangmingjun
75625a41d8 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!520
 2023-02-14 10:22:01 +00:00
yangyakun
d2f1012722 [m1] 
[1.0.2]
[有速度的情况下不允许开门、温度选择左右判断固定]
 2023-02-14 18:18:54 +08:00
wangmingjun
0979e5fd79 [M2] M2 状态栏 2023-02-14 18:08:35 +08:00
wangmingjun
614ce77859 [M2] M2 图片+视频链接 2023-02-14 16:02:43 +08:00
zhongchao
4f25b0fd43 [2.13.0-arch-opt] merge 2.14.0 line id func 2023-02-14 15:17:40 +08:00
wangmingjun
1ebfd603c5 [M2] M2 pnc UI 2023-02-14 14:50:14 +08:00
wangmingjun
f563753889 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-14 14:13:16 +08:00
wangmingjun
84a5f426eb [M2] M2 转向灯 2023-02-14 14:13:11 +08:00
yangyakun
16a0eb74e8 [m1] 
[1.0.2]
[车速和开关门]
 2023-02-14 14:01:15 +08:00
yangyakun
dfe39842e2 [m1] 
[1.0.0]
[温度选中修改配置]
 2023-02-13 22:08:31 +08:00
yangyakun
38a882b3e5 [m1] 
[1.0.0]
[样式修改]
 2023-02-13 21:33:15 +08:00
wangmingjun
d17c29d048 [M2] M2 UI 红绿灯，地图样式文件 2023-02-13 20:08:39 +08:00
yangyakun
1e83fd5566 [m1] 
[1.0.0]
[状态栏通过Arout获取]
 2023-02-13 19:36:50 +08:00
yangyakun
9c8e35bfb2 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-13 18:54:18 +08:00