From 80544aff3214aec8ddf39c1d976edead0a157312 Mon Sep 17 00:00:00 2001 From: Jack <1484288157@qq.com> Date: Fri, 27 Mar 2020 11:43:25 +0800 Subject: [PATCH] =?UTF-8?q?0326=E6=B5=8B=E8=AF=95=E8=A1=A5=E5=85=852(1),4,?= =?UTF-8?q?6=20https://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/assets/lottie/follow.json | 1 + .../video/detail/DetailPlayerView.kt | 42 +++++++++++++++--- .../video/detail/VideoDetailActivity.kt | 20 --------- .../detail/VideoDetailContainerFragment.kt | 1 + .../ic_video_detail_share_wechat.png | Bin 0 -> 3599 bytes .../res/drawable/bg_video_detail_name.xml | 4 +- .../main/res/layout/fragment_home_video.xml | 2 +- .../layout/layout_video_detail_surface.xml | 23 +++++++--- 8 files changed, 58 insertions(+), 35 deletions(-) create mode 100644 app/src/main/assets/lottie/follow.json create mode 100644 app/src/main/res/drawable-xxhdpi/ic_video_detail_share_wechat.png diff --git a/app/src/main/assets/lottie/follow.json b/app/src/main/assets/lottie/follow.json new file mode 100644 index 0000000000..f95a60687f --- /dev/null +++ b/app/src/main/assets/lottie/follow.json @@ -0,0 +1 @@ +{"v":"5.6.4","fr":25,"ip":0,"op":40,"w":66,"h":66,"nm":"合成 3","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"路径","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":8,"s":[0]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[40]},{"i":{"x":[0.23],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":15,"s":[40]},{"t":18,"s":[100]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.683],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[-60]},{"t":16,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.278,"y":1},"o":{"x":0.333,"y":0},"t":10,"s":[28.25,36.75,0],"to":[0.792,-0.625,0],"ti":[-0.792,0.625,0]},{"t":18,"s":[33,33,0]}],"ix":2},"a":{"a":0,"k":[-0.67,2.403,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":18,"s":[100,100,100]},{"i":{"x":[0,0,0.667],"y":[1,1,1]},"o":{"x":[0.544,0.544,0.333],"y":[0,0,0]},"t":26,"s":[100,100,100]},{"t":39,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[1.997,-3.994],[1.997,3.995],[-1.993,3.995]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.141176000237,0.588235020638,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":-315,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.126],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":9,"s":[75]},{"t":18,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":100,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"路径 2备份","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.544],"y":[1]},"o":{"x":[0.515],"y":[0]},"t":5,"s":[100]},{"t":10,"s":[0]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.606],"y":[0]},"t":3,"s":[0]},{"t":10,"s":[30]}],"ix":10},"p":{"a":0,"k":[33,33.018,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.994,0],[3.996,0]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径 2备份","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"路径 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.112],"y":[1]},"o":{"x":[0.621],"y":[0]},"t":5,"s":[100]},{"t":10,"s":[0]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.595],"y":[0]},"t":3,"s":[0]},{"t":10,"s":[120]}],"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[0,0.003,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,3.996],[0,-3.994]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.01],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":3,"s":[0]},{"t":10,"s":[50]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":40,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"椭圆形","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.256],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.156],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":12,"s":[60]},{"t":18,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0,0,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":3,"s":[100,100,100]},{"t":18,"s":[120,120,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141176000237,0.588235020638,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"椭圆形 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0,0,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":3,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":20,"s":[120,120,100]},{"i":{"x":[0,0,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":28,"s":[120,120,100]},{"t":37,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":0,"s":[17,17]},{"t":3,"s":[18,18]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":0,"bm":0}],"markers":[]} \ No newline at end of file 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 eef5295a1a..045fd0e52c 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 @@ -1,5 +1,7 @@ package com.gh.gamecenter.video.detail +import android.animation.AnimatorSet +import android.animation.ObjectAnimator import android.annotation.SuppressLint import android.app.Activity import android.content.Context @@ -69,6 +71,7 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib private var mLastClickTime = 0L private var mLottieLike: LottieAnimationView? = null private var mHandler: Handler? = null + private var weChatAnimate: AnimatorSet? = null init { mHandler = Handler(Handler.Callback { @@ -168,7 +171,7 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib } else { likeIv.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_video_detail_like)) } - attentionIv.goneIf(videoEntity.me.isFollower || videoEntity.user.id == UserManager.getInstance().userId) + attentionIv.goneIf(videoEntity.user.id == UserManager.getInstance().userId || videoEntity.me.isFollower) attentionIv.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_video_detail_follow)) if (!likeContainer.hasOnClickListeners()) RxView.clicks(likeContainer) @@ -245,10 +248,17 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib ToastUtils.showToast("网络错误") return@setOnClickListener } - mViewModel?.follow(videoEntity) - recordMta("关注用户") - uploadVideoStreamingPlaying("关注用户") - MtaHelper.onEvent("视频详情", "关注用户", mCombinedTitleAndId) + attentionLottie.visibility = View.VISIBLE + attentionIv.visibility = View.GONE + attentionLottie.setAnimation("lottie/follow.json") + attentionLottie.playAnimation() + attentionLottie.doOnAnimationEnd { + attentionLottie.visibility = View.GONE + mViewModel?.follow(videoEntity) + recordMta("关注用户") + uploadVideoStreamingPlaying("关注用户") + MtaHelper.onEvent("视频详情", "关注用户", mCombinedTitleAndId) + } } } } @@ -402,6 +412,27 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib } } + private fun playWechatAnimation() { + if (weChatAnimate == null) { + shareIv.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_video_detail_share_wechat)) + val scaleXAnimation = ObjectAnimator.ofFloat(shareIv, "scaleX", 1f, 0.9f, 1f) + scaleXAnimation.repeatCount = -1 + val scaleYAnimation = ObjectAnimator.ofFloat(shareIv, "scaleY", 1f, 0.9f, 1f) + scaleYAnimation.repeatCount = -1 + + weChatAnimate = AnimatorSet() + weChatAnimate?.play(scaleXAnimation)?.with(scaleYAnimation) + weChatAnimate?.duration = 1500 + weChatAnimate?.start() + } + } + + fun removeWechatAnimation() { + weChatAnimate?.end() + weChatAnimate = null + shareIv.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_video_detail_share)) + } + override fun createNetWorkState() { if (mNetInfoModule == null) { mNetInfoModule = NetInfoModule(mContext.applicationContext, NetInfoModule.NetChangeListener { state -> @@ -707,6 +738,7 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib repeatPlayCount++ seekOnStart = 0 startPlayLogic() + playWechatAnimation() } override fun onCompletion() { diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt index e4d97e59db..7522b4a1cc 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt @@ -12,10 +12,6 @@ import java.util.* // 由于兼容性问题，本游戏详情页不应该被低于 Android 4.4 的设备打开 class VideoDetailActivity : BaseActivity() { var uuid = UUID.randomUUID() -// var isPauseVideo = true//跳转页面时是否需要暂停视频 - var mLastTime = 0L - var mIsDown = false - private val mIntervalTime = 500 override fun getLayoutId(): Int { return R.layout.activity_video_detail @@ -35,22 +31,6 @@ class VideoDetailActivity : BaseActivity() { supportFragmentManager.beginTransaction().replace(R.id.layout_activity_content, containerFragment).commitNowAllowingStateLoss() } - //限制视频滑动频率 - override fun dispatchTouchEvent(ev: MotionEvent): Boolean { - if (ev.action == MotionEvent.ACTION_DOWN) { - mIsDown = true - } else if (ev.action == MotionEvent.ACTION_MOVE) { - if (mIsDown && System.currentTimeMillis() - mLastTime < mIntervalTime) { - return true - } - } else if (ev.action == MotionEvent.ACTION_UP) { - mLastTime = System.currentTimeMillis() - mIsDown = false - } - return super.dispatchTouchEvent(ev) - } - - override fun onDestroy() { CustomManager.releaseAllVideos("detail_$uuid") mBaseHandler.postDelayed({ 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 73445d5665..1d08d21ce3 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 @@ -220,6 +220,7 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener { mViewModel.entranceDetail, video.id, mViewModel.uuid, 0.0, 0, 0, "play") } val detailPlayerView = recyclerview.findViewHolderForAdapterPosition(position)?.itemView as? DetailPlayerView + detailPlayerView?.removeWechatAnimation() detailPlayerView?.repeatPlayCount = 0 detailPlayerView?.unObserveVolume(requireActivity() as AppCompatActivity) detailPlayerView?.removeLikeAnimation() diff --git a/app/src/main/res/drawable-xxhdpi/ic_video_detail_share_wechat.png b/app/src/main/res/drawable-xxhdpi/ic_video_detail_share_wechat.png new file mode 100644 index 0000000000000000000000000000000000000000..072bcbbf5299ce8442393f7f9b5330066fc006aa GIT binary patch literal 3599 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 Vs{719#Z>?R002ovPDHLkV1n2w(j5Q* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/bg_video_detail_name.xml b/app/src/main/res/drawable/bg_video_detail_name.xml index f3f7db9557..ccfc39049f 100644 --- a/app/src/main/res/drawable/bg_video_detail_name.xml +++ b/app/src/main/res/drawable/bg_video_detail_name.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home_video.xml b/app/src/main/res/layout/fragment_home_video.xml index 8ddca1e219..85a2915c76 100644 --- a/app/src/main/res/layout/fragment_home_video.xml +++ b/app/src/main/res/layout/fragment_home_video.xml @@ -49,7 +49,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/mTabIndicator" - android:layout_marginTop="24dp"> + android:layout_marginTop="5dp"> + @@ -318,7 +326,7 @@ android:id="@+id/commentContainer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="14dp" + android:layout_marginTop="20dp" android:gravity="center" android:orientation="vertical"> @@ -343,11 +351,12 @@ android:id="@+id/shareContainer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="14dp" + android:layout_marginTop="20dp" android:gravity="center" android:orientation="vertical">