From 1981dee5aec45793d3c4ebdbc4e637528c71b3c5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 03 二月 2021 19:20:47 +0800
Subject: [PATCH] 'PPTV'

---
 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java |   65 +++++++++++++++-----------------
 1 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
index f7673c2..c46f74e 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
@@ -34,6 +34,7 @@
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
+import com.bytedance.sdk.openadsdk.TTFullScreenVideoAd;
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -59,10 +60,11 @@
 import com.weikou.beibeivideo.entity.VideoDetailInfo;
 import com.weikou.beibeivideo.entity.VideoInfo;
 import com.weikou.beibeivideo.entity.VideoResource;
+import com.weikou.beibeivideo.entity.video.ChangeVideoEvent;
 import com.weikou.beibeivideo.ui.BaseActivity;
 import com.weikou.beibeivideo.ui.ad.PlayVideoPreADFragment;
 import com.weikou.beibeivideo.ui.common.ShareActivity;
-import com.weikou.beibeivideo.ui.mine.FXBrowserActivity;
+import com.weikou.beibeivideo.ui.video.VideoPlayerBrowserActivity;
 import com.weikou.beibeivideo.ui.video.FunshionPlayerFragment;
 import com.weikou.beibeivideo.ui.video.VideoPlayerActivity;
 import com.weikou.beibeivideo.util.BeibeiConstant;
@@ -89,7 +91,7 @@
 public class VideoDetailActivity2 extends BaseActivity implements
         OnClickListener {
 
-    private final String TAG = "VideoDetailActivity2";
+    private final String TAG = VideoDetailActivity2.class.getName();
 
     //    private boolean mLandscape;
     private VideoInfo videoInfo;
@@ -142,7 +144,7 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.video_detail_activity);
-        VideoUtil.videoEpisodeList.clear();
+        VideoUtil.clearVideoEpisodeList(this);
         /*
          * 璁$畻鐘舵�佹爮楂樺害骞惰缃�
          */
@@ -279,6 +281,13 @@
         if (BeibeiConstant.AD_TYPE.isVideoDetailSplashAd()) {
             if (FullVideoAdManager.getInstance().isCacahed()) {
                 FullVideoAdManager.getInstance().showAd(this);
+            } else {
+                FullVideoAdManager.getInstance().loadAd(BeibeiVideoApplication.application, new FullVideoAdManager.IFullVideoAdListener() {
+                    @Override
+                    public void onSuccess(TTFullScreenVideoAd ad) {
+                        FullVideoAdManager.getInstance().showAd(VideoDetailActivity2.this);
+                    }
+                });
             }
         }
     }
@@ -312,7 +321,7 @@
         if (BeibeiConstant.IS_TEST)
             BeibeiConstant.AD_TYPE = null;
         //闇�瑕佸姞杞藉箍鍛�
-        if (BeibeiConstant.AD_TYPE != null && BeibeiConstant.AD_TYPE.isPlayerAd()) {
+        if (BeibeiConstant.AD_TYPE != null && BeibeiConstant.AD_TYPE.isPlayerAd() && playUrl.getPlayType() != 2) {
             mVideoDetailVideoAdFragment = new PlayVideoPreADFragment();
             mVideoDetailVideoAdFragment.setPageEventListener(new IPageEventListener() {
                 @Override
@@ -363,6 +372,15 @@
                 videoInfo.getResourceList().get(i).setChecked(false);
             }
         }
+
+        //鎾斁缁熻
+        BeibeiVideoAPI.playStatistic(BeibeiVideoApplication.application, videoInfo.getId(), playUrl.getResource().getId() + "", new BasicTextHttpResponseHandler() {
+            @Override
+            public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
+
+            }
+        });
+
         if (playUrl.getResource().getName().contains("鐖卞鑹�")) {
             if (playUrl != null) {
                 if (playUrl.getPlayType() == 0) {
@@ -371,7 +389,7 @@
                     return;
                 } else if (playUrl.getPlayType() == 1) {
                     Intent intent = new Intent(VideoDetailActivity2.this,
-                            VideoPlayerActivity.class);
+                            VideoPlayerBrowserActivity.class);
                     intent.putExtra("url", playUrl.getUrl());
                     startActivity(intent);
                     initPlayer();
@@ -404,7 +422,7 @@
                 return;
             } else if (playUrl.getPlayType() == 1) {
                 Intent intent = new Intent(VideoDetailActivity2.this,
-                        FXBrowserActivity.class);
+                        VideoPlayerBrowserActivity.class);
                 intent.putExtra("url", playUrl.getUrl());
                 startActivity(intent);
                 saveWatchHistory("椋庤");
@@ -433,7 +451,7 @@
                 return;
             } else if (playUrl.getPlayType() == 1) {
                 Intent intent = new Intent(VideoDetailActivity2.this,
-                        VideoPlayerActivity.class);
+                        VideoPlayerBrowserActivity.class);
                 intent.putExtra("url", playUrl.getUrl());
                 startActivity(intent);
                 saveWatchHistory(playUrl.getResource().getName());
@@ -659,6 +677,7 @@
 
     @Override
     public void onResume() {
+        Log.i(TAG, "onResume");
         super.onResume();
         EventBus.getDefault().register(this);
         if (fl_ad.getVisibility() == View.GONE) {
@@ -668,6 +687,7 @@
 
     @Override
     public void onPause() {
+        Log.i(TAG, "onPause");
         super.onPause();
         EventBus.getDefault().unregister(this);
     }
@@ -692,7 +712,6 @@
         } catch (IndexOutOfBoundsException e) {
             e.printStackTrace();
         }
-
     }
 
     public void onEventMainThread(VideoInfo info) {
@@ -771,8 +790,7 @@
                                             new TypeToken<VideoInfo>() {
                                             }.getType());
                             if (videoInfo != null) {
-                                VideoUtil.videoEpisodeList.clear();
-                                VideoUtil.videoEpisodeList.addAll(videoInfo.getVideoDetailList());
+                                VideoUtil.saveVideoEpisodeList(BeibeiVideoApplication.application, videoInfo.getVideoDetailList(), false);
                             }
                             // 闄勫姞瀛楁
                             if (jsonObject.optJSONObject("Extra1") != null) {
@@ -854,7 +872,7 @@
                                     }
                                 }
                                 getUrl(VideoUtil.videoEpisodeList.get(0),
-                                        isSetup);
+                                        true);
                                 findViewById(android.R.id.content).postDelayed(
                                         new Runnable() {
 
@@ -923,6 +941,8 @@
                                     .optString("Params"));
                             info.setAid(data.optString("Aid"));
                             info.setVid(data.optString("Vid"));
+                            info.setCode(jsonObject.getJSONObject("Data")
+                                    .optString("Code"));
                             playUrl = info;
                             if (videoInfo == null) {
                                 return;
@@ -953,29 +973,6 @@
         transaction.commitAllowingStateLoss();
         checkConfiguration(getResources().getConfiguration());
         Log.i(TAG, "update");
-    }
-
-    public static class ChangeVideoEvent {
-        private VideoInfo videoInfo;
-
-        private String tag;
-
-        public VideoInfo getVideoInfo() {
-            return videoInfo;
-        }
-
-        public void setVideoInfo(VideoInfo videoInfo) {
-            this.videoInfo = videoInfo;
-        }
-
-        public String getTag() {
-            return tag;
-        }
-
-        public void setTag(String tag) {
-            this.tag = tag;
-        }
-
     }
 
     @Override

--
Gitblit v1.8.0