Skip to content

L
LuckyFarm
Commit e6336f03 authored by Li's avatar Li
Browse files
Options

[李俊岐] 优化钻石弹窗

parent 59e214b8
Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 29 deletions
app/src/main/java/com/ym/msdh/game/activity/WelfareActivity.kt
View file @ e6336f03
......@@ -209,16 +209,7 @@ class WelfareActivity : BaseActivity(), WelfareContract.View,
request()
if (result != null) {
EventUtils.onEvent("welfare_task_receive_dialog_show")
CenterDialog.showgetWaterDrop(
this,
3,
mData?.coins?.toInt()!!,
"welfare_task_receive",
DialogInterface.OnCancelListener {
},
null
)
GameDialog.showDiamandReward(this, mData?.coins?:0)
}
}
......
library/src/main/java/com/ym/library/base/BaseDialog.kt
View file @ e6336f03
......@@ -48,8 +48,9 @@ open class BaseDialog {
//window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,0);
window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
window.attributes = lp
if (animation == 0)
window.setWindowAnimations(R.style.UpdateVersionCompatDialogTheme)//设置动画
if (animation > 0)
window.setWindowAnimations(animation)//设置动画
// window.setWindowAnimations(R.style.UpdateVersionCompatDialogTheme)//设置动画
return mDialogView
}
......
library/src/main/java/com/ym/library/utils/GameDialog.kt
View file @ e6336f03
......@@ -111,7 +111,7 @@ object GameDialog : BaseDialog() {
iv_close?.setOnClickListener {
mDialog?.dismiss()
}
AdUtils.showFeedAd(activity, "", layout_ad)
AdUtils.showFeedAd(activity, "open_red_envelope_dialog", layout_ad)
mDialog.setCanceledOnTouchOutside(false)
......@@ -167,7 +167,7 @@ object GameDialog : BaseDialog() {
iv_close?.setOnClickListener {
mDialog?.dismiss()
}
AdUtils.showFeedAd(activity, "", layout_ad)
AdUtils.showFeedAd(activity, "all_speed_up_dialog", layout_ad)
mDialog.setCanceledOnTouchOutside(false)
......@@ -293,7 +293,7 @@ object GameDialog : BaseDialog() {
iv_close?.setOnClickListener {
mDialog?.dismiss()
}
AdUtils.showFeedAd(activity, "", layout_ad)
AdUtils.showFeedAd(activity, "get_box_dialog", layout_ad)
mDialog.setCanceledOnTouchOutside(false)
......@@ -389,7 +389,7 @@ object GameDialog : BaseDialog() {
mDialog?.show()
}
AdUtils.showFeedAd(activity, "", layout_ad)
AdUtils.showFeedAd(activity, "red_pg_doubled_dialog", layout_ad)
layout_ad?.postDelayed({
layout_ad.visibility = View.VISIBLE
if (layout_ad?.visibility == View.VISIBLE) {
......@@ -438,7 +438,7 @@ object GameDialog : BaseDialog() {
mDialog?.show()
}
AdUtils.showFeedAd(activity, "shop_damage", layout_ad)
AdUtils.showFeedAd(activity, "shop_damage_dialog", layout_ad)
layout_ad?.postDelayed({
layout_ad.visibility = View.VISIBLE
if (layout_ad?.visibility == View.VISIBLE) {
......@@ -504,7 +504,7 @@ object GameDialog : BaseDialog() {
mDialog?.show()
}
AdUtils.showFeedAd(activity, "", layout_ad)
AdUtils.showFeedAd(activity, "get_cash_dialog", layout_ad)
layout_ad?.postDelayed({
layout_ad.visibility = View.VISIBLE
if (layout_ad?.visibility == View.VISIBLE) {
......@@ -555,7 +555,7 @@ object GameDialog : BaseDialog() {
mDialog?.show()
}
AdUtils.showFeedAd(activity, "", layout_ad)
AdUtils.showFeedAd(activity, "gold_inadequate_dialog", layout_ad)
layout_ad?.postDelayed({
layout_ad.visibility = View.VISIBLE
if (layout_ad?.visibility == View.VISIBLE) {
......@@ -608,7 +608,7 @@ object GameDialog : BaseDialog() {
mDialog?.show()
}
AdUtils.showFeedAd(activity, "", layout_ad)
AdUtils.showFeedAd(activity, "accelerator_dialog_dialog", layout_ad)
layout_ad?.postDelayed({
layout_ad.visibility = View.VISIBLE
if (layout_ad?.visibility == View.VISIBLE) {
......@@ -686,7 +686,55 @@ object GameDialog : BaseDialog() {
if (!activity?.isFinishing) {
mDialog?.show()
}
}
/**
* 钻石奖励领取
*/
fun showDiamandReward(activity: Activity,rewardNum: Int) {
if (activity == null) return
EventUtils.onEvent("jiasu_show")
val mDialog = Dialog(activity, R.style.UpdateVersionCompatDialogTheme)
val mDialogView =
showBottomDialog(
R.layout.dialog_layout_diamand_reward,
activity,
mDialog,
0,
Gravity.CENTER
)
val layout_dialog_root =
mDialogView.findViewById<LinearLayout>(R.id.layout_diamand_root)
val tv_get_diamand_num = mDialogView.findViewById<TextView>(R.id.tv_get_diamand_num)
val iv_accelerator_close = mDialogView.findViewById<ImageView>(R.id.iv_diamand_close)
val btn_diamand_btn = mDialogView.findViewById<ImageView>(R.id.btn_diamand_btn)
val layout_ad = mDialogView?.findViewById<FrameLayout>(R.id.layout_ad)
tv_get_diamand_num.text = "+${rewardNum}"
btn_diamand_btn.setOnClickListener {
mDialog?.dismiss()
}
iv_accelerator_close.setOnClickListener {
mDialog?.dismiss()
}
FilterUtils.addClickAlpha(btn_diamand_btn)
mDialog.setCanceledOnTouchOutside(false)
mDialog.setCancelable(false)
if (!activity?.isFinishing) {
mDialog?.show()
}
AdUtils.showFeedAd(activity, "diamand_reward_dialog_dialog", layout_ad)
layout_ad?.postDelayed({
layout_ad.visibility = View.VISIBLE
if (layout_ad?.visibility == View.VISIBLE) {
layout_dialog_root?.gravity = Gravity.BOTTOM
}
}, 500)
}
}
\ No newline at end of file
library/src/main/res/layout/dialog_layout_diamand_reward.xml 0 → 100644
View file @ e6336f03
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout_diamand_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center">
<RelativeLayout
android:layout_width="328dp"
android:layout_height="293dp"
android:layout_marginTop="6dp"
android:layout_marginRight="5dp"
android:background="@drawable/icon_dialog_diamand_reward_bg">
<com.ym.library.widget.FontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
android:includeFontPadding="false"
android:text="恭喜获得钻石"
android:textColor="@color/white"
android:textSize="22sp" />
<ImageView
android:id="@+id/iv_diamoind_diamand"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="80dp"
android:src="@drawable/icon_diamand" />
<com.ym.library.widget.MediumBoldTextView
android:id="@+id/tv_get_diamand_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_diamoind_diamand"
android:layout_centerHorizontal="true"
android:layout_marginTop="22dp"
android:layout_marginBottom="5dp"
android:includeFontPadding="false"
android:text="+3"
android:textColor="#095100"
android:textSize="20sp" />
<ImageView
android:id="@+id/btn_diamand_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="30dp"
android:src="@drawable/icon_dialog_get_showxia_btn" />
</RelativeLayout>
<ImageView
android:id="@+id/iv_diamand_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:src="@drawable/icon_base_dialog_close" />
</FrameLayout>
<include layout="@layout/layout_base_feed_ad" />
</LinearLayout>
\ No newline at end of file
library/src/main/res/values/styles.xml
View file @ e6336f03
......@@ -60,8 +60,8 @@
<!--遮盖层-->
<item name="android:backgroundDimEnabled">true</item>
<!--动画效果-->
<item name="android:windowEnterAnimation">@anim/push_scale_in</item>
<item name="android:windowExitAnimation">@anim/push_scale_out</item>
<!-- <item name="android:windowEnterAnimation">@anim/push_scale_in</item>-->
<!-- <item name="android:windowExitAnimation">@anim/push_scale_out</item>-->
<!-- Base.Theme.AppCompat.Light.Dialog.Alert 特有的属性，用于指定默认宽度，这里需要禁用 -->
<item name="android:windowMinWidthMajor">0dp</item>
<item name="android:windowMinWidthMinor">0dp</item>
......
userinfo/src/main/res/drawable/shape_setting_fff5bc_r8_bg.xml 0 → 100644
View file @ e6336f03
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:shape="rectangle"
tools:ignore="MissingDefaultResource">
<stroke
android:width="1dp"
android:color="#F2CC2C" />
<solid android:color="#FFF5BC" />
<corners android:radius="8dp" />
</shape>
\ No newline at end of file
userinfo/src/main/res/layout/activity_setting.xml
View file @ e6336f03
......@@ -38,14 +38,16 @@
android:layout_marginLeft="10dp"
android:layout_marginTop="4dp"
android:layout_marginRight="10dp"
android:background="@drawable/icon_withdrawals_record_bg">
android:layout_marginBottom="10dp"
android:background="@drawable/shape_setting_fff5bc_r8_bg">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:paddingTop="8dp"
android:paddingRight="5dp">
android:paddingRight="5dp"
android:paddingBottom="8dp">
<LinearLayout
android:layout_width="match_parent"
......
userinfo/src/main/res/layout/activity_user_info.xml
View file @ e6336f03
......@@ -205,8 +205,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_user_withdrawals_record"
android:layout_marginLeft="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="14dp"
android:layout_marginRight="9dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" />
<LinearLayout
......@@ -320,7 +321,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_clockin_title"
android:layout_marginLeft="10dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="9dp"
android:layout_marginTop="14dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" />
......
userinfo/src/main/res/layout/item_user_withdraw.xml
View file @ e6336f03
......@@ -2,10 +2,10 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layout_adapter_item_root"
android:layout_width="98dp"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_marginRight="13dp"
android:layout_marginBottom="10dp"
android:layout_marginRight="7dp"
android:layout_marginBottom="7dp"
android:background="@drawable/icon_fragment_withdraw_select">
<com.ym.library.widget.MediumBoldTextView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment