From 205a7bba1dbef65c082daa17df82ab8339a5411d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 05 二月 2021 21:55:24 +0800
Subject: [PATCH] Merge branch '3.7.9' of ssh://193.112.35.168:29418/buwan-android-new into 3.7.9
---
BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
index 794f72b..76c9926 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
@@ -730,19 +730,18 @@
private void getVideoDetail(final Context context, String videoId,
String videoThirdType, final boolean isSetup) {
+ int position = getIntent().getIntExtra(
+ "playing_position", 0);
SharedPreferences preferences = context.getSharedPreferences("user",
Context.MODE_PRIVATE);
String uid = preferences.getString("uid", "");
String loginid = preferences.getString("LoginUid", "");
- BeibeiVideoAPI.getVideoDetail(context, uid, resourceId, videoId, loginid,
+ BeibeiVideoAPI.getVideoDetail(context, uid, resourceId, videoId, position, loginid,
videoThirdType, new BasicTextHttpResponseHandler() {
@Override
public void onStart() {
super.onStart();
- // if (BeibeiConstant.DEBUG)
- // Toast.makeText(VideoDetailActivity2.this, "onStart",
- // Toast.LENGTH_SHORT).show();
}
@Override
@@ -750,9 +749,6 @@
String responseString, Throwable throwable) {
super.onFailure(statusCode, headers, responseString,
throwable);
- // if (BeibeiConstant.DEBUG)
- // Toast.makeText(VideoDetailActivity2.this, "onFailure",
- // Toast.LENGTH_SHORT).show();
if (progressDialog.isShowing()) {
progressDialog.dismiss();
}
@@ -769,19 +765,6 @@
Header[] headers, JSONObject jsonObject)
throws Exception {
- boolean pptv = true;
- if (pptv) {
- fl_pptv.setVisibility(View.VISIBLE);
- ll_other.setVerticalGravity(View.GONE);
- getSupportFragmentManager().beginTransaction().replace(R.id.fl_pptv, new PPTVPlayFragment()).commit();
- if (progressDialog.isShowing()) {
- progressDialog.dismiss();
- }
- return;
- } else {
- fl_pptv.setVisibility(View.GONE);
- ll_other.setVisibility(View.VISIBLE);
- }
// if (BeibeiConstant.DEBUG)
// Toast.makeText(VideoDetailActivity2.this,
@@ -796,6 +779,28 @@
e.printStackTrace();
}
if (jsonObject.getBoolean("IsPost")) {
+ JSONObject data = jsonObject.optJSONObject("Data");
+ boolean pptv = data.optBoolean("pptv", false);
+ if (pptv) {
+ String playUrl = data.optString("playUrl");
+ fl_pptv.setVisibility(View.VISIBLE);
+ ll_other.setVerticalGravity(View.GONE);
+ PPTVPlayFragment pptvPlayFragment = new PPTVPlayFragment();
+ Bundle bundle = new Bundle();
+ bundle.putString("playUrl", playUrl);
+ bundle.putString("videoId",data.optString("videoId"));
+ pptvPlayFragment.setArguments(bundle);
+ getSupportFragmentManager().beginTransaction().replace(R.id.fl_pptv, pptvPlayFragment).commit();
+ if (progressDialog.isShowing()) {
+ progressDialog.dismiss();
+ }
+ return;
+ } else {
+ fl_pptv.setVisibility(View.GONE);
+ ll_other.setVisibility(View.VISIBLE);
+ }
+
+
findViewById(R.id.fragment_video_detail_container)
.setVisibility(View.VISIBLE);
findViewById(R.id.fragment_video_episode_container)
--
Gitblit v1.8.0