Merge remote-tracking branch 'origin/develop_ddcy_1.0.3' into develop_ddcy_1.0.3

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

@@ -862,7 +862,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
         //关闭view
         Log.e("MXL", "CLOSE")
         callUnity("TitleView", "getHomeInfo", "")
-        callUnity("DailyWelfarm", "getCardList", "")
+        callUnity("GameManager", "getCardList", "")
     }
 
     fun getUserInfo() {

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

@@ -59,6 +59,7 @@ class CashExchangeAdapter :
                 initShotAnim(holder.item_duihuan!!)
             }
         }
+        holder.item_duihuan?.addClickScale()
         holder.item_duihuan?.setOnClickListener {
             if (Utils.isFastClick2()) {
                 duihuan(bean.id, bean.type!!, bean.cash)

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

@@ -142,11 +142,11 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
                 }
 
                 override fun onAdShow() {
-                    TODO("Not yet implemented")
+
                 }
 
                 override fun onAdVideoBarClick() {
-                    TODO("Not yet implemented")
+
                 }
 
                 override fun onError(errorMsg: String?) {
@@ -158,7 +158,6 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
                 }
 
                 override fun onSuccess() {
-                    TODO("Not yet implemented")
                 }
             })
     }

library/build.gradle

@@ -67,7 +67,7 @@ dependencies {
     api ("com.bx:adsdk:1.3.3"){
         exclude group: 'com.google.code.gson'
     }
-    api 'com.ym.admodule:admodule:1.0.2.7'
+    api 'com.ym.admodule:admodule:1.0.2.11'
     api 'com.airbnb.android:lottie:3.1.0'
     /* api 'androidx.appcompat:appcompat:1.2.0-alpha02'
      api 'com.android.support:design:28.0.0'