From 85a9db4d5e86408ebd9e19601bffa3d65d3bc408 Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Mon, 7 Feb 2022 15:53:12 +0800
Subject: [PATCH] =?UTF-8?q?[OCH]OCH:=20=E6=81=A2=E5=A4=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=BB=9F=E4=B8=80versionName=E3=80=81versionCode?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=A0jenkins=E6=89=93=E5=8C=85=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E3=80=82=E6=9A=82=E5=90=84=E9=9C=80=E6=B1=82=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E5=90=84=E8=87=AA=E4=BF=AE=E6=94=B9versionName=EF=BC=88Revert?=
 =?UTF-8?q?=EF=BC=9ARoboBus/Taxi=E4=B8=9A=E5=8A=A1=E6=A0=B9=E6=8D=AEflavor?=
 =?UTF-8?q?=E5=88=86=E5=88=AB=E9=85=8D=E7=BD=AEversionName=E3=80=81version?=
 =?UTF-8?q?Code=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/productFlavors/fPadLenovoOchBus.gradle           |  4 ++--
 app/productFlavors/fPadLenovoOchTaxi.gradle          |  4 ++--
 app/productFlavors/fPadLenovoOchTaxiPassenger.gradle |  4 ++--
 gradle.properties                                    | 12 ++----------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle
index 03c28debc9..9513405334 100644
--- a/app/productFlavors/fPadLenovoOchBus.gradle
+++ b/app/productFlavors/fPadLenovoOchBus.gradle
@@ -9,8 +9,8 @@ project.android.productFlavors {
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
-        versionCode rootProject.versionCodeBusDriver as int
-        versionName rootProject.versionNameBusDriver
+        versionCode rootProject.versionCode as int
+        versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
         dimension "product"
diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle
index 68d4d8be2b..036649e6d1 100644
--- a/app/productFlavors/fPadLenovoOchTaxi.gradle
+++ b/app/productFlavors/fPadLenovoOchTaxi.gradle
@@ -10,8 +10,8 @@ project.android.productFlavors {
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
-        versionCode rootProject.versionCodeTaxiDriver as int
-        versionName rootProject.versionNameTaxiDriver
+        versionCode rootProject.versionCode as int
+        versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
         dimension "product"
diff --git a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
index 121537ceb2..e7df020fe6 100644
--- a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
+++ b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
@@ -9,8 +9,8 @@ project.android.productFlavors {
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
-        versionCode rootProject.versionCodeTaxiPassenger as int
-        versionName rootProject.versionNameTaxiPassenger
+        versionCode rootProject.versionCode as int
+        versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
         dimension "product"
diff --git a/gradle.properties b/gradle.properties
index 060f351e8b..5aa2d3ee51 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -86,17 +86,9 @@ WEBSOCKET_VERSION=1.1.7
 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
 applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
+# RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0
 versionCode=80008
-versionName=8.0.17
-# RoboTaxi司机端
-versionCodeTaxiDriver=2050100
-versionNameTaxiDriver=2.5.1
-# RoboBus司机端
-versionCodeBusDriver=2050100
-versionNameBusDriver=2.5.1
-# RoboTaxi乘客屏app
-versionCodeTaxiPassenger=1000000
-versionNameTaxiPassenger=1.0.0
+versionName=2.5.1
 
 ################# 新架构模块Maven版本管理 #################
 MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.8