diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java index b6549f9b57..63d3178e74 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java @@ -23,7 +23,7 @@ public interface BindingcarApiService { */ @Headers("Content-Type:application/json;charset=UTF-8") @POST("pad/selectPadByMac") - Observable getBindingcarInfo(@Header("access_token") String access_token, @Body RequestBody requestBody); + Observable getBindingcarInfo(/*@Header("access_token") String access_token,*/ @Body RequestBody requestBody); /** * 绑定和修改绑定车机 @@ -32,6 +32,6 @@ public interface BindingcarApiService { */ @Headers("Content-Type:application/json;charset=UTF-8") @POST("pad/updatePadByMac") - Observable modifyBindingcarInfo(@Header("access_token") String access_token, @Body RequestBody requestBody); + Observable modifyBindingcarInfo(/*@Header("access_token") String access_token,*/ @Body RequestBody requestBody); } 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 0a0fa8c38e..12c0c3707b 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 @@ -34,11 +34,10 @@ import okhttp3.RequestBody; public class BindingcarNetWorkManager { private static volatile BindingcarNetWorkManager requestNoticeManager; private final BindingcarApiService mBindingcarApiService; - private String token = "c4a2f30cebf64972bcd11577e1c07f86"; //中台做了接口适配，需要这个token - private static final String TAG = "BindingcarNetWorkManager"; + private static final String TAG = "BindingcarNetManager"; private BindingcarNetWorkManager() { - mBindingcarApiService = MoGoRetrofitFactory.getInstance(HostConst.BINDING_SN_HOST) + mBindingcarApiService = MoGoRetrofitFactory.getInstance(HostConst.CMDB_HOST) .create(BindingcarApiService.class); } @@ -60,11 +59,20 @@ public class BindingcarNetWorkManager { * @param macAddress mac地址 */ public void getBindingcarInfo(Context context, String macAddress, String widevineIDWithMd5, int screenType) { -// String macAddress = "48:b0:2d:3a:bc:78"; +// String macAddress1 = "48:b0:2d:3a:bc:78"; +// String macAddress1 = "48:b0:2d:4d:b9:63"; // String sn = "X20202203105S688HZ"; + +// modifyBindingcar(macAddress1, sn, new BindingcarCallBack() { +// @Override +// public void callBackResult(ModifyBindingcarInfo modifyBindingcarInfo) { +// +// } +// }, screenType); + BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); - mBindingcarApiService.getBindingcarInfo(token, requestBody) + mBindingcarApiService.getBindingcarInfo(requestBody) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -76,6 +84,7 @@ public class BindingcarNetWorkManager { public void onNext(@NonNull BindingcarInfo info) { if (info != null && info.getData() != null) { CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); + Log.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); if (info.getData().getCompare().equals("0")) { CallerHmiManager.INSTANCE.showBindingcarDialog(); } else if (info.getData().getCompare().equals("3")) { @@ -84,10 +93,12 @@ public class BindingcarNetWorkManager { TipToast.shortTip("当前工控机没有入库"); } - //根据车辆类型切换不同的车辆模型 + //根据车辆类型切换不同的车辆模型,只针对红旗做处理 // if (info.getData().getVendor().equals("一汽红旗")) { //TODO -// CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache); -// } else if (info.getData().getVendor().equals("东风")) { +// CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.hq_h9); +// } + +// else if (info.getData().getVendor().equals("东风汽车集团")) { // CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche); // } else if (info.getData().getVendor().equals("金旅星辰")) { // CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache); @@ -102,6 +113,7 @@ public class BindingcarNetWorkManager { @Override public void onError(@NonNull Throwable e) { CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); + Log.e(TAG, "onError ------ > e = " + e); } @Override @@ -118,7 +130,7 @@ public class BindingcarNetWorkManager { public void modifyBindingcar(String macAddress, String widevineIDWithMd5, BindingcarCallBack callBack, int screenType) { BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); - mBindingcarApiService.modifyBindingcarInfo(token, requestBody) + mBindingcarApiService.modifyBindingcarInfo(requestBody) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -130,6 +142,7 @@ public class BindingcarNetWorkManager { public void onNext(@NonNull ModifyBindingcarInfo info) { if (info != null) { callBack.callBackResult(info); + Log.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()); CallerLogger.INSTANCE.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()); } } @@ -137,6 +150,7 @@ public class BindingcarNetWorkManager { @Override public void onError(@NonNull Throwable e) { CallerLogger.INSTANCE.e(TAG, "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); + Log.e(TAG, "onError ----2-- > e = " + e); } @Override diff --git a/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d b/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d new file mode 100644 index 0000000000..47a6be55af Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d differ diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java index df45519ece..db14171a5e 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java @@ -19,7 +19,10 @@ public class HostConst { public static final String CITY_HOST = "http://dzt-city.zhidaozhixing.com"; public static final String SOCKET_CENTER_DOMAIN = "socketRegion"; - public static final String BINDING_SN_HOST = "https://mygateway.zhidaozhixing.com/cmdbapi/"; //中台提供的接口服务 - public static final String BINDING_SN_HOST_TEST = "https://mygateway.zhidaozhixing.com/cmdbapitest/"; //中台提供的接口服务测试 +// public static final String UPGRADE_APP_HOST_TEST = "http://10.0.200.12:32423?/"; + public static final String UPGRADE_APP_HOST = "http://eagle-mis.zhidaozhixing.com/"; + + public static final String CMDB_HOST = "http://eagle-mis.zhidaozhixing.com/eagleEye-mis/cmdbapi/"; + }