From 6914aa8b8e32f377d55e347aa2717234ed3f0e77 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 27 Jun 2022 11:14:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network/UpgradeAppNetWorkManager.java | 4 ++-- .../appupgrade/network/UpgradeAppRequest.java | 24 ++++++++++--------- .../bindingcar/BindingcarProvider.java | 16 ++++++++++++- .../eagle/core/data/bindingcar/AppInfo.java | 18 ++++++++++---- gradle.properties | 1 + 5 files changed, 45 insertions(+), 18 deletions(-) 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 6fe3c77764..5481e2a6b0 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,7 +58,7 @@ public class UpgradeAppNetWorkManager { /** * 获取app升级信息 */ - public void getAppUpgradeInfo(Context context, String screenType) { + public void getAppUpgradeInfo(Context context, String screenType, String carType) { // String sn = "X20202203105S688HZ"; // int versionCode = 2070000; // String versionName = "2.7.0"; @@ -67,7 +67,7 @@ public class UpgradeAppNetWorkManager { int versionCode = AppUtils.getAppVersionCode(); String versionName = AppUtils.getAppVersionName(); - UpgradeAppRequest request = new UpgradeAppRequest(sn, versionCode, versionName, screenType); + UpgradeAppRequest request = new UpgradeAppRequest(sn, versionCode, versionName, screenType, carType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mUpgradeApiService.getUpgradeInfo("apps_control", requestBody) .subscribeOn(Schedulers.io()) 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 a8c1a63c63..78e35e9531 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,20 @@ package com.mogo.eagle.core.function.appupgrade.network; * @since: 11/15/21 */ public class UpgradeAppRequest { -// private String resources; private String sn; private int version_code; private String version_name; private String screen_type; + private String car_type; - public UpgradeAppRequest(/*String resources,*/ String sn, int versionCode, String versionName, String type) { + public UpgradeAppRequest( String sn, int versionCode, String versionName, String type, String carType) { this.sn = sn; this.version_code = versionCode; this.version_name = versionName; this.screen_type = type; + this.car_type = carType; } -// public String getResources() { -// return resources; -// } -// -// public void setResources(String resources) { -// this.resources = resources; -// } - public String getSn() { return sn; } @@ -59,13 +52,22 @@ public class UpgradeAppRequest { this.screen_type = screen_type; } + public String getCar_type() { + return car_type; + } + + public void setCar_type(String car_type) { + this.car_type = car_type; + } + @Override public String toString() { return "UpgradeAppRequest{" + "sn='" + sn + '\'' + ", version_code=" + version_code + ", version_name='" + version_name + '\'' + - ", screen_type=" + screen_type + + ", screen_type='" + screen_type + '\'' + + ", car_type='" + car_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 f095a17fd6..8a5e01ee78 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 @@ -128,12 +128,26 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { return screenType; } + private int getCarType() { + int carType = -1; + if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { + carType = 1; //bus + } + + if(AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { + carType = 2; //taxi + } + + return carType; + + } + /** * 查询app是否需要升级 */ @Override public void queryAppUpgrade() { - UpgradeAppNetWorkManager.getInstance().getAppUpgradeInfo(mContext, String.valueOf(getScreenType())); + UpgradeAppNetWorkManager.getInstance().getAppUpgradeInfo(mContext, String.valueOf(getScreenType()), String.valueOf(getCarType())); } } 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 2109002bf4..9ac0f4394e 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 @@ -20,6 +20,7 @@ public class AppInfo implements Serializable { private int version_code; private String version_name; private String create_time; + private String car_type; public IdInfo get_id() { return _id; @@ -117,21 +118,30 @@ public class AppInfo implements Serializable { this.create_time = create_time; } + public String getCar_type() { + return car_type; + } + + public void setCar_type(String car_type) { + this.car_type = car_type; + } + @Override public String toString() { return "AppInfo{" + "_id=" + _id + - ", bk_inst_id='" + bk_inst_id + '\'' + + ", bk_inst_id=" + bk_inst_id + ", bk_inst_name='" + bk_inst_name + '\'' + ", bk_supplier_account='" + bk_supplier_account + '\'' + - ", screen_type=" + screen_type + + ", screen_type='" + screen_type + '\'' + ", sn='" + sn + '\'' + - ", last_time=" + last_time + + ", last_time='" + last_time + '\'' + ", app_url='" + app_url + '\'' + ", bk_obj_id='" + bk_obj_id + '\'' + ", version_code=" + version_code + ", version_name='" + version_name + '\'' + - ", create_time=" + create_time + + ", create_time='" + create_time + '\'' + + ", car_type='" + car_type + '\'' + '}'; } } diff --git a/gradle.properties b/gradle.properties index 390f78bc82..5fbfd62028 100644 --- a/gradle.properties +++ b/gradle.properties @@ -93,6 +93,7 @@ applicationName=IntelligentPilot versionCode=2080000 versionName=2.8.0 + ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.10 MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.58.10