diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeContract.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeContract.kt index 91c4683926..4573e021ba 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeContract.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizeContract.kt @@ -10,6 +10,8 @@ class AuthorizeContract { fun readyToAuthorize() fun showAuthorizationError() + + fun voiceAuthorizeError() } interface Biz { 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 792494b6d8..b259a30dcf 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 @@ -32,7 +32,7 @@ class AuthorizeFragment : MvpFragment { diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizePresenter.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizePresenter.kt index 91fb367b28..69fb0e834e 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizePresenter.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/fragment/AuthorizePresenter.kt @@ -2,12 +2,14 @@ package com.mogo.module.authorize.fragment import androidx.lifecycle.LifecycleOwner import com.mogo.commons.mvp.Presenter +import com.mogo.module.authorize.R import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeRegisterHandler import com.mogo.module.authorize.authprovider.launcher.MogoAuthorizeMainController import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Companion.mogoAuthShow import com.mogo.module.authorize.model.bean.Agreement import com.mogo.module.authorize.util.DateUtil.parseDateToTime import com.mogo.module.authorize.util.SharedPreferenceUtil.updateAuthorizeVersion +import com.mogo.module.authorize.voice.VoiceUtil import com.mogo.utils.logger.Logger class AuthorizePresenter : Presenter, AuthorizeContract.Biz { @@ -80,6 +82,7 @@ class AuthorizePresenter : Presenter, AuthorizeContract. }, { closeAuthorizeView() }) + mView.voiceAuthorizeError() } private fun closeAuthorizeView() { diff --git a/modules/mogo-module-authorize/src/main/res/values/strings.xml b/modules/mogo-module-authorize/src/main/res/values/strings.xml index 7c09fd8115..55ab13ef81 100644 --- a/modules/mogo-module-authorize/src/main/res/values/strings.xml +++ b/modules/mogo-module-authorize/src/main/res/values/strings.xml @@ -5,5 +5,6 @@ 正在加载,请稍等... 加载失败 点击重试 - 您还没有授权,不可分享,您可以说“同意”进行授权。 + 请阅读用户协议并做出选择。未授权部分功能的使用会受到限制。您可以说“同意”进行授权。 + 授权失败 diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideAdapter.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideAdapter.kt index 6d21d0fa62..de1b0d7e81 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideAdapter.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideAdapter.kt @@ -27,7 +27,7 @@ class GuideAdapter(fragmentActivity: GuideFragment) : FragmentStateAdapter(fragm } init { - guideList.add(GUIDE_PAGE_START, GuideStartFragment()) + guideList.add(GUIDE_PAGE_START, GuideStartFragment(fragmentActivity)) guideList.add(GUIDE_PAGE_CARD, GuideCardFragment(fragmentActivity)) guideList.add(GUIDE_PAGE_ONLINE_CAR, GuideOnLineCarFragment(fragmentActivity)) guideList.add(GUIDE_PAGE_NAVIGATION, GuideNavigationFragment(fragmentActivity)) 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 bb7cd9f341..39c26b0755 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 @@ -1,13 +1,26 @@ package com.mogo.module.guide.guide +import android.graphics.Color +import android.graphics.LinearGradient +import android.graphics.Shader +import android.view.View import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter import com.mogo.module.guide.R +import com.mogo.module.guide.fragment.GuideFragment import com.mogo.module.guide.util.AnalyticsUtil import com.mogo.module.guide.util.AnalyticsUtil.INVOKE_TRACK_SHOW +import kotlinx.android.synthetic.main.module_guide_item_start.* -class GuideStartFragment : MvpFragment>() { + +class GuideStartFragment : MvpFragment>, View.OnClickListener { + + private var containerFragment: GuideFragment? = null + + constructor(containerFragment: GuideFragment) { + this.containerFragment = containerFragment + } override fun getLayoutId(): Int { return R.layout.module_guide_item_start @@ -19,6 +32,17 @@ class GuideStartFragment : MvpFragment>() { override fun initViews() { AnalyticsUtil.track(INVOKE_TRACK_SHOW, hashMapOf("pages_num" to 1)) + val mLinearGradient = LinearGradient(0f, 0f, 0f, moduleGuideTvStart.paint.textSize, + Color.parseColor("#B3B3B3"), Color.parseColor("#EBEBEB"), Shader.TileMode.CLAMP) + moduleGuideTvStart.paint.shader = mLinearGradient + } + + override fun onClick(v: View) { + when (v.id) { + R.id.moduleGuideTvStart, R.id.moduleGuidetIvStart -> { + containerFragment?.moveToNext() + } + } } class GuideStartPresenter : Presenter { 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 e3ca21994f..3fc6fef3fb 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 @@ -1,5 +1,29 @@ \ No newline at end of file + android:layout_height="match_parent" + android:background="@mipmap/module_guide_item_start"> + + + + + \ No newline at end of file diff --git a/modules/mogo-module-guide/src/main/res/mipmap-ldpi/module_guide_item_start_scroll.png b/modules/mogo-module-guide/src/main/res/mipmap-ldpi/module_guide_item_start_scroll.png new file mode 100644 index 0000000000..23ca7ad659 Binary files /dev/null and b/modules/mogo-module-guide/src/main/res/mipmap-ldpi/module_guide_item_start_scroll.png differ diff --git a/modules/mogo-module-guide/src/main/res/values/strings.xml b/modules/mogo-module-guide/src/main/res/values/strings.xml index 377130cc80..4cc90ce4d9 100644 --- a/modules/mogo-module-guide/src/main/res/values/strings.xml +++ b/modules/mogo-module-guide/src/main/res/values/strings.xml @@ -1,5 +1,6 @@ mogo-module-guide-agreement + 左滑了解更多 进入首页 下一步 跳过教程