fixed conflict

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

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("");
}
}

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);
}
}