From 58e1506f8f5984185059e7ce048cc7d50c8a3621 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 14 Aug 2020 11:01:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=20app=20=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20build.gradle=20=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E5=8F=8A=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86=E5=88=86?= =?UTF-8?q?=E7=BB=84=E6=96=B9=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 133 +++++---------------------------------------- app/regroup.gradle | 45 +++++++++++++++ 2 files changed, 59 insertions(+), 119 deletions(-) create mode 100644 app/regroup.gradle diff --git a/app/build.gradle b/app/build.gradle index 3a3707d12e..9fa3526b19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,11 +2,9 @@ apply plugin: 'com.android.application' apply plugin: 'com.alibaba.arouter' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -import java.text.SimpleDateFormat android { compileSdkVersion rootProject.ext.android.compileSdkVersion - // buildToolsVersion rootProject.ext.android.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion @@ -66,13 +64,13 @@ android { independent { manifest.srcFile 'src/independent/AndroidManifest.xml' } - e8xx{ + e8xx { manifest.srcFile 'src/e8xx/AndroidManifest.xml' } em4 { manifest.srcFile 'src/em4/AndroidManifest.xml' } - f8xxLauncherOnlineRelease{ + f8xxLauncherOnlineRelease { manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml' } } @@ -81,7 +79,7 @@ android { productFlavors { //独立app - independent{ + independent { dimension "basic" // 是否启动位置服务 buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'false' @@ -90,7 +88,7 @@ android { buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"' } // launcher app - launcher{ + launcher { dimension "basic" // 是否启动位置服务 buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'true' @@ -99,11 +97,11 @@ android { buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"' } // f系列-分体机全系列，未细分 - f8xx{ + f8xx { applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" // 使用思必驰语音 - buildConfigField 'int', 'AIType','2' + buildConfigField 'int', 'AIType', '2' buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' @@ -117,7 +115,7 @@ android { applicationId rootProject.ext.android.launcherApplicationId dimension "product" // 使用思必驰语音 - buildConfigField 'int', 'AIType','2' + buildConfigField 'int', 'AIType', '2' buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' @@ -131,7 +129,7 @@ android { applicationId rootProject.ext.android.launcherApplicationId dimension "product" // 使用思必驰语音 - buildConfigField 'int', 'AIType','2' + buildConfigField 'int', 'AIType', '2' buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' @@ -173,7 +171,7 @@ android { applicationId rootProject.ext.android.independentApplicationId dimension "product" // 使用同行者语音 - buildConfigField 'int', 'AIType','1' + buildConfigField 'int', 'AIType', '1' buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' @@ -183,11 +181,11 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' } // d系列 1+16 版本 - d82x{ + d82x { applicationId rootProject.ext.android.independentApplicationId dimension "product" // 使用同行者语音 - buildConfigField 'int', 'AIType','1' + buildConfigField 'int', 'AIType', '1' buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' @@ -197,11 +195,11 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' } // 比亚迪 - bydauto{ + bydauto { applicationId rootProject.ext.android.bydautoIndependentApplicationId dimension "product" // 不使用语音 - buildConfigField 'int', 'AIType','0' + buildConfigField 'int', 'AIType', '0' buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，其他车机，比亚迪定为1 buildConfigField 'int', 'CAR_MACHINE_TYPE', '1' @@ -229,42 +227,6 @@ android { } } -def generateVersionCode() { - String vn = rootProject.ext.android.versionName - String[] versions = vn.split("\\.") - if (versions.length == 3) { - int num1 = Integer.valueOf(versions[0]) - int num2 = Integer.valueOf(versions[1]) - int num3 = Integer.valueOf(versions[2]) - if (num1 < 1 || num1 > 99){ - throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])") - } - if (num2 < 0 || num2 > 99){ - throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])") - } - if (num3 < 0 || num3 > 99){ - throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])") - } - StringBuilder builder = new StringBuilder() - builder.append(num1) - if( num2 > 9 ){ - builder.append(num2) - } else { - builder.append("0").append(num2) - } - if( num3 > 9 ){ - builder.append(num3) - } else { - builder.append("0").append(num3) - } - println("last versionCode ${builder}") - return Integer.valueOf(builder.toString()) - } else { - throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])") - } - -} - repositories { flatDir { dirs 'libs' @@ -332,13 +294,6 @@ dependencies { apply from: "./functions/leftpanel.gradle" } -//android.applicationVariants.all { variant -> -// variant.outputs.all { //这里修改apk文件名 -// outputFileName = "Launcher2.0_V${android.defaultConfig.versionName}_${getCurrentDate()}_${variant.name}_${getGitCommit()}.apk" -// println outputFileName -// } -//} - android.applicationVariants.all { variant -> def buildTime = new Date().format("yyyyMMdd", TimeZone.getTimeZone("GMT+08:00")) def flavor = variant.productFlavors.collect { it.name }.join('-') @@ -354,64 +309,4 @@ android.applicationVariants.all { variant -> } } - -def getMonthAndDay() { - - SimpleDateFormat sdf = new SimpleDateFormat("MMddHH") - return sdf.format(new Date()) -} - -def getCurrentDate() { - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss") - return sdf.format(new Date()) -} - -def getGitCommit() { - def gitDir = new File("${new File("${rootDir}")}/.git") - if (!gitDir.isDirectory()) { - return 'non_git_build' - } - - def cmd = 'git log --pretty=format:%h -1' - def gitCommit = cmd.execute().text.trim() - - print gitCommit - - def cmd2 = 'git status -s' - def gitStatus = cmd2.execute().text.trim() - - println '---------' - - print gitStatus - if (gitStatus != null && !gitStatus.isEmpty()) { - return 'local-build' - } - - assert !gitCommit.isEmpty() - gitCommit -} - -afterEvaluate { - - it.getTasks().iterator().forEachRemaining { - def nameLowCase = it.name - - if (nameLowCase.startsWith("assemble") - && nameLowCase.contains("Independent") - && (nameLowCase.endsWith("Debug") || nameLowCase.endsWith("Release"))) { - it.group = "assembleIndependent" - } else if (nameLowCase.startsWith("assemble") - && nameLowCase.contains("Launcher") - && (nameLowCase.endsWith("Debug") || nameLowCase.endsWith("Release"))) { - it.group = "assembleLauncher" - } else if (nameLowCase.startsWith("install") - && nameLowCase.contains("Independent") - && (nameLowCase.endsWith("Debug") || nameLowCase.endsWith("Release"))) { - it.group = "installIndependent" - } else if (nameLowCase.startsWith("install") - && nameLowCase.contains("Launcher") - && (nameLowCase.endsWith("Debug") || nameLowCase.endsWith("Release"))) { - it.group = "installLauncher" - } - } -} +apply from: "./regroup.gradle" diff --git a/app/regroup.gradle b/app/regroup.gradle new file mode 100644 index 0000000000..4b3e0ba638 --- /dev/null +++ b/app/regroup.gradle @@ -0,0 +1,45 @@ +// 将 install 和 assemble 任务按功能分组 + +afterEvaluate { + + def independent = ["em3", "em1", "d8xx", "d82x", "bydauto"] + def launcher = ["f8xx", "em4"] + + it.getTasks().iterator().forEachRemaining { + def task = it + def taskName = task.name + if (taskName.startsWith("assemble") + && taskName.contains("Independent") + && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { + independent.forEach { + if( taskName.toLowerCase().contains(it) ){ + task.group = "assembleIndependent" + } + } + } else if (taskName.startsWith("assemble") + && taskName.contains("Launcher") + && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { + launcher.forEach { + if( taskName.toLowerCase().contains(it) ){ + task.group = "assembleLauncher" + } + } + } else if (taskName.startsWith("install") + && taskName.contains("Independent") + && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { + independent.forEach { + if( taskName.toLowerCase().contains(it) ){ + task.group = "installIndependent" + } + } + } else if (taskName.startsWith("install") + && taskName.contains("Launcher") + && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { + launcher.forEach { + if( taskName.toLowerCase().contains(it) ){ + task.group = "installLauncher" + } + } + } + } +} From 06a06e47b7d77b3e12e5f7752074f0d0f12519cb Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 14 Aug 2020 11:27:50 +0800 Subject: [PATCH 2/6] fix bug of UI and update callchat to 1.5.1 --- gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 620f4a0289..954f602451 100644 --- a/gradle.properties +++ b/gradle.properties @@ -65,12 +65,13 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 # 探路 MOGO_MODULE_TANLU_VERSION=1.3.1.24 # 车聊聊 -CARCHATTING_VERSION=1.4.9 +CARCHATTING_VERSION=1.5.1 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.3.4 # 视频引导 MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT # 视频引导接口 + MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 From 72c0cb27aed547dc55bdb17418537f59aeba303f Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 14 Aug 2020 11:37:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/network/V2XShareNetworkModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java index 877136cec3..c706acbe91 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java @@ -136,7 +136,7 @@ public class V2XShareNetworkModel { public void onError(Throwable e) { super.onError(e); if (callback != null){ - callback.onFail("当前服务不可以, 请稍后重试"); + callback.onFail("网络异常，点击刷新重试"); } } }); @@ -180,7 +180,7 @@ public class V2XShareNetworkModel { public void onError(Throwable e) { super.onError(e); if (callback != null){ - callback.onFail("当前服务不可以, 请稍后重试"); + callback.onFail("网络异常，点击刷新重试"); } } }); From f9b8707745d382f0d93980d15bc47120145e152c Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 14 Aug 2020 12:03:12 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/adapter/V2XShareEventAdapter.java | 4 ++-- .../module/v2x/fragment/V2XShareEventsFragment.java | 11 +++++------ .../com/mogo/module/v2x/listener/AdapterCallback.java | 4 +++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 686d49e351..ee61fb7aa8 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -223,7 +223,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter Date: Fri, 14 Aug 2020 12:12:32 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/fragment/V2XShareEventsFragment.java | 4 ++-- .../java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index 29f91fa0a0..c473c778ad 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -97,7 +97,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba @Override public void onFail(String msg) { - loadingView.stopWithError(msg); + loadingView.stopWithError(msg,View.VISIBLE); loadingView.refresButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -183,7 +183,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba @Override public void onFail(String msg) { - + loadingView.stopWithError(msg,View.INVISIBLE); } }); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java index b8c1e9beea..a73c2c4ccc 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java @@ -76,7 +76,7 @@ public class V2XNetworkLoadingView extends RelativeLayout { } } - public void stopWithError(String errormsg) { + public void stopWithError(String errormsg, int showRefreshButton) { if (v2XAnimationManager != null) { v2XAnimationManager.soptWithError(); } @@ -84,7 +84,7 @@ public class V2XNetworkLoadingView extends RelativeLayout { textView.setText(errormsg); } if (refresButton != null) { - refresButton.setVisibility(VISIBLE); + refresButton.setVisibility(showRefreshButton); } } From d6b68ba10b9e4a74a4f4f78c989e74e372e68739 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 14 Aug 2020 12:25:12 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=8C=87=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/V2XShareEventAdapter.java | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index ee61fb7aa8..1768ed13bf 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -73,31 +73,6 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter