diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 82a7f46..872c592 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,10 +17,10 @@ android:theme="@style/Theme.Architectureandroid"> + android:exported="true" + android:launchMode="singleTask"> - diff --git a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt index d156574..7548edb 100644 --- a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt +++ b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt @@ -25,4 +25,11 @@ object VididinEvents { const val Event_AD_TASK_TYPE_Complement = 804 const val Event_AD_TASK_TYPE_BOX_TASK = 805 + + + + // UI jump related + const val EVENT_JUMP_2_FIRST_WITHDRAW = 900 + const val EVENT_JUMP_2_SIGN = 901 + } \ No newline at end of file diff --git a/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt b/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt index 209087a..f14b2e9 100644 --- a/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt @@ -1,8 +1,10 @@ package com.gamedog.vididin.main import android.app.Activity +import com.ama.core.architecture.util.eventbus.NotifyMan import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog +import com.gamedog.vididin.VididinEvents import com.gamedog.vididin.databinding.DialogBeginnerGiftBinding import com.gamedog.vididin.router.Router @@ -27,6 +29,7 @@ class BeginnerGiftDialog(activity: Activity) : BindingDialog(), OnTab VididinEvents.EVENT_DAILY_WATCHED_AD_NUM_CHANGED -> { updateDailyWatchAdUI() } + + VididinEvents.EVENT_JUMP_2_FIRST_WITHDRAW -> { + scroll2FirstWithdraw() + } } }, VididinEvents.Event_Sign_State_Changed, VididinEvents.Event_Account_Cash_Changed, VididinEvents.Event_Account_Gold_Changed, VididinEvents.EVENT_DAILY_WATCHED_VIDEO_NUM_CHANGED, - VididinEvents.EVENT_DAILY_WATCHED_AD_NUM_CHANGED) + VididinEvents.EVENT_DAILY_WATCHED_AD_NUM_CHANGED, VididinEvents.EVENT_JUMP_2_FIRST_WITHDRAW) + } + + private fun scroll2FirstWithdraw() { + binding?.newbieContainer?.let { binding?.scrollView?.scroll2ChildView(it) } } private fun updateDailySignButUI() { diff --git a/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml b/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml index fb429a7..ffef70f 100644 --- a/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml +++ b/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml @@ -1,6 +1,7 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/core/architecture/src/main/java/com/ama/core/architecture/widget/MyScrollView.kt b/core/architecture/src/main/java/com/ama/core/architecture/widget/MyScrollView.kt new file mode 100644 index 0000000..980a4c6 --- /dev/null +++ b/core/architecture/src/main/java/com/ama/core/architecture/widget/MyScrollView.kt @@ -0,0 +1,23 @@ +package com.ama.core.architecture.widget + +import android.content.Context +import android.graphics.Rect +import android.util.AttributeSet +import android.view.View +import androidx.core.widget.NestedScrollView + +class MyScrollView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : NestedScrollView(context, attrs, defStyleAttr) { + + fun scroll2ChildView(child: View) { + val tempRect = Rect() + child.getDrawingRect(tempRect) + offsetDescendantRectToMyCoords(child, tempRect) + val scrollDelta: Int = computeScrollDeltaToGetChildRectOnScreen(tempRect) + smoothScrollTo(0, tempRect.top) + } + +}