代码优化

video/app/src/main/java/com/duben/speedplaylet/common/AppConfig.java

@@ -16,6 +16,7 @@ public class AppConfig {
      * app应用首页 0-主页 1-position 2-我
      */
     public static int fragmentClickFlag = 0;
+    public static int vedioId = 0;
 
     // 退出登录首页刷新
     public static boolean exitLoginMainRefresh = false;

video/app/src/main/java/com/duben/speedplaylet/manager/LocalVedioManager.kt

@@ -9,6 +9,7 @@ import com.bytedance.sdk.dp.DPSdk
 import com.bytedance.sdk.dp.IDPWidgetFactory
 import com.duben.speedplaylet.ad.express.ExpressManager
 import com.duben.library.utils.json.JsonUtil
+import com.duben.speedplaylet.common.AppConfig
 import com.duben.speedplaylet.common.Constant
 import com.duben.speedplaylet.mvp.model.VedioBean
 import com.duben.speedplaylet.utils.AppPreferencesManager
@@ -28,6 +29,7 @@ object LocalVedioManager {
      * 提交当前视频数据
      */
     fun commitVedio(data: VedioBean) {
+        AppConfig.vedioId = data.vedioId
         cacheVedio(data)
         TrackManager.getInstance().commitVedio(data)
     }
@@ -106,13 +108,13 @@ object LocalVedioManager {
             bundle.putBoolean(Constant.VEDIO_NEXT, isPlayNext)
             bundle.putBoolean(Constant.VEDIO_THIRD, isThirdId)
             readyGo(activity, TxVideoActivity::class.java, bundle)
-        } else if (data?.createType == 3) {
+        } else if (data?.createType == 2) {
+            requestDrama(activity, data)
+        } else {
             //推荐短剧
             val bundle = Bundle()
             bundle.putString(Constant.VEDIO_BEAN, JsonUtil.toJson(data))
             readyGo(activity, NewTxVideoActivity::class.java, bundle)
-        } else {
-            requestDrama(activity, data)
         }
 
         if (!UserManager.getInstance().vipFlag) {

video/app/src/main/java/com/duben/speedplaylet/manager/TrackManager.java

@@ -41,6 +41,12 @@ public class TrackManager {
         }
     }
 
+    public void firstShowVedio() {
+        if (trackPresenter != null) {
+            trackPresenter.firstShowVedio();
+        }
+    }
+
     public void commitVedio(VedioBean data) {
         if (trackPresenter != null) {
             HashMap<String, Object> vo = new HashMap<>();

video/app/src/main/java/com/duben/speedplaylet/mvp/model/RecommendBannerList.java

+package com.duben.speedplaylet.mvp.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class RecommendBannerList implements Serializable {
+    private List<VedioBean> vedio4;
+
+    public List<VedioBean> getList() {
+        return vedio4;
+    }
+
+    public void setList(List<VedioBean> list) {
+        this.vedio4 = list;
+    }
+}

video/app/src/main/java/com/duben/speedplaylet/mvp/presenters/RecommendBannerPresenter.kt

@@ -2,17 +2,22 @@ package com.duben.speedplaylet.mvp.presenters
 
 import com.duben.library.net.neterror.BaseSubscriber
 import com.duben.library.net.neterror.Throwable
+import com.duben.speedplaylet.common.AppConfig
 import com.duben.speedplaylet.manager.AppHttpManager
 import com.duben.speedplaylet.mvp.model.BannerList
 import com.duben.speedplaylet.mvp.model.BaseResponse
+import com.duben.speedplaylet.mvp.model.RecommendBannerList
 import com.duben.speedplaylet.mvp.views.RecommendBannerView
+import java.util.HashMap
 
 class RecommendBannerPresenter : BasePresenter<RecommendBannerView>() {
 
     fun orders() {
+        val vo = HashMap<String, Any>()
+        vo["vedioId"] = AppConfig.vedioId
         AppHttpManager.getInstance(loanApplication)
-            .call(loanService.orders(),
-                object : BaseSubscriber<BaseResponse<BannerList>>() {
+            .call(loanService.vedio4Msg(vo),
+                object : BaseSubscriber<BaseResponse<RecommendBannerList>>() {
                     override fun onCompleted() {
                         if (isLinkView) return
                     }
@@ -21,7 +26,7 @@ class RecommendBannerPresenter : BasePresenter<RecommendBannerView>() {
                         if (isLinkView) return
                     }
 
-                    override fun onNext(baseResponse: BaseResponse<BannerList>) {
+                    override fun onNext(baseResponse: BaseResponse<RecommendBannerList>) {
                         if (isLinkView) return
 
                         val code = baseResponse.status

video/app/src/main/java/com/duben/speedplaylet/mvp/presenters/TrackPresenter.java

 package com.duben.speedplaylet.mvp.presenters;
 
 import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 
-import com.google.gson.JsonObject;
-import com.duben.speedplaylet.common.Constant;
-import com.duben.speedplaylet.manager.LocalVedioManager;
-import com.duben.speedplaylet.mvp.model.IndexList;
-import com.duben.speedplaylet.mvp.model.VedioBean;
-import com.duben.speedplaylet.utils.AppPreferencesManager;
 import com.duben.library.net.neterror.BaseSubscriber;
 import com.duben.library.net.neterror.Throwable;
 import com.duben.speedplaylet.MintsApplication;
+import com.duben.speedplaylet.common.AppConfig;
 import com.duben.speedplaylet.common.DeviceInfo;
 import com.duben.speedplaylet.manager.AppHttpManager;
 import com.duben.speedplaylet.manager.UserManager;
 import com.duben.speedplaylet.mvp.model.BaseResponse;
 import com.duben.speedplaylet.mvp.model.UserBean;
 import com.duben.speedplaylet.utils.DeviceUuidFactory;
+import com.google.gson.JsonObject;
 
 import java.util.HashMap;
 
@@ -48,7 +42,7 @@ public class TrackPresenter extends BaseTrackPresenter {
                                     case 200: {
                                         UserManager.getInstance().saveUserInfo(baseResponse.getData());
 
-                                        getMyInfo();
+                                        firstShowVedio();
 
                                         saveTerminalInfo();
                                     }
@@ -227,4 +221,33 @@ public class TrackPresenter extends BaseTrackPresenter {
                         });
     }
 
+
+    public void firstShowVedio() {
+        AppHttpManager.getInstance(loanApplication)
+                .call(loanService.firstShowVedio(),
+                        new BaseSubscriber<BaseResponse<JsonObject>>() {
+                            @Override
+                            public void onCompleted() {
+                            }
+
+                            @Override
+                            public void onError(Throwable e) {
+                            }
+
+                            @Override
+                            public void onNext(BaseResponse<JsonObject> baseResponse) {
+                                switch (baseResponse.getStatus()) {
+                                    case 200: {
+                                        try {
+                                            JsonObject data = baseResponse.getData();
+                                            AppConfig.showVipVedio = data.get("canShowVedio4").getAsBoolean();
+                                        } catch (Exception e) {
+                                            e.printStackTrace();
+                                        }
+                                    }
+                                }
+                            }
+                        });
+
+    }
 }

video/app/src/main/java/com/duben/speedplaylet/mvp/views/RecommendBannerView.kt

 package com.duben.speedplaylet.mvp.views
 
-import com.duben.speedplaylet.mvp.model.BannerList
-import com.duben.speedplaylet.mvp.model.UserBean
-import com.duben.speedplaylet.mvp.model.VipBean
-import com.duben.speedplaylet.mvp.model.WxPayParamBean
+import com.duben.speedplaylet.mvp.model.*
 
 interface RecommendBannerView : BaseView {
 
-    fun ordersSuc(data: BannerList?)
+    fun ordersSuc(data: RecommendBannerList?)
 }
\ No newline at end of file

video/app/src/main/java/com/duben/speedplaylet/net/LoanService.java

@@ -3,6 +3,7 @@ package com.duben.speedplaylet.net;
 import android.content.Context;
 import android.text.TextUtils;
 
+import com.duben.speedplaylet.mvp.model.RecommendBannerList;
 import com.google.gson.JsonObject;
 import com.duben.speedplaylet.BuildConfig;
 import com.duben.speedplaylet.mvp.model.BannerList;
@@ -310,6 +311,19 @@ public interface LoanService {
     @POST("api/vedio/showTurn")
     Observable<BaseResponse<NineShowBean>> showTurn();
 
+    /**
+     * 获取推荐状态
+     */
+    @POST("api/vedio/showVedio4")
+    Observable<BaseResponse<JsonObject>> firstShowVedio();
+
+    /**
+     * 推荐banner
+     */
+    @POST("api/vedio/vedio4Msg")
+    Observable<BaseResponse<RecommendBannerList>> vedio4Msg(@Body Map<String, Object> vo);
+
+
     /**
      * 默认http工厂
      */

video/app/src/main/java/com/duben/speedplaylet/ui/activitys/RecommendBannerActivity.kt

@@ -9,6 +9,7 @@ import com.duben.library.utils.nodoubleclick.AntiShake
 import com.duben.speedplaylet.R
 import com.duben.speedplaylet.manager.LocalVedioManager
 import com.duben.speedplaylet.mvp.model.BannerList
+import com.duben.speedplaylet.mvp.model.RecommendBannerList
 import com.duben.speedplaylet.mvp.model.VedioBean
 import com.duben.speedplaylet.mvp.presenters.RecommendBannerPresenter
 import com.duben.speedplaylet.mvp.views.RecommendBannerView
@@ -58,7 +59,7 @@ class RecommendBannerActivity : BaseActivity(),RecommendBannerView, View.OnClick
         recommendBannerPresenter.detachView()
     }
 
-    override fun ordersSuc(data: BannerList?) {
+    override fun ordersSuc(data: RecommendBannerList?) {
         data?.let {
             setBanner(it.list)
         }

video/app/src/main/java/com/duben/speedplaylet/ui/activitys/SplashActivity.kt

@@ -71,7 +71,7 @@ class SplashActivity : BaseActivity() {
 
     private fun initData() {
         if(!TextUtils.isEmpty(UserManager.getInstance().userID)){
-            TrackManager.getInstance().getMyInfo()
+            TrackManager.getInstance().firstShowVedio()
         }
 
         val firstSplash = get().getBoolean(Constant.FIRST_SPLASH, true)

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

@@ -16,6 +16,7 @@
         android:scaleType="fitXY" />
 
     <TextView
+        android:visibility="gone"
         android:id="@+id/bannerTitle"
         android:layout_width="match_parent"
         android:layout_height="24dp"

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

@@ -20,7 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="14dp"
             android:textColor="@color/white"
             android:textSize="18sp"
             tools:text="包年会员" />