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

merge och

Browse Source
This commit is contained in:
suyong
2021-06-10 18:59:11 +08:00
parent 961297e5cb 8482dc389c
commit f585851cb2
87 changed files with 879 additions and 1156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
View File

@@ -16,7 +16,6 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.commons.network.Utils;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.adas.AdasDataListener;
import com.mogo.module.adas.AdasProvider;
@@ -50,7 +49,6 @@ import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode;
import com.zhidao.adasconfig.common.config.EnumCarHeading;
import com.zhidao.adasconfig.common.config.EnumSkinStyle;
import com.zhidao.autopilot.support.api.AutopilotServiceManage;
import com.zhidao.autopilot.support.api.IAutopolitDataCallBack;
import com.zhidao.autopilotservice.model.AdasAIDLAutopilotArriveModel;
import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel;
import com.zhidao.autopilotservice.model.AdasAIDLOwnerCarRectModel;
@@ -127,12 +125,12 @@ public class MogoADASController implements IMogoADASController {
*/
private final Handler mAdasRecognizedRecHandler = new Handler(WorkThreadHandler.newInstance("AdasRecognizedRecThread").getLooper()) {
@Override
public void handleMessage( Message msg ) {
super.handleMessage( msg );
if ( msg.obj instanceof List ) {
mAdasDataListener.notifyOwnerCarRect( ( List< AdasAIDLOwnerCarRectModel > ) msg.obj );
} else if(msg.obj == null ){
mAdasDataListener.notifyOwnerCarRect( null );
public void handleMessage(Message msg) {
super.handleMessage(msg);
if (msg.obj instanceof List) {
mAdasDataListener.notifyOwnerCarRect((List<AdasAIDLOwnerCarRectModel>) msg.obj);
} else if (msg.obj == null) {
mAdasDataListener.notifyOwnerCarRect(null);
}
}
};
@@ -187,7 +185,14 @@ public class MogoADASController implements IMogoADASController {
model.setYt(bean.getYt());
model.setDistance_x(bean.getDistance_x());
model.setDistance_y(bean.getDistance_y());
model.setType(bean.getType());
String type;
if (TextUtils.isEmpty(bean.getType())) {
type = "100";
Logger.d(TAG, " === ADAS 返回结果出现 type 为 null情况 ====");
} else {
type = bean.getType();
}
model.setType(type);
model.setLat(bean.getLat());
model.setLon(bean.getLon());
model.setHeading(bean.getHeading());
@@ -204,8 +209,8 @@ public class MogoADASController implements IMogoADASController {
data.add(model);
Log.d("ADAS数据延时", "uuid : " + bean.getUuid() + "systemTime : " + System.currentTimeMillis() + " GPS time" + Long.parseLong(bean.getSystemTime())
+ " timeDelay : " + (System.currentTimeMillis() - Long.parseLong(bean.getSystemTime())));
Log.d("ADAS数据延时", "uuid : " + bean.getUuid() + " type : " + bean.getType() + "systemTime : " + System.currentTimeMillis() + " GPS time" + Long.parseLong(bean.getSystemTime())
+ " timeDelay : " + (System.currentTimeMillis() - Long.parseLong(bean.getSystemTime())));
// Log.d("ADAS原始数据", "uuid : " + bean.getUuid() + " type : " + bean.getType());
Logger.d(TAG, "识别距离：x = %s, y = %s", model.getDistance_x(), model.getDistance_y());
@@ -323,15 +328,15 @@ public class MogoADASController implements IMogoADASController {
if (SingletonsHolder.get(IMogoStatusManager.class).isVrMode()) {
return;
}
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
init( AbsMogoApplication.getApp() );
Logger.d(TAG, Log.getStackTraceString(new Throwable()));
init(AbsMogoApplication.getApp());
adasProvider.addAdasStatusListener(new AdasStatusListener() {
@Override
public void onServiceConnected() {
super.onServiceConnected();
Logger.d( TAG, "adas statuslistener connected & send sn");
BasicInfo info=new BasicInfo();
info.setSn(MoGoAiCloudClientConfig.getInstance().getSn()+"xavier");
info.setSn(MoGoAiCloudClientConfig.getInstance().getSn());
AdasManager.getInstance().setBasicInfo(info);
invokeShowADASOperation();
@@ -341,18 +346,18 @@ public class MogoADASController implements IMogoADASController {
@Override
public void onServiceDisconnected() {
Logger.d( TAG, "adas statuslistener disconnected");
Logger.d(TAG, "adas statuslistener disconnected");
super.onServiceDisconnected();
}
});
invokeShowADASOperation();
if ( mAdasDataListener == null ) {
if (mAdasDataListener == null) {
mAdasDataListener = new AdasDataListener() {
@Override
public void sendMsg( String msg ) {
Logger.d( TAG, "adas AdasDataListener sendmsg " + msg);
for ( IMogoAdasDataCallback callback : mAdasDataCallbackList ) {
public void sendMsg(String msg) {
Logger.d(TAG, "adas AdasDataListener sendmsg " + msg);
for (IMogoAdasDataCallback callback : mAdasDataCallbackList) {
try {
callback.onAdasDataCallback(msg);
} catch (Exception e) {
@@ -362,8 +367,8 @@ public class MogoADASController implements IMogoADASController {
}
@Override
public void cameraEyeDetectResult( String detectResult ) {
Logger.d( TAG, "detectResult " + detectResult);
public void cameraEyeDetectResult(String detectResult) {
Logger.d(TAG, "detectResult " + detectResult);
try {
JSONObject jsonObjectWs = new JSONObject(detectResult);
String action = jsonObjectWs.optString("action");
@@ -389,9 +394,9 @@ public class MogoADASController implements IMogoADASController {
@Override
public void requestGetCarModelListInfo() {
Logger.d( TAG, "requestGetCarModelListInfo ");
if ( DebugConfig.isMapBased() ) {
Logger.d( TAG, "requestGetCarModelListInfo" );
Logger.d(TAG, "requestGetCarModelListInfo ");
if (DebugConfig.isMapBased()) {
Logger.d(TAG, "requestGetCarModelListInfo");
// 向adas发送车模list
String carModelList = SharedPrefsMgr.getInstance(context).getString("CAR_MODEL_LIST", "");
if (carModelList != null && !carModelList.isEmpty()) {
@@ -418,9 +423,9 @@ public class MogoADASController implements IMogoADASController {
}
@Override
public void autopilotArrive( AdasAIDLAutopilotArriveModel autopilotArriveModel ) {
Logger.d( TAG, "autopilotArriveModel " + autopilotArriveModel);
if ( autopilotArriveModel == null ) {
public void autopilotArrive(AdasAIDLAutopilotArriveModel autopilotArriveModel) {
Logger.d(TAG, "autopilotArriveModel " + autopilotArriveModel);
if (autopilotArriveModel == null) {
return;
}
if (mAdasOCHCallback != null) {
@@ -433,16 +438,16 @@ public class MogoADASController implements IMogoADASController {
}
@Override
public void ownerCarStateInfo( String ownerCarStateInfo ) {
Logger.d( TAG, "ownerCarStateInfo " + ownerCarStateInfo);
public void ownerCarStateInfo(String ownerCarStateInfo) {
Logger.d(TAG, "ownerCarStateInfo " + ownerCarStateInfo);
Message message = mAdasLocationRecHandler.obtainMessage();
message.obj = ownerCarStateInfo;
message.sendToTarget();
}
@Override
public void notifyOwnerCarState( AdasAIDLOwnerCarStateModel ownerCarStateModel ) {
Logger.d( TAG, "AdasAIDLOwnerCarStateModel " + ownerCarStateModel);
public void notifyOwnerCarState(AdasAIDLOwnerCarStateModel ownerCarStateModel) {
Logger.d(TAG, "AdasAIDLOwnerCarStateModel " + ownerCarStateModel);
ADASCarStateInfo stateInf = new ADASCarStateInfo();
stateInf.setAction("state");
ADASCarStateInfo.ValuesBean bean = new ADASCarStateInfo.ValuesBean();
@@ -895,7 +900,7 @@ public class MogoADASController implements IMogoADASController {
}
@Override
public void mockAdasRecognized( String json ) {
mAdasDataListener.cameraEyeDetectResult( json );
public void mockAdasRecognized(String json) {
mAdasDataListener.cameraEyeDetectResult(json);
}
}

2
services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java
View File

@@ -73,7 +73,7 @@ public class IntentManager implements IMogoIntentManager {
@Override
public void invoke( String command, Intent intent ) {
List< IMogoIntentListener > listeners = mListeners.get( command );
CopyOnWriteArrayList< IMogoIntentListener > listeners = mListeners.get( command );
if ( listeners != null && !listeners.isEmpty() ) {
Iterator< IMogoIntentListener > iterator = listeners.iterator();
while ( iterator.hasNext() ) {

2
services/mogo-service/src/main/java/com/mogo/service/impl/locationinfo/MogoLocationInfoService.java
View File

@@ -49,7 +49,7 @@ class MogoLocationInfoService implements IMogoLocationInfoService {
public void init( Context context ) {
try {
Class< ? > clazz = Class.forName( "com.mogo.base.services.locationinfo.MogoLocationInfoServices" );
Class< ? > clazz = Class.forName( "com.mogo.aicloud.services.locationinfo.MogoLocationInfoServices" );
Method getInstanceMethod = clazz.getMethod( "getInstance" );
getInstanceMethod.setAccessible( true );
mDelegate = ( IMogoLocationInfoService ) getInstanceMethod.invoke( null );

29
services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java
View File

@@ -1,17 +1,14 @@
package com.mogo.service.impl.v2x;
import android.content.Context;
import android.content.Intent;
import android.nfc.Tag;
import android.util.Log;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.intent.IMogoIntentListener;
import com.mogo.service.v2x.IV2XListener;
import com.mogo.service.v2x.IV2XWarningListener;
import com.mogo.service.v2x.IV2XProvider;
import com.mogo.service.v2x.IV2XWindowManagerListener;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -24,10 +21,10 @@ import java.util.concurrent.CopyOnWriteArrayList;
*/
@Route(path = MogoServicePaths.PATH_V2X_FRONT_CRASH_WARNING)
public class V2XManager implements IV2XProvider {
private final Map<String, CopyOnWriteArrayList<IV2XListener>> mListeners = new ConcurrentHashMap<>();
private final Map<String, CopyOnWriteArrayList> mListeners = new ConcurrentHashMap<>();
@Override
public void registerIntentListener(String intent, IV2XListener listener) {
public void registerIntentListener(String intent, Object listener) {
if (listener == null || intent == null) {
Log.d("V2XManager", "listener == null || intent == null");
return;
@@ -40,7 +37,7 @@ public class V2XManager implements IV2XProvider {
}
@Override
public void unregisterIntentListener(String intent, IV2XListener listener) {
public void unregisterIntentListener(String intent, IV2XWarningListener listener) {
if (mListeners.containsKey(intent)) {
mListeners.get(intent).remove(listener);
}
@@ -48,9 +45,9 @@ public class V2XManager implements IV2XProvider {
@Override
public void warningChangedForListenerWithDirection(int direction, String command) {
List<IV2XListener> listeners = mListeners.get(command);
List<IV2XWarningListener> listeners = mListeners.get(command);
if (listeners != null && !listeners.isEmpty()) {
for (IV2XListener listener : listeners) {
for (IV2XWarningListener listener : listeners) {
if (listener != null) {
listener.warningChangedWithDirection(direction);
}
@@ -58,6 +55,18 @@ public class V2XManager implements IV2XProvider {
}
}
@Override
public void changeTipWindowStatusForListener(String command) {
List<IV2XWindowManagerListener> listeners = mListeners.get(command);
if (listeners != null && !listeners.isEmpty()) {
for (IV2XWindowManagerListener listener : listeners) {
if (listener != null) {
listener.removeTipWindowByListener();
}
}
}
}
@Override
public void init(Context context) {