5G世界更换老版保活 -，ecpm接口区分应用内、外字段，删除隐藏导航栏-，更新打点，更新Gromoresdk-,应用外开关默认开-，开屏不区分是否黑名单都调用预加载接口

app/build.gradle

@@ -238,25 +238,35 @@ dependencies {
 
     // 穿山甲 GroMore
     // mediation_ad_sdk
-    implementation(name: 'mediation_ad_sdk_3.0.0.0', ext: 'aar')
-    implementation(name: 'gdt_adapter_4.410.1280.0', ext: 'aar')
-    implementation(name: 'ks_adapter_3.3.16.0', ext: 'aar')
-    implementation(name: 'pangle_adapter_4.0.1.1.0', ext: 'aar')
+    implementation(name: 'mediation_ad_sdk_3.1.0.1', ext: 'aar')
+    implementation(name: 'gdt_adapter_4.422.1292.0', ext: 'aar')
+    implementation(name: 'ks_adapter_3.3.17.1', ext: 'aar')
+    implementation(name: 'pangle_adapter_4.0.1.9.1', ext: 'aar')
     // 穿山甲广告
-    implementation(name: 'open_ad_sdk_4.0.1.1', ext: 'aar')
+    implementation(name: 'open_ad_sdk_4.0.1.9', ext: 'aar')
     // 广点通广告 腾讯
-    implementation(name: 'GDTSDK.unionNormal.4.410.1280', ext: 'aar')
+    implementation(name: 'GDTSDK.unionNormal.4.422.1292', ext: 'aar')
     // 快手
-    implementation(name: 'kssdk-ad-3.3.16', ext: 'aar')
+    implementation(name: 'kssdk-ad-3.3.17', ext: 'aar')
     // talkingdata已集成
 
     implementation project(':animlibrary')
 
+    // 保活相关
+//    implementation 'me.weishu:free_reflection:2.2.0'
+//    implementation(name: 'alive-sdk-v3.3.3-release', ext: 'aar')
+//    implementation(name: 'alive-plugin-music-sdk-v3.0.3-release', ext: 'aar')
+//    implementation(name: 'keepalive-sdk-v3.3.2-release', ext: 'aar')
+//    implementation(name: 'libbase-sdk-v3.0.3-release', ext: 'aar')
+//    implementation(name: 'net_native-v3.1.3.22-release', ext: 'aar')
+//    implementation 'org.greenrobot:eventbus:3.1.1'
+//    implementation 'androidx.core:core-ktx:1.1.0'
+
     // 保活相关
     implementation 'me.weishu:free_reflection:2.2.0'
-    implementation(name: 'alive-sdk-v3.3.3-release', ext: 'aar')
-    implementation(name: 'alive-plugin-music-sdk-v3.0.3-release', ext: 'aar')
-    implementation(name: 'keepalive-sdk-v3.3.2-release', ext: 'aar')
+    implementation(name: 'alive-sdk-v3.1.5-release', ext: 'aar')
+    implementation(name: 'alive-plugin-music-sdk-v3.0.2-release', ext: 'aar')
+    implementation(name: 'keepalive-sdk-v3.1.4-release', ext: 'aar')
     implementation(name: 'libbase-sdk-v3.0.3-release', ext: 'aar')
     implementation(name: 'net_native-v3.1.3.22-release', ext: 'aar')
     implementation 'org.greenrobot:eventbus:3.1.1'

app/src/main/java/com/mints/fiveworld/MintsApplication.java

@@ -162,8 +162,7 @@ public class MintsApplication extends BaseApp {
         }
 
         // 保活: 进一步初始化保活
-        KeepAliveHelper.Companion.init(this);
-//        KeepAliveHelper.Companion.init(this, channel);
+        KeepAliveHelper.Companion.init(this, channel);
 
         if (isMainProcess) {
             getEventLogger().logEvent("App_init_2");

app/src/main/java/com/mints/fiveworld/ad/AdReportManager.kt

@@ -4,7 +4,9 @@ import android.text.TextUtils
 import com.mints.fiveworld.common.Constant
 import com.mints.fiveworld.manager.AppPreferencesManager
 import com.mints.fiveworld.manager.TrackManager
+import com.mints.fiveworld.utils.LogUtil
 import java.lang.Exception
+import java.util.HashMap
 
 /**
  *
@@ -20,6 +22,12 @@ object AdReportManager {
     const val INNER_IN = "1"    //应用内
     const val INNER_OUT = "0"   //应用外
 
+    /**
+     * 广告是否请求成功
+     */
+    const val REQUEST_FAIL = 0   //请求失败
+    const val REQUEST_SUC = 1    //请求成功
+
     /**
      * eventType 事件类型
      */
@@ -464,4 +472,41 @@ object AdReportManager {
             e.printStackTrace()
         }
     }
+
+    /**
+     * 延迟激活匹配
+     *
+     * scene: int  0开屏，1信息流，2全屏
+     * status: int   0加载失败，1加载成功
+     */
+    fun lazyRegister(adType: String, status: Int, errorCode: String = "", errorMsg: String = "") {
+        LogUtil.d("AdReportManager", "adType=${adType}  status=${status}")
+
+        when (adType) {//0-开屏，1-信息流，4-全屏
+            Constant.GRO_MORE_ADTYPE0 -> {
+                if (AppPreferencesManager.get().getBoolean(Constant.SPLASH_LAZY, true)) {
+                    cmtLazyRegister(0, status, errorCode, errorMsg)
+                }
+            }
+            Constant.GRO_MORE_ADTYPE1 -> {
+                if (AppPreferencesManager.get().getBoolean(Constant.EXPRESS_LAZY, true)) {
+                    cmtLazyRegister(1, status, errorCode, errorMsg)
+                }
+            }
+            Constant.GRO_MORE_ADTYPE4 -> {
+                if (AppPreferencesManager.get().getBoolean(Constant.FULL_LAZY, true)) {
+                    cmtLazyRegister(2, status, errorCode, errorMsg)
+                }
+            }
+        }
+    }
+
+    private fun cmtLazyRegister(adType: Int, status: Int, errorCode: String, errorMsg: String) {
+        val vo = HashMap<String, Any>()
+        vo["scene"] = adType
+        vo["status"] = status
+        vo["err_code"] = errorCode
+        vo["err_msg"] = errorMsg
+        TrackManager.getInstance().cmtLazyRegister(vo)
+    }
 }
