From 78e869a3b4f88fa104d1e0204df1e8116db94e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 29 Jul 2021 19:28:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E5=B7=B4=E8=BD=A6?=
 =?UTF-8?q?=20TTS=20=E6=8A=8A=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E3=80=90=E8=98=91=E8=8F=87=E8=BD=A6=E8=81=94=E3=80=91?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E3=80=8C=E2=80=99=E8=98=91=E8=8F=87=E8=BD=A6?=
 =?UTF-8?q?=E8=81=94=E2=80=98=E3=80=8D=E8=A7=A3=E5=86=B3=E6=96=AD=E5=8F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                    |  3 +--
 .idea/runConfigurations.xml                         | 13 -------------
 .../com/mogo/och/bus/presenter/OchBusPresenter.java |  4 ++--
 OCH/mogo-och-taxi/src/main/res/values/strings.xml   |  2 +-
 .../src/main/res/values/strings.xml                 |  2 +-
 .../src/main/res/values/strings.xml                 |  4 ++--
 6 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e5099552a0..861e8a3cfd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
@@ -90,7 +90,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index e497da9998..0000000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
index 60aed92e2e..838b111c71 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
@@ -324,7 +324,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog
             return;
         }
         isGoingToNextStation = true;
-        AIAssist.getInstance( getContext() ).speakTTSVoice( "欢迎乘坐蘑菇车联无人驾驶小巴车，请您坐好，注意乘车安全，行程即将开始" );
+        AIAssist.getInstance( getContext() ).speakTTSVoice( "欢迎乘坐’蘑菇车联‘无人驾驶小巴车，请您坐好，注意乘车安全，行程即将开始" );
         RequestBody request = RequestBody.create( MediaType.get( "application/json" ), GsonUtil.jsonFromObject( new OchBusLeaveStationRequest( Utils.getSn(), stationList.get( currentStationIndex ).getSiteId() ) ) );
         mService.leaveStation( request ).subscribeOn( Schedulers.io() )
                 .observeOn( AndroidSchedulers.mainThread() )
@@ -482,7 +482,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog
         }
         Logger.d( TAG, "单程结束====" );
         MogoApisHandler.getInstance().getApis().getAdasControllerApi().cancelAutopilot();
-        AIAssist.getInstance( getContext() ).speakTTSVoice( "感谢您体验蘑菇车联无人驾驶小巴车，请您携带好随身物品，我们下次再见" );
+        AIAssist.getInstance( getContext() ).speakTTSVoice( "感谢您体验’蘑菇车联‘无人驾驶小巴车，请您携带好随身物品，我们下次再见" );
         RequestBody request = RequestBody.create( MediaType.get( "application/json" ), GsonUtil.jsonFromObject( new OchBusLeaveStationRequest( Utils.getSn(), stationList.get( currentStationIndex ).getSiteId() ) ) );
         mService.leaveStation( request ).subscribeOn( Schedulers.io() )
                 .observeOn( AndroidSchedulers.mainThread() )
diff --git a/OCH/mogo-och-taxi/src/main/res/values/strings.xml b/OCH/mogo-och-taxi/src/main/res/values/strings.xml
index c5d671ad04..bd72319fc8 100644
--- a/OCH/mogo-och-taxi/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="module_och_taxi_order_status_ph_text">已到达上车站点，等待乘客上车</string>
     <string name="module_och_taxi_order_distance_anchor_text">预计里程</string>
     <string name="module_och_taxi_order_distance_text_ph">3.2 km</string>
-    <string name="module_och_taxi_order_complete">请携带好随身物品，注意侧后\n方来车，感谢体验蘑菇车联自\n动驾驶车！</string>
+    <string name="module_och_taxi_order_complete">请携带好随身物品，注意侧后\n方来车，感谢体验’蘑菇车联‘自\n动驾驶车！</string>
     <string name="module_och_taxi_on_the_way_2_end_station">去往下车地点</string>
     <string name="module_och_taxi_waiting">已到达，等待乘客上车</string>
     <string name="module_och_taxi_new_order">收到新订单，前往上车地点</string>
diff --git a/modules/mogo-module-guide/src/main/res/values/strings.xml b/modules/mogo-module-guide/src/main/res/values/strings.xml
index 4d6fb31f49..6ce77e8b38 100644
--- a/modules/mogo-module-guide/src/main/res/values/strings.xml
+++ b/modules/mogo-module-guide/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="module_guide_item_next_step">下一步</string>
     <string name="module_guide_finish">结束</string>
 
-    <string name="module_guide_voice_page_one">欢迎使用蘑菇车联，您下次可以直接对我说，打开蘑菇车联来直接进入应用，点击左下方按钮进行摄像头设置</string>
+    <string name="module_guide_voice_page_one">欢迎使用’蘑菇车联‘，您下次可以直接对我说，打开’蘑菇车联‘来直接进入应用，点击左下方按钮进行摄像头设置</string>
     <string name="module_guide_voice_page_two">左边是道路事件的播报，点击右边地图上的事件标示可以查看事件详情,或者直接唤醒小智说，中关村附近堵不堵，来查询目的地周围路况</string>
     <string name="module_guide_voice_page_three">这里是道路信息显示，点击后可查看事件详情</string>
     <string name="module_guide_voice_page_four">这里是事件汇总，您可以查看您参与的事件和您的分享记录</string>
diff --git a/modules/mogo-module-service/src/main/res/values/strings.xml b/modules/mogo-module-service/src/main/res/values/strings.xml
index 2bda294524..dc38b2a33b 100644
--- a/modules/mogo-module-service/src/main/res/values/strings.xml
+++ b/modules/mogo-module-service/src/main/res/values/strings.xml
@@ -1,9 +1,9 @@
 <resources>
     <string name="app_name">mogo-module-service</string>
     <string name="module_service_app_entrance_text">辅助\n驾驶</string>
-    <string name="module_service_launcher_card_tips">你的周围有%d个%s，请点击查看，你也可以对我说打开蘑菇车联</string>
+    <string name="module_service_launcher_card_tips">你的周围有%d个%s，请点击查看，你也可以对我说打开’蘑菇车联‘</string>
     <string name="module_service_launcher_card_info">周围有%d个%s</string>
-    <string name="module_service_open_app_tip">亲，建议您使用蘑菇车联</string>
+    <string name="module_service_open_app_tip">亲，建议您使用’蘑菇车联‘</string>
     <string name="module_services_str_20Km_radius">扩大到20公里半径</string>
     <string name="module_services_str_40Km_radius">扩大到40公里半径</string>
     <string name="module_services_panel_item_distance_tag_text">距离目的地</string>