From 5e06f3f1846e4435187914c715b43a486c8e36ff Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Thu, 10 Sep 2020 11:43:11 +0800
Subject: [PATCH] fix bug

---
 .../com/mogo/module/guide/guide/GuideStageFiveFragment.kt | 2 +-
 .../com/mogo/module/guide/guide/GuideStageFourFragment.kt | 3 ++-
 .../com/mogo/module/guide/guide/GuideStageOneFragment.kt  | 2 +-
 .../mogo/module/guide/guide/GuideStageThreeFragment.kt    | 4 +++-
 .../com/mogo/module/guide/guide/GuideStageTwoFragment.kt  | 3 ++-
 .../src/main/res/layout/module_guide_item_include.xml     | 8 ++++----
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt
index 2598e06f6c..3d955ab3e8 100644
--- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt
+++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt
@@ -32,7 +32,7 @@ class GuideStageFiveFragment : MvpFragment<IView, Presenter<IView>> {
         super.onResume()
         containerFragment?.invisibleRight()
         speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_five), object : IMogoVoiceCmdCallBack {
-            override fun onTTSEnd(ttsId: String?, tts: String?) {
+            override fun onSpeakEnd(speakText: String?) {
                 containerFragment?.closeGuideFragment()
             }
         })
diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt
index fe9a84a81d..96df9cb926 100644
--- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt
+++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt
@@ -30,9 +30,10 @@ class GuideStageFourFragment : MvpFragment<IView, Presenter<IView>> {
 
     override fun onResume() {
         super.onResume()
+        containerFragment?.visibleLeft()
         containerFragment?.visibleRight()
         speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_four), object : IMogoVoiceCmdCallBack {
-            override fun onTTSEnd(ttsId: String?, tts: String?) {
+            override fun onSpeakEnd(speakText: String?) {
                 containerFragment?.moveToNext()
             }
         })
diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt
index a4c572b32a..b2f8b7470a 100644
--- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt
+++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt
@@ -36,7 +36,7 @@ class GuideStageOneFragment : MvpFragment<IView, Presenter<IView>> {
         super.onResume()
         containerFragment?.invisibleLeft()
         speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_one), object : IMogoVoiceCmdCallBack {
-            override fun onTTSEnd(ttsId: String?, tts: String?) {
+            override fun onSpeakEnd(speakText: String?) {
                 containerFragment?.moveToNext()
             }
         })
diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt
index 853c04a47c..e649cab503 100644
--- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt
+++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt
@@ -30,8 +30,10 @@ class GuideStageThreeFragment : MvpFragment<IView, Presenter<IView>> {
 
     override fun onResume() {
         super.onResume()
+        containerFragment?.visibleLeft()
+        containerFragment?.visibleRight()
         speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_three), object : IMogoVoiceCmdCallBack {
-            override fun onTTSEnd(ttsId: String?, tts: String?) {
+            override fun onSpeakEnd(speakText: String?) {
                 containerFragment?.moveToNext()
             }
         })
diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt
index 10700d5969..c9ddf0137a 100644
--- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt
+++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt
@@ -31,8 +31,9 @@ class GuideStageTwoFragment : MvpFragment<IView, Presenter<IView>> {
     override fun onResume() {
         super.onResume()
         containerFragment?.visibleLeft()
+        containerFragment?.visibleRight()
         speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_two), object : IMogoVoiceCmdCallBack {
-            override fun onTTSEnd(ttsId: String?, tts: String?) {
+            override fun onSpeakEnd(speakText: String?) {
                 containerFragment?.moveToNext()
             }
         })
diff --git a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_include.xml b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_include.xml
index 3db0f73706..c46d99fe5c 100644
--- a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_include.xml
+++ b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_include.xml
@@ -6,8 +6,8 @@
 
     <ImageView
         android:id="@+id/module_guide_page_right"
-        android:layout_width="@dimen/dp_52"
-        android:layout_height="@dimen/dp_87"
+        android:layout_width="@dimen/dp_54"
+        android:layout_height="@dimen/dp_90"
         android:layout_marginRight="@dimen/dp_92"
         android:visibility="gone"
         android:src="@mipmap/module_guide_right_page"
@@ -17,8 +17,8 @@
 
     <ImageView
         android:id="@+id/module_guide_page_left"
-        android:layout_width="@dimen/dp_52"
-        android:layout_height="@dimen/dp_87"
+        android:layout_width="@dimen/dp_54"
+        android:layout_height="@dimen/dp_90"
         android:layout_marginLeft="@dimen/dp_92"
         android:visibility="gone"
         android:src="@mipmap/module_guide_left_page"