Merge branch 'dev_hengyang_base' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_hengyang_base
This commit is contained in:
zhongchao
@@ -5,7 +5,6 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.os.RemoteException;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
@@ -47,7 +46,6 @@ import com.zhidao.adasconfig.api.AdasConfigApiController;
|
||||
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.autopilotservice.model.AdasAIDLAutopilotArriveModel;
|
||||
import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel;
|
||||
import com.zhidao.autopilotservice.model.AdasAIDLOwnerCarRectModel;
|
||||
@@ -301,7 +299,8 @@ public class MogoADASController implements IMogoADASController {
|
||||
@Override
|
||||
public void killADAS() {
|
||||
try {
|
||||
AutopilotServiceManage.getInstance().kill();
|
||||
//AutopilotServiceManage.getInstance().kill();
|
||||
adasProvider.killAdas();
|
||||
} catch (Exception e) {
|
||||
|
||||
}
|
||||
@@ -309,6 +308,16 @@ public class MogoADASController implements IMogoADASController {
|
||||
|
||||
private volatile boolean needEmphasizeMyLocation = false;
|
||||
|
||||
private void testOCH() {
|
||||
RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters();
|
||||
currentAutopilot.isSpeakVoice = true;
|
||||
currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( 0, 1 );
|
||||
currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( 2, 3 );
|
||||
currentAutopilot.vehicleType = 10;
|
||||
Logger.d( TAG, "开启自动驾驶====" + currentAutopilot );
|
||||
aiCloudToAdasData(currentAutopilot);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void showADAS() {
|
||||
|
||||
@@ -331,6 +340,9 @@ public class MogoADASController implements IMogoADASController {
|
||||
info.setSn(MoGoAiCloudClientConfig.getInstance().getSn());
|
||||
AdasManager.getInstance().setBasicInfo(info);
|
||||
invokeShowADASOperation();
|
||||
|
||||
//测试网约车
|
||||
//testOCH();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -389,7 +401,8 @@ public class MogoADASController implements IMogoADASController {
|
||||
// 向adas发送车模list
|
||||
String carModelList = SharedPrefsMgr.getInstance(context).getString("CAR_MODEL_LIST", "");
|
||||
if (carModelList != null && !carModelList.isEmpty()) {
|
||||
AutopilotServiceManage.getInstance().settingCarModelListInfo(carModelList);
|
||||
//AutopilotServiceManage.getInstance().settingCarModelListInfo(carModelList);
|
||||
adasProvider.settingCarModelListInfo(carModelList);
|
||||
}
|
||||
// 此处进行网络请求，请求成功后再通知一次adas
|
||||
requestCarModelList();
|
||||
@@ -533,7 +546,8 @@ public class MogoADASController implements IMogoADASController {
|
||||
}
|
||||
|
||||
try {
|
||||
AutopilotServiceManage.getInstance().showAdas();
|
||||
//AutopilotServiceManage.getInstance().showAdas();
|
||||
adasProvider.showAdas();
|
||||
} catch (Exception e) {
|
||||
Intent intent = new Intent(ACTION);
|
||||
intent.putExtra(PARAM_COMMAND, VAL_COMMAND);
|
||||
@@ -556,7 +570,8 @@ public class MogoADASController implements IMogoADASController {
|
||||
Logger.d(TAG, "close adas");
|
||||
|
||||
try {
|
||||
AutopilotServiceManage.getInstance().hideAdas();
|
||||
//AutopilotServiceManage.getInstance().hideAdas();
|
||||
adasProvider.hideAdas();
|
||||
} catch (Exception e) {
|
||||
Intent intent = new Intent(ACTION);
|
||||
intent.putExtra(PARAM_COMMAND, VAL_COMMAND);
|
||||
@@ -585,7 +600,7 @@ public class MogoADASController implements IMogoADASController {
|
||||
|
||||
@Override
|
||||
public void init(Context context) {
|
||||
AutopilotServiceManage.getInstance().init(context);
|
||||
//AutopilotServiceManage.getInstance().init(context);
|
||||
mIsReleased = false;
|
||||
mAdasMessageFactory = new MyMessageFactory();
|
||||
adasProvider = ARouter.getInstance().navigation(AdasProvider.class);
|
||||
@@ -594,12 +609,14 @@ public class MogoADASController implements IMogoADASController {
|
||||
|
||||
@Override
|
||||
public void setSettingStatus(boolean show) {
|
||||
AutopilotServiceManage.getInstance().setSettingStatus(show);
|
||||
//AutopilotServiceManage.getInstance().setSettingStatus(show);
|
||||
adasProvider.setSettingStatus(show);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setUseAlgorithm(boolean open) {
|
||||
AutopilotServiceManage.getInstance().setUseAlgorithm(open);
|
||||
//AutopilotServiceManage.getInstance().setUseAlgorithm(open);
|
||||
adasProvider.setUseAlgorithm(open);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -670,7 +687,8 @@ public class MogoADASController implements IMogoADASController {
|
||||
AdasControlCommandParameter parameter = new AdasControlCommandParameter(action, result);
|
||||
//位置信息 action是aiCloudToStartAutopilot
|
||||
try {
|
||||
AutopilotServiceManage.getInstance().aiCloudToAdasData(GsonUtil.jsonFromObject(parameter));
|
||||
//AutopilotServiceManage.getInstance().aiCloudToAdasData(GsonUtil.jsonFromObject(parameter));
|
||||
adasProvider.sendWsMessage(GsonUtil.jsonFromObject(parameter));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@@ -692,7 +710,8 @@ public class MogoADASController implements IMogoADASController {
|
||||
String value = GsonUtil.jsonFromObject(o.getResult());
|
||||
SharedPrefsMgr.getInstance(context).putString("CAR_MODEL_LIST", value);
|
||||
if (value != null && !value.isEmpty()) {
|
||||
AutopilotServiceManage.getInstance().settingCarModelListInfo(value);
|
||||
//AutopilotServiceManage.getInstance().settingCarModelListInfo(value);
|
||||
adasProvider.settingCarModelListInfo(value);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -716,7 +735,8 @@ public class MogoADASController implements IMogoADASController {
|
||||
mIsReleased = true;
|
||||
//AutopilotServiceManage.getInstance().unRegisterAutopilotDataListener( mAutopolitDataCallBack );
|
||||
adasProvider.removeAdasEventListener(mAdasDataListener);
|
||||
AutopilotServiceManage.getInstance().release();
|
||||
adasProvider.removeAdasStatusListener();
|
||||
//AutopilotServiceManage.getInstance().release();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -826,7 +846,8 @@ public class MogoADASController implements IMogoADASController {
|
||||
}
|
||||
int status = IMogoAdasOCHCallback.STATUS_AUTOPILOT_DISABLE;
|
||||
try {
|
||||
status = AutopilotServiceManage.getInstance().autopilotStateCall().getState();
|
||||
//status = AutopilotServiceManage.getInstance().autopilotStateCall().getState();
|
||||
status = adasProvider.autopilotStateCall().getState();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@@ -851,11 +872,12 @@ public class MogoADASController implements IMogoADASController {
|
||||
|
||||
@Override
|
||||
public void cancelAutopilot() {
|
||||
try {
|
||||
AutopilotServiceManage.getInstance().cancelAutopilot();
|
||||
} catch (RemoteException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
//try {
|
||||
//AutopilotServiceManage.getInstance().cancelAutopilot();
|
||||
adasProvider.cancelPolit();
|
||||
//} catch (RemoteException e) {
|
||||
// e.printStackTrace();
|
||||
//}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user