From f39ce00152240bda6076ae106def7bc5d29b8962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Tue, 31 Mar 2020 09:51:48 +0800 Subject: [PATCH] =?UTF-8?q?20200331=E6=B5=8B=E8=AF=95=EF=BC=9A1=20https://?= =?UTF-8?q?gitlab.ghzs.com/pm/halo-app-issues/issues/801?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/util/ShareUtils.java | 8 +++----- .../com/gh/gamecenter/retrofit/service/ApiService.java | 2 +- .../com/gh/gamecenter/video/detail/DetailPlayerView.kt | 1 + .../video/detail/VideoDetailContainerFragment.kt | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index 90ed29f5dd..01a679c2e1 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -46,6 +46,8 @@ import com.tencent.tauth.IUiListener; import com.tencent.tauth.Tencent; import com.tencent.tauth.UiError; +import org.greenrobot.eventbus.EventBus; + import java.io.ByteArrayOutputStream; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -54,8 +56,6 @@ import java.util.List; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import org.greenrobot.eventbus.EventBus; - import static com.gh.common.util.LoginHelper.WEIBO_SCOPE; /** @@ -186,9 +186,7 @@ public class ShareUtils { if (position == arrLabel.length - 1) { callBack.onCancel(); } else { - if (!"复制链接".equals(arrLabel[position])) { - callBack.onSuccess(arrLabel[position]); - } + callBack.onSuccess(arrLabel[position]); } } }); diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 0fee4f3cfb..cdc00fbb82 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -1906,7 +1906,7 @@ public interface ApiService { /** * 获取活动的视频流 - * @param type hot最热,new最新 + * @param type hot最热,new最新,award获奖（只返回获奖视频） * @param act 活动名称 */ @GET("activities/videos/{video_id}/stream?page_size=20") diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt index 05a7f359f3..20c83901d8 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt @@ -276,6 +276,7 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib shareSummary, ShareUtils.ShareType.video, object : ShareUtils.ShareCallBack { override fun onSuccess(label: String) { + removeWechatAnimation() if ("短信" == label) mViewModel?.shareVideoStatistics(mVideoEntity) } diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt index 495111f253..6c455a9381 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt @@ -601,6 +601,7 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener { shareSummary, ShareUtils.ShareType.video, object : ShareUtils.ShareCallBack { override fun onSuccess(label: String) { + findVisibleVideoViewByPosition()?.removeWechatAnimation() if ("短信" == label) mViewModel.shareVideoStatistics(mViewModel.currentDisplayingVideo) }