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

1066 Commits

Author SHA1 Message Date
yangyakun
67e5531d80 Merge branch 'dev_minibus-d_230322_3.0.0' into dev_robobus-d_230413_3.1.0 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt
#	OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/constant/URLConst.kt
#	OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
#	OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
#	OCH/mogo-och-common-module/build.gradle
#	OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
#	app/config/tempConfig.json
#	app/config/urlConfig.json
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt
#	gradle.properties
 2023-04-14 10:40:00 +08:00
donghongyu
7c9fc5fae5 Merge remote-tracking branch 'origin/dev_robobus-d_230322_3.0.0' into dev_robobus-d_230322_3.0.0 2023-04-13 13:11:53 +08:00
yangyakun
81e778aa84 [video] 
[视频链接回滚]
 2023-04-13 11:32:27 +08:00
yangyakun
1ff26bf25b [video] 
[视频播放不能设置一个不让轮播不起来]
 2023-04-13 10:20:31 +08:00
yangyakun
0d4fceaadb [shuttle] 
[视频播放]
 2023-04-12 22:02:33 +08:00
yangyakun
4b9dd12acc [shuttle] 
[视频播放]
 2023-04-12 20:51:13 +08:00
yangyakun
fb1dc67d25 [m2] 
[3.0.0]
[广告视频从json配置文件获取视频]
 2023-04-12 20:49:30 +08:00
yangyakun
e17f044f14 [m2] 
[3.0.0]
[m2 车模偏移-0.5f]
 2023-04-12 20:07:48 +08:00
xuxinchao
8d5465920b [dev_robobus-d_230322_3.0.0]正式环境去除端口号 
# Conflicts:
#	app/urlConfig.json
 2023-04-12 16:55:00 +08:00
yangyakun
0b3f264837 [3.0.0] 
[m2]
[ui修改、视频变更 b2视频和b1视频]
 2023-04-11 19:48:36 +08:00
yangyakun
f0f5e49078 [3.0.0] 
[m2]
[车模调整]
 2023-04-11 17:20:41 +08:00
yangyakun
c00c30d670 [video] 
[配置修改]
 2023-04-11 11:17:17 +08:00
wangmingjun
8038a94e26 [mini bus3.0.0] 司机端二维码合并问题处理 2023-04-10 17:30:41 +08:00
wangmingjun
1755396f72 [mini bus] merge 司机端二维码冲突 2023-04-10 16:36:11 +08:00
donghongyu
faa191d8f9 「dev_robobus-d_230322_3.0.0」 
1、增加
    lintOptions {
        abortOnError false
    }
 2023-04-10 14:24:03 +08:00
yangyakun
029f578c76 Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-07 20:59:44 +08:00
yangyakun
7f67ea9027 [m2] 
[3.0.0]
[广告视频从json配置文件获取视频]
 2023-04-07 20:59:34 +08:00
yangyakun
429de28e85 [m2] 
[3.0.0]
[shuttleM2司机屏车模修改]
 2023-04-07 19:27:52 +08:00
xuxinchao
2b584b3985 [dev_3.0.0]增加云南私服云通话长链配置、fix提升地图版本编译不通过问题 2023-03-31 20:41:07 +08:00
wangmingjun
393c77c9b6 [3.0.0] merge dev_robobus_network_weak_230323 2023-03-31 18:46:21 +08:00
yangyakun
fad8d4327c [map] 
[模型修改、高精地图版本升级]
 2023-03-30 16:34:16 +08:00
xuxinchao
5c03c0d07e [dev_robobus-d_230322_3.0.0]正式环境去除端口号 2023-03-29 18:31:18 +08:00
wangmingjun
ca1809bed7 [3.0.0] 司机端二维码 2023-03-29 18:16:29 +08:00
wangmingjun
7bbb65bf9c Merge branch 'dev_robobus-d_230322_3.0.0' into 'dev_robobus_network_weak_230323' 
Dev robobus d 230322 3.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!743
 2023-03-28 09:08:22 +00:00
