From 9954f46c7082b6e6a68baef3d972a095a286e645 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 25 May 2023 15:17:35 +0800
Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[=E6=B7=BB=E5=8A=A0saas?=
 =?UTF-8?q?=E9=80=9A=E9=81=93]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                     | 10 +++++-----
 app/config/tempConfig.json           |  2 +-
 app/config/urlConfig.json            |  2 +-
 app/script/flavorfilter/flavors.json |  7 ++++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 70bad84dd7..35780b5391 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ bugly {
     appKey = '3c736249-d6be-4066-b577-b7a6dc975cf7' // 注册时分配的App Key
 }
 
-Properties properties = new Properties();
+Properties properties = new Properties()
 properties.load(project.rootProject.file("gradle.properties").newDataInputStream())
 
 android {
@@ -139,10 +139,10 @@ android {
             buildConfigField 'String', 'URLs', "\"${readFileToJson("dali").replace("\"", "\\\"")}\""
             buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("dali").replace("\"", "\\\"")}\""
         }
-        fuzhou {
+        saas {
             dimension "project"
-            buildConfigField 'String', 'URLs', "\"${readFileToJson("fuzhou").replace("\"", "\\\"")}\""
-            buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("fuzhou").replace("\"", "\\\"")}\""
+            buildConfigField 'String', 'URLs', "\"${readFileToJson("saas").replace("\"", "\\\"")}\""
+            buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("saas").replace("\"", "\\\"")}\""
         }
         // 配置网络环境，QA、线上、演示
         qa {
@@ -319,7 +319,7 @@ def variantName() {
 
             if (taskName.contains("Yantai")) {
                 project.dependencies.add('implementation', project.project(':tts:tts-iflytek'))
-            }else if (taskName.contains("Mogo") || taskName.contains("Fuzhou")) {
+            }else if (taskName.contains("Mogo") || taskName.contains("Saas")) {
                 project.dependencies.add('implementation', project.project(':tts:tts-pad'))
             }else if (taskName.contains("Dali")) {
                 project.dependencies.add('implementation', project.project(':tts:tts-pad'))
diff --git a/app/config/tempConfig.json b/app/config/tempConfig.json
index 44007f1d89..87f52a3f09 100644
--- a/app/config/tempConfig.json
+++ b/app/config/tempConfig.json
@@ -197,7 +197,7 @@
       ]
     }
   },
-  "fuzhou": {
+  "saas": {
     "shuttlepassenger": {
       "ads": [
         {
diff --git a/app/config/urlConfig.json b/app/config/urlConfig.json
index 11695bac0a..3602ac7888 100644
--- a/app/config/urlConfig.json
+++ b/app/config/urlConfig.json
@@ -104,7 +104,7 @@
       "chart_socket_url":""
     }
   },
-  "fuzhou": {
+  "saas": {
     "qa": {
       "och_url": "https://och-a.zhidaozhixing.com",
       "shuttle_url": "https://och-a.zhidaozhixing.com",
diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json
index ed5937262a..ba969cc36c 100644
--- a/app/script/flavorfilter/flavors.json
+++ b/app/script/flavorfilter/flavors.json
@@ -48,10 +48,15 @@
       "passenger": ["ochM1"]
     }
   },
-  "fuzhou": {
+  "saas": {
     "shuttle" :{
       "driver": ["ochJL","ochM2"],
       "passenger": ["ochJL","ochM2"]
+    },
+    "bus" :{
+      "driver": ["ochJL"],
+      "driverpassenger": ["ochJL"],
+      "passenger": ["ochJL"]
     }
   }
 }