rain effect

myAllDream · Jul 30, 2021 · 0c28c37 · 0c28c37
1 parent c2ded2d
commit 0c28c37
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 54 deletions.
diff --git a/app/src/main/res/layout/layout_weather_notify.xml b/app/src/main/res/layout/layout_weather_notify.xml
@@ -19,7 +19,8 @@
         android:layout_marginLeft="16dp"
         android:layout_toRightOf="@+id/ivWeather"
         android:text="浦东新区"
-        android:textColor="@color/color_666" />
+        android:textColor="@color/color_666"
+        android:textSize="14sp" />
 
     <TextView
         android:id="@+id/tvWeather"
@@ -29,7 +30,8 @@
         android:layout_marginLeft="16dp"
         android:layout_marginTop="4dp"
         android:layout_toRightOf="@+id/ivWeather"
-        android:text="晴" />
+        android:text="晴"
+        android:textSize="14sp" />
 
     <TextView
         android:id="@+id/tvTemp"
@@ -39,7 +41,8 @@
         android:layout_marginLeft="16dp"
         android:layout_marginTop="4dp"
         android:layout_toRightOf="@+id/tvWeather"
-        android:text="25°C" />
+        android:text="25°C"
+        android:textSize="14sp" />
 
     <ImageView
         android:layout_width="45dp"

diff --git a/bg/src/main/java/me/wsj/bg/ShowActivity.kt b/bg/src/main/java/me/wsj/bg/ShowActivity.kt
@@ -5,6 +5,7 @@ import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import me.wsj.lib.EffectUtil
 import me.wsj.lib.specialeffects.ICancelable
+import me.wsj.lib.utils.IconUtils
 
 class ShowActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/bg/src/main/java/me/wsj/bg/adapter/AllAdapter.kt b/bg/src/main/java/me/wsj/bg/adapter/AllAdapter.kt
@@ -9,6 +9,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import me.wsj.bg.R
 import me.wsj.bg.bean.WeatherBean
