yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/v1.0.3' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.3

Browse Source
This commit is contained in:
wangcongtao
2020-03-30 15:15:22 +08:00
parent 82c08b5c74 06fe0d8b31
commit e285f6301e
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeFragment.kt
View File

@@ -41,7 +41,7 @@ class AuthorizeFragment(private val invokeTag: String) : MvpFragment<AuthorizeCo
override fun readyToAuthorize() { override fun readyToAuthorize() {
clLoadingErrorContainer.visibility = View.GONE clLoadingErrorContainer.visibility = View.GONE
clLoadingContainer.visibility = View.VISIBLE clLoadingAuthorizeContainer.visibility = View.VISIBLE
} }
override fun showAuthorizationAgreementContent( override fun showAuthorizationAgreementContent(
@@ -51,7 +51,7 @@ class AuthorizeFragment(private val invokeTag: String) : MvpFragment<AuthorizeCo
agreementBottom: String, agreementBottom: String,
agreementLast: String) { agreementLast: String) {
VoiceUtil.speak(context!!.resources.getString(R.string.module_authorize_agreement_tip), context!!, this) 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 clAuthorizeContainer.visibility = View.VISIBLE
this.agreementId = agreementId this.agreementId = agreementId
tvAuthorizeTitle.text = Html.fromHtml(agreementTitle) tvAuthorizeTitle.text = Html.fromHtml(agreementTitle)
@@ -61,7 +61,7 @@ class AuthorizeFragment(private val invokeTag: String) : MvpFragment<AuthorizeCo
} }
override fun showAuthorizationError() { override fun showAuthorizationError() {
clLoadingContainer.visibility = View.GONE clLoadingAuthorizeContainer.visibility = View.GONE
clLoadingErrorContainer.visibility = View.VISIBLE clLoadingErrorContainer.visibility = View.VISIBLE
} }

16
modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml
View File

@@ -6,7 +6,7 @@
android:background="#000000"> android:background="#000000">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clLoadingContainer" android:id="@+id/clLoadingAuthorizeContainer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_330" android:layout_marginLeft="@dimen/dp_330"
@@ -109,7 +109,7 @@
android:layout_marginTop="@dimen/dp_90" android:layout_marginTop="@dimen/dp_90"
android:layout_marginRight="@dimen/dp_330" android:layout_marginRight="@dimen/dp_330"
android:layout_marginBottom="@dimen/dp_90" 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" android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -117,7 +117,8 @@
<Button <Button
android:id="@+id/btnAuthorizeAgree" 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:layout_height="@dimen/dp_156"
android:background="@drawable/module_authorize_selector_blue_left_corner" android:background="@drawable/module_authorize_selector_blue_left_corner"
android:gravity="center" android:gravity="center"
@@ -125,19 +126,22 @@
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/dp_55" android:textSize="@dimen/dp_55"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/btnAuthorizeDisAgree" />
<Button <Button
android:id="@+id/btnAuthorizeDisAgree" android:id="@+id/btnAuthorizeDisAgree"
android:layout_width="@dimen/dp_607" android:layout_width="0px"
android:layout_height="@dimen/dp_156" android:layout_height="@dimen/dp_156"
app:layout_constraintHorizontal_weight="1"
android:background="@drawable/module_authorize_selector_dark_right_corner" android:background="@drawable/module_authorize_selector_dark_right_corner"
android:gravity="center" android:gravity="center"
android:text="@string/module_authorize_agreement_disagree" android:text="@string/module_authorize_agreement_disagree"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/dp_55" android:textSize="@dimen/dp_55"
app:layout_constraintLeft_toRightOf="@+id/btnAuthorizeAgree"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintRight_toRightOf="parent"/>
<ScrollView <ScrollView
android:layout_width="0px" android:layout_width="0px"

5
modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt
View File

@@ -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.IMogoModuleLifecycle
import com.mogo.service.module.IMogoModuleProvider import com.mogo.service.module.IMogoModuleProvider
import com.mogo.service.module.ModuleType import com.mogo.service.module.ModuleType
import com.mogo.utils.UiThreadHandler
@Route(path = PATH_GUIDE_FRAGMENT) @Route(path = PATH_GUIDE_FRAGMENT)
class MogoGuideProvider : IMogoModuleProvider { class MogoGuideProvider : IMogoModuleProvider {
@@ -58,7 +59,9 @@ class MogoGuideProvider : IMogoModuleProvider {
} }
override fun init(context: Context?) { override fun init(context: Context?) {
GuideBizManager.init() UiThreadHandler.postDelayed({
GuideBizManager.init()
}, 5000L)
} }
override fun getAppPackage(): String? { override fun getAppPackage(): String? {