Merge remote-tracking branch 'origin/master'

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

@@ -30,6 +30,7 @@ import com.ym.module.toponad.ToponManager
 import com.ym.module.toponad.listener.ToponRewardListener
 import com.ym.xync.R
 import org.jetbrains.anko.runOnUiThread
+import java.lang.reflect.Method
 
 /**
  * @author (wangXuewei)
@@ -53,7 +54,33 @@ class GameActivity : UnityPlayerActivity() {
         TurntableDialog.initTurntableAnim()
         ToponManager.initRewardAd(this, AdID.mPlacementId_Reward_video_luck_farm)
     }
-
+    /**
+     * 调用Unity的方法
+     * @param gameObjectName    调用的GameObject的名称
+     * @param functionName      方法名
+     * @param args              参数
+     * @return                  调用是否成功
+     */
+    fun callUnity(
+        gameObjectName: String?,
+        functionName: String?,
+        args: String?
+    ): Boolean {
+        try {
+            val classtype =
+                Class.forName("com.unity3d.player.UnityPlayer")
+            val method: Method = classtype.getMethod(
+                "UnitySendMessage",
+                String::class.java,
+                String::class.java,
+                String::class.java
+            )
+            method.invoke(classtype, gameObjectName, functionName, args)
+            return true
+        } catch (e: Exception) {
+        }
+        return false
+    }
     /**
      * 跳转提现页
      */
@@ -119,7 +146,33 @@ class GameActivity : UnityPlayerActivity() {
      */
     fun adFlyBox() {
         Log.e("M", "点击宝箱看视频")
-        getFlyBoxReceive()
+
+        ToponManager.loadReward(this, object : ToponRewardListener {
+            override fun onRewardedVideoAdPlayClicked(entity: ATAdInfo) {
+                Log.d("wxw", "onRewardedVideoAdPlayClicked")
+            }
+
+            override fun onRewardedVideoAdClosed(entity: ATAdInfo) {
+                Log.d("wxw", "onRewardedVideoAdClosed")
+                //看视频上报
+                getVideoAcceleratorsReceive();
+                 getFlyBoxReceive()
+
+            }
+
+            override fun onRewardedVideoAdFailed(errorCode: AdError) {
+                Log.d("wxw", "onRewardedVideoAdFailed")
+            }
+
+            override fun onRewardedVideoAdPlayEnd(entity: ATAdInfo) {
+                Log.d("wxw", "onRewardedVideoAdPlayEnd")
+            }
+
+            override fun onRewardedVideoAdPlayStart(entity: ATAdInfo) {
+                Log.d("wxw", "onRewardedVideoAdPlayStart")
+            }
+        }, AdID.mPlacementId_Reward_video_luck_farm)
+
     }
 
     /**

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

@@ -45,7 +45,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
     private var turntables: TurntableEntity? = null
     private var tvTurntableCount: TextView? = null
     private var tvTime: TextView? = null
-    private var btnTurntableLottery: TextView? = null
+    private var btnTurntableLottery: ImageView? = null
     private var ivTurntableBg: ImageView? = null
     private var btnCountdown: ImageView? = null
     private var mPresenter: TurntablePresenter? = null
@@ -81,7 +81,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
 
         ivTurntableBg = mDialogView?.findViewById<ImageView>(R.id.iv_turntable_bg)
         tvTurntableCount = mDialogView?.findViewById<TextView>(R.id.tv_main_turntable_count)
-        btnTurntableLottery = mDialogView?.findViewById<TextView>(R.id.btn_turntable_lottery)
+        btnTurntableLottery = mDialogView?.findViewById<ImageView>(R.id.btn_turntable_lottery)
         btnCountdown = mDialogView?.findViewById<ImageView>(R.id.btn_turntable_lottery_countdown)
         tvTime = mDialogView?.findViewById<TextView>(R.id.tv_main_turntable_time)
 
@@ -190,6 +190,7 @@ 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_turntable.xml

@@ -94,13 +94,12 @@
                 android:textSize="16sp"
                 android:visibility="gone" />
 
-            <TextView
+            <ImageView
                 android:id="@+id/btn_turntable_lottery"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@mipmap/icon_main_turntable_free_draw"
                 android:gravity="center"
-                android:text="免费抽奖"
                 android:textColor="@color/white"
                 android:textSize="20sp"
                 android:visibility="visible" />