代码优化

video/app/src/main/AndroidManifest.xml

@@ -11,6 +11,11 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <!--必要权限，解决安全风险漏洞，发送和注册广播事件需要调用带有传递权限的接口-->
+    <permission
+        android:name="${applicationId}.openadsdk.permission.TT_PANGOLIN"
+        android:protectionLevel="signature" />
+    <uses-permission android:name="${applicationId}.openadsdk.permission.TT_PANGOLIN" />
 
 
     <application
@@ -72,7 +77,7 @@
         </activity>
         <activity
             android:name=".ui.activitys.SplashAdActivity"
-            android:excludeFromRecents="true"
+            android:exported="false"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activitys.MobileLoginActivity"

video/app/src/main/java/com/mints/wisdomclean/ad/AdNoProListener.kt

-package com.mints.wisdomclean.ad
-
-/**
- * 广告状态触发事件
- */
-abstract class AdNoProListener : IAdNoProListener {
-
-}
-
-interface IAdNoProListener {
-    fun adFail()
-
-    fun adSuccess()
-
-    fun adClose()
-}
\ No newline at end of file

video/app/src/main/java/com/mints/wisdomclean/ad/AdStatusListener.kt

 package com.mints.wisdomclean.ad
 
+import java.util.HashMap
+
 interface AdStatusListener {
     fun adSuccess()
 
     fun adFail()
 
-    fun adClose()
+    fun adClose(vo : HashMap<String, Any>?)
 }
\ No newline at end of file

video/app/src/main/java/com/mints/wisdomclean/ad/NoPreAdManager.kt

@@ -2,6 +2,7 @@ package com.mints.wisdomclean.ad
 
 import android.app.Activity
 import com.mints.wisdomclean.ad.video.InMoneyVideoNoPre
+import java.util.HashMap
 
 /**
  * 实时加载激励视频、全屏
@@ -13,9 +14,9 @@ object NoPreAdManager {
     fun loadVideoAd(
         activity: Activity,
         carrierType: String,
-        listener: AdNoProListener?
+        listener: AdStatusListener?
     ) {
-        val adNoProListener = object : AdNoProListener() {
+        val adNoProListener = object : AdStatusListener {
             override fun adFail() {
                 listener?.adFail()
             }
@@ -25,8 +26,8 @@ object NoPreAdManager {
 
             }
 
-            override fun adClose() {
-                listener?.adClose()
+            override fun adClose(vo : HashMap<String, Any>?) {
+                listener?.adClose(vo)
             }
 
         }

video/app/src/main/java/com/mints/wisdomclean/ad/splash/SplashManager.kt

@@ -125,13 +125,13 @@ object SplashManager {
         override fun onAdSkip() {
             LogUtil.d(TAG, "gromore应用内开屏广告--> 7、onAdSkip ")
 
-            adStatusListener?.adClose()
+            adStatusListener?.adClose(null)
         }
 
         override fun onAdDismiss() {
             LogUtil.d(TAG, "gromore应用内开屏广告--> 7、onAdDismiss ")
 
-            adStatusListener?.adClose()
+            adStatusListener?.adClose(null)
         }
     }
 

video/app/src/main/java/com/mints/wisdomclean/ad/video/InMoneyVideo.java

@@ -233,14 +233,7 @@ public class InMoneyVideo {
                     nowAdSource = mttRewardAd.getShowEcpm().getAdNetworkPlatformName();
                 }
 
-                HashMap<String, Object> vo = new HashMap<>();
-                vo.put("adcode", nowAdcode);
-                vo.put("ecpm", nowEcpm);
-                vo.put("adSource", nowAdSource);
-                vo.put("carrierType", carrierType);
-                vo.put("adid", BuildConfig.GROMORE_VIDEO_CODE);
-                TrackManager.getInstance().cmtGroMoreInfo(vo);
-                TrackManager.getInstance().reporGromeEcpm(vo);
+
             }
             LogUtil.d(TAG, "gromore应用内激励视频广告-->onRewardedAdShow");
 
@@ -280,8 +273,14 @@ public class InMoneyVideo {
         public void onRewardedAdClosed() {
             LogUtil.d(TAG, "gromore应用内激励视频广告-->onRewardedAdClosed   preAdcode=" + preAdcode);
 
+            HashMap<String, Object> vo = new HashMap<>();
+            vo.put("adcode", nowAdcode);
+            vo.put("ecpm", nowEcpm);
+            vo.put("adSource", nowAdSource);
+            vo.put("carrierType", carrierType);
+            vo.put("adid", BuildConfig.GROMORE_VIDEO_CODE);
             if (adStatusListener != null) {
-                adStatusListener.adClose();
+                adStatusListener.adClose(vo);
             }
 
             adStatusListener = null;

video/app/src/main/java/com/mints/wisdomclean/ad/video/InMoneyVideoNoPre.java

@@ -14,9 +14,7 @@ import com.bytedance.msdk.api.v2.slot.GMAdOptionUtil;
 import com.bytedance.msdk.api.v2.slot.GMAdSlotRewardVideo;
 import com.mints.library.utils.json.JsonUtil;
 import com.mints.wisdomclean.BuildConfig;
-import com.mints.wisdomclean.ad.AdNoProListener;
-import com.mints.wisdomclean.common.Constant;
-import com.mints.wisdomclean.manager.TrackManager;
+import com.mints.wisdomclean.ad.AdStatusListener;
 import com.mints.wisdomclean.manager.UserManager;
 import com.mints.wisdomclean.utils.LogUtil;
 
@@ -57,15 +55,15 @@ public class InMoneyVideoNoPre {
 
     private boolean isClickScreen = true; // 是否点击屏幕跳转广告
 
-    private AdNoProListener adNoProListener;
+    private AdStatusListener adStatusListener;
 
     /**
      * 激励视频
      */
-    public void loadAd(Activity _activity, AdNoProListener adNoProListener, String carrier) {
+    public void loadAd(Activity _activity, AdStatusListener adStatusListener, String carrier) {
 
         this.carrierType = carrier;
-        this.adNoProListener = adNoProListener;
+        this.adStatusListener = adStatusListener;
         this.weakActivity = new WeakReference(_activity);
         this.isClickScreen = true;
 
@@ -108,8 +106,8 @@ public class InMoneyVideoNoPre {
                 LogUtil.e(TAG, "InMoneyVideoNoPre应用内激励视频广告-->onError  " + adError.code + adError.message + "  id=" + adUnitId);
                 LogUtil.e(TAG, "InMoneyVideoNoPre应用内激励视频广告-->onRewardVideoLoadFail  result=" + JsonUtil.toJson(mttRewardAd.getAdLoadInfoList()));
 
-                if (adNoProListener != null) {
-                    adNoProListener.adFail();
+                if (adStatusListener != null) {
+                    adStatusListener.adFail();
                 }
             }
 
@@ -128,8 +126,8 @@ public class InMoneyVideoNoPre {
                 } else {
                     LogUtil.e(TAG, " onRewardVideoCached  onError  ");
 
-                    if (adNoProListener != null) {
-                        adNoProListener.adFail();
+                    if (adStatusListener != null) {
+                        adStatusListener.adFail();
                     }
                 }
             }
@@ -150,8 +148,8 @@ public class InMoneyVideoNoPre {
          * 广告的展示回调 每个广告仅回调一次
          */
         public void onRewardedAdShow() {
-            if (adNoProListener != null) {
-                adNoProListener.adSuccess();
+            if (adStatusListener != null) {
+                adStatusListener.adSuccess();
             }
 
 
@@ -163,14 +161,7 @@ public class InMoneyVideoNoPre {
                     nowAdSource = mttRewardAd.getShowEcpm().getAdNetworkPlatformName();
                 }
 
-                HashMap<String, Object> vo = new HashMap<>();
-                vo.put("adcode", nowAdcode);
-                vo.put("ecpm", nowEcpm);
-                vo.put("adSource", nowAdSource);
-                vo.put("carrierType", carrierType);
-                vo.put("adid", BuildConfig.GROMORE_VIDEO_CODE);
-                TrackManager.getInstance().cmtGroMoreInfo(vo);
-                TrackManager.getInstance().reporGromeEcpm(vo);
+
             }
             LogUtil.d(TAG, "InMoneyVideoNoPre应用内激励视频广告-->onRewardedAdShow");
 
@@ -205,11 +196,17 @@ public class InMoneyVideoNoPre {
         public void onRewardedAdClosed() {
             LogUtil.d(TAG, "InMoneyVideoNoPre应用内激励视频广告-->onRewardedAdClosed   nowAdcode=" + nowAdcode);
 
-            if (adNoProListener != null) {
-                adNoProListener.adClose();
+            HashMap<String, Object> vo = new HashMap<>();
+            vo.put("adcode", nowAdcode);
+            vo.put("ecpm", nowEcpm);
+            vo.put("adSource", nowAdSource);
+            vo.put("carrierType", carrierType);
+            vo.put("adid", BuildConfig.GROMORE_VIDEO_CODE);
+            if (adStatusListener != null) {
+                adStatusListener.adClose(vo);
             }
 
-            adNoProListener = null;
+            adStatusListener = null;
         }
 
         /**
@@ -225,8 +222,8 @@ public class InMoneyVideoNoPre {
         public void onVideoError() {
             LogUtil.e(TAG, "InMoneyVideoNoPre应用内激励视频广告-->onVideoError");
 
-            if (adNoProListener != null) {
-                adNoProListener.adFail();
+            if (adStatusListener != null) {
+                adStatusListener.adFail();
             }
         }
 

video/app/src/main/java/com/mints/wisdomclean/manager/TrackManager.java

@@ -44,19 +44,6 @@ public class TrackManager {
         }
     }
 
-    public void cmtGroMoreInfo(HashMap<String, Object> vo) {
-        if (trackPresenter != null && !TextUtils.isEmpty(UserManager.getInstance().getUserID())) {
-            trackPresenter.cmtGroMoreInfo(vo);
-        }
-    }
-
-    public void reporGromeEcpm(HashMap<String, Object> vo) {
-        if (trackPresenter != null && !TextUtils.isEmpty(UserManager.getInstance().getUserID())) {
-            trackPresenter.reporGromeEcpm(vo);
-        }
-    }
-
-
     public void commitVedio(VedioBean data) {
         if (trackPresenter != null) {
             HashMap<String, Object> vo = new HashMap<>();

video/app/src/main/java/com/mints/wisdomclean/mvp/presenters/TrackPresenter.java

@@ -77,24 +77,6 @@ public class TrackPresenter extends BaseTrackPresenter {
                         });
     }
 
-    public void cmtGroMoreInfo(HashMap<String, Object> vo) {
-        AppHttpManager.getInstance(loanApplication)
-                .call(loanService.reportAdIncome(vo),
-                        new BaseSubscriber<BaseResponse<Object>>() {
-                            @Override
-                            public void onCompleted() {
-                            }
-
-                            @Override
-                            public void onError(Throwable e) {
-
-                            }
-
-                            @Override
-                            public void onNext(BaseResponse<Object> baseResponse) {
-                            }
-                        });
-    }
 
     public void commitVedio(HashMap<String, Object> vo) {
         AppHttpManager.getInstance(loanApplication)
@@ -115,25 +97,6 @@ public class TrackPresenter extends BaseTrackPresenter {
                         });
     }
 
-    public void reporGromeEcpm(HashMap<String, Object> vo) {
-        AppHttpManager.getInstance(loanApplication)
-                .call(loanService.reporGromeEcpm(vo),
-                        new BaseSubscriber<BaseResponse<JsonObject>>() {
-                            @Override
-                            public void onCompleted() {
-                            }
-
-                            @Override
-                            public void onError(Throwable e) {
-
-                            }
-
-                            @Override
-                            public void onNext(BaseResponse<JsonObject> baseResponse) {
-                            }
-                        });
-    }
-
     public void saveV6Terminal() {
         try {
             Context context = MintsApplication.getContext();

video/app/src/main/java/com/mints/wisdomclean/net/LoanService.java

@@ -144,21 +144,13 @@ public interface LoanService {
     @POST("api/vip/unSign")
     Observable<BaseResponse<JsonObject>> unSign();
 
-    /**
-     * groMore数据提交
-     *
-     * @return
-     */
-    @POST("api/reportAdIncome")
-    Observable<BaseResponse<Object>> reportAdIncome(@Body Map<String, Object> vo);
-
     /**
      * groMore激励视频展示广告提交数据
      *
      * @return
      */
-    @POST("api/reporGromeEcpm")
-    Observable<BaseResponse<JsonObject>> reporGromeEcpm(@Body Map<String, Object> vo);
+    @POST("api/vedio/unlock")
+    Observable<BaseResponse<JsonObject>> unlock(@Body Map<String, Object> vo);
 
     /**
      * 首页分类

video/app/src/main/java/com/mints/wisdomclean/video/DramaApiDetailActivity.kt

@@ -20,6 +20,7 @@ import com.mints.wisdomclean.ui.widgets.VideoEpisodeDialog
 import kotlinx.android.synthetic.main.drama_activity_api_detail.*
 import kotlinx.android.synthetic.main.drama_activity_api_detail.fm_bottom
 import org.json.JSONObject
+import java.util.HashMap
 
 /**
  *  @author Assen
@@ -330,6 +331,14 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
                         "",
                         object : AdStatusListener {
                             override fun adSuccess() {
+
+                            }
+
+                            override fun adFail() {
+                            }
+
+                            override fun adClose(vo : HashMap<String, Any>?) {
+
                                 val hasUnlockList: MutableList<Int> =
                                     mHasUnlockIndexMap[drama.id] ?: mutableListOf()
                                 hasUnlockList.add(widget.currentDramaIndex)
@@ -338,12 +347,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
                                 callback?.onDramaRewardArrived() // 解锁当前集
                             }
 
-                            override fun adFail() {
-                            }
-
-                            override fun adClose() {
-                            }
-
                         })
 
 

video/app/src/main/res/layout/fragment_main_my.xml

@@ -235,6 +235,10 @@
 
                 </LinearLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/my_color_gray" />
 
                 <LinearLayout
                     android:id="@+id/ll_my_setting"