[提交人]：王雪伟

[提交简述] ：多多菜园
[实现方案] ：1.0.1

app/src/main/java/com/ym/game/adapter/SpeedWaterTaskAdapter.kt

 package com.ym.game.adapter
 
+import android.app.Activity
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.MotionEvent
@@ -24,11 +25,11 @@ class SpeedWaterTaskAdapter :
     BaseRecyclerAdapter<WateringTaskEntity, SpeedWaterTaskAdapter.WateringTaskHolder> {
 
     private var type: Int = -1
-    private var mContext: Context? = null
+    private var mContext: Activity? = null
     private val listener: OnRecycleItemClickListener<WateringTaskEntity>
 
     constructor(
-        content: Context?,
+        content: Activity?,
         type: Int,
         listener: OnRecycleItemClickListener<WateringTaskEntity>
     ) : super() {

app/src/main/java/com/ym/game/adapter/WateringTaskAdpater.kt

 package com.ym.game.adapter
 
+import android.app.Activity
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.MotionEvent
@@ -29,11 +30,11 @@ class WateringTaskAdpater :
     BaseRecyclerAdapter<WateringTaskEntity, WateringTaskAdpater.WateringTaskHolder> {
 
     private var type: Int = -1
-    private var mContext: Context? = null
+    private var mContext: Activity? = null
     private val listener: OnRecycleItemClickListener<WateringTaskEntity>
 
     constructor(
-        content: Context?,
+        content: Activity?,
         type: Int,
         listener: OnRecycleItemClickListener<WateringTaskEntity>
     ) : super() {

app/src/main/java/com/ym/game/application/BaseApplication.kt

@@ -32,7 +32,7 @@ class BaseApplication : MultiDexApplication() {
         //第一步初始化 application
         AppliContext.init(this)
         // Config.init(this)
-        NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
+        NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
 
         Constant.appLs = "afcbef40e31631d3"//appls
         AdManager.init(this)
@@ -41,8 +41,7 @@ class BaseApplication : MultiDexApplication() {
 //            this, ZXADConfig
 //                .csjId("5116010")
 //                .gdtId("1111153326")
-////                .bdId("ba584026")
-////                .signMob("5105", "9d597f774eb14956")
+////                .bdId("ba584026")////                .signMob("5105", "9d597f774eb14956")
 //                .ksId("533500011")
 //                .ylbId("10000188")
 //                .Build()

app/src/main/java/com/ym/game/view/MainDialog.kt

@@ -8,10 +8,7 @@ import android.view.Gravity
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.widget.*
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bytedance.sdk.openadsdk.TTNativeExpressAd
@@ -56,6 +53,96 @@ object MainDialog {
         return mDialogView
     }
 
+    /**
+     * 领取红包奖励
+     */
+    fun getTaskRewardDialog(
+        activity: Activity,
+        reward: String,
+        withdrawClick: View.OnClickListener
+    ) {
+        val mDialog = Dialog(activity, com.ym.library.R.style.UpdateVersionCompatDialogTheme)
+        val mDialogView =
+            CenterDialog.showBottomDialog(
+                R.layout.dialog_get_water_drop2,
+                activity,
+                mDialog,
+                0,
+                Gravity.CENTER
+            )
+        val layouAd = mDialogView?.findViewById<FrameLayout>(R.id.layout_get_drop_ad2)
+
+        AdManager.loadFeedAd(
+            ADConfig.AD_IMG_FADE,
+            activity,
+            ZXADSizeConfig(
+                Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 56,
+                ((Utils.px2dip(activity.windowManager?.defaultDisplay?.width!!.toFloat()) - 56) * 0.66).toInt()
+            ),
+            object :
+                ZXADExpressListener {
+                override fun onError(p1: String?) {
+
+                }
+
+                override fun onNativeExpressAdLoad(p0: MutableList<TTNativeExpressAd>?) {
+                }
+
+                override fun onAdClicked(newsEntity: NewsEntity) {
+                }
+
+                override fun onAdShow(newsEntity: NewsEntity) {
+                }
+
+                override fun onRenderFail(s: String) {
+                }
+
+                override fun onRenderSuccess() {
+                }
+
+                override fun onDownloadFinished() {
+                }
+
+                override fun onInstalled() {
+                }
+
+                override fun onDownloadFailed() {
+                }
+
+                override fun onDownloadPaused() {
+                }
+
+                override fun onDownloadActive() {
+                }
+
+                override fun onIdle() {
+                }
+
+                override fun onFail() {
+                }
+
+                override fun onSuccess() {
+                }
+            },
+            layouAd
+        )
+
+        mDialogView.findViewById<ImageView>(R.id.lv_get_drop_close2).setOnClickListener {
+            EventUtils.onEvent("click_close_receive_redPack_dialog", "点击关闭领取红包弹窗")
+            mDialog.dismiss()
+        }
+        mDialogView.findViewById<TextView>(R.id.tv_get_drop_count4)?.text = reward
+        mDialogView.findViewById<TextView>(R.id.btn_get_six_reward)?.setOnClickListener {
+            if (Utils.isFastClick()) {
+                withdrawClick.onClick(it)
+                mDialog.dismiss()
+            }
+        }
+        mDialog?.setCanceledOnTouchOutside(false)
+        mDialog?.setCancelable(false)
+        mDialog?.show()
+    }
+
     /**
      * 转盘奖励
      * type:   奖励类型
@@ -63,7 +150,7 @@ object MainDialog {
      * adType: 广告的类型
      */
     fun showgetWaterDrop(
-        context: Context?,
+        context: Activity?,
         type: Int,
         adType: String,
         rewardCount: Int,
@@ -139,7 +226,7 @@ object MainDialog {
 //        shwoAd(adType, context, layoutAd)
         AdManager.loadFeedAd(
             ADConfig.AD_IMG_FADE,
-            (context as Activity),
+            context,
             ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 56, 245),
             object :
                 ZXADExpressListener {

app/src/main/java/com/ym/game/view/SiginDropsPopupwindow.kt

@@ -51,14 +51,14 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
     private val TAG = "Popupwindow"
     private var mListener: IDialogViewCloseCallback? = null
     private var view: View? = null
-    private var mContext: Context? = null
+    private var mContext: Activity? = null
     private var tvPopupSigninDrops: TextView? = null
     private var mPresenter: WateringRewardPresenter? = null
 
     private var singinDropsAdapter: SigninDropsAdapter? = null
     private var wateringTaskAdpater: WateringTaskAdpater? = null
 
-    fun init(mContext: Context?, mListener: IDialogViewCloseCallback) {
+    fun init(mContext: Activity?, mListener: IDialogViewCloseCallback) {
         this.mListener = mListener
         this.mContext = mContext
 //        ToponManager.initNativeAd((mContext as Activity), AdID.AD_DAILY_DRIP_BIGIMAGE)

app/src/main/java/com/ym/game/view/SpeedWaterPopupWindow.kt

@@ -40,12 +40,12 @@ class SpeedWaterPopupWindow : PopupWindow(), SpeedWaterContract.View,
     OnRecycleItemClickListener<WateringTaskEntity> {
     private var mListener: IDialogViewCloseCallback? = null
     private var view: View? = null
-    private var mContext: Context? = null
+    private var mContext: Activity? = null
     private var mPresenter: SpeedWaterPresenter? = null
 
     private var speedadapter: SpeedWaterTaskAdapter? = null
 
-    fun init(mContext: Context?, mListener: IDialogViewCloseCallback) {
+    fun init(mContext: Activity?, mListener: IDialogViewCloseCallback) {
         this.mListener = mListener
         this.mContext = mContext
         RxBusUtil.getDefault().register(this)

app/src/main/java/com/ym/game/view/TurntableDialog.kt

@@ -44,7 +44,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
     private var isStartAnim = true
     private var isUpdate = false
 
-    private var context: Context? = null
+    private var context: Activity? = null
     private var mDialog: Dialog? = null
 
     private var mLotteryResult: TurntableEntity.Turntable? = null
@@ -65,7 +65,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
     /**
      *幸运转盘
      */
-    fun showTurntable(context: Context?, mListener: IDialogViewCloseCallback) {
+    fun showTurntable(context: Activity?, mListener: IDialogViewCloseCallback) {
         if (context == null) {
             return
         }

app/src/main/res/layout/dialog_get_water_drop.xml

@@ -157,18 +157,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/id_ll_content"
-                    android:visibility="gone"
                     android:layout_centerHorizontal="true"
                     android:background="@drawable/btn_selector" />
 
-                <TextView
-                    android:id="@+id/btn_get_six_reward"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/id_ll_content"
-                    android:layout_centerHorizontal="true"
-                    android:background="@mipmap/img_receive_six_reward" />
-
             </RelativeLayout>
         </RelativeLayout>
 

app/src/main/res/layout/dialog_get_water_drop2.xml

+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="370dp">
+
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:background="@mipmap/icon_main_dialog_get_drops_bg">
+
+
+            </RelativeLayout>
+
+
+            <ImageView
+                android:id="@+id/lv_get_drop_close2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="70dp"
+                android:layout_marginRight="@dimen/dp_30"
+                android:src="@mipmap/icon_new_close" />
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="350dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginBottom="20dp"
+                android:background="@mipmap/icon_content_bg">
+
+                <ImageView
+                    android:id="@+id/id_img_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="35dp"
+                    android:src="@mipmap/icon_img_title_get_coin_" />
+
+                <TextView
+                    android:id="@+id/id_tv_gongxi_get2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="@dimen/dp_44"
+                    android:text="恭喜获得金币"
+                    android:visibility="invisible"
+                    android:textColor="@color/white"
+                    android:textSize="20sp" />
+
+                <LinearLayout
+                    android:id="@+id/id_ll_content"
+                    android:layout_width="wrap_content"
+                    android:layout_height="150dp"
+                    android:layout_below="@+id/id_tv_gongxi_get2"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="@dimen/dp_60"
+                    android:orientation="horizontal"
+                    android:visibility="visible">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:id="@+id/iv_get_drop_bg"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_60"
+                            android:src="@mipmap/icon_coin" />
+
+                        <TextView
+                            android:id="@+id/tv_get_drop_count4"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:textColor="@color/color_7C1714"
+                            android:textSize="20sp"
+                            tools:text="+40g" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/btn_get_six_reward"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/id_ll_content"
+                    android:layout_centerHorizontal="true"
+                    android:background="@mipmap/img_receive_six_reward" />
+
+            </RelativeLayout>
+        </RelativeLayout>
+
+        <FrameLayout
+            android:id="@+id/layout_get_drop_ad2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="18dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="18dp"
+            android:background="@color/white"
+            android:padding="@dimen/dp_10"
+            android:visibility="gone" />
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file