多多菜园1.0.4最新代码

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

@@ -983,7 +983,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
                         result?.buttonText ?: "",
                         result?.buttonStatus ?: 0,
                         id,
-                        2,
+                        result?.type,
                         jine,
                         true,
                     Dialog(this@GameActivity)

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

@@ -52,16 +52,20 @@ class BaseApplication : MultiDexApplication() {
     private var backToFrontTime: Long = 0
     override fun onCreate() {
         super.onCreate()
-        NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
+        NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
         NetConfig.BASE_FEED_URL="https://fsapi.ihuomao.com/"
         NetConfig.BASE_AD_URL="https://bs.ihuomao.com/"
         NetConfig.URL_REPORT_BASE="http://report.ihuomao.com/"
 
+
+
         //TODO 上线去掉测试地址
-        NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
+            //     NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
 //        Constant.appLs = "afcbef40e31631d3"//appls
         AdManager.init(this,"afcbef40e31631d3")
-        LogUtils.getConfig().logSwitch = true
+        LogUtils.getConfig().logSwitch = false
+        LogUtils.e("MXL","true")
+
         UMConfigure.setLogEnabled(true)
         UMConfigure.init(this, "5f9bb48945b2b751a91fb2d5", "", UMConfigure.DEVICE_TYPE_PHONE, "")
         PlatformConfig.setWeixin(Constant.WX_APPID, Constant.WX_APPKEY)

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

@@ -4,6 +4,8 @@ import android.app.Activity
 import android.app.Dialog
 import android.content.Context
 import android.content.DialogInterface
+import android.os.Debug
+import android.util.Log
 import android.view.Gravity
 import android.view.MotionEvent
 import android.view.View
@@ -454,6 +456,7 @@ object MainDialog {
                 imgtitle.setImageResource(R.mipmap.img_duihuan_success)
                 imggoon.setImageResource(R.mipmap.img_go_on_make_money)
                 if (type == 1) {
+                    Log.e("MXL","show_xinshou0.3")
                     EventUtils.onEvent("show_xinshou0.3", "新手0.3")
                 } else if (type == 4) {
                     EventUtils.onEvent("show_fuli0.3", "福利0.3")
@@ -465,6 +468,7 @@ object MainDialog {
                     if (id != null) {
                         when (id) {
                             1 -> {
+                                Log.e("MXL","show_baicai")
                                 EventUtils.onEvent("show_baicai", "白菜" + jine)
                             }
                             2 -> {

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

@@ -126,6 +126,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
                     }
                 } else if (data.opentype == 1) {
                     if (data.sid != null) {
+                       // EventUtils.onEvent("welfare_task_undone_click", "${data.sid}")
                         showAd(data.sid)
                         EventUtils.onEvent("renwu_undone_click_total")
                     }

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.17'
+    api 'com.ym.admodule:admodule:1.0.2.20'
     api 'com.airbnb.android:lottie:3.1.0'
     /* api 'androidx.appcompat:appcompat:1.2.0-alpha02'
      api 'com.android.support:design:28.0.0'

library/src/main/java/com/ym/library/module/ExchangeEntity.kt

@@ -7,4 +7,5 @@ class ExchangeEntity {
     var buttonText: String? = ""
     var buttonStatus: Int? = 0
     var title: String? = ""
+    var type: Int? = 0
 }
\ No newline at end of file

library/src/main/java/com/ym/library/net/ApiClient.kt

@@ -48,7 +48,7 @@ object ApiClient {
         .connectTimeout(10000, TimeUnit.MILLISECONDS)
         .readTimeout(10000, TimeUnit.MILLISECONDS)
         .addInterceptor(logInterceptor.apply {
-            level = HttpLoggingInterceptor.Level.BODY
+            level = HttpLoggingInterceptor.Level.NONE
         })
 //        .retryOnConnectionFailure(false)
         .hostnameVerifier { hostname, session ->

library/src/main/java/com/ym/library/net/GameApiClient.kt

@@ -50,7 +50,7 @@ object GameApiClient {
         .connectTimeout(10000, TimeUnit.MILLISECONDS)
         .readTimeout(10000, TimeUnit.MILLISECONDS)
         .addInterceptor(logInterceptor.apply {
-            level = HttpLoggingInterceptor.Level.BODY
+            level = HttpLoggingInterceptor.Level.NONE
         })
 //        .retryOnConnectionFailure(false)
         .hostnameVerifier { hostname, session ->

userinfo/src/main/java/com/ym/userinfo/module/activity/SettingActivity.kt

@@ -50,10 +50,10 @@ class SettingActivity : BaseActivity() {
         id_notif_check.setOnCheckedChangeListener(CompoundButton.OnCheckedChangeListener { compoundButton, b ->
             SettingPreference.setNotice(b)
             if (b) {
-                EventUtils.onEvent("notification_off", "关通知栏按钮点击")
+                EventUtils.onEvent("notification_on", "开通知栏按钮点击")
                 RxBus.get().post("refresh_login", "open_notif")
             } else {
-                EventUtils.onEvent("notification_on", "开通知栏按钮点击")
+                EventUtils.onEvent("notification_off", "关通知栏按钮点击")
                 RxBus.get().post("refresh_login", "close_notif")
             }
         })