Commit f2423fa4 authored by Li's avatar Li

[李俊岐] 修改福利页

parent 44a46cbf
...@@ -159,17 +159,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -159,17 +159,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
fun onclickHead() { fun onclickHead() {
// JumpUtils.jumpUserInfoActivity() // JumpUtils.jumpUserInfoActivity()
// GameDialog.showProduceGourmet(this@GameActivity,20,0,object :View.OnClickListener { GameDialog.showAccelerator(this@GameActivity,10,object :View.OnClickListener {
// override fun onClick(p0: View?) {
//
// }
// },object :View.OnClickListener {
// override fun onClick(p0: View?) {
//
// }
// })
//
GameDialog.showGoldInadequate(this@GameActivity,object :View.OnClickListener {
override fun onClick(p0: View?) { override fun onClick(p0: View?) {
} }
......
...@@ -51,11 +51,11 @@ class WelfareTaskAdpater : ...@@ -51,11 +51,11 @@ class WelfareTaskAdpater :
} }
if (data?.adRenderStyle != null && data?.adRenderStyle == 3) { if (data?.adRenderStyle != null && data?.adRenderStyle == 3) {
holder?.layoutBg.setBackgroundResource(R.drawable.shape_ffedf7_r8) holder?.layoutBg.setBackgroundResource(R.drawable.icon_item_lucky_task_bg)
} else if (data?.adRenderStyle != null && data?.adRenderStyle == 2) { } else if (data?.adRenderStyle != null && data?.adRenderStyle == 2) {
holder?.layoutBg.setBackgroundResource(R.drawable.shape_ffedf7_r8) holder?.layoutBg.setBackgroundResource(R.drawable.icon_item_lucky_task_bg)
} else { } else {
holder?.layoutBg.setBackgroundResource(R.drawable.shape_fefce2_r8) holder?.layoutBg.setBackgroundResource(R.drawable.icon_record_bg)
} }
if (data?.buttonSway != null && data?.buttonSway == 1) { if (data?.buttonSway != null && data?.buttonSway == 1) {
...@@ -86,7 +86,7 @@ class WelfareTaskAdpater : ...@@ -86,7 +86,7 @@ class WelfareTaskAdpater :
when (data.status) { when (data.status) {
0 -> { 0 -> {
if (data?.adRenderStyle != null && data?.adRenderStyle == 3) { if (data?.adRenderStyle != null && data?.adRenderStyle == 3) {
holder.ivStatus.setImageResource(R.drawable.icon_item_welfare_task_complete2) holder.ivStatus.setImageResource(R.drawable.icon_item_welfare_task_complete)
} else { } else {
holder.ivStatus.setImageResource(R.drawable.icon_item_welfare_task_complete) holder.ivStatus.setImageResource(R.drawable.icon_item_welfare_task_complete)
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<!-- <stroke--> <!-- <stroke-->
<!-- android:width="1dp"--> <!-- android:width="1dp"-->
<!-- android:color="#EEEEEE" />--> <!-- android:color="#EEEEEE" />-->
<solid android:color="#975423" /> <solid android:color="#A45D00" />
</shape> </shape>
</item> </item>
<item android:id="@android:id/progress"> <item android:id="@android:id/progress">
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<corners android:radius="9dp" /> <corners android:radius="9dp" />
<gradient <gradient
android:angle="0" android:angle="0"
android:endColor="#FF5A44" android:endColor="#68CB00"
android:startColor="#FF5A44" /> android:startColor="#68CB00" />
</shape> </shape>
</clip> </clip>
</item> </item>
......
...@@ -4,34 +4,30 @@ ...@@ -4,34 +4,30 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#F7BD7C" android:background="#FDAB2D"
tools:context=".game.activity.WelfareActivity"> tools:context=".game.activity.WelfareActivity">
<RelativeLayout <RelativeLayout
android:id="@+id/layout_welfare_title" android:id="@+id/id_rl_welfare_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="64dp"
android:background="#FF9E35"> android:background="#FDAB2D">
<ImageView <ImageView
android:id="@+id/iv_welfare_close" android:id="@+id/iv_welfare_close"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:paddingLeft="12dp" android:paddingLeft="10dp"
android:paddingRight="12dp" android:paddingBottom="3dp"
android:paddingBottom="12dp" android:src="@drawable/icon_setting_page_back" />
android:src="@drawable/arrow_left" />
<com.ym.library.widget.MediumBoldTextView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:paddingBottom="8dp" android:src="@drawable/icon_welfare_title"
android:text="每日福利"
android:textColor="@color/color_333333"
android:textSize="20sp"
android:textStyle="bold" /> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
...@@ -39,159 +35,147 @@ ...@@ -39,159 +35,147 @@
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/layout_welfare_title"> android:layout_below="@+id/id_rl_welfare_toolbar">
<RelativeLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:layout_marginLeft="10dp"
<View android:layout_marginTop="4dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/icon_withdrawals_record_bg"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="83dp"
android:background="#FF9E35" /> android:layout_marginLeft="8dp"
android:layout_marginTop="13dp"
<ImageView android:layout_marginRight="8dp"
android:layout_width="match_parent" android:background="@drawable/icon_record_bg">
android:layout_height="wrap_content"
android:layout_alignParentBottom="true" <ImageView
android:scaleType="fitXY" android:id="@+id/iv_welfare_diamond_big"
android:src="@drawable/icon_welfare_bg" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:src="@drawable/icon_welfare_diamond_big" />
<LinearLayout
android:id="@+id/layout_welfare_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/iv_welfare_diamond_big"
android:orientation="vertical">
<LinearLayout <com.ym.library.widget.MediumBoldTextView
android:layout_width="match_parent" android:id="@+id/tv_welfare_diamond_conut"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="80dp"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="85dp"
android:layout_marginTop="10dp"
android:background="@drawable/shape_fefce2_r8">
<ImageView
android:id="@+id/iv_welfare_diamond_big"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_marginBottom="12dp"
android:layout_marginLeft="14dp" android:includeFontPadding="false"
android:layout_marginRight="8dp" android:text="集齐20颗钻石可获得宝箱"
android:src="@drawable/icon_welfare_diamond_big" /> android:textColor="#663408"
android:textSize="16sp" />
<LinearLayout <RelativeLayout
android:id="@+id/layout_welfare_progress"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/iv_welfare_diamond_big" <ProgressBar
android:orientation="vertical"> android:id="@+id/progess_watering_bar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="230dp"
android:layout_height="14dp"
android:max="100"
android:progress="30"
android:progressDrawable="@drawable/game_welfare_progress_bg" />
<com.ym.library.widget.MediumBoldTextView <TextView
android:id="@+id/tv_welfare_diamond_conut" android:id="@+id/tv_welfare_diamond_progress"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_centerHorizontal="true"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="集齐20颗钻石可获得宝箱" android:text="3/6"
android:textColor="#975423" android:textColor="@color/white"
android:textSize="17sp" /> android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout </LinearLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ProgressBar
android:id="@+id/progess_watering_bar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="230dp"
android:layout_height="14dp"
android:max="100"
android:progress="30"
android:progressDrawable="@drawable/game_welfare_progress_bg" />
<TextView
android:id="@+id/tv_welfare_diamond_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:includeFontPadding="false"
android:text="3/6"
android:textColor="@color/white"
android:textSize="12sp" />
</RelativeLayout>
</LinearLayout>
<ImageView
android:id="@+id/iv_welfare_reward_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="-5.5dp"
android:layout_marginTop="26dp"
android:layout_toRightOf="@+id/layout_welfare_progress"
android:src="@drawable/icon_welfare_box_close" />
<ImageView
android:id="@+id/iv_welfare_reward_red_pg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_toRightOf="@+id/layout_welfare_progress"
android:src="@drawable/icon_welfare_red_pg_big"
android:visibility="gone" />
</RelativeLayout>
<!--<LinearLayout <ImageView
android:id="@+id/layout_diamond" android:id="@+id/iv_welfare_reward_box"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="23dp" android:layout_marginLeft="-5.5dp"
android:gravity="center_vertical" android:layout_marginTop="26dp"
android:visibility="gone"> android:layout_toRightOf="@+id/layout_welfare_progress"
<TextView android:src="@drawable/icon_welfare_box_close"
android:id="@+id/tv_welfare_diamond_conut" android:visibility="gone" />
android:layout_width="0dp"
android:layout_height="wrap_content" <ImageView
android:layout_weight="1" android:id="@+id/iv_welfare_reward_red_pg"
android:text="集齐5颗钻石可获得宝箱奖励" android:layout_width="wrap_content"
android:textColor="@color/color_333333" android:layout_height="wrap_content"
android:textSize="17sp" /> android:layout_marginLeft="-10dp"
android:layout_marginTop="18dp"
<ImageView android:layout_toRightOf="@+id/layout_welfare_progress"
android:layout_width="23dp" android:src="@drawable/icon_welfare_red_pg_big"
android:layout_height="20dp" android:visibility="visible" />
android:layout_marginRight="4dp"
android:src="@drawable/icon_welfare_diamond2" />
<TextView
android:id="@+id/tv_welfare_diamond_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text="3/6"
android:textColor="@color/color_333333"
android:textSize="17sp" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView </RelativeLayout>
android:id="@+id/recycler_welfare_diamond_reward"
android:layout_width="match_parent"
android:layout_height="wrap_content" />-->
<androidx.recyclerview.widget.RecyclerView <!--<LinearLayout
android:id="@+id/recycler_welfare_task" android:id="@+id/layout_diamond"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="23dp"
android:gravity="center_vertical"
android:visibility="gone">
<TextView
android:id="@+id/tv_welfare_diamond_conut"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" /> android:layout_weight="1"
android:text="集齐5颗钻石可获得宝箱奖励"
android:textColor="@color/color_333333"
android:textSize="17sp" />
<ImageView
android:layout_width="23dp"
android:layout_height="20dp"
android:layout_marginRight="4dp"
android:src="@drawable/icon_welfare_diamond2" />
<TextView
android:id="@+id/tv_welfare_diamond_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text="3/6"
android:textColor="@color/color_333333"
android:textSize="17sp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_welfare_diamond_reward"
android:layout_width="match_parent"
android:layout_height="wrap_content" />-->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_welfare_task"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout_welfare_item_bg" android:id="@+id/layout_welfare_item_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="66dp" android:layout_height="76dp"
android:layout_marginBottom="12dp" android:layout_marginBottom="10dp"
android:background="@drawable/shape_fefce2_r8" android:background="@drawable/icon_record_bg"
android:paddingLeft="@dimen/dp_14"> android:paddingLeft="@dimen/dp_21">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="浇水10次" android:text="浇水10次"
android:textColor="@color/color_333333" android:textColor="#663408"
android:textSize="17sp" /> android:textSize="16sp" />
<ImageView <ImageView
android:id="@+id/iv_welfare_item_title" android:id="@+id/iv_welfare_item_title"
...@@ -36,25 +36,22 @@ ...@@ -36,25 +36,22 @@
</LinearLayout> </LinearLayout>
<com.ym.library.widget.MediumBoldTextView
<TextView
android:id="@+id/tv_welfare_item_subtitle" android:id="@+id/tv_welfare_item_subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_welfare_item_title"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="浏览60秒领取奖励" android:text="浏览60秒领取奖励"
android:textColor="#975423" android:textColor="#975423"
android:textSize="13sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="14dp" android:layout_marginRight="21dp"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
...@@ -72,21 +69,20 @@ ...@@ -72,21 +69,20 @@
android:layout_marginRight="@dimen/dp_3" android:layout_marginRight="@dimen/dp_3"
android:src="@drawable/icon_welfare_diamond" /> android:src="@drawable/icon_welfare_diamond" />
<TextView <com.ym.library.widget.MediumBoldTextView
android:id="@+id/tv_welfare_item_count" android:id="@+id/tv_welfare_item_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="+0g" android:text="+0"
android:textColor="#FF5A44" android:textColor="#FF5A44"
android:textSize="15sp" android:textSize="15sp" />
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/layout_welfare_item_status" android:id="@+id/layout_welfare_item_status"
android:layout_width="86dp" android:layout_width="wrap_content"
android:layout_height="34dp" android:layout_height="wrap_content"
android:layout_marginTop="3dp"> android:layout_marginTop="-6dp">
<ImageView <ImageView
android:id="@+id/iv_welfare_item_status" android:id="@+id/iv_welfare_item_status"
...@@ -95,6 +91,7 @@ ...@@ -95,6 +91,7 @@
android:src="@drawable/icon_item_welfare_task_receiveed" /> android:src="@drawable/icon_item_welfare_task_receiveed" />
<TextView <TextView
android:visibility="gone"
android:id="@+id/tv_welfare_item_status" android:id="@+id/tv_welfare_item_status"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="30dp" android:layout_height="30dp"
......
...@@ -548,7 +548,7 @@ object GameDialog : BaseDialog() { ...@@ -548,7 +548,7 @@ object GameDialog : BaseDialog() {
/** /**
* 加速器 * 加速器
*/ */
fun showAccelerator(activity: Activity,sum:Int,listener: View.OnClickListener) { fun showAccelerator(activity: Activity,num:Int,listener: View.OnClickListener) {
if (activity == null) return if (activity == null) return
val mDialog = Dialog(activity, R.style.UpdateVersionCompatDialogTheme) val mDialog = Dialog(activity, R.style.UpdateVersionCompatDialogTheme)
val mDialogView = val mDialogView =
...@@ -561,25 +561,27 @@ object GameDialog : BaseDialog() { ...@@ -561,25 +561,27 @@ object GameDialog : BaseDialog() {
) )
val layout_dialog_root = val layout_dialog_root =
mDialogView.findViewById<LinearLayout>(R.id.layout_gold_root) mDialogView.findViewById<LinearLayout>(R.id.layout_accelerator_root)
val btn_gold_btn = mDialogView.findViewById<ImageView>(R.id.btn_gold_btn) val btn_accelerator_btn = mDialogView.findViewById<ImageView>(R.id.btn_accelerator_btn)
val iv_diamoind_close = mDialogView.findViewById<ImageView>(R.id.iv_gold_close) val tv_accelerator_num = mDialogView.findViewById<TextView>(R.id.tv_accelerator_num)
val iv_accelerator_close = mDialogView.findViewById<ImageView>(R.id.iv_accelerator_close)
val layout_ad = mDialogView?.findViewById<FrameLayout>(R.id.layout_ad) val layout_ad = mDialogView?.findViewById<FrameLayout>(R.id.layout_ad)
tv_accelerator_num.text = "今天剩余${num}次"
btn_gold_btn.setOnClickListener { btn_accelerator_btn.setOnClickListener {
mDialog?.dismiss() mDialog?.dismiss()
} }
iv_diamoind_close.setOnClickListener { iv_accelerator_close.setOnClickListener {
mDialog?.dismiss() mDialog?.dismiss()
} }
mDialog?.setOnDismissListener { mDialog?.setOnDismissListener {
listener.onClick(btn_gold_btn) listener.onClick(btn_accelerator_btn)
} }
FilterUtils.addClickAlpha(btn_gold_btn) FilterUtils.addClickAlpha(btn_accelerator_btn)
mDialog.setCanceledOnTouchOutside(false) mDialog.setCanceledOnTouchOutside(false)
mDialog.setCancelable(false) mDialog.setCancelable(false)
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout_get_box_root" android:id="@+id/layout_accelerator_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
...@@ -31,34 +31,33 @@ ...@@ -31,34 +31,33 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_get_box_info"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="80dp" android:layout_marginTop="80dp"
android:src="@drawable/icon_coin" /> android:src="@drawable/icon_accelerator_bg" />
<ImageView <ImageView
android:id="@+id/btn_get_box_btn" android:id="@+id/btn_accelerator_btn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/tv_get_box_num" android:layout_above="@+id/tv_accelerator_num"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:src="@drawable/icon_ad_open_box_btn" /> android:src="@drawable/icon_accelerator_bg_btn" />
<TextView <TextView
android:id="@+id/tv_get_box_num" android:id="@+id/tv_accelerator_num"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="30dp" android:layout_marginBottom="34dp"
android:text="今天剩余15次" android:text="今天剩余x次"
android:textColor="#94491A" android:textColor="#94491A"
android:textSize="13sp" /> android:textSize="14sp" />
</RelativeLayout> </RelativeLayout>
<ImageView <ImageView
android:id="@+id/iv_get_box_close" android:id="@+id/iv_accelerator_close"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
......
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