[6.7.2]

[Update]
1、升级动态皮肤加载SDK
2、完善YiXin皮肤包中的文案/TTS，蘑菇--》易鑫

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt

@@ -21,6 +21,7 @@ import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.charter.passenger.presenter.BusPassengerPresenter
 import com.mogo.och.charter.passenger.presenter.CharterPassengerNoviceGuidancePresenter
 import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.skin.utils.SkinResources
 import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome
 import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_01
 import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_02
@@ -315,7 +316,7 @@ class NoviceGuidanceFragment :
     }
 
     fun setProductType(type: String) {
-        actv_start_guildance.text = "欢迎乘坐蘑菇车联自动驾驶$type!"
+        actv_start_guildance.text = "欢迎乘坐${SkinResources.getInstance().getString(R.string.operation_platform_name)}车联自动驾驶$type!"
     }
 
     companion object {

OCH/charter/passenger/src/main/res/layout/charter_p_devices_fragment.xml

@@ -105,7 +105,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/actv_end_order_content"
-            android:text="要提前说再见了吗？蘑菇小助手很舍不得您呢！"
+            android:text="@string/end_order_content"
             android:textSize="@dimen/dp_26"
             android:textColor="@color/charter_p_112b57"
             app:layout_constraintStart_toStartOf="parent"

OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_fragment.xml

@@ -12,7 +12,7 @@
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="@dimen/dp_186"
         android:layout_marginStart="@dimen/dp_280"
-        android:text="欢迎乘坐蘑菇车联自动驾驶!"
+        android:text="@string/start_guildance"
         android:visibility="gone"
         android:textSize="@dimen/dp_52"
         android:textStyle="bold"
@@ -39,7 +39,7 @@
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="@+id/actv_complete_guidance_title"
         app:layout_constraintTop_toBottomOf="@+id/actv_complete_guidance_title"
-        android:text="您已完成乘车指南，更多功能欢迎探索~\n蘑菇小助手预祝您旅途愉快!"
+        android:text="@string/complete_guidance_value"
         android:textSize="@dimen/dp_43"
         android:textColor="@color/charter_p_101c35"
         android:textStyle="bold"

OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml

@@ -134,7 +134,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="稍等，亲\n蘑菇小助手正在为您确认信息…"
+                android:text="@string/loading_wait_driver_title"
                 android:textColor="@color/charter_p_4a5375"
                 android:textSize="@dimen/dp_30"
                 app:layout_constraintEnd_toEndOf="@+id/iv_loading_wait_driver"

OCH/charter/passenger/src/main/res/values/strings.xml

@@ -50,6 +50,12 @@
     <string name="charter_p_start_auto_fail">自驾系统繁忙，稍后再试试吧～</string>
     <string name="charter_p_arrived_station_left_100">%1$s就要到啦！</string>
     <string name="charter_p_net_error">稍后再来看看吧</string>
+
+
+    <string name="start_guildance">欢迎乘坐蘑菇车联自动驾驶!</string>
+    <string name="loading_wait_driver_title">稍等，亲\n蘑菇小助手正在为您确认信息…</string>
+    <string name="end_order_content">要提前说再见了吗？蘑菇小助手很舍不得您呢！</string>
+    <string name="complete_guidance_value">您已完成乘车指南，更多功能欢迎探索~\n蘑菇小助手预祝您旅途愉快!</string>
 <!--    <string name="m1_novice_guidance_tts">正在为您靠边停车，扶稳坐好哟</string>-->
 <!--    <string name="m1_novice_guidance_tts">靠边停车成功</string>-->
 <!--    <string name="m1_novice_guidance_tts">车辆系统繁忙，请稍后再试</string>-->

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java

@@ -45,6 +45,7 @@ import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum;
 import com.mogo.och.taxi.bean.OrderQueryRespBean;
 import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean;
 import com.mogo.och.taxi.model.TaxiModel;
+import com.mogo.skin.utils.SkinResources;
 
 import java.util.Calendar;
 import java.util.List;
@@ -586,7 +587,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
                         mTtsLessThan200Tip = 0;
                         isFirstStartAutopilotDone = true;
                         mOrderCancel.setVisibility(View.GONE);
-                        VoiceNotice.showNotice("感谢您使用蘑菇智行,再见~");
+                        VoiceNotice.showNotice("感谢您使用"+ SkinResources.getInstance().getString(R.string.operation_platform_name)+"智行,再见~");
                         showOrHideNavi(false);
                         break;
                 }

OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml

@@ -115,7 +115,7 @@
         app:backageViewId="@+id/actv_video_press"
         app:selectedDrawable="@drawable/taxt_p_bottom_video_press"
         app:normalDrawable="@drawable/taxt_p_bottom_video_normal"
-        app:bottomTitle="蘑菇资讯"
+        app:bottomTitle="@string/actv_video_title"
         android:layout_marginStart="@dimen/dp_107"
         app:bottomTitleCheckedColor="@color/white"
         app:bottomTitleNormalColor="@color/taxi_cp_41444D"

OCH/taxi/pcommon/src/main/res/values/strings.xml

@@ -2,4 +2,6 @@
 <resources>
     <string name="taxi_cp_setting_light">亮度</string>
     <string name="taxi_cp_setting_sound">音量</string>
+
+    <string name="actv_video_title">蘑菇资讯</string>
 </resources>