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

fixed conflict

Browse Source
This commit is contained in:
lixiaopeng
2022-03-22 10:34:06 +08:00
parent a39f310331
commit f2307e6683
300 changed files with 12240 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
View File

@@ -1,15 +1,21 @@
package com.mogo.eagle.core.function.autopilot.adapter;
import android.text.TextUtils;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager;
import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager;
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.module.common.drawer.IdentifyDataDrawer;
import com.zhidao.support.obu.ami.AmiClientManager;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import chassis.Chassis;
@@ -18,7 +24,8 @@ import record_cache.RecordPanelOuterClass;
public class MoGoHandAdasMsgManager implements
IMoGoAutopilotIdentifyListener,
IMoGoAutopilotVehicleStateListener {
IMoGoAutopilotVehicleStateListener,
IMoGoAutopilotCarConfigListener {
private final String TAG = "AdasEventManager";
@@ -82,4 +89,12 @@ public class MoGoHandAdasMsgManager implements
}
@Override
public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) {
if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) {
CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress());
}
}
}

5
core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarManager.java
View File

@@ -2,6 +2,8 @@ package com.mogo.eagle.core.function.bindingcar;
import android.content.Context;
import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager;
/**
* @author lixiaopeng
* @description
@@ -21,6 +23,9 @@ public class BindingcarManager {
return mBindingcarManager;
}
private void requestBindingcarInfo() {
BindingcarNetWorkManager.getInstance().getBindingcarInfo("");
}
}

17
core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
View File

@@ -1,6 +1,7 @@
package com.mogo.eagle.core.function.bindingcar;
import android.content.Context;
import android.util.Log;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
@@ -34,11 +35,23 @@ public class BindingcarProvider implements IMoGoBindingcarProvider {
}
/**
* TODO 获取
* @param macAddress
*/
@Override
public void getBindingcarInfo(String macAddress) {
// Log.d("liyz", "macAddress = " + macAddress);
// BindingcarNetWorkManager.getInstance().getBindingcarInfo(macAddress);
}
@Override
public void modifyCarInfo(BindingcarCallBack callBack) {
BindingcarNetWorkManager.getInstance().getBindingcarInfo("");
// BindingcarNetWorkManager.getInstance().modifyBindingcar(callBack);
BindingcarNetWorkManager.getInstance().modifyBindingcar(callBack);
}
}