Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev

Browse Source
This commit is contained in:
kehaoyuan@ghzhushou.com
2020-02-28 12:08:33 +08:00
parent b954c1f664 707beb9672
commit 1b1bd3264a
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/gh/common/view/LikeView.kt
View File

@ -22,10 +22,10 @@ class LikeView : RelativeLayout {
fun runLikeAnimation(event: MotionEvent) {
val iv = ImageView(context)
val lp = LayoutParams(180, 180)
lp.leftMargin = event.rawX.toInt() - 90
lp.topMargin = event.rawY.toInt() - 220
iv.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_video_detail_liked))
val lp = LayoutParams(168, 150)
lp.leftMargin = event.rawX.toInt() - 84
lp.topMargin = event.rawY.toInt() - 200
iv.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_double_click_like))
iv.layoutParams = lp
addView(iv)
@ -47,7 +47,7 @@ class LikeView : RelativeLayout {
//位移动画，Y轴从0上移至600
.with(translationY(iv, 0F, -800F, 1200, 400))
//透明动画，从1-0
.with(alphaAni(iv, 1F, 0F, 800, 400))
.with(alphaAni(iv, 1F, 0F, 500, 400))
//缩放动画，X轴1至3倍
.with(scaleAni(iv, "scaleX", 1F, 3f, 800, 400))
//缩放动画，Y轴1至3倍

12
app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt
View File

@ -3,6 +3,8 @@ package com.gh.gamecenter.video.detail
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Context
import android.graphics.drawable.Animatable
import android.net.Uri
import android.os.Handler
import android.preference.PreferenceManager
import android.util.AttributeSet
@ -16,6 +18,12 @@ import android.widget.SeekBar
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import com.airbnb.lottie.LottieAnimationView
import com.facebook.drawee.backends.pipeline.Fresco
import com.facebook.drawee.controller.BaseControllerListener
import com.facebook.drawee.view.SimpleDraweeView
import com.facebook.fresco.animation.drawable.AnimatedDrawable2
import com.facebook.fresco.animation.drawable.BaseAnimationListener
import com.facebook.imagepipeline.image.ImageInfo
import com.gh.common.AppExecutor
import com.gh.common.constant.Constants
import com.gh.common.observer.MuteCallback
@ -439,7 +447,6 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
super.changeUiToPlayingShow()
setViewShowState(mStartButton, View.INVISIBLE)
if (!byStartedClick) {
// setViewShowState(mStartButton, View.INVISIBLE)
setViewShowState(mBottomContainer, View.GONE)
setViewShowState(mBottomProgressBar, View.VISIBLE)
hideAllWidget()
@ -471,8 +478,7 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
override fun changeUiToPlayingBufferingShow() {
super.changeUiToPlayingBufferingShow()
setViewShowState(mLoadingProgressBar, View.GONE)
//setViewShowState(mLoadingProgressBar, View.GONE)
if (mIsDragSeek) {
setViewShowState(mBottomProgressBar, View.GONE)
setViewShowState(mBottomContainer, View.VISIBLE)