需求调整

video/app/src/main/java/com/mints/helivideo/MintsApplication.java

@@ -52,13 +52,6 @@ public class MintsApplication extends MultiDexApplication {
         super.onCreate();
         mContext = this.getApplicationContext();
 
-//        // 友盟SDK预初始化函数
-//        // preInit预初始化函数耗时极少，不会影响App首次冷启动用户体验
-//        UmengManager.INSTANCE.preInit(this,
-//                MateUtils.INSTANCE.getAppMetaData(this, "CHANNEL_NAME"));
-
-
-
         // 三方配置
         thirdConfig();
     }

video/app/src/main/java/com/mints/helivideo/ad/TTAdManagerHolder.java

@@ -13,6 +13,7 @@ import com.bytedance.sdk.openadsdk.mediation.init.MediationPrivacyConfig;
 import com.mints.helivideo.BuildConfig;
 import com.mints.helivideo.MintsApplication;
 import com.mints.helivideo.common.Constant;
+import com.mints.helivideo.utils.AppPreferencesManager;
 import com.mints.helivideo.utils.DeviceUuidFactory;
 import com.mints.helivideo.utils.LogUtil;
 
@@ -79,7 +80,7 @@ public class TTAdManagerHolder {
                  * 使用聚合功能此开关必须设置为true，默认为false，不会初始化聚合模板，聚合功能会吟唱
                  */
                 .useMediation(true)
-//                .customController(getTTCustomController()) //如果您需要设置隐私策略请参考该api
+                .customController(getTTCustomController()) //如果您需要设置隐私策略请参考该api
 //                .setMediationConfig(new MediationConfig.Builder() //可设置聚合特有参数详细设置请参考该api
 //                        .setMediationConfigUserInfoForSegment(getUserInfoForSegment())//如果您需要配置流量分组信息请参考该api
 //                        .build())
@@ -107,31 +108,49 @@ public class TTAdManagerHolder {
 
             @Override
             public boolean isCanUseWifiState() {
+                if (AppPreferencesManager.INSTANCE.get()
+                        .getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return false;
+
                 return super.isCanUseWifiState();
             }
 
             @Override
             public String getMacAddress() {
+                if (AppPreferencesManager.INSTANCE.get()
+                        .getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return "";
+
                 return super.getMacAddress();
             }
 
             @Override
             public boolean isCanUseWriteExternal() {
+                if (AppPreferencesManager.INSTANCE.get()
+                        .getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return false;
+
                 return super.isCanUseWriteExternal();
             }
 
             @Override
             public String getDevOaid() {
+                if (AppPreferencesManager.INSTANCE.get()
+                        .getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return "";
+
                 return super.getDevOaid();
             }
 
             @Override
             public boolean isCanUseAndroidId() {
+                if (AppPreferencesManager.INSTANCE.get()
+                        .getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return false;
+
                 return super.isCanUseAndroidId();
             }
 
             @Override
             public String getAndroidId() {
+                if (AppPreferencesManager.INSTANCE.get()
+                        .getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return "";
+
                 return super.getAndroidId();
             }
 
@@ -141,11 +160,17 @@ public class TTAdManagerHolder {
 
                     @Override
                     public boolean isLimitPersonalAds() {
+                        if (AppPreferencesManager.INSTANCE.get()
+                                .getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return false;
+
                         return super.isLimitPersonalAds();
                     }
 
                     @Override
                     public boolean isProgrammaticRecommend() {
+                        if (AppPreferencesManager.INSTANCE.get()
+                                .getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return false;
+
                         return super.isProgrammaticRecommend();
                     }
                 };
@@ -153,6 +178,9 @@ public class TTAdManagerHolder {
 
             @Override
             public boolean isCanUsePermissionRecordAudio() {
+                if (AppPreferencesManager.INSTANCE.get()
+                        .getBoolean(Constant.LOAN_PERMISSION_FLAG, true)) return false;
+
                 return super.isCanUsePermissionRecordAudio();
             }
         };

video/app/src/main/java/com/mints/helivideo/mvp/model/VedioBean.java

@@ -6,7 +6,7 @@ import java.util.ArrayList;
 public class VedioBean implements Serializable {
 
     private String thirdId;//穿山甲id
-    private int createType;//类型，1，自有剧，2 穿山甲
+    private int createType;//类型，1，自有剧，2 穿山甲，3 推荐短剧，4 九宫格
     private String title;
     private String type;
 

video/app/src/main/java/com/mints/helivideo/ui/fragment/MainFragment.kt

@@ -303,11 +303,18 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
             banner.addBannerLifecycleObserver(this)
                 .setAdapter(ImageTitleAdapter(bannerList))
                 .setOnBannerListener { data2, position ->
+                    val banner = data.list.get(position)
+                    if (banner.createType == 4) {
+                        // 九宫格
+                        readyGo(NineActivity::class.java)
+                    } else {
                         LocalVedioManager.startVedioDetailActivityForType(
                             requireActivity(),
-                        data.list.get(position)
+                            banner
                         )
                     }
+
+                }
         }
     }
 

video/app/src/main/java/com/mints/helivideo/ui/fragment/MyFragment.kt

@@ -137,7 +137,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
             R.id.ll_my_payrecord -> {
                 readyGo(OrderRecordActivity::class.java)
             }
-            R.id.btn_action -> {
+            R.id.btn_action,R.id.rl_lucky -> {
                 clickTurn()
             }
         }
@@ -203,6 +203,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
         ll_my_setting.setOnClickListener(this)
         ll_contactus.setOnClickListener(this)
         btn_action.setOnClickListener(this)
+        rl_lucky.setOnClickListener(this)
     }