diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarManager.java index b9792941ff..775077088e 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarManager.java @@ -2,7 +2,9 @@ package com.mogo.eagle.core.function.bindingcar; import android.content.Context; +import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack; import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager; +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; /** * @author lixiaopeng @@ -23,10 +25,13 @@ public class BindingcarManager { return mBindingcarManager; } - private void requestBindingcarInfo() { - BindingcarNetWorkManager.getInstance().getBindingcarInfo(""); + protected void getBindingcarInfo() { } + protected void modifyCarInfo(BindingcarCallBack callBack) { + } + + } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java index 5165dd48a4..0bfee198e3 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -20,6 +20,8 @@ import org.jetbrains.annotations.NotNull; @Route(path = MogoServicePaths.PATH_BINDING_CAR) public class BindingcarProvider implements IMoGoBindingcarProvider { + private Context mContext; + @NotNull @Override public String getFunctionName() { @@ -32,11 +34,11 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { @Override public void init(Context context) { - + mContext = context; } /** - * TODO 获取 + * TODO 获取,每次连接请求一次 * @param macAddress */ @Override @@ -47,8 +49,7 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { @Override public void modifyCarInfo(BindingcarCallBack callBack) { - BindingcarNetWorkManager.getInstance().modifyBindingcar(callBack); - + BindingcarNetWorkManager.getInstance().modifyBindingcar("",callBack); } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java index eb51652caa..7e2ee35355 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -7,6 +7,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.eagle.core.data.bindingcar.BindingcarInfo; import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo; import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack; +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.network.utils.GsonUtil; import io.reactivex.Observer; @@ -66,7 +67,14 @@ public class BindingcarNetWorkManager { @Override public void onNext(@NonNull BindingcarInfo info) { - Log.d("liyz", "getBindingcarInfo onNext info =" + info.toString()); + if (info != null && info.getData() != null) { + Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); + if (info.getData().getCompare() == 0) { + CallerHmiManager.INSTANCE.showBindingcarDialog(); + } else if (info.getData().getCompare() == 3) { + CallerHmiManager.INSTANCE.showModifyBindingcarDialog(); + } + } } @Override @@ -83,9 +91,9 @@ public class BindingcarNetWorkManager { } /** - * 绑定和修改绑定车辆 + * 绑定和修改绑定车辆 TODO */ - public void modifyBindingcar(BindingcarCallBack callBack) { + public void modifyBindingcar(String macAddress, BindingcarCallBack callBack) { String sn = MoGoAiCloudClientConfig.getInstance().getSn(); BindingcarRequest request = new BindingcarRequest(sn, "48:b0:2d:3a:9c:19"); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/CarInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/CarInfo.java index 08438ea99a..03419d2f49 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/CarInfo.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/CarInfo.java @@ -8,6 +8,95 @@ import java.io.Serializable; * @since 3/16/22 */ public class CarInfo implements Serializable { +// compare为0 是表示车辆未绑定ipad sn +// compare为1 是表示车辆已绑定ipad sn 并且 与所传appsn一致 +// compare为2 是表示cmdb车辆没有真实绑定ipad +// compare为3 是表示车辆已绑定ipad sn 并且 与所传appsn不一致 + private int compare; + private String old_version; + private String vendor; //销售商 + private String series; //类别 + private String model; //款式 + private String new_version; + private String brand; //品牌 + private String energy_type; //驱动类型 + public int getCompare() { + return compare; + } + + public void setCompare(int compare) { + this.compare = compare; + } + + public String getOld_version() { + return old_version; + } + + public void setOld_version(String old_version) { + this.old_version = old_version; + } + + public String getVendor() { + return vendor; + } + + public void setVendor(String vendor) { + this.vendor = vendor; + } + + public String getSeries() { + return series; + } + + public void setSeries(String series) { + this.series = series; + } + + public String getModel() { + return model; + } + + public void setModel(String model) { + this.model = model; + } + + public String getNew_version() { + return new_version; + } + + public void setNew_version(String new_version) { + this.new_version = new_version; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getEnergy_type() { + return energy_type; + } + + public void setEnergy_type(String energy_type) { + this.energy_type = energy_type; + } + + @Override + public String toString() { + return "CarInfo{" + + "compare='" + compare + '\'' + + ", old_version='" + old_version + '\'' + + ", vendor='" + vendor + '\'' + + ", series='" + series + '\'' + + ", model='" + model + '\'' + + ", new_version='" + new_version + '\'' + + ", brand='" + brand + '\'' + + ", energy_type='" + energy_type + '\'' + + '}'; + } }