修改登录方式打开激活，只调用一次

GoodMoney/app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.mints.goodmoney"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 9
-        versionName "1.0.8"
+        versionCode 10
+        versionName "1.0.9"
         flavorDimensions "default"
 
         // dex突破65535的限制
@@ -251,8 +251,6 @@ dependencies {
     implementation(name: 'scenead-2.1', ext: 'aar')
     implementation 'com.just.agentweb:agentweb:4.1.2'
     // 喜马拉雅 已集成
-    // 巨量引擎 暂不接入
-//    implementation 'com.bytedance.applog:RangersAppLog-Lite-cn-3.3.12.aar'
 
 
 

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

@@ -97,8 +97,34 @@ public class TtCsjAdManager {
      * 按包渠道更新代码位
      */
     public static void updataIdByChannel(AdcodeBean idBean) {
-        // 渠道对象为空
-        if (idBean == null) {
+        // 渠道对象不为空
+        if (idBean != null) {
+            // 后台返回 用户注册渠道
+            // 信息流
+            TT_AD_NATIVEEXPRESS_AWARD = idBean.getCsj().getCsjv1();
+            TT_AD_NATIVEEXPRESS_WALK = idBean.getCsj().getCsjv2();
+            TT_AD_NATIVEEXPRESS_WATER = idBean.getCsj().getCsjv2();
+            TT_AD_NATIVEEXPRESS_MORNINGCLOCK = idBean.getCsj().getCsjv2();
+            TT_AD_NATIVEEXPRESS_EAT = idBean.getCsj().getCsjv2();
+            // 激励视频
+            TT_AD_VEDIO_DRINK = idBean.getCsj().getCsjv3();
+            TT_AD_VEDIO_MAIN = idBean.getCsj().getCsjv3();
+            TT_AD_VEDIO_ERASE = idBean.getCsj().getCsjv3();
+            TT_AD_VEDIO_TURNABLE = idBean.getCsj().getCsjv3();
+            TT_AD_VEDIO_MOREDIALOG = idBean.getCsj().getCsjv3();
+            // banner
+            TT_AD_BANNER_MY = idBean.getCsj().getCsjv4();
+            return;
+        }
+
+        // 对象为空,加载本地渠道
+        loadLocalChannel();
+    }
+
+    /**
+     * 加载本地渠道
+     */
+    private static void loadLocalChannel() {
         String channel = CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME");
         if (channel.contains(ChannelManager.CHANNEL_TOUTIAO)) {
             // 信息流
@@ -107,17 +133,19 @@ public class TtCsjAdManager {
             TT_AD_NATIVEEXPRESS_WATER = "945666097";
             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";
-
             // banner
-                TT_AD_BANNER_MY="945666042";
-            } else {
+            TT_AD_BANNER_MY = "945666042";
+
+            return;
+        }
+
+
         // 自有默认
         // 信息流
         TT_AD_NATIVEEXPRESS_AWARD = "945562047";
@@ -125,35 +153,13 @@ public class TtCsjAdManager {
         TT_AD_NATIVEEXPRESS_WATER = "945562698";
         TT_AD_NATIVEEXPRESS_MORNINGCLOCK = "945627921";
         TT_AD_NATIVEEXPRESS_EAT = "945627922";
-
         // 激励视频
         TT_AD_VEDIO_DRINK = "945562032";
         TT_AD_VEDIO_MAIN = "945562036";
         TT_AD_VEDIO_ERASE = "945562037";
         TT_AD_VEDIO_TURNABLE = "945562039";
         TT_AD_VEDIO_MOREDIALOG = "945562040";
-
         // banner
-                TT_AD_BANNER_MY="945661050";
-            }
-        } else {
-            // 后台返回 用户注册渠道
-            // 信息流
-            TT_AD_NATIVEEXPRESS_AWARD = idBean.getCsj().getCsjv1();
-            TT_AD_NATIVEEXPRESS_WALK = idBean.getCsj().getCsjv2();
-            TT_AD_NATIVEEXPRESS_WATER = idBean.getCsj().getCsjv2();
-            TT_AD_NATIVEEXPRESS_MORNINGCLOCK = idBean.getCsj().getCsjv2();
-            TT_AD_NATIVEEXPRESS_EAT = idBean.getCsj().getCsjv2();
-
-            // 激励视频
-            TT_AD_VEDIO_DRINK = idBean.getCsj().getCsjv3();
-            TT_AD_VEDIO_MAIN = idBean.getCsj().getCsjv3();
-            TT_AD_VEDIO_ERASE = idBean.getCsj().getCsjv3();
-            TT_AD_VEDIO_TURNABLE =idBean.getCsj().getCsjv3();
-            TT_AD_VEDIO_MOREDIALOG = idBean.getCsj().getCsjv3();
-
-            // banner
-            TT_AD_BANNER_MY=idBean.getCsj().getCsjv4();
-        }
+        TT_AD_BANNER_MY = "945661050";
     }
 }

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

@@ -3,7 +3,6 @@ package com.mints.goodmoney.manager
 import android.content.Context
 import com.mints.goodmoney.MintsApplication
 import com.mints.goodmoney.mvp.model.AdcodeBean
-import com.mints.goodmoney.mvp.model.UserMsgBean
 import com.mints.library.utils.CommonUtils
 import com.qq.e.comm.managers.GDTADManager
 
@@ -48,43 +47,51 @@ object YlhAdManager {
      * 更新代码位
      */
     fun updataIdByChannel(idBean: AdcodeBean?) {
-        // 渠道对象为空
-        if (idBean == null) {
+        // 渠道对象不为空
+        if (idBean != null) {
+            // 后台返回 用户注册渠道
+            // 开屏
+            YLH_AD_SPLASH_POSTID = idBean.ylh.ylhv1
+            // 激励视频
+            YLH_AD_VEDIO_DRINK_POSTID = idBean.ylh.ylhv2
+            YLH_AD_VEDIO_MAIN_POSTID = idBean.ylh.ylhv2
+            YLH_AD_VEDIO_ERASE_POSTID = idBean.ylh.ylhv2
+            YLH_AD_VEDIO_TURNABLE_POSTID = idBean.ylh.ylhv2
+            YLH_AD_VEDIO_MOREDIALOG_POSTID = idBean.ylh.ylhv2
+
+            return
+        }
+
+
+        // 对象为空,加载本地渠道
+        loadLocalChannel()
+    }
+
+    private fun loadLocalChannel() {
         val channel = CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
         if (channel.contains(ChannelManager.CHANNEL_TOUTIAO)) {
             // 头条
             // 开屏
             YLH_AD_SPLASH_POSTID = "4031840694338658"
-
             // 激励视频
             YLH_AD_VEDIO_DRINK_POSTID = "7091944614237712"
             YLH_AD_VEDIO_MAIN_POSTID = "7091944614237712"
             YLH_AD_VEDIO_ERASE_POSTID = "7091944614237712"
             YLH_AD_VEDIO_TURNABLE_POSTID = "7091944614237712"
             YLH_AD_VEDIO_MOREDIALOG_POSTID = "7091944614237712"
-            } else {
+
+            return
+        }
+
         // 自有默认
         // 开屏
         YLH_AD_SPLASH_POSTID = "7021944730189381"
-
         // 激励视频
         YLH_AD_VEDIO_DRINK_POSTID = "2031043750380462"
         YLH_AD_VEDIO_MAIN_POSTID = "8081940760988417"
         YLH_AD_VEDIO_ERASE_POSTID = "9061142700180449"
         YLH_AD_VEDIO_TURNABLE_POSTID = "5051746700185561"
         YLH_AD_VEDIO_MOREDIALOG_POSTID = "9001346780383626"
-            }
-        } else {
-            // 后台返回 用户注册渠道
-            // 开屏
-            YLH_AD_SPLASH_POSTID = idBean.ylh.ylhv1
 
-            // 激励视频
-            YLH_AD_VEDIO_DRINK_POSTID = idBean.ylh.ylhv2
-            YLH_AD_VEDIO_MAIN_POSTID = idBean.ylh.ylhv2
-            YLH_AD_VEDIO_ERASE_POSTID = idBean.ylh.ylhv2
-            YLH_AD_VEDIO_TURNABLE_POSTID = idBean.ylh.ylhv2
-            YLH_AD_VEDIO_MOREDIALOG_POSTID = idBean.ylh.ylhv2
-        }
     }
 }
\ No newline at end of file

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

@@ -56,7 +56,7 @@ class HomePresenter : BasePresenter<HomeView>() {
                                 val code: Int = baseResponse.getStatus()
                                 when (code) {
                                     200 -> {
-                                        ps.put(Constant.FIRST_DEVICE_FLAG, true)
+//                                        ps.put(Constant.FIRST_DEVICE_FLAG, true)
                                     }
                                 }
                             }

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MainFragment.kt

@@ -103,6 +103,9 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
         showLittle()
 
         initListener()
+
+        // 打开激活
+        uploadDeviceInfo()
     }
 
     override fun onHiddenChanged(hidden: Boolean) {
@@ -120,9 +123,6 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
         super.onResume()
 
         if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_MAIN) {
-            // 打开激活
-            uploadDeviceInfo()
-
             if (!TextUtils.isEmpty(userManager?.userID)) {
                 homePresenter.getHallBaseMsg()
             } else {
@@ -144,9 +144,9 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
     }
 
     private fun uploadDeviceInfo() {
-        if (!ps.getBoolean(Constant.FIRST_DEVICE_FLAG, false)) {
+//        if (!ps.getBoolean(Constant.FIRST_DEVICE_FLAG, false)) {
             homePresenter.comSaveTerminalInfo(ps)
-        }
+//        }
     }
 
     override fun onPause() {