donghongyu
c54cdf3b2f 「dev_robobus-d_230322_3.0.0」 
删除了usb-camera相关代码
 2023-03-28 15:46:30 +08:00
yangyakun
3c81e145e1 [shuttle] 
[添加ndk架构]
 2023-03-23 11:41:03 +08:00
yangyakun
2b2ec07a57 [shuttle] 
[分离shuttle]
 2023-03-23 11:37:05 +08:00
wangmingjun
7cc8498704 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!729
 2023-03-22 10:20:36 +00:00
xinfengkun
1329cb4d0d 修改说明文档 2023-03-22 11:16:17 +08:00
xinfengkun
ab2d990fa4 修改合并代码出错导致 m1档位对自动驾驶有限制问题 2023-03-22 11:10:39 +08:00
pangfan
ab08a8c597 [delivery]1.大理/烟台项目：正式环境域名配置（使用online打包） 2023-03-20 19:25:31 +08:00
renwj
8988688660 [dev_arch_opt_3.0] 添加严格模式，方便检测主线程耗时操作 2023-03-16 19:12:52 +08:00
yangyakun
2acddc210f [gradle] 
[dali、yantai add noop]
 2023-03-16 11:34:43 +08:00
wangmingjun
b0be8d5326 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!692
 2023-03-15 14:31:26 +00:00
donghongyu
ed5617240d Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-03-15 16:20:54 +08:00
donghongyu
2f7ba56064 [dev_arch_opt_3.0] 
[Change]
[
1、升级AiCloudSDK，日志打印改为原生
2、高德定位回调本地记录修改判断条件
3、升级APM版本，并对crash日志采集信息重新整理，让现场数据更加丰富辅助排查问题
4、关闭了IjkPlayer日志
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-03-15 16:16:55 +08:00
renwj
e28a2d8e25 [dev_arch_opt_3.0] 代码逻辑优化 2023-03-15 15:37:37 +08:00
renwj
16388def88 [dev_arch_opt_3.0] 代码逻辑优化 2023-03-15 15:37:03 +08:00
wangmingjun
a994018fbe 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!687
 2023-03-15 07:34:47 +00:00
renwj
c720701746 [dev_arch_opt_3.0] 解决后台启动服务崩溃 2023-03-15 15:29:58 +08:00
wangmingjun
10558693c3 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!682
 2023-03-15 06:02:34 +00:00
renwj
4fdbe43cae [dev_arch_opt_3.0] 代码逻辑优化 2023-03-14 23:13:52 +08:00
wangmingjun
47fb68c6da [M2]关闭线程优化，视频视频播放生命周期处理 2023-03-14 17:05:13 +08:00
wangmingjun
84a6795575 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] 优化TextView频繁调用setText导致的频繁绘制问题; 优化状态栏上工控机相关状态的处理逻辑

See merge request zhjt/AndroidApp/MoGoEagleEye!675
 2023-03-14 08:09:54 +00:00
renwj
33a2f2dfe4 [dev_arch_opt_3.0] 优化TextView频繁调用setText导致的频繁绘制问题; 优化状态栏上工控机相关状态的处理逻辑 2023-03-14 16:02:27 +08:00
xuxinchao
c8e02c9812 [m2]大理mis和dns正式域名配置 2023-03-14 15:13:35 +08:00
xuxinchao
6b28449c3a [m2]大理mis和dns正式域名配置 2023-03-14 15:11:58 +08:00
wangmingjun
b98e446bfe Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-14 14:27:38 +08:00
renwj
7e3abc88e0 [dev_arch_opt_3.0] 优化UiThreadHandler和ThreadUtils切换主线程的逻辑，避免主线程消息队列过多，造成卡顿 2023-03-14 14:14:40 +08:00
wangmingjun
7750720dec [M2] 车模替换 2023-03-13 10:17:00 +08:00