yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge dev2_aiSdk_datalink

Browse Source
This commit is contained in:
zhongchao
2021-06-07 11:01:02 +08:00
parent cc08be60df a8e44f2d43
commit 07fca42513
183 changed files with 2780 additions and 8609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
View File

@@ -51,7 +51,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.WindowUtils;
import com.mogo.utils.logger.Logger;
@@ -481,7 +480,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
}
@Override
public void changeMapVisualAngle(VisualAngleMode angelMode) {
public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) {
}
@@ -1052,7 +1051,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
@Override
public long getTileId(double lon, double lat) {
return getMap().getUIController().getTileId(lon,lat);
return getMap().getUIController().getTileId(lon, lat);
}
@Override

3
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java
View File

@@ -46,7 +46,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.NetworkUtils;
import com.mogo.utils.WindowUtils;
import com.mogo.utils.logger.Logger;
@@ -384,7 +383,7 @@ public class AMapViewWrapper implements IMogoMapView,
}
@Override
public void changeMapVisualAngle(VisualAngleMode angelMode) {
public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) {
}

64
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java
View File

@@ -14,7 +14,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.logger.Logger;
import java.util.List;
@@ -48,11 +47,11 @@ public class AMapUIController implements IMogoMapUIController {
}
public void initClient(IMogoMapUIController client) {
Logger.d( "whatthefuck-AMapUIController", "init %s", this );
Logger.d("whatthefuck-AMapUIController", "init %s", this);
this.mClient = client;
}
public synchronized void destroy(){
public synchronized void destroy() {
mClient = null;
}
@@ -69,7 +68,7 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
public MapControlResult changeZoom( boolean zoom) {
public MapControlResult changeZoom(boolean zoom) {
if (mClient != null) {
return mClient.changeZoom(zoom);
}
@@ -86,14 +85,14 @@ public class AMapUIController implements IMogoMapUIController {
@Override
public void changeMapMode(EnumMapUI mode) {
Logger.d( "whatthefuck-AMapUIController", "%s", this );
Logger.d("whatthefuck-AMapUIController", "%s", this);
if (mClient != null) {
mClient.changeMapMode(mode);
}
}
@Override
public void changeMapVisualAngle(VisualAngleMode angelMode) {
public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) {
}
@@ -118,15 +117,15 @@ public class AMapUIController implements IMogoMapUIController {
@Override
public void emphasizeMyLocation() {
if ( mClient != null ) {
if (mClient != null) {
mClient.emphasizeMyLocation();
}
}
@Override
public void showMyLocation( View view ) {
if ( mClient != null ) {
mClient.showMyLocation( view );
public void showMyLocation(View view) {
if (mClient != null) {
mClient.showMyLocation(view);
}
}
@@ -139,7 +138,7 @@ public class AMapUIController implements IMogoMapUIController {
@Override
public void loseLockMode() {
if ( mClient != null ) {
if (mClient != null) {
mClient.loseLockMode();
}
}
@@ -152,7 +151,7 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
public void displayOverview( Rect bounds ) {
public void displayOverview(Rect bounds) {
if (mClient != null) {
mClient.displayOverview(bounds);
}
@@ -198,7 +197,8 @@ public class AMapUIController implements IMogoMapUIController {
return null;
}
@Override public MogoLatLng getWindowCenterLocation() {
@Override
public MogoLatLng getWindowCenterLocation() {
if (mClient != null) {
return mClient.getWindowCenterLocation();
}
@@ -230,7 +230,7 @@ public class AMapUIController implements IMogoMapUIController {
@Override
public void startJumpAnimation(IMogoMarker marker, float high, Interpolator interpolator,
long duration) {
long duration) {
if (mClient != null) {
mClient.startJumpAnimation(marker, high, interpolator, duration);
}
@@ -244,9 +244,9 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
public void showBounds( String tag, MogoLatLng carPosition, List< MogoLatLng > lonLats, Rect bound, boolean lockCarPosition ) {
if ( mClient != null ) {
mClient.showBounds( tag, carPosition, lonLats, bound, lockCarPosition );
public void showBounds(String tag, MogoLatLng carPosition, List<MogoLatLng> lonLats, Rect bound, boolean lockCarPosition) {
if (mClient != null) {
mClient.showBounds(tag, carPosition, lonLats, bound, lockCarPosition);
}
}
@@ -258,55 +258,55 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
public float calculateLineDistance( MogoLatLng p1, MogoLatLng p2 ) throws Exception {
if ( mClient != null ) {
return mClient.calculateLineDistance( p1, p2 );
public float calculateLineDistance(MogoLatLng p1, MogoLatLng p2) throws Exception {
if (mClient != null) {
return mClient.calculateLineDistance(p1, p2);
}
return 0;
}
@Override
public EnumMapUI getCurrentUiMode() {
if ( mClient != null ) {
if (mClient != null) {
return mClient.getCurrentUiMode();
}
return null;
}
@Override
public void changeMyLocation( Location location ) {
if ( mClient != null ) {
mClient.changeMyLocation( location );
public void changeMyLocation(Location location) {
if (mClient != null) {
mClient.changeMyLocation(location);
}
}
@Override
public boolean isCarLocked() {
if ( mClient != null ) {
if (mClient != null) {
return mClient.isCarLocked();
}
return false;
}
@Override
public void setCarCursorOption( CarCursorOption option ) {
if ( mClient != null ) {
mClient.setCarCursorOption( option );
public void setCarCursorOption(CarCursorOption option) {
if (mClient != null) {
mClient.setCarCursorOption(option);
}
}
@Override
public MapCameraPosition getMapCameraPosition() {
if ( mClient != null ) {
if (mClient != null) {
return mClient.getMapCameraPosition();
}
return null;
}
@Override
public void changeBearing( float bearing ) {
if ( mClient != null ) {
mClient.changeBearing( bearing );
public void changeBearing(float bearing) {
if (mClient != null) {
mClient.changeBearing(bearing);
}
}

2
libraries/map-custom/build.gradle
View File

@@ -67,7 +67,7 @@ dependencies {
implementation project(':foudations:mogo-commons')
}
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.33'
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.44'
// implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
}

67
libraries/map-custom/map-version-update
View File

@@ -11,4 +11,69 @@ mapAutoView.getMapAutoViewHelper()?.setMapViewVisualAngle(type）
type 0=近景 1=中景 2=远景
视角切换监听事件
mapAutoView.setOnMapViewVisualAngleChangeListener
mapAutoView.setOnMapViewVisualAngleChangeListener
8.5.17
更新了顺义数据
8.5.19
修改自车模型
8.5.22
修改自车模型
2D锚点缩放功能
普通模式poi显示问题
8.5.24
优化渲染时间
更新衡阳数据
临时处理绘制3D模型策略
8.5.25
修改远景下拖动地图偶现黑屏问题
关闭部分多余日志
8.5.26
更新顺义高精数据
优化渲染效率
修改切换后台黑屏问题
8.5.28
修改远视角高度bug并修正切换动画
修改路牌显示
修改红绿灯摄像头显示bug
优化渲染效率
8.5.29
添加了3D锚点动画
近远景切换，会导致车道线渲染不全
修改地图移动方法
8.5.31
修改近景切换
添加自动开启定位开关
修改桥模型
mapAutoView.getMapAutoViewHelper()?.setNearViewAnglePosition（LonLatPoint(112.57392375608,26.830652231402)）切换近视角
8.5.32
解决崩溃问题
8.5.33
更新顺义衡阳数
8.5.34
高精数据放到redis
8.5.35
修改绿化带显示问题
暂时对sdk去掉混淆，方便crash定位
解决bugly #304037 问题
8.5.38
修改崩溃bug
更换最新的摄像头和红绿灯
8.5.40
修改崩溃bug
更新路牌数据
修改近视角切换

15
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
View File

@@ -17,7 +17,6 @@ import android.view.animation.Interpolator;
import android.widget.TextView;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.voice.AIAssist;
import com.mogo.map.IMogoMap;
import com.mogo.map.IMogoMapView;
import com.mogo.map.MogoLatLng;
@@ -35,7 +34,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.TipToast;
import com.mogo.utils.UiThreadHandler;
import com.mogo.utils.logger.Logger;
@@ -376,12 +374,21 @@ public class AMapViewWrapper implements IMogoMapView,
}
@Override
public void changeMapVisualAngle(VisualAngleMode angelMode) {
public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) {
MapAutoViewHelper mapAutoViewHelper = mMapView.getMapAutoViewHelper();
if (mapAutoViewHelper != null) {
Logger.d(TAG, " 用户更改视距 currentThread : " + Thread.currentThread().getName());
mVisualAngleMode = angelMode;
mapAutoViewHelper.setMapViewVisualAngle(angelMode.getCode());
if (angelMode == MODE_CLOSE_SIGHT) {
if (mogoLatLng == null) {
Logger.e(TAG, "切换地图近景需要传入要移动的经纬度数据");
return;
}
// 近景传入经纬度为点击地图上静态marker经纬度数据，为GPS坐标点。
mapAutoViewHelper.setNearViewAnglePosition(new LonLatPoint(mogoLatLng.lon, mogoLatLng.lat), true);
} else {
mapAutoViewHelper.setMapViewVisualAngle(angelMode.getCode());
}
}
}

3
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
View File

@@ -95,7 +95,8 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder {
public IMogoMapView getMapView( Context context ) {
Log.d(TAG,"setDebugMode==true");
NavAutoApi.INSTANCE.init( context, MapParams.Companion.init()
.setDebugMode( false )
.setDebugMode( true )
.setDataFileSource(1) //todo 使用本地地图数据
.setCoordinateType( MapParams.COORDINATETYPE_GCJ02 )
.setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D )
.setZoom( 20 )

6
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
View File

@@ -14,7 +14,7 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.logger.Logger;
import com.zhidaoauto.map.sdk.open.MapAutoApi;
import org.json.JSONObject;
@@ -88,9 +88,9 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
public void changeMapVisualAngle(VisualAngleMode angelMode) {
public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) {
if (mClient != null) {
mClient.changeMapVisualAngle(angelMode);
mClient.changeMapVisualAngle(angelMode, mogoLatLng);
}
}

4
libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java
View File

@@ -35,7 +35,9 @@ public abstract class MogoBaseMapView extends FrameLayout implements ILifeCycle
private void init( Context context ) {
addMapView( context );
MogoMap.getInstance().init( getContext(), mMapView.getMap() );
if (mMapView != null){
MogoMap.getInstance().init( getContext(), mMapView.getMap() );
}
}
protected abstract void addMapView( Context context );

1
libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java
View File

@@ -1,5 +1,6 @@
package com.mogo.map.listener;
import android.util.Log;
import android.view.MotionEvent;
import com.mogo.map.MogoLatLng;

3
libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java
View File

@@ -42,7 +42,7 @@ public interface IMogoMarkerManager {
void removeMarkers( String tag );
/**
* 移除地图上所有markers
* 移除地图上添加的所有markers
*/
void removeMarkers();
@@ -63,6 +63,7 @@ public interface IMogoMarkerManager {
* @return
*/
List< IMogoMarker > getMarkers( String tag );
/**
* 获取所有类型的marker。
*

3
libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
View File

@@ -11,7 +11,6 @@ import androidx.annotation.Nullable;
import com.mogo.map.MogoLatLng;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.anim.OnMarkerAnimationListener;
import com.mogo.realtime.entity.ADASRecognizedResult;
import org.json.JSONObject;
@@ -54,7 +53,7 @@ public interface IMogoMapUIController {
*
* @param angelMode {@link VisualAngleMode}
*/
void changeMapVisualAngle(VisualAngleMode angelMode);
void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng);
/**
* 获得当前地图视距模式

5
libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
View File

@@ -13,7 +13,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.logger.Logger;
import org.json.JSONObject;
@@ -93,11 +92,11 @@ public class MogoMapUIController implements IMogoMapUIController {
}
@Override
public void changeMapVisualAngle(VisualAngleMode angelMode) {
public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) {
initDelegate();
if (mDelegate != null) {
Logger.d(TAG, "set VisualAngle: %s", angelMode.name());
mDelegate.changeMapVisualAngle(angelMode);
mDelegate.changeMapVisualAngle(angelMode, mogoLatLng);
}
}

19
libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java
View File

@@ -74,6 +74,16 @@ public class MogoMarkerManager implements IMogoMarkerManager {
MogoMarkersHandler.getInstance().removeAll();
}
@Override
public void visibleAllMarkers() {
MogoMarkersHandler.getInstance().visibleAll();
}
@Override
public void inVisibleAllMarkers() {
MogoMarkersHandler.getInstance().inVisibleAll();
}
@Override
public List< IMogoMarker > getMarkers( String tag ) {
return MogoMarkersHandler.getInstance().getMarkers( tag );
@@ -99,13 +109,4 @@ public class MogoMarkerManager implements IMogoMarkerManager {
// RouteOverlayHelper.getInstance().removeAll();
}
@Override
public void visibleAllMarkers() {
}
@Override
public void inVisibleAllMarkers() {
}
}

4
libraries/tanlulib/build.gradle
View File

@@ -67,13 +67,15 @@ dependencies {
implementation rootProject.ext.dependencies.arouter
kapt rootProject.ext.dependencies.aroutercompiler
implementation rootProject.ext.dependencies.mogoaicloudtanlu
if (Boolean.valueOf(RELEASE)) {
implementation rootProject.ext.dependencies.mogoutils
implementation rootProject.ext.dependencies.mogocommons
implementation rootProject.ext.dependencies.mogomap
implementation rootProject.ext.dependencies.mogoserviceapi
} else {
implementation project(":foudations:mogo-utils")
implementation project(':modules:mogo-module-common')
implementation project(':libraries:mogo-map')
implementation project(':services:mogo-service-api')

5
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt
View File

@@ -2,6 +2,7 @@ package com.zhidao.roadcondition.model
import android.util.Log
import com.google.gson.Gson
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.network.Utils
import com.mogo.module.common.constants.HostConst
import com.zhidao.roadcondition.base.BaseRepository
@@ -13,7 +14,7 @@ class StrategyServiceModel : BaseRepository() {
suspend fun getCityStrategy(): BaseResponse<Results> {
return apiCall {
val map = hashMapOf<String, String>()
map["sn"] = Utils.getSn()
map["sn"] = MoGoAiCloudClientConfig.getInstance().getSn()
val locInfo = LocationUtil.getInstance().getLocationInfo()
map["data"] = Gson().toJson(
StrategyRequest(
@@ -31,7 +32,7 @@ class StrategyServiceModel : BaseRepository() {
val informationBodyStr = Gson().toJson(informationBody)
Log.d("MainServiceController", "uploadInformation informationBody = $informationBodyStr")
HttpClient.getInstance(HostConst.DEVA_HOST).getHttpApi()
.uploadInformation(mapOf("sn" to Utils.getSn(), "data" to informationBodyStr))
.uploadInformation(mapOf("sn" to MoGoAiCloudClientConfig.getInstance().getSn(), "data" to informationBodyStr))
}
}
}

3
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
View File

@@ -4,6 +4,7 @@ import android.text.TextUtils
import android.util.Log
import com.hw.videoprocessor.VideoProcessor
import com.mogo.cloud.network.BaseData
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.cloud.tanlu.api.ITanluUploadCallback
import com.mogo.cloud.tanlu.api.MogoUploadManager
import com.mogo.cloud.tanlu.bean.UploadInfo
@@ -499,7 +500,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
info.direction = direction
info.areaCode = areaCode
info.cityCode = cityCode
info.sn = Utils.getSn()
info.sn = MoGoAiCloudClientConfig.getInstance().getSn()
info.type = type //0为图片， 1为视频
info.fromType = fromType
info.mainInfoId = mainInfoId

7
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
View File

@@ -2,8 +2,9 @@ package com.zhidao.roadcondition.util
import android.content.Context
import com.elegant.analytics.Analytics
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.network.Utils
import com.mogo.commons.network.Utils.getFotaVersion
import java.util.HashMap
const val CarNet_Alive:String = "CarNet_Alive"//探路日活DAU埋点
@@ -45,8 +46,8 @@ fun trackNormalEvent(event: String, _data: MutableMap<String, Any>?, context: Co
val localParams = HashMap<String, Any>()
//公共参数 time sn
localParams["time"] = System.currentTimeMillis()
localParams["systemversion"] = getSystemVersion(context)
localParams["sn"] = Utils.getSn()
localParams["systemversion"] = getFotaVersion()
localParams["sn"] = MoGoAiCloudClientConfig.getInstance().getSn()
Analytics.getInstance().track(event, data)
}

19
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/DeviceUtil.kt
View File

@@ -1,19 +0,0 @@
@file:JvmName("DeviceInfo")
package com.zhidao.roadcondition.util
import android.content.Context
fun getSystemVersion(context: Context): String {
try {
val cls = context.classLoader
val systemProperties = cls.loadClass("android.os.SystemProperties")
val paramTypes = String::class.java
val get = systemProperties.getMethod("get", paramTypes)
val version = get.invoke(systemProperties, "ro.fota.version") as String
return if (!version.trim().isNullOrEmpty()) version.trim() else ""
} catch (e: Exception) {
e.printStackTrace()
}
return ""
}

3
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
View File

@@ -3,6 +3,7 @@ package com.zhidao.roadcondition.util
import android.util.Log
import com.google.gson.JsonArray
import com.google.gson.JsonObject
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.network.Utils
import com.zhidao.roadcondition.model.InformationBody
@@ -53,7 +54,7 @@ fun getInformationBody(
if (latitude == 0.0) locationInfo.latitude else latitude,
if (longitude == 0.0) locationInfo.longitude else longitude,
locationInfo.provinceName,
Utils.getSn(),
MoGoAiCloudClientConfig.getInstance().getSn(),
locationInfo.street,
type,
0,