From 6d94c39bf213b4903e76284632d25093b2ba363c Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Mon, 30 Mar 2020 15:03:53 +0800
Subject: [PATCH 1/2] fix bug

---
 .../main/res/layout/module_authorize_fragment.xml  | 14 +++++++++-----
 .../com/mogo/module/guide/MogoGuideProvider.kt     |  5 ++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml
index 14a5bb005d..27a7a62c31 100644
--- a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml
+++ b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml
@@ -109,7 +109,7 @@
         android:layout_marginTop="@dimen/dp_90"
         android:layout_marginRight="@dimen/dp_330"
         android:layout_marginBottom="@dimen/dp_90"
-        android:background="@drawable/module_authorize_shape_drak_top_corner"
+        android:background="@drawable/module_authorize_selector_dark_corner"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -117,7 +117,8 @@
 
         <Button
             android:id="@+id/btnAuthorizeAgree"
-            android:layout_width="@dimen/dp_607"
+            android:layout_width="0px"
+            app:layout_constraintHorizontal_weight="1"
             android:layout_height="@dimen/dp_156"
             android:background="@drawable/module_authorize_selector_blue_left_corner"
             android:gravity="center"
@@ -125,19 +126,22 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/dp_55"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/btnAuthorizeDisAgree" />
 
         <Button
             android:id="@+id/btnAuthorizeDisAgree"
-            android:layout_width="@dimen/dp_607"
+            android:layout_width="0px"
             android:layout_height="@dimen/dp_156"
+            app:layout_constraintHorizontal_weight="1"
             android:background="@drawable/module_authorize_selector_dark_right_corner"
             android:gravity="center"
             android:text="@string/module_authorize_agreement_disagree"
             android:textColor="@android:color/white"
             android:textSize="@dimen/dp_55"
+            app:layout_constraintLeft_toRightOf="@+id/btnAuthorizeAgree"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintRight_toRightOf="parent"/>
 
         <ScrollView
             android:layout_width="0px"
diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt
index 917b658898..2920563afb 100644
--- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt
+++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt
@@ -14,6 +14,7 @@ import com.mogo.module.guide.GuideConstant.Companion.PATH_GUIDE_MODULE_NAME
 import com.mogo.service.module.IMogoModuleLifecycle
 import com.mogo.service.module.IMogoModuleProvider
 import com.mogo.service.module.ModuleType
+import com.mogo.utils.UiThreadHandler
 
 @Route(path = PATH_GUIDE_FRAGMENT)
 class MogoGuideProvider : IMogoModuleProvider {
@@ -58,7 +59,9 @@ class MogoGuideProvider : IMogoModuleProvider {
     }
 
     override fun init(context: Context?) {
-        GuideBizManager.init()
+        UiThreadHandler.postDelayed({
+            GuideBizManager.init()
+        }, 5000L)
     }
 
     override fun getAppPackage(): String? {

From 06fe0d8b313f7d09d72ddf8593d8340ad17a1f4f Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Mon, 30 Mar 2020 15:06:51 +0800
Subject: [PATCH 2/2] rename id

---
 .../com/mogo/module/authorize/fragment/AuthorizeFragment.kt | 6 +++---
 .../src/main/res/layout/module_authorize_fragment.xml       | 2 +-
 2 files changed, 4 insertions(+), 4 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 7e919f996d..918f71156d 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
@@ -41,7 +41,7 @@ class AuthorizeFragment(private val invokeTag: String) : MvpFragment<AuthorizeCo
 
     override fun readyToAuthorize() {
         clLoadingErrorContainer.visibility = View.GONE
-        clLoadingContainer.visibility = View.VISIBLE
+        clLoadingAuthorizeContainer.visibility = View.VISIBLE
     }
 
     override fun showAuthorizationAgreementContent(
@@ -51,7 +51,7 @@ class AuthorizeFragment(private val invokeTag: String) : MvpFragment<AuthorizeCo
             agreementBottom: String,
             agreementLast: String) {
         VoiceUtil.speak(context!!.resources.getString(R.string.module_authorize_agreement_tip), context!!, this)
-        clLoadingContainer.visibility = View.GONE
+        clLoadingAuthorizeContainer.visibility = View.GONE
         clAuthorizeContainer.visibility = View.VISIBLE
         this.agreementId = agreementId
         tvAuthorizeTitle.text = Html.fromHtml(agreementTitle)
@@ -61,7 +61,7 @@ class AuthorizeFragment(private val invokeTag: String) : MvpFragment<AuthorizeCo
     }
 
     override fun showAuthorizationError() {
-        clLoadingContainer.visibility = View.GONE
+        clLoadingAuthorizeContainer.visibility = View.GONE
         clLoadingErrorContainer.visibility = View.VISIBLE
     }
 
diff --git a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml
index 27a7a62c31..7274745c5b 100644
--- a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml
+++ b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml
@@ -6,7 +6,7 @@
     android:background="#000000">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/clLoadingContainer"
+        android:id="@+id/clLoadingAuthorizeContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginLeft="@dimen/dp_330"