优化圣于地

GoodMoney/app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.mints.goodmoney"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 17
-        versionName "1.1.6"
+        versionCode 18
+        versionName "1.1.7"
         flavorDimensions "default"
 
         // dex突破65535的限制

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/ShVideoAdManager.kt

@@ -3,6 +3,7 @@ package com.mints.goodmoney.ad.video
 import android.app.Activity
 import android.text.TextUtils
 import androidx.annotation.Nullable
+import com.mints.goodmoney.BuildConfig
 import com.mints.goodmoney.common.AppConfig
 import com.mints.goodmoney.common.Constant
 import com.mints.goodmoney.manager.TrackManager
@@ -65,7 +66,13 @@ class ShVideoAdManager private constructor(activity: Activity) :
         this.activity = activity
         isClickScreen = true
 
-        val type = TZ_REWRAD_TYPE_RELEASE
+//        val type = TZ_REWRAD_TYPE_RELEASE
+
+        val type = if (BuildConfig.DEBUG) {
+            TZ_REWRAD_TYPE_DEBUG
+        } else {
+            TZ_REWRAD_TYPE_RELEASE
+        }
 
         ADLoader(activity)
                 .get(ADType.REWARD_VIDEO)

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/TtCsjAdManager.java

@@ -153,16 +153,16 @@ public class TtCsjAdManager {
             TT_AD_NATIVEEXPRESS_MORNINGCLOCK = "945666097";
             TT_AD_NATIVEEXPRESS_EAT = "945666097";
             // 激励视频
-            TT_AD_VEDIO_DRINK = "945666029";
-            TT_AD_VEDIO_MAIN = "945666029";
-            TT_AD_VEDIO_ERASE = "945666029";
-            TT_AD_VEDIO_TURNABLE = "945666029";
-            TT_AD_VEDIO_MOREDIALOG = "945666029";
-            TT_AD_VEDIO_OFFINELINE = "945666029";
-            TT_AD_VEDIO_SIGN = "945666029";
-            TT_AD_VEDIO_BLESSINGBAG = "945666029";
-            TT_AD_VEDIO_HOMEVEDIO = "945666029";
-            TT_AD_VEDIO_SMALLHOMEVEDIO = "945666029";
+            TT_AD_VEDIO_DRINK = "945562040";
+            TT_AD_VEDIO_MAIN = "945562040";
+            TT_AD_VEDIO_ERASE = "945562040";
+            TT_AD_VEDIO_TURNABLE = "945562040";
+            TT_AD_VEDIO_MOREDIALOG = "945562040";
+            TT_AD_VEDIO_OFFINELINE = "945562040";
+            TT_AD_VEDIO_SIGN = "945562040";
+            TT_AD_VEDIO_BLESSINGBAG = "945562040";
+            TT_AD_VEDIO_HOMEVEDIO = "945562040";
+            TT_AD_VEDIO_SMALLHOMEVEDIO = "945562040";
             // banner
             TT_AD_BANNER_MY = "945666042";
 

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/YlhAdManager.kt

@@ -89,16 +89,16 @@ object YlhAdManager {
             // 开屏
             YLH_AD_SPLASH_POSTID = "4031840694338658"
             // 激励视频
-            YLH_AD_VEDIO_DRINK_POSTID = "1031552263176415"
-            YLH_AD_VEDIO_MAIN_POSTID = "1031552263176415"
-            YLH_AD_VEDIO_ERASE_POSTID = "1031552263176415"
-            YLH_AD_VEDIO_TURNABLE_POSTID = "1031552263176415"
-            YLH_AD_VEDIO_MOREDIALOG_POSTID = "1031552263176415"
-            YLH_AD_VEDIO_SIGN_POSTID = "1031552263176415"
-            YLH_AD_VEDIO_BLESSINGBAG_POSTID = "1031552263176415"
-            YLH_AD_VEDIO_OFFINELINE_POSTID = "1031552263176415"
-            YLH_AD_VEDIO_HOMEVEDIO_POSTID = "1031552263176415"
-            YLH_AD_VEDIO_SMALLHOMEVEDIO_POSTID = "1031552263176415"
+            YLH_AD_VEDIO_DRINK_POSTID = "9001346780383626"
+            YLH_AD_VEDIO_MAIN_POSTID = "9001346780383626"
+            YLH_AD_VEDIO_ERASE_POSTID = "9001346780383626"
+            YLH_AD_VEDIO_TURNABLE_POSTID = "9001346780383626"
+            YLH_AD_VEDIO_MOREDIALOG_POSTID = "9001346780383626"
+            YLH_AD_VEDIO_SIGN_POSTID = "9001346780383626"
+            YLH_AD_VEDIO_BLESSINGBAG_POSTID = "9001346780383626"
+            YLH_AD_VEDIO_OFFINELINE_POSTID = "9001346780383626"
+            YLH_AD_VEDIO_HOMEVEDIO_POSTID = "9001346780383626"
+            YLH_AD_VEDIO_SMALLHOMEVEDIO_POSTID = "9001346780383626"
 
             return
         }

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/TaskPresenter.kt

@@ -3,6 +3,7 @@ package com.mints.goodmoney.mvp.presenters
 import android.text.TextUtils
 import com.google.gson.Gson
 import com.google.gson.JsonObject
+import com.mints.goodmoney.BuildConfig
 import com.mints.goodmoney.common.DeviceInfo
 import com.mints.goodmoney.manager.AppHttpManager
 import com.mints.goodmoney.manager.CpdManager
@@ -10,8 +11,10 @@ import com.mints.goodmoney.mvp.model.BaseResponse
 import com.mints.goodmoney.mvp.model.CpdModelBean
 import com.mints.goodmoney.mvp.views.TaskView
 import com.mints.goodmoney.net.CpdService
+import com.mints.goodmoney.utils.LogUtil
 import com.mints.library.net.neterror.BaseSubscriber
 import com.mints.library.net.neterror.Throwable
+import com.mints.library.utils.json.JsonUtil
 
 class TaskPresenter : BasePresenter<TaskView>() {
 
@@ -36,7 +39,7 @@ class TaskPresenter : BasePresenter<TaskView>() {
                                 when (code) {
                                     200 -> {
                                         if (data != null) {
-                                            view.getShCpdTimeSuc(data.get("needSeconds").asInt,data.get("coin").asInt,
+                                            view.getShCpdTimeSuc(data.get("needSeconds").asInt, data.get("coin").asInt,
                                                     data.get("CPD").asInt, data.get("CPD_SYD").asInt)
                                         }
                                     }
@@ -48,15 +51,21 @@ class TaskPresenter : BasePresenter<TaskView>() {
     fun cmtImp(url: String) {
         AppHttpManager.getInstance(loanApplication)
                 .call(CpdService.Factory.getInstance().cmtImp(url),
-                        object : BaseSubscriber<BaseResponse<JsonObject>>() {
+                        object : BaseSubscriber<Any>() {
                             override fun onCompleted() {
                             }
 
                             override fun onError(e: Throwable) {
+                                if (isLinkView) return
+                                LogUtil.d("TaskPresenter", "onError->${e.printStackTrace()}")
                             }
 
-                            override fun onNext(baseResponse: BaseResponse<JsonObject>) {
+                            override fun onNext(baseResponse: Any) {
                                 if (isLinkView) return
+                                if (BuildConfig.DEBUG) {
+                                    LogUtil.d("TaskPresenter", "onNext->${url}   JsonUtil:${JsonUtil.toJson(baseResponse)}")
+                                }
+
                             }
                         })
     }

GoodMoney/app/src/main/java/com/mints/goodmoney/net/CpdService.java

@@ -61,10 +61,10 @@ public interface CpdService {
         private static CpdService create() {
             OkHttpClient.Builder builder = new OkHttpClient.Builder();
 
-            builder.retryOnConnectionFailure(false);
-            builder.connectTimeout(5, TimeUnit.SECONDS);
-            builder.readTimeout(5, TimeUnit.SECONDS);
-            builder.writeTimeout(5, TimeUnit.SECONDS);
+            builder.retryOnConnectionFailure(true);
+            builder.connectTimeout(10, TimeUnit.SECONDS);
+            builder.readTimeout(10, TimeUnit.SECONDS);
+            builder.writeTimeout(10, TimeUnit.SECONDS);
 
             if (BuildConfig.DEBUG) {
                 HttpLoggingInterceptor logging = new HttpLoggingInterceptor(message -> {