From 1c0b58fb3d6edff7b6472887e550384d7f52bd00 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 16 Jul 2020 17:22:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=AA=E5=B1=8F=E9=A1=B5?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=EF=BC=8C=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=BE=85=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../splash/{BydConst.kt => SplashConst.kt} | 2 +- .../{BydProvider.kt => SplashProvider.kt} | 6 +-- .../splash/fragment/BydSplashFragment.kt | 38 ++++++++++++++++++- .../main/res/layout/fragment_byd_splash.xml | 12 ++++++ 5 files changed, 53 insertions(+), 7 deletions(-) rename modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/{BydConst.kt => SplashConst.kt} (85%) rename modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/{BydProvider.kt => SplashProvider.kt} (91%) diff --git a/app/build.gradle b/app/build.gradle index dd70785bb6..a4902d69a3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -300,7 +300,7 @@ dependencies { releaseImplementation project(':modules:mogo-module-gps-simulator-noop') implementation project(':modules:mogo-module-media') implementation project(':modules:mogo-module-service') -// implementation project(':modules:mogo-module-splash') + implementation project(':modules:mogo-module-splash') // 事件面板分渠道引用 d82xImplementation project(':modules:mogo-module-event-panel-noop') em1Implementation project(':modules:mogo-module-event-panel-noop') diff --git a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashConst.kt similarity index 85% rename from modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt rename to modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashConst.kt index 127a37c7d8..a2ffcbd208 100644 --- a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt +++ b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashConst.kt @@ -1,6 +1,6 @@ package com.zhidao.mogo.module.splash -object BydConst { +object SplashConst { const val MODULE_NAME = "MODULE_SPLASH" const val PATH_NAME = "/splash/api" } \ No newline at end of file diff --git a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashProvider.kt similarity index 91% rename from modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt rename to modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashProvider.kt index e3456e3130..207206469e 100644 --- a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt +++ b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashProvider.kt @@ -13,8 +13,8 @@ import com.mogo.map.navi.IMogoNaviListener import com.mogo.service.module.IMogoModuleLifecycle import com.mogo.service.module.IMogoModuleProvider import com.mogo.utils.logger.Logger -import com.zhidao.mogo.module.splash.BydConst.MODULE_NAME -import com.zhidao.mogo.module.splash.BydConst.PATH_NAME +import com.zhidao.mogo.module.splash.SplashConst.MODULE_NAME +import com.zhidao.mogo.module.splash.SplashConst.PATH_NAME import com.zhidao.mogo.module.splash.fragment.BydSplashFragment /** @@ -23,7 +23,7 @@ import com.zhidao.mogo.module.splash.fragment.BydSplashFragment * @author tongchenfei */ @Route(path = PATH_NAME) -class BydProvider : IMogoModuleProvider { +class SplashProvider : IMogoModuleProvider { override fun getNaviListener(): IMogoNaviListener? { return null } diff --git a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt index f1d48a718d..bcd4301496 100644 --- a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt +++ b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt @@ -1,19 +1,53 @@ package com.zhidao.mogo.module.splash.fragment +import android.os.Handler +import android.os.Message import com.mogo.commons.mvp.MvpFragment import com.zhidao.mogo.module.splash.R import com.zhidao.mogo.module.splash.presenter.BydSplashPresenter import kotlinx.android.synthetic.main.fragment_byd_splash.* -class BydSplashFragment :MvpFragment(){ +const val DEFAULT_COUNT_DOWN_TIME = 5 +const val MSG_COUNT_DOWN = 1001 +const val DEFAULT_COUNT_DOWN_DELAY = 1000L +class BydSplashFragment :MvpFragment(),Handler.Callback{ + private val handler = Handler(this) + private var countDownTime = DEFAULT_COUNT_DOWN_TIME + override fun getLayoutId(): Int = R.layout.fragment_byd_splash override fun initViews() { + startCountDown() tvByd.setOnClickListener { - activity!!.supportFragmentManager.beginTransaction().remove(this).commit() + hideSplash() } } override fun createPresenter(): BydSplashPresenter = BydSplashPresenter(this) + private fun startCountDown(){ + handler.removeMessages(MSG_COUNT_DOWN) + countDownTime = DEFAULT_COUNT_DOWN_TIME + tvCountDown.text = countDownTime.toString() + handler.sendEmptyMessageDelayed(MSG_COUNT_DOWN, DEFAULT_COUNT_DOWN_DELAY) + } + + override fun handleMessage(msg: Message): Boolean { + if (msg.what == MSG_COUNT_DOWN) { + countDownTime-- + if(countDownTime>0) { + tvCountDown.text = countDownTime.toString() + handler.sendEmptyMessageDelayed(MSG_COUNT_DOWN, DEFAULT_COUNT_DOWN_DELAY) + }else{ + hideSplash() + } + return true + } + return false + } + + private fun hideSplash(){ + handler.removeMessages(MSG_COUNT_DOWN) + activity!!.supportFragmentManager.beginTransaction().remove(this).commit() + } } \ No newline at end of file diff --git a/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml b/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml index 48d96894c5..45207fa003 100644 --- a/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml +++ b/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml @@ -20,4 +20,16 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + \ No newline at end of file