\ No newline at end of file

app/src/main/java/com/mints/fiveworld/common/Constant.kt

@@ -115,4 +115,8 @@ object Constant {
 
     // 是否第一次显示小火箭 true-是
     const val IS_ONE_HOTPAGE = "IS_ONE_HOTPAGE"
+
+    const val SPLASH_LAZY = "SPLASH_LAZY"//开屏延迟
+    const val FULL_LAZY = "FULL_LAZY"//全屏延迟
+    const val EXPRESS_LAZY = "EXPRESS_LAZY"//信息流延迟
 }

app/src/main/java/com/mints/fiveworld/manager/TrackManager.java

@@ -168,4 +168,10 @@ public class TrackManager {
             trackPresenter.splashTenMate(type);
         }
     }
+
+    public void cmtLazyRegister(HashMap<String, Object> vo) {
+        if (trackPresenter != null && !TextUtils.isEmpty(UserManager.getInstance().getUserID())) {
+            trackPresenter.cmtLazyRegister(vo);
+        }
+    }
 }

app/src/main/java/com/mints/fiveworld/mvp/presenters/SplashPresenter.kt

@@ -14,6 +14,7 @@ import com.mints.fiveworld.mvp.model.SplashAppBean
 import com.mints.fiveworld.mvp.model.UserBean
 import com.mints.fiveworld.mvp.views.SplashView
 import com.mints.fiveworld.utils.DeviceUuidFactory
+import com.mints.fiveworld.utils.LogUtil
 import com.mints.library.net.neterror.BaseSubscriber
 import com.mints.library.net.neterror.Throwable
 import com.mints.library.utils.CommonUtils
@@ -22,6 +23,8 @@ import java.util.*
 class SplashPresenter : BasePresenter<SplashView>() {
 
     fun getCloseNeedInitAppsCount() {
+        LogUtil.d("SplashPresenter222","getCloseNeedInitAppsCount 请求-1")
+
         val vo = HashMap<String, Any>()
         vo["os"] = "Android"
         vo["uid"] = UserManager.getInstance().userID
@@ -31,12 +34,12 @@ class SplashPresenter : BasePresenter<SplashView>() {
                         object : BaseSubscriber<BaseResponse<SplashAppBean>>() {
                             override fun onCompleted() {
                                 if (isLinkView) return
-                                view.hideLoading()
                             }
 
                             override fun onError(e: Throwable) {
                                 if (isLinkView) return
-                                view.hideLoading()
+                                LogUtil.d("SplashPresenter222","getCloseNeedInitAppsCount onError-2")
+
                                 view.getAppsCountFail()
                             }
 
@@ -44,8 +47,24 @@ class SplashPresenter : BasePresenter<SplashView>() {
                                 if (isLinkView) return
                                 val code = baseResponse.status
                                 when (code) {
-                                    200 -> view.getAppsCountSuc(baseResponse.data)
-                                    else -> view.getAppsCountFail()
+                                    200 -> {
+                                        LogUtil.d("SplashPresenter222","getCloseNeedInitAppsCount 返回onNext 200-2")
+
+                                        if (!TextUtils.isEmpty(UserManager.getInstance().userID)) {
+                                            LogUtil.d("SplashPresenter222","getCloseNeedInitAppsCount 返回onNext getAppsCountSuc  200-2.1")
+
+                                            view.getAppsCountSuc(baseResponse.data)
+                                        } else {
+                                            LogUtil.d("SplashPresenter222","getCloseNeedInitAppsCount 返回onNext userLogin  200-2.1")
+
+                                            userLogin(baseResponse.data)
+                                        }
+                                    }
+                                    else -> {
+                                        LogUtil.d("SplashPresenter222","getCloseNeedInitAppsCount 返回onNext onError-2")
+
+                                        view.getAppsCountFail()
+                                    }
                                 }
                             }
                         })
@@ -54,7 +73,9 @@ class SplashPresenter : BasePresenter<SplashView>() {
     /**
      * 游客登录
      */
-    fun userLogin() {
+    fun userLogin(splashBean: SplashAppBean) {
+        LogUtil.d("SplashPresenter222","userLogin 请求-1")
+
         val vo = HashMap<String, Any>()
         vo["device"] = DeviceUuidFactory().deviceUuid.toString()
         AppHttpManager.getInstance(loanApplication)
@@ -65,22 +86,25 @@ class SplashPresenter : BasePresenter<SplashView>() {
 
                             override fun onError(e: Throwable) {
                                 if (isLinkView) return
-                                view.userRegisterOver()
+                                view.getAppsCountFail()
+                                LogUtil.d("SplashPresenter222","userLogin onError-2")
+
                             }
 
                             override fun onNext(baseResponse: BaseResponse<UserBean>) {
                                 if (isLinkView) return
+                                LogUtil.d("SplashPresenter222","userLogin 返回onNext 200-2")
+
                                 val code = baseResponse.status
                                 val message = baseResponse.message
                                 val data: UserBean? = baseResponse.data
                                 when (code) {
                                     200 -> if (data != null) {
                                         UserManager.getInstance().saveUserInfo(data)
-                                        view.userRegisterOver()
-                                        saveTerminalInfo()
+                                        saveTerminalInfo(splashBean)
                                         installApp()
                                     }
-                                    else -> view.showToast(message)
+                                    else -> view.getAppsCountFail()
                                 }
                             }
                         })
@@ -89,7 +113,9 @@ class SplashPresenter : BasePresenter<SplashView>() {
     /**
      * 提交设备信息
      */
-    private fun saveTerminalInfo() {
+    private fun saveTerminalInfo(splashBean: SplashAppBean) {
+        LogUtil.d("SplashPresenter222","saveTerminalInfo 请求-1")
+
         val vo = HashMap<String, Any>()
         val deviceInfo: DeviceInfo = DeviceInfo.instance
         val macAddress: String = deviceInfo.getMacAddress()
@@ -117,13 +143,19 @@ class SplashPresenter : BasePresenter<SplashView>() {
 
                             override fun onError(e: Throwable) {
                                 if (isLinkView) return
-                                view.userRegisterOver()
+                                view.getAppsCountFail()
+                                LogUtil.d("SplashPresenter222","saveTerminalInfo onError-2")
+
                             }
 
                             override fun onNext(baseResponse: BaseResponse<Any>) {
                                 if (isLinkView) return
                                 when (baseResponse.status) {
                                     200 -> {
+                                        LogUtil.d("SplashPresenter222","saveTerminalInfo 返回onNext 200-2")
+
+                                        view.getAppsCountSuc(splashBean)
+
                                         AdReportManager.eventExpress(
                                                 AdReportManager.INNER_IN,
                                                 AdReportManager.EVENT_TYPE_SHOWFAIL,
@@ -145,12 +177,15 @@ class SplashPresenter : BasePresenter<SplashView>() {
                                         TrackManager.getInstance().splashTenMate(Constant.SPLASH_10_MATE)
 
                                     }
+                                    else -> view.getAppsCountFail()
                                 }
                             }
                         })
     }
 
     private fun installApp() {
+        LogUtil.d("SplashPresenter222","installApp 请求-1")
+
         val vo = HashMap<String, Any>()
         vo["device"] = DeviceUuidFactory().deviceUuid.toString()
         AppHttpManager.getInstance(loanApplication)
@@ -160,9 +195,13 @@ class SplashPresenter : BasePresenter<SplashView>() {
                             }
 
                             override fun onError(e: Throwable) {
+                                LogUtil.d("SplashPresenter222","installApp onError-2")
+
                             }
 
                             override fun onNext(baseResponse: BaseResponse<Any>) {
+                                LogUtil.d("SplashPresenter222","installApp 返回onNext -2")
+
                             }
                         })
     }

app/src/main/java/com/mints/fiveworld/mvp/presenters/TrackPresenter.java

@@ -22,6 +22,7 @@ import com.mints.fiveworld.mvp.model.OutAppConfig;
 import com.mints.fiveworld.mvp.model.UserBean;
 import com.mints.fiveworld.mvp.model.WifiActiveBean;
 import com.mints.fiveworld.utils.DeviceUuidFactory;
+import com.mints.fiveworld.utils.LogUtil;
 import com.mints.fiveworld.utils.WifiUtils;
 import com.mints.library.net.neterror.BaseSubscriber;
 import com.mints.library.net.neterror.Throwable;
@@ -333,4 +334,49 @@ public class TrackPresenter extends BaseTrackPresenter {
                             }
                         });
     }
+
+    public void cmtLazyRegister(HashMap<String, Object> vo) {
+        AppHttpManager.getInstance(loanApplication)
+                .call(loanService.cmtLazyRegister(vo),
+                        new BaseSubscriber<BaseResponse<Object>>() {
+                            @Override
+                            public void onCompleted() {
+                            }
+
+                            @Override
+                            public void onError(Throwable e) {
+
+                            }
+
+                            @Override
+                            public void onNext(BaseResponse<Object> baseResponse) {
+                                try {
+                                    int scene = (int) vo.get("scene");
+                                    switch (scene) {//int  0开屏，1信息流，2全屏
+                                        case 0: {
+                                            LogUtil.d("AdReportManager", "onNext adType=${开屏}  status=${status}");
+                                            AppPreferencesManager.INSTANCE.get().put(Constant.SPLASH_LAZY, false);
+                                            break;
+                                        }
+                                        case 1: {
+                                            LogUtil.d("AdReportManager", "onNext adType=${信息流}  status=${status}");
+
+                                            AppPreferencesManager.INSTANCE.get().put(Constant.EXPRESS_LAZY, false);
+                                            break;
+                                        }
+                                        case 2: {
+                                            LogUtil.d("AdReportManager", "onNext adType=${全屏}  status=${status}");
+
+                                            AppPreferencesManager.INSTANCE.get().put(Constant.FULL_LAZY, false);
+                                            break;
+                                        }
+                                    }
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+
+                            }
+                        });
+    }
+
 }

app/src/main/java/com/mints/fiveworld/mvp/views/SplashView.kt

@@ -8,6 +8,4 @@ interface SplashView : BaseView {
     fun getAppsCountSuc(data: SplashAppBean?)
 
     fun getAppsCountFail()
-
-    fun userRegisterOver()
 }

app/src/main/java/com/mints/fiveworld/net/LoanService.java

@@ -124,6 +124,12 @@ public interface LoanService {
     @POST("api/feedback")
     Observable<BaseResponse<Object>> feedback(@Body Map<String, Object> vo);
 
+    /**
+     * 延迟激活匹配
+     */
+    @POST("api/reportAdPreloadStatus")
+    Observable<BaseResponse<Object>> cmtLazyRegister(@Body Map<String, Object> vo);
+
     /**
      * 默认http工厂
      */

app/src/main/java/com/mints/fiveworld/utils/ForegroundOrBackground.java

@@ -170,13 +170,6 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
             main_activity = activity;
         }
 
-        String simpleName = activity.getClass().getSimpleName();
-
-        // 全屏广告概率显示HomeBar
-        if (isFullADActivity(simpleName) && HitChanceKeeper.INSTANCE.isHitChance(HitChanceConfig.INSTANCE.getFullHideHomeBarChance())) {
-            AdSafeKeeper.exitFullScreenEx(activity);
-        }
-
     }
 
     @Override