diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index c48274d617..2fafe1c779 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -96,6 +96,7 @@ public class MoGoHandAdasMsgManager implements CallerHmiManager.INSTANCE.showTurnLight(state); } } + } @Override diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeApiService.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeApiService.java index 0769aeb280..f6357e630a 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeApiService.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeApiService.java @@ -1,15 +1,13 @@ package com.mogo.eagle.core.function.appupgrade.network; -import com.mogo.eagle.core.data.bindingcar.BindingcarInfo; -import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo; import com.mogo.eagle.core.data.bindingcar.UpgradeAppInfo; import io.reactivex.Observable; import okhttp3.RequestBody; import retrofit2.http.Body; -import retrofit2.http.Header; import retrofit2.http.Headers; import retrofit2.http.POST; +import retrofit2.http.Query; /** * @author lixiaopeng @@ -19,11 +17,11 @@ import retrofit2.http.POST; public interface UpgradeApiService { /** * 获取升级信息 - * + * , @Query("resources") String i * @return {@link UpgradeAppInfo} */ @Headers("Content-Type:application/json;charset=UTF-8") - @POST("pad/selectPadByMac") - Observable getUpgradeInfo(@Body RequestBody requestBody); + @POST("unify/selectResources") + Observable getUpgradeInfo(@Query("resources") String res, @Body RequestBody requestBody); } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java index d05c8f46ef..bb70ada193 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java @@ -58,19 +58,19 @@ public class UpgradeAppNetWorkManager { /** * 获取app升级信息 */ - public void getAppUpgradeInfo(Context context, int screenType) { + public void getAppUpgradeInfo(Context context, String screenType) { String sn = "X20202203105S688HZ"; - String versionCode = "2070000"; + int versionCode = 2070000; String versionName = "2.7.0"; - int screenType1 = 1; + String screenType1 = "1"; // String sn = MoGoAiCloudClientConfig.getInstance().getSn(); // String versionCode = AppUtils.getAppVersionCode(); // String versionName = AppUtils.getAppVersionName(); - UpgradeAppRequest request = new UpgradeAppRequest("apps_control", sn, versionCode, versionName, screenType1); + UpgradeAppRequest request = new UpgradeAppRequest(sn, versionCode, versionName, screenType1); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); - mUpgradeApiService.getUpgradeInfo(requestBody) + mUpgradeApiService.getUpgradeInfo("apps_control", requestBody) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -81,10 +81,13 @@ public class UpgradeAppNetWorkManager { @Override public void onNext(@NonNull UpgradeAppInfo info) { + Log.d("liyz", "onNext -------> " + info.code + "----msg =" + info.msg); if (info != null && info.getData() != null) { Log.d("liyz", "UpgradeAppInfo url = " + info.getData().getApp_url() + "----code = " + info.getData().getVersion_code()); //TODO 弹框 - + if (info.getData().getVersion_code() >= versionCode) { + CallerHmiManager.INSTANCE.showUpgradeDialog("appupgrade", info.getData().getApp_url()); + } } } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppRequest.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppRequest.java index 8be28f9bcd..a8c1a63c63 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppRequest.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppRequest.java @@ -6,27 +6,26 @@ package com.mogo.eagle.core.function.appupgrade.network; * @since: 11/15/21 */ public class UpgradeAppRequest { - private String resources; +// private String resources; private String sn; - private String version_code; + private int version_code; private String version_name; - private int screen_type; + private String screen_type; - public UpgradeAppRequest(String resources, String sn, String versionCode, String versionName, int type) { - this.resources = resources; + public UpgradeAppRequest(/*String resources,*/ String sn, int versionCode, String versionName, String type) { this.sn = sn; this.version_code = versionCode; this.version_name = versionName; this.screen_type = type; } - public String getResources() { - return resources; - } - - public void setResources(String resources) { - this.resources = resources; - } +// public String getResources() { +// return resources; +// } +// +// public void setResources(String resources) { +// this.resources = resources; +// } public String getSn() { return sn; @@ -36,11 +35,11 @@ public class UpgradeAppRequest { this.sn = sn; } - public String getVersion_code() { + public int getVersion_code() { return version_code; } - public void setVersion_code(String version_code) { + public void setVersion_code(int version_code) { this.version_code = version_code; } @@ -52,11 +51,11 @@ public class UpgradeAppRequest { this.version_name = version_name; } - public int getScreen_type() { + public String getScreen_type() { return screen_type; } - public void setScreen_type(int screen_type) { + public void setScreen_type(String screen_type) { this.screen_type = screen_type; } @@ -64,7 +63,7 @@ public class UpgradeAppRequest { public String toString() { return "UpgradeAppRequest{" + "sn='" + sn + '\'' + - ", version_code='" + version_code + '\'' + + ", version_code=" + version_code + ", version_name='" + version_name + '\'' + ", screen_type=" + screen_type + '}'; 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 68cd68ef9e..f095a17fd6 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 @@ -133,7 +133,7 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { */ @Override public void queryAppUpgrade() { - UpgradeAppNetWorkManager.getInstance().getAppUpgradeInfo(mContext, getScreenType()); + UpgradeAppNetWorkManager.getInstance().getAppUpgradeInfo(mContext, String.valueOf(getScreenType())); } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index e3e3e44df8..19bb89cca6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -62,9 +62,7 @@ class SystemVersionView @JvmOverloads constructor( ivPadVersion.setOnClickListener { CallerLogger.i("$M_HMI$$TAG", "pad version view clicked") // CallerBindingcarManager.getBindingcarProvider().queryAppUpgrade() - - Logger.d("liyz", "ivPadVersion --click ") - + } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java index 9ad5ccd4b5..2443da77e6 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java @@ -17,7 +17,7 @@ public class AppInfo implements Serializable { private long last_time; private String app_url; private String bk_obj_id; - private String version_code; + private int version_code; private String version_name; private long create_time; @@ -93,11 +93,11 @@ public class AppInfo implements Serializable { this.bk_obj_id = bk_obj_id; } - public String getVersion_code() { + public int getVersion_code() { return version_code; } - public void setVersion_code(String version_code) { + public void setVersion_code(int version_code) { this.version_code = version_code; } @@ -129,7 +129,7 @@ public class AppInfo implements Serializable { ", last_time=" + last_time + ", app_url='" + app_url + '\'' + ", bk_obj_id='" + bk_obj_id + '\'' + - ", version_code='" + version_code + '\'' + + ", version_code=" + version_code + ", version_name='" + version_name + '\'' + ", create_time=" + create_time + '}'; 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 2cfc5ca01a..1caf51adcb 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 @@ -22,6 +22,6 @@ public class HostConst { 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 = "http://10.0.200.12:32423/unify/selectResources/"; + public static final String UPGRADE_APP_HOST = "http://10.0.200.12:32423?/"; }