Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/ym/game/GameActivity.kt

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

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

@@ -165,7 +165,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
                 Log.d("wxw", "onRewardedVideoAdClosed")
                 //看视频上报
                 getVideoAcceleratorsReceive();
-                getFlyBoxReceive()
+                 getFlyBoxReceive()
 
             }
 
@@ -544,5 +544,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
     override fun onCloseViewSuccess(isSuccess: Boolean) {
         //关闭view
         Log.d("wxw", "关闭view")
+        Log.d("wxw","关闭view")
+        callUnity("TitleView", "getHomeInfo","")
     }
 }
\ No newline at end of file

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

@@ -23,6 +23,7 @@ import com.ym.game.contract.WateringRewardContract
 import com.ym.game.module.SinginEntity
 import com.ym.game.module.WateringTaskEntity
 import com.ym.game.presenter.WateringRewardPresenter
+import com.ym.library.Constant
 import com.ym.library.module.AdEntity
 import com.ym.library.net.BaseObserver
 import com.ym.library.net.RxSchedulers
@@ -31,6 +32,7 @@ import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.rxbus.Subscribe
 import com.ym.library.rxbus.ThreadMode
 import com.ym.library.utils.EventUtils
+import com.ym.library.utils.JumpUtils
 import com.ym.library.utils.LogUtils
 import com.ym.library.utils.Utils
 import com.ym.module.guesssong.listener.OnRecycleItemClickListener
@@ -48,7 +50,7 @@ import com.ym.xync.R
 class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
     OnRecycleItemClickListener<WateringTaskEntity> {
     private val TAG = "Popupwindow"
-    private var mListener:IDialogViewCloseCallback?=null
+    private var mListener: IDialogViewCloseCallback? = null
     private var view: View? = null
     private var mContext: Context? = null
     private var tvPopupSigninDrops: TextView? = null
@@ -57,7 +59,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
     private var singinDropsAdapter: SigninDropsAdapter? = null
     private var wateringTaskAdpater: WateringTaskAdpater? = null
 
-    fun init(mContext: Context?,mListener: IDialogViewCloseCallback) {
+    fun init(mContext: Context?, mListener: IDialogViewCloseCallback) {
         this.mListener = mListener
         this.mContext = mContext
         RxBusUtil.getDefault().register(this)
@@ -111,64 +113,69 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
                 when (data.reference) {
                     1 -> {
                         dismiss()
-                        TurntableDialog.showTurntable(mContext,mListener!!)
+                        TurntableDialog.showTurntable(mContext, mListener!!)
                         RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_TURNTABLE_LOTTERYED)
                     }
                     2 -> {
                         dismiss()
-                       // WateringTaskPopupwindow().init(mContext)
+                        // WateringTaskPopupwindow().init(mContext)
                     }
                     3 -> dismiss()
+                    6 -> {
+                        dismiss()
+                        JumpUtils.h5Jump("每日福利", Constant.Param.WelfareCenter, false)
+                    }
                     4 -> {
-//                        //看广告
-//                        ToponManager.loadReward((mContext as Activity), object : ToponRewardListener {
-//                                override fun onRewardedVideoAdPlayClicked(entity: ATAdInfo) {
-//                                    EventUtils.onEvent(
-//                                        "ad_click",
-//                                        Utils.obj2Str(
-//                                            AdEntity(
-//                                                entity.networkFirmId,
-//                                                AdID.AD_LUCKY_DAILY_WATER_VIDEO,
-//                                                "每日水滴激励视频"
-//                                            )
-//                                        )
-//                                    )
-//                                }
-//
-//                                override fun onRewardedVideoAdClosed(entity: ATAdInfo) {
-//                                    RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_REQUEST_TEPORT)
-//                                    mPresenter?.getRrchardDailyTask()
-//                                }
-//
-//                                override fun onRewardedVideoAdFailed(errorCode: AdError) {
-//
-//                                }
-//
-//                                override fun onRewardedVideoAdPlayEnd(entity: ATAdInfo) {
-//                                    EventUtils.onEvent(
-//                                        "ad_ended",
-//                                        Utils.obj2Str(AdEntity("ad_ended", "ad_ended", "每日水滴激励视频"))
-//                                    )
-//                                }
-//
-//                                override fun onRewardedVideoAdPlayStart(entity: ATAdInfo) {
-//                                    EventUtils.onEvent(
-//                                        "ad_show",
-//                                        Utils.obj2Str(
-//                                            AdEntity(
-//                                                entity.networkFirmId,
-//                                                AdID.AD_LUCKY_DAILY_WATER_VIDEO,
-//                                                "每日水滴激励视频"
-//                                            )
-//                                        )
-//                                    )
-//                                }
-//
-//                            },
-//                            AdID.AD_BUBBLE_POP_VIDEO
-//                        )
-//
-                   }
+                        //看广告
+                        ToponManager.loadReward(
+                            (mContext as Activity), object : ToponRewardListener {
+                                override fun onRewardedVideoAdPlayClicked(entity: ATAdInfo) {
+                                    EventUtils.onEvent(
+                                        "ad_click",
+                                        Utils.obj2Str(
+                                            AdEntity(
+                                                entity.networkFirmId,
+                                                AdID.mPlacementId_Reward_video_luck_farm,
+                                                "每日水滴激励视频"
+                                            )
+                                        )
+                                    )
+                                }
+
+                                override fun onRewardedVideoAdClosed(entity: ATAdInfo) {
+                                    mPresenter?.getRrchardDailyTask()
+                                }
+
+                                override fun onRewardedVideoAdFailed(errorCode: AdError) {
+
+                                }
+
+                                override fun onRewardedVideoAdPlayEnd(entity: ATAdInfo) {
+                                    EventUtils.onEvent(
+                                        "ad_ended",
+                                        Utils.obj2Str(AdEntity("ad_ended", "ad_ended", "每日水滴激励视频"))
+                                    )
+                                }
+
+                                override fun onRewardedVideoAdPlayStart(entity: ATAdInfo) {
+                                    EventUtils.onEvent(
+                                        "ad_show",
+                                        Utils.obj2Str(
+                                            AdEntity(
+                                                entity.networkFirmId,
+                                                AdID.mPlacementId_Reward_video_luck_farm,
+                                                "每日水滴激励视频"
+                                            )
+                                        )
+                                    )
+                                }
+
+                            },
+                            AdID.mPlacementId_Reward_video_luck_farm
+                        )
+
+                    }
+
                 }
             }
         }

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

@@ -194,7 +194,6 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
     //转盘结果
     override fun turntableLotteryResult(data: TurntableEntity.Turntable) {
         mLotteryResult = data
-        //callUnity("FragmentBox", "showFragmenBoxOpen", Utils.obj2Str(result))
         if (isStartAnim) {
             if (ivTurntableBg != null) {
                 startAnim(data.id, ivTurntableBg!!)

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

@@ -119,7 +119,7 @@
                     android:layout_centerHorizontal="true"
                     android:layout_marginTop="20dp"
                     android:layout_marginBottom="28dp"
-                    android:background="@mipmap/icon_main_turntable_free_draw"
+                    android:background="@mipmap/icon_happpy_get"
                     android:gravity="center"
                     android:text="开心收下"
                     android:textColor="@color/white"