[提交人]：王雪伟

[提交简述] ：幸福农场
[实现方案] ：修改转盘关闭回调

app/src/main/java/com/ym/game/GameActivity.kt

@@ -28,6 +28,8 @@ import com.ym.library.widget.LoadingDialog
 import com.ym.module.toponad.AdID
 import com.ym.module.toponad.ToponManager
 import com.ym.module.toponad.listener.ToponRewardListener
+import com.ym.task.module.bean.GuessSongBean
+import com.ym.task.module.listener.OnRecycleItemClickListener
 import com.ym.xync.R
 import org.jetbrains.anko.runOnUiThread
 import java.lang.reflect.Method
@@ -37,7 +39,8 @@ import java.lang.reflect.Method
  * @datetime 2020-10-09 22:09 GMT+8
  * @detail :
  */
-class GameActivity : UnityPlayerActivity() {
+class GameActivity : UnityPlayerActivity(),IDialogViewCloseCallback {
+
     private var mLoading: LoadingDialog? = null
     private val mContext = AppliContext.get()
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -121,7 +124,7 @@ class GameActivity : UnityPlayerActivity() {
         this.runOnUiThread(object : Runnable {
             override fun run() {
                 if (Utils.isFastClick()) {
-                    TurntableDialog.showTurntable(this@GameActivity)
+                    TurntableDialog.showTurntable(this@GameActivity,this@GameActivity)
                     RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_TURNTABLE_LOTTERYED)
                 }
 
@@ -136,7 +139,7 @@ class GameActivity : UnityPlayerActivity() {
     fun getCoin() {
         this.runOnUiThread(object : Runnable {
             override fun run() {
-                SiginDropsPopupwindow().init(this@GameActivity)
+                SiginDropsPopupwindow().init(this@GameActivity,this@GameActivity)
             }
         })
     }
@@ -517,4 +520,9 @@ class GameActivity : UnityPlayerActivity() {
                 }
             })
     }
+
+    override fun onCloseViewSuccess(isSuccess: Boolean) {
+        //关闭view
+        Log.d("wxw","关闭view")
+    }
 }
\ No newline at end of file

app/src/main/java/com/ym/game/IDialogViewCloseCallback.kt

+package com.ym.game
+
+/**
+ * @author (wangXuewei)
+ * @datetime 2020-10-09 22:12 GMT+8
+ * @detail :
+ */
+interface IDialogViewCloseCallback {
+    //主页
+    fun onCloseViewSuccess(isSuccess: Boolean)
+}
\ No newline at end of file

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

@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.anythink.core.api.ATAdInfo
 import com.anythink.core.api.AdError
+import com.ym.game.IDialogViewCloseCallback
 import com.ym.game.adapter.SigninDropsAdapter
 import com.ym.game.adapter.WateringTaskAdpater
 import com.ym.game.contract.WateringRewardContract
@@ -36,6 +37,7 @@ import com.ym.module.guesssong.listener.OnRecycleItemClickListener
 import com.ym.module.toponad.AdID
 import com.ym.module.toponad.ToponManager
 import com.ym.module.toponad.listener.ToponRewardListener
+import com.ym.task.module.bean.GuessSongBean
 import com.ym.xync.R
 
 /**
@@ -46,7 +48,7 @@ import com.ym.xync.R
 class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
     OnRecycleItemClickListener<WateringTaskEntity> {
     private val TAG = "Popupwindow"
-
+    private var mListener:IDialogViewCloseCallback?=null
     private var view: View? = null
     private var mContext: Context? = null
     private var tvPopupSigninDrops: TextView? = null
@@ -55,7 +57,8 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
     private var singinDropsAdapter: SigninDropsAdapter? = null
     private var wateringTaskAdpater: WateringTaskAdpater? = null
 
-    fun init(mContext: Context?) {
+    fun init(mContext: Context?,mListener: IDialogViewCloseCallback) {
+        this.mListener = mListener
         this.mContext = mContext
         RxBusUtil.getDefault().register(this)
 //        ToponManager.initNativeAd((mContext as Activity), AdID.AD_DAILY_DRIP_BIGIMAGE)
@@ -108,7 +111,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
                 when (data.reference) {
                     1 -> {
                         dismiss()
-                        TurntableDialog.showTurntable(mContext)
+                        TurntableDialog.showTurntable(mContext,mListener!!)
                         RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_TURNTABLE_LOTTERYED)
                     }
                     2 -> {

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

@@ -11,6 +11,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.anythink.core.api.ATAdInfo
 import com.anythink.core.api.AdError
+import com.ym.game.IDialogViewCloseCallback
 import com.ym.game.contract.TurntableContract
 import com.ym.game.module.TurntableEntity
 import com.ym.game.presenter.TurntablePresenter
@@ -25,6 +26,8 @@ import com.ym.library.utils.Utils
 import com.ym.module.toponad.AdID
 import com.ym.module.toponad.ToponManager
 import com.ym.module.toponad.listener.ToponRewardListener
+import com.ym.task.module.bean.GuessSongBean
+import com.ym.task.module.listener.OnRecycleItemClickListener
 import com.ym.xync.R
 
 
@@ -34,7 +37,7 @@ import com.ym.xync.R
  */
 object TurntableDialog : TurntableUtils(), TurntableContract.View {
     private var TAG = "Turntable"
-
+    private var mListener: IDialogViewCloseCallback?=null
     private var isStartAnim = true
     private var isUpdate = false
 
@@ -59,7 +62,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
     /**
      *幸运转盘
      */
-    fun showTurntable(context: Context?) {
+    fun showTurntable(context: Context?,mListener: IDialogViewCloseCallback) {
         if (context == null) {
             return
         }
@@ -109,6 +112,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
             //            RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_UPDATE_HOME_INFO)
             mDialog?.dismiss()
             timeTask?.cancel()
+            mListener.onCloseViewSuccess(true);
             RxBusUtil.getDefault().unregister(this)
         }