[charter]

[3.2.0]
[添加saas通道]

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'))

app/config/tempConfig.json

@@ -197,7 +197,7 @@
       ]
     }
   },
-  "fuzhou": {
+  "saas": {
     "shuttlepassenger": {
       "ads": [
         {

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",

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"]
     }
   }
 }