From d2f68969cb7ef9dab0618a5a0f4dfd0a01ba01c5 Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Tue, 31 Mar 2020 17:57:27 +0800
Subject: [PATCH] fix bug

---
 .../mogo/module/authorize/fragment/AuthorizeFragment.kt   | 2 +-
 .../java/com/mogo/module/authorize/voice/VoiceManager.kt  | 8 +++++---
 .../java/com/mogo/module/authorize/voice/VoiceUtil.kt     | 4 ++--
 .../com/mogo/module/guide/guide/GuideStartFragment.kt     | 4 +++-
 .../src/main/res/layout/module_guide_item_start.xml       | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt
index b259a30dcf..d7a02a9adf 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt
@@ -57,7 +57,7 @@ class AuthorizeFragment : MvpFragment<AuthorizeContract.View, AuthorizePresenter
     }
 
     override fun initViews() {
-        Logger.d(TAG, "initView : ${this.javaClass.hashCode()}")
+        Logger.d(TAG, "initView ")
         AnalyticsUtil.track(INVOKE_TRACK_AUTHORIZE_SHOW)
         init()
         Logger.d(TAG, "invokeTag :$invokeTag")
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceManager.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceManager.kt
index d29e9d6a82..c664aa310d 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceManager.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceManager.kt
@@ -1,6 +1,8 @@
 package com.mogo.module.authorize.voice
 
 import android.content.Intent
+import com.mogo.module.authorize.voice.VoiceUtil.VOICE_INTENT_AGREE
+import com.mogo.module.authorize.voice.VoiceUtil.VOICE_INTENT_DISAGREE
 import com.mogo.module.authorize.voice.VoiceUtil.VOICE_REGISTER_AUTHORIZE_AGREE
 import com.mogo.module.authorize.voice.VoiceUtil.VOICE_REGISTER_AUTHORIZE_DISAGREE
 import com.mogo.utils.logger.Logger
@@ -26,12 +28,12 @@ object VoiceManager {
     fun handleOnIntentCmd(cmd: String, intent: Intent, listener: IVoiceIntentListener) {
         Logger.i(TAG, "handleOnIntentCmd: cmd -> $cmd")
         when (cmd) {
-            VOICE_REGISTER_AUTHORIZE_AGREE -> {
+            VOICE_INTENT_AGREE -> {
                 Logger.i(TAG, "语音唤醒 同意")
                 listener.onVoiceCmdAgree()
             }
-            VOICE_REGISTER_AUTHORIZE_DISAGREE -> {
-                Logger.i(TAG, "语音免唤醒 不同意")
+            VOICE_INTENT_DISAGREE -> {
+                Logger.i(TAG, "语音唤醒 不同意")
                 listener.onVoiceCmdDisAgree()
             }
         }
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt
index e7785dbd6b..3063079c34 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt
@@ -61,7 +61,7 @@ object VoiceUtil {
                         VOICE_REGISTER_AUTHORIZE_AGREE,
                         agreeArray, voiceCommand
                 )
-//        intentRegister?.registerIntentListener(VOICE_INTENT_AGREE, intentCommand)
+        intentRegister?.registerIntentListener(VOICE_INTENT_AGREE, intentCommand)
     }
 
     private fun registerDisAgree(
@@ -75,7 +75,7 @@ object VoiceUtil {
                         VOICE_REGISTER_AUTHORIZE_DISAGREE,
                         disAgreeArray, voiceCommand
                 )
-//        intentRegister?.registerIntentListener(VOICE_INTENT_DISAGREE, intentCommand)
+        intentRegister?.registerIntentListener(VOICE_INTENT_DISAGREE, intentCommand)
     }
 
     fun unregisterAll(context: Context, listener: IVoiceIntentListener) {
diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStartFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStartFragment.kt
index 39c26b0755..c06da62a58 100644
--- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStartFragment.kt
+++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStartFragment.kt
@@ -35,11 +35,13 @@ class GuideStartFragment : MvpFragment<IView, Presenter<IView>>, View.OnClickLis
         val mLinearGradient = LinearGradient(0f, 0f, 0f, moduleGuideTvStart.paint.textSize,
                 Color.parseColor("#B3B3B3"), Color.parseColor("#EBEBEB"), Shader.TileMode.CLAMP)
         moduleGuideTvStart.paint.shader = mLinearGradient
+        moduleGuideTvStart.setOnClickListener(this)
+        moduleGuideIvStart.setOnClickListener(this)
     }
 
     override fun onClick(v: View) {
         when (v.id) {
-            R.id.moduleGuideTvStart, R.id.moduleGuidetIvStart -> {
+            R.id.moduleGuideTvStart, R.id.moduleGuideIvStart -> {
                 containerFragment?.moveToNext()
             }
         }
diff --git a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_start.xml b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_start.xml
index 3fc6fef3fb..0a0cf2730d 100644
--- a/modules/mogo-module-guide/src/main/res/layout/module_guide_item_start.xml
+++ b/modules/mogo-module-guide/src/main/res/layout/module_guide_item_start.xml
@@ -6,7 +6,7 @@
     android:background="@mipmap/module_guide_item_start">
 
     <ImageView
-        android:id="@+id/moduleGuidetIvStart"
+        android:id="@+id/moduleGuideIvStart"
         android:layout_width="@dimen/dp_77"
         android:layout_height="@dimen/dp_77"
         android:layout_marginBottom="@dimen/dp_75"