diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java index 1194734bb3..e92e84e107 100644 --- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java +++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java @@ -45,9 +45,7 @@ public class BackToMainHomeManager { return; } - if ( mStatusManager.isAppListUIShow() ) { - mApis.getIntentManagerApi().invoke( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, new Intent() ); - } + mApis.getIntentManagerApi().invoke( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, new Intent() ); Logger.d( TAG, "返回桌面" ); diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 726b1ed0a6..bfb66cffe1 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -75,7 +75,7 @@ public class EntranceFragment extends MvpFragment120px 120px 120px - 40px + 30px 30px 32px 32px @@ -84,7 +84,7 @@ 159px 70px 70px - 24px + 56px 83px 24px 40px @@ -103,6 +103,7 @@ 36px 36px -2px + 95px 30px 40px @@ -138,6 +139,7 @@ 90px 6dp 15px + 4px 10px 20px diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index b1e5bf7240..7423964cdd 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -39,7 +39,7 @@ 120px 120px 120px - 40px + 30px 30px 32px 32px @@ -84,7 +84,7 @@ 159px 70px 70px - 24px + 56px 83px 24px 40px @@ -103,6 +103,7 @@ 36px 36px -2px + 95px 30px 40px @@ -138,6 +139,7 @@ 90px 6dp 15px + 4px 10px 20px diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 3b7a570ba8..26b9b2c5fe 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -40,7 +40,7 @@ 66px 66px 66px - 21px + 16px 16px 34.5px 20px @@ -82,25 +82,26 @@ 544px 117px - 60px + 80px 85px 85px - 38px - 38px - 13px + 40px + 40px + 30px + 44px 13px 20px 32px - 32px + 28px 7px 5px 22px - 22px + 16px 18px - 24px - + 24px 15px - 5px + 13px + 58px 9px 9px @@ -142,6 +143,7 @@ 58px 3dp 10px + 4px 6px 10px diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt index 51b81b71a5..e8b8971d26 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt @@ -32,8 +32,8 @@ import com.mogo.utils.UiThreadHandler import com.mogo.utils.glide.GlideApp class FloatView constructor( - private val pushViewModel: PushViewModel, - private val context: Context + private val pushViewModel: PushViewModel, + private val context: Context ) { companion object { @@ -50,7 +50,7 @@ class FloatView constructor( } open abstract inner class PushView(context: Context) : FrameLayout(context), - PushViewController { + PushViewController { lateinit var appIcon: ImageView lateinit var titleIconContainer: View lateinit var pushTitle: TextView @@ -103,7 +103,7 @@ class FloatView constructor( } fun hasTextContent(bean: PushBean?): Boolean = - bean?.content?.isNullOrEmpty()?.not() ?: false + bean?.content?.isNullOrEmpty()?.not() ?: false fun hasImgContent(bean: PushBean?): Boolean = bean?.QRCode?.isNullOrEmpty()?.not() ?: false @@ -139,9 +139,9 @@ class FloatView constructor( pushImage.layoutParams = params ThreadPoolService.execute { val bmp = stringConverterBitmap( - bean.QRCode, - getQrImgWidth(), - getQrImgHeight() + bean.QRCode, + getQrImgWidth(), + getQrImgHeight() ) UiThreadHandler.post { pushImage.setImageBitmap(bmp) @@ -220,6 +220,8 @@ class FloatView constructor( return } } + pushViewModel.pushBean?.showTimeout = 0 + updateTimer() } override fun onViewAdded(view: View?) { @@ -248,23 +250,23 @@ class FloatView constructor( } override fun getImgWidth(): Int = - context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_width) + context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_width) override fun getImgHeight(): Int = - context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height) + context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height) override fun getQrImgWidth(): Int = - context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height) + context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height) override fun getQrImgHeight(): Int = - context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height) + context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height) } inner class PushViewInWindowView(context: Context) : PushView(context), View.OnTouchListener { private val mContentContainer: View private val mWindowManager = - context.getSystemService(Context.WINDOW_SERVICE) as WindowManager + context.getSystemService(Context.WINDOW_SERVICE) as WindowManager private val params = WindowManager.LayoutParams() @@ -302,8 +304,8 @@ class FloatView constructor( mWindowManager.updateViewLayout(this, params) } translationXAnimation( - -ResourcesHelper.getDimension(context, R.dimen.module_push_ui_width_vertical), - 0f + -ResourcesHelper.getDimension(context, R.dimen.module_push_ui_width_vertical), + 0f ) { if (pushViewModel.pushBean != null) { startClosePush() @@ -312,17 +314,17 @@ class FloatView constructor( } private fun translationXAnimation( - from: Float, - to: Float, - doOnEnd: (animator: Animator) -> Unit + from: Float, + to: Float, + doOnEnd: (animator: Animator) -> Unit ) { val transitionXAnimator: ObjectAnimator = - ObjectAnimator.ofFloat( - this, - View.TRANSLATION_X, - from, - to - ) + ObjectAnimator.ofFloat( + this, + View.TRANSLATION_X, + from, + to + ) transitionXAnimator.duration = 200 transitionXAnimator.doOnEnd(doOnEnd) transitionXAnimator.start() @@ -333,7 +335,7 @@ class FloatView constructor( var paddingBottom: Int = 0 if (pushButton.isVisible) { paddingBottom = - context.resources.getDimensionPixelSize(R.dimen.module_push_content_paddingBottom_vertical) + context.resources.getDimensionPixelSize(R.dimen.module_push_content_paddingBottom_vertical) } mContentContainer.setPadding(0, 0, 0, paddingBottom) } @@ -341,8 +343,8 @@ class FloatView constructor( override fun hide() { super.hide() translationXAnimation( - this.x, - -ResourcesHelper.getDimension(context, R.dimen.module_push_ui_width_vertical) + this.x, + -ResourcesHelper.getDimension(context, R.dimen.module_push_ui_width_vertical) ) { Logger.d(TAG, "here") this.x = 0f @@ -413,16 +415,16 @@ class FloatView constructor( } override fun getImgWidth(): Int = - context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_width_vertical) + context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_width_vertical) override fun getImgHeight(): Int = - context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height_vertical) + context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height_vertical) override fun getQrImgWidth(): Int = - context.resources.getDimensionPixelSize(R.dimen.module_push_image_qr_size_vertical) + context.resources.getDimensionPixelSize(R.dimen.module_push_image_qr_size_vertical) override fun getQrImgHeight(): Int = - context.resources.getDimensionPixelSize(R.dimen.module_push_image_qr_size_vertical) + context.resources.getDimensionPixelSize(R.dimen.module_push_image_qr_size_vertical) } private val delayClosePush: Runnable @@ -524,8 +526,8 @@ class FloatView constructor( private fun startClosePush() { uiHandler.removeCallbacks(delayClosePush) uiHandler.postDelayed( - delayClosePush, - 1000L + delayClosePush, + 1000L ) }