Commit 10b19d7c authored by wanglei's avatar wanglei

Merge remote-tracking branch 'origin/master'

parents cdcefb75 b6488a76
...@@ -187,7 +187,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl ...@@ -187,7 +187,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
} }
} }
@SuppressLint("ObjectAnimatorBinding")
private fun startAnimation() { private fun startAnimation() {
binding.ivCircleBorder.visibility = View.GONE binding.ivCircleBorder.visibility = View.GONE
val delay: Long = 1200 val delay: Long = 1200
...@@ -198,11 +197,15 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl ...@@ -198,11 +197,15 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
interpolator = LinearInterpolator() interpolator = LinearInterpolator()
addUpdateListener { animation -> addUpdateListener { animation ->
val animatedValue = animation.animatedValue as Float val animatedValue = animation.animatedValue as Float
binding.ivShan.rotation = animatedValue * 2 runCatching {
binding.ivShan.rotation = animatedValue * 2
}
} }
doOnEnd { doOnEnd {
binding.ivCircleBorder.visibility = View.VISIBLE runCatching {
AnimationHelps.rotation(binding.ivShan, 2000) binding.ivCircleBorder.visibility = View.VISIBLE
AnimationHelps.rotation(binding.ivShan, 2000)
}
animator1 = null animator1 = null
} }
start() start()
...@@ -213,8 +216,10 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl ...@@ -213,8 +216,10 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
this.startDelay = delay this.startDelay = delay
addUpdateListener { animation -> addUpdateListener { animation ->
val value = animation.animatedValue as Float val value = animation.animatedValue as Float
binding.tvJunkFiles.alpha = value runCatching {
binding.tvJunkFiles.translationY = (binding.tvClean.height * (1 - value)) binding.tvJunkFiles.alpha = value
binding.tvJunkFiles.translationY = (binding.tvClean.height * (1 - value))
}
} }
doOnEnd { doOnEnd {
animator2 = null animator2 = null
...@@ -243,7 +248,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl ...@@ -243,7 +248,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
repeatMode = ValueAnimator.RESTART repeatMode = ValueAnimator.RESTART
} }
val widthAnim = ObjectAnimator.ofInt(binding.ivCircleBorder, "width", 1, 4).apply { val widthAnim = ObjectAnimator.ofInt(1, 4).apply {
duration = 2000 duration = 2000
startDelay = delay startDelay = delay
repeatCount = ValueAnimator.INFINITE repeatCount = ValueAnimator.INFINITE
......
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:includeFontPadding="false" android:includeFontPadding="false"
tools:drawableStart="@mipmap/x_qing"
android:gravity="center" android:gravity="center"
android:background="@drawable/bg_gradient_weather" android:background="@drawable/bg_gradient_weather"
android:paddingHorizontal="14dp" android:paddingHorizontal="14dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="15sp" android:textSize="15sp"
app:drawableStartCompat="@mipmap/x_qing"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/space" app:layout_constraintTop_toBottomOf="@id/space"
tools:text="30℃" /> android:text="22℃" />
<TextView <TextView
android:id="@+id/tv_zodiac" android:id="@+id/tv_zodiac"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment