Commit Graph

114 Commits

Author SHA1 Message Date
chenfufeng
cb1363dc81 修正一下导入的类的包名
Signed-off-by: chenfufeng <chenfufeng@zhidaoauto.com>
2021-09-24 20:43:33 +08:00
chenfufeng
bbb5bc8aa2 解决BuildConfig依赖冲突的问题
Signed-off-by: chenfufeng <chenfufeng@zhidaoauto.com>
2021-09-24 20:00:08 +08:00
liujing
a4631f7880 Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_check
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	gradle.properties
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
2021-09-15 18:09:27 +08:00
董宏宇
5139a2f6e1 解决了一些发布maven的版本依赖,但是卡在了mogo-module-share 2021-09-03 20:01:05 +08:00
董宏宇
add55b0cb7 升级自研地图
版本	日志
1.0.1-vr-1.0.6
1.增加分区域获取高精数据功能
2.增加设置车相对于屏幕底部的位置
3.修改渲染线的绘制方式
4.增加动态3D模型
2021-08-30 12:10:40 +08:00
董宏宇
ff017d4adf Merge branch 'feature/feature_show_dispatch' into feature/feature_mogo_obu
# Conflicts:
#	.idea/gradle.xml
#	.idea/misc.xml
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
#	OCH/mogo-och-taxi/src/main/res/values/strings.xml
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	config.gradle
#	foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java
#	foudations/mogo-aicloud-services-apk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
#	foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
#	foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java
#	gradle.properties
#	libraries/map-custom/build.gradle
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/spi/SPIRealTimeUpload.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service-api/src/main/java/com/mogo/service/connection/IMogoSocketManager.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java
2021-08-30 11:59:44 +08:00
liujing
f1fc89b3b1 [add] 首页监听车辆监控状态,修改检测入口预警标识的显示状态 2021-08-26 19:02:24 +08:00
liujing
48c22a391e 非自动驾驶模式打开检测任务,测试数据,后续根据产品需求做修改 2021-08-24 19:49:47 +08:00
liujing
e791cb84cc 网络信号加tts播报提示(测试数据,需求无tts播报) 2021-08-24 15:31:43 +08:00
liujing
3ada9738ff 添加测试数据 2021-08-02 21:08:20 +08:00
董宏宇
674c420771 更改联想PAD启动小智语音的时机 2021-08-02 12:21:29 +08:00
liujing
ae0586d572 获取包名,补充监听内容占位 2021-07-30 15:43:25 +08:00
liujing
bbb3203d64 信号强弱判断 2021-07-30 12:49:59 +08:00
liujing
59b8e0ce55 增加网络信号强度 2021-07-30 11:45:37 +08:00
liujing
3d72bd0dfd 添加网络监控 2021-07-29 21:02:13 +08:00
董宏宇
6e3d93ee2c 更改联想PAD启动小智语音的时机 2021-07-24 00:50:44 +08:00
lixiaopeng
b797cb53af add map version 2021-07-20 15:10:40 +08:00
董宏宇
6293c072dd Complete small map draw polyline 2021-06-28 20:14:57 +08:00
zhongchao
c598b44866 wait to finish of mockdata 2021-06-16 17:28:24 +08:00
lianglihui
8bd6fb19b7 新增鹰眼识别车辆类型:卡车,自行车 2021-06-11 15:58:02 +08:00
zhongchao
504fc47132 changed the getSn and visual func 2021-05-27 21:13:36 +08:00
董宏宇
223fc500a8 完成最优车道连调 2021-05-07 18:51:20 +08:00
董宏宇
a2ef2bbd44 完成最优路线的颜色梯度计算
增加逻辑,3D模式下关闭道路事件连线的绘制
2021-04-16 17:53:54 +08:00
董宏宇
533809bb61 删除无用测试数据 2021-04-13 18:05:42 +08:00
zhongchao
8fa4e0b746 .. 2021-04-12 15:54:55 +08:00
zhongchao
b6603b7b5b fix bug of SP and frontLive time 2021-04-09 16:02:36 +08:00
wangcongtao
2de05d7d86 升级aisdk版本,修改依赖 2021-02-26 10:15:18 +08:00
zhongchao
d4fcf51537 replace network module 2021-02-23 16:43:56 +08:00
wangcongtao
233ba7b89f Merge branch 'qa_merge_shunyi_vr_map' into dev2
# Conflicts:
#	config.gradle
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
2021-01-26 09:26:48 +08:00
wangcongtao
425ddf1489 opt 2021-01-21 15:01:05 +08:00
tongchenfei
f63579bd11 Merge dev_mogo_httpdns
there are some conflicts:
 both modified:   foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
        both modified:   gradle.properties
        both modified:   modules/mogo-module-share/consumer-rules.pro
        both modified:   modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
2021-01-14 14:45:53 +08:00
tongchenfei
8acdfbbe2e merge branch 2021-01-07 19:33:30 +08:00
wangcongtao
8e5767fd6c Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9
# Conflicts:
#	services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java
2021-01-07 18:59:09 +08:00
wangcongtao
610d599d43 优化已知问题 2021-01-07 18:13:54 +08:00
unknown
8be440d6b2 proguard 2021-01-05 19:18:12 +08:00
tongchenfei
a121f3d2bd httpdns singleton 2021-01-05 14:02:48 +08:00
unknown
ee9ff0c457 Merge branch 'dev_1.1.9' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_1.1.9 2021-01-05 10:11:49 +08:00
unknown
becc8b2ff5 add proguard 2021-01-05 10:11:00 +08:00
unknown
17cd8c57e3 proguard 2021-01-04 16:29:06 +08:00
tongchenfei
dff433ee65 替换ViewUtils.fromView实现 2020-12-29 19:07:26 +08:00
tongchenfei
ed309f942b opt http dns 2020-12-29 11:19:33 +08:00
董宏宇
5aeb73a39d Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map 2020-12-22 13:02:30 +08:00
董宏宇
0b8c5205ef 修复了小地图自定义样式没有生效的bug,原因是高德地图的问题,解决方案如下
aMap.setOnMapLoadedListener(new AMap.OnMapLoadedListener() {

            @Override
            public void onMapLoaded() {
                //Log.w("onMapLoaded", "===onMapLoaded====");
                // 高德地图有bug,所以需要多次调用设置皮肤才能成功
                if (options != null) {
                    options.setCustomMapStylePath(styleFilePath);
                    mAMapNaviView.setViewOptions(options);
                }

                //设置希望展示的地图缩放级别
                CameraUpdate cameraUpdate = CameraUpdateFactory.zoomTo(12);
                aMap.moveCamera(cameraUpdate);
            }
        });
2020-12-22 13:00:48 +08:00
wangcongtao
ea3518b676 opt 2020-12-22 11:21:53 +08:00
wangcongtao
548af4227a Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map
# Conflicts:
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
2020-12-18 10:55:59 +08:00
wangcongtao
036d85df1e opt 2020-12-18 10:55:17 +08:00
tongchenfei
7848be8ea6 opt traffic light panel 2020-12-17 20:04:00 +08:00
wangcongtao
578a5fc383 opt 2020-12-14 19:16:40 +08:00
wangcongtao
78646d6842 opt 2020-12-08 14:08:53 +08:00
wangcongtao
e1082ac994 opt 2020-12-07 16:30:37 +08:00