+import me.wsj.lib.utils.IconUtils
 
 class AllAdapter(
     val context: Context,

diff --git a/img/effect.gif b/img/effect.gif
diff --git a/img/widget.gif b/img/widget.gif
diff --git a/lib/src/main/java/me/wsj/lib/EffectUtil.kt b/lib/src/main/java/me/wsj/lib/EffectUtil.kt
@@ -22,14 +22,21 @@ class EffectUtil {
                 2 -> {
                     if (isDay) {
                         EffectCloudDrawable(
-                            context.resources.getDrawable(R.drawable.cloudy_day_2),
-                            context.resources.getDrawable(R.drawable.cloudy_day_1),
-                            context.resources.getDrawable(R.drawable.cloudy_day_3)
+                            1,
+                            arrayOf(
+                                context.resources.getDrawable(R.drawable.cloudy_day_1),
+                                context.resources.getDrawable(R.drawable.cloudy_day_2),
+                                context.resources.getDrawable(R.drawable.cloudy_day_3),
+                                context.resources.getDrawable(R.drawable.cloudy_day_4)
+                            )
                         )
                     } else
                         EffectCloudDrawable(
-                            context.resources.getDrawable(R.drawable.cloudy_day_2),
-                            context.resources.getDrawable(R.drawable.cloudy_day_1)
+                            1,
+                            arrayOf(
+                                context.resources.getDrawable(R.drawable.cloudy_night1),
+                                context.resources.getDrawable(R.drawable.cloudy_night2)
+                            )
                         )
                 }
                 4 -> {  // 中雨

diff --git a/lib/src/main/java/me/wsj/lib/specialeffects/EffectCloudDrawable.kt b/lib/src/main/java/me/wsj/lib/specialeffects/EffectCloudDrawable.kt
@@ -7,75 +7,89 @@ import android.graphics.PixelFormat
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
 import android.view.animation.LinearInterpolator
+import me.wsj.lib.specialeffects.entity.Cloud
+import me.wsj.lib.specialeffects.entity.Rain
 import per.wsj.commonlib.utils.LogUtil
+import java.util.*
 import kotlin.math.PI
 import kotlin.math.sin
 
 /**
  * create by shiju.wang
  * cloud
  */
-class EffectCloudDrawable(val cloud1: Drawable, val cloud2: Drawable, var cloud3: Drawable? = null) :
+class EffectCloudDrawable(val type: Int, val clouds: Array<Drawable>) :
     Drawable(), ICancelable {
 
-    private var mAnimator: ValueAnimator? = null
-
-    private var mWidth = 0
+    val random = Random()
 
-    private var rate1 = 0f
-    private var y1 = 0
+    val speed = 1
 
-    private var y2 = 0
+    private var mAnimator: ValueAnimator? = null
 
-    private var y3 = 0
+    private var mWidth = 0
 
-    init {
-        startAnim()
-    }
+    val cloudList = ArrayList<Cloud>()
 
     override fun onBoundsChange(bounds: Rect) {
         super.onBoundsChange(bounds)
 
         mWidth = bounds.right - bounds.left
 
-        y1 = (mWidth * 0.05).toInt()
-        y2 = (mWidth * 0.3).toInt()
-        y3 = (mWidth * 0.54).toInt()
+        for (i in 0 until 3) {
+            val nextX = random.nextInt(mWidth)
+            val nextY = random.nextInt((mWidth * 0.7).toInt())
+            cloudList.add(
+                Cloud(
+                    nextX.toFloat(),
+                    nextY.toFloat(),
+                    random.nextFloat() * speed + speed,
+                    random.nextInt(clouds.size)
+                )
+            )
+        }
 
+        startAnim()
     }
 
     private fun startAnim() {
         if (mAnimator == null) {
             mAnimator = ValueAnimator.ofFloat(0f, 1f)
             mAnimator?.repeatCount = ValueAnimator.INFINITE
-            mAnimator?.duration = 30000
+            mAnimator?.duration = 3000
             mAnimator?.interpolator = LinearInterpolator()
             mAnimator?.addUpdateListener {
-                rate1 = it.animatedValue as Float
-
-                invalidateSelf()
+                updatePosition()
             }
             mAnimator?.start()
         }
     }
 
+    private fun updatePosition() {
+        cloudList.forEach {
+            it.x += it.speed
+            val drawable = clouds[it.type]
+            if (it.x > mWidth + drawable.intrinsicWidth) {
+                it.x = 0f
+                it.y = random.nextInt((mWidth * 0.7).toInt()).toFloat()
+                it.speed = random.nextFloat() * speed + speed
+                it.type = random.nextInt(clouds.size)
+            }
+        }
+        invalidateSelf()
+    }
+
     override fun draw(canvas: Canvas) {
-        val total1 = cloud1.intrinsicWidth + mWidth
-        val curX1 = (-cloud1.intrinsicWidth + total1 * rate1).toInt()
-
-        cloud1.setBounds(curX1, y1, curX1 + cloud1.intrinsicWidth, y1 + cloud1.intrinsicHeight)
-        cloud1.draw(canvas)
-
-        val total2 = cloud2.intrinsicWidth * 4 + mWidth
-        val curX2 = (-cloud2.intrinsicWidth * 2 + total2 * rate1).toInt()
-        cloud2.setBounds(curX2, y2, curX2 + cloud2.intrinsicWidth, y2 + cloud2.intrinsicHeight)
-        cloud2.draw(canvas)
-
-        cloud3?.let {
-            val total3 = it.intrinsicWidth * 3 + mWidth
-            val curX3 = (-it.intrinsicWidth * 2 + total3 * rate1).toInt()
-            it.setBounds(curX3, y3, curX3 + it.intrinsicWidth, y3 + it.intrinsicHeight)
-            it.draw(canvas)
+        for (cloud in cloudList) {
+            val drawable = clouds[cloud.type]
+            drawable.setBounds(
+                (cloud.x - drawable.intrinsicWidth).toInt(),
+                (cloud.y).toInt(),
+                cloud.x.toInt(),
+                (cloud.y + drawable.intrinsicHeight).toInt()
+            )
+
+            drawable.draw(canvas)
         }
     }
 

diff --git a/lib/src/main/java/me/wsj/lib/specialeffects/EffectRainDrawable.kt b/lib/src/main/java/me/wsj/lib/specialeffects/EffectRainDrawable.kt
@@ -4,7 +4,7 @@ import android.animation.ValueAnimator
 import android.graphics.*
 import android.graphics.drawable.Drawable
 import android.view.animation.AccelerateInterpolator
-import me.wsj.lib.specialeffects.rain.Rain
+import me.wsj.lib.specialeffects.entity.Rain
 import per.wsj.commonlib.utils.LogUtil
 import java.util.*
 import kotlin.collections.ArrayList
@@ -52,17 +52,17 @@ class EffectRainDrawable(val type: Int, val rains: Array<Drawable>) :
         animator.repeatCount = -1
         animator.interpolator = AccelerateInterpolator()
         animator.addUpdateListener {
-            updateParticle()
+            updatePosition()
         }
     }
 
-    private fun updateParticle() {
+    private fun updatePosition() {
         rainList.forEach {
             it.y += it.speed
             val drawable = rains[it.type]
             if (it.y > mHeight + drawable.intrinsicHeight) {
                 it.y = 0f
-                it.speed = random.nextInt(speed) + speed
+                it.speed = random.nextInt(speed + 1) + speed
                 it.type = random.nextInt(rains.size)
             }
         }
@@ -78,7 +78,7 @@ class EffectRainDrawable(val type: Int, val rains: Array<Drawable>) :
             val nextY = random.nextInt(mHeight)
             rainList.add(
                 Rain(
-                    nextX.toFloat(), nextY.toFloat(), random.nextInt(speed) + speed,
+                    nextX.toFloat(), nextY.toFloat(), random.nextInt(speed + 1) + speed,
                     random.nextInt(rains.size)
                 )
             )
@@ -115,6 +115,7 @@ class EffectRainDrawable(val type: Int, val rains: Array<Drawable>) :
     }
 
     override fun cancel() {
+        animator.removeAllListeners()
         animator.cancel()
         LogUtil.d("Effect4Drawable cancel ---------------------------> ")
     }

diff --git a/lib/src/main/java/me/wsj/lib/specialeffects/entity/Cloud.kt b/lib/src/main/java/me/wsj/lib/specialeffects/entity/Cloud.kt
@@ -0,0 +1,8 @@
+package me.wsj.lib.specialeffects.entity
+
+class Cloud(
+    var x: Float,
+    var y: Float,
+    var speed: Float,
+    var type: Int = 0
+)
diff --git a/...va/me/wsj/lib/specialeffects/rain/Rain.kt → .../me/wsj/lib/specialeffects/entity/Rain.kt b/...va/me/wsj/lib/specialeffects/rain/Rain.kt → .../me/wsj/lib/specialeffects/entity/Rain.kt
@@ -1,4 +1,4 @@
-package me.wsj.lib.specialeffects.rain
+package me.wsj.lib.specialeffects.entity
 
 class Rain(
     var x: Float,

diff --git a/readme.md b/readme.md
@@ -15,11 +15,14 @@
 - 天气特效
 
 ## 预览
-![weather_info](/img/home.gif) ![hourly](/img/hourly.gif)
+![weather_info](img/home.gif) ![effect](img/effect.gif)
 
-![15dforecast](/img/15d.gif) ![sun_moon](/img/sun.gif)
+![hourly](img/hourly.gif) ![15dforecast](img/15d.gif)
+
+![sun_moon](img/sun.gif) ![widget](img/widget.gif)
+
+![add_city](img/add_city.png) ![settings](img/settings.png)
 
-![add_city](/img/add_city.png) ![settings](/img/settings.png)
 
 
 ## TODO

diff --git a/readme_en.md b/readme_en.md
@@ -16,11 +16,14 @@
 
 ## Preview
 
-![weather_info](/img/home.gif) ![hourly](/img/hourly.gif)
+![weather_info](img/home.gif) ![effect](img/effect.gif)
 
-![15dforecast](/img/15d.gif) ![sun_moon](/img/sun.gif)
+![hourly](img/hourly.gif) ![15dforecast](img/15d.gif)
+
+![sun_moon](img/sun.gif) ![widget](img/widget.gif)
+
+![add_city](img/add_city.png) ![settings](img/settings.png)
 
-![add_city](/img/add_city.png) ![settings](/img/settings.png)