refactor:optimize weather code framework

Author: ForgetAll

app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'android-apt'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 25

app/src/main/java/com/xiasuhuei321/gank_kotlin/MainActivity.kt

@@ -1,29 +1,29 @@
 package com.xiasuhuei321.gank_kotlin
 
-import android.graphics.Bitmap
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.Window
 import android.view.WindowManager
-import android.widget.RelativeLayout
-import com.xiasuhuei321.gank_kotlin.customview.weather.WeatherView
-import com.xiasuhuei321.gank_kotlin.extension.LogUtil
-import com.xiasuhuei321.gank_kotlin.extension.find
+import com.xiasuhuei321.gank_kotlin.extension.shortToast
+import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
-    var bmp: Bitmap? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE)
         window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                 WindowManager.LayoutParams.FLAG_FULLSCREEN)
         setContentView(R.layout.activity_main)
-        val test = find<WeatherView>(R.id.wv_test)
-        val rl_test = find<RelativeLayout>(R.id.rl_test)
-        rl_test.setOnClickListener {
-            LogUtil.i("test", "点击事件传到了")
+
+        weatherIv.setOnClickListener {
+            shortToast("weather icon be clicked")
         }
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        weatherWv.onDestroy()
+    }
 }
 
 

app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/Rain.kt

@@ -3,6 +3,7 @@ package com.xiasuhuei321.gank_kotlin.customview.weather
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
+import android.graphics.PointF
 import com.xiasuhuei321.gank_kotlin.context
 import com.xiasuhuei321.gank_kotlin.extension.getScreenHeight
 import com.xiasuhuei321.gank_kotlin.extension.getScreenWidth
@@ -12,8 +13,10 @@ import java.util.*
  * Created by xiasuhuei321 on 2017/9/5.
  * author:luo
  * e-mail:[email protected]
+ *
+ * desc:
  */
-class Rain(start: android.graphics.PointF, end: android.graphics.PointF) : WeatherShape(start, end) {
+class Rain(start: PointF, end: PointF) : WeatherShape(start, end) {
 
     override var TAG = "Rain"
 
@@ -32,8 +35,8 @@ class Rain(start: android.graphics.PointF, end: android.graphics.PointF) : Weath
     //    var originSpeed = speed
     var rainAlpha = 100
     private var lastTime = 0L // 从开始到现在下落所经过的时间
-    var rainColor = Color.WHITE
-    override var time: Long = 5000 // 总共下落时间
+    var rainColor = Color.parseColor("#efefef")
+//    override var time: Long = 5000 // 总共下落时间
 
     var paint = Paint().apply {
         color = rainColor
@@ -44,17 +47,16 @@ class Rain(start: android.graphics.PointF, end: android.graphics.PointF) : Weath
 
     // 计算加速度
     override fun getAcceleration(): Float {
-        val acc = context.getScreenHeight() / (time * time).toFloat()
+//        val acc = context.getScreenHeight() / (time * time).toFloat()
 //        LogUtil.i(TAG, "acc = " + acc)
         // 恩，决定了，放弃加速，匀速走完
         return 0f
     }
 
     /**
-     * 此函数用来绘制相对"固定"的雨滴
+     * 绘制过程在此完成
      */
     override fun draw(canvas: Canvas) {
-        // 计算公式： s = at^2
         if (!isInUse) {
             lastTime += randomPre()
             initStyle()
@@ -64,8 +66,9 @@ class Rain(start: android.graphics.PointF, end: android.graphics.PointF) : Weath
         start.y += distance
         end.y += distance
         canvas.drawLine(start.x, start.y, end.x, end.y, paint)
+        // 很重要，持续时间增加
         lastTime += timeSpace
-        // 可以复用了
+        // 如果已经超出屏幕，表示可以服用了，清空原先状态
         if (end.y >= context.getScreenHeight()) {
             clear()
         }

app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/Snow.kt

@@ -1,7 +1,25 @@
 package com.xiasuhuei321.gank_kotlin.customview.weather
 
+import android.graphics.Canvas
+import android.graphics.PointF
+
 /**
  * Created by xiasuhuei321 on 2017/9/5.
  * author:luo
  * e-mail:[email protected]
- */
+ */
+class Snow(start: PointF, end: PointF) : WeatherShape(start, end) {
+    override fun getAcceleration(): Float {
+        return 0f
+    }
+
+    override fun draw(canvas: Canvas) {
+    }
+
+    override fun randomPre(): Long {
+        return 1
+    }
+
+    override fun initStyle() {
+    }
+}

app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/WeatherShape.kt

@@ -11,16 +11,28 @@ import android.graphics.PointF
 abstract class WeatherShape(val start: PointF, val end: PointF) {
     open var TAG = "WeatherShape"
 
+    /**
+     * 是否是正在被使用的状态
+     */
     var isInUse = false
 
+    /**
+     * 是否是随机刷新的Shape
+     */
     var isRandom = false
 
+    /**
+     * 下落的速度，特指垂直方向，子类可以实现自己水平方向的速度
+     */
     var speed = 0.05f
 
-    abstract var time: Long
+    /**
+     * 总时间
+     */
+    //    abstract var time: Long
 
     /**
-     * 根据自己的规则计算加速度
+     * 根据自己的规则计算加速度，如果是匀速直接 return 0
      */
     abstract fun getAcceleration(): Float
 
@@ -29,7 +41,13 @@ abstract class WeatherShape(val start: PointF, val end: PointF) {
      */
     abstract fun draw(canvas: Canvas)
 
+    /**
+     * 随机的提前量，让Shape错开
+     */
     abstract fun randomPre(): Long
 
+    /**
+     * 初始化Shape风格
+     */
     abstract fun initStyle()
 }

app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/WeatherView.kt

@@ -1,25 +1,25 @@
 package com.xiasuhuei321.gank_kotlin.customview.weather
 
 import android.content.Context
-import android.graphics.*
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.PixelFormat
+import android.graphics.PorterDuff
 import android.util.AttributeSet
 import android.view.SurfaceHolder
 import android.view.SurfaceView
 import com.xiasuhuei321.gank_kotlin.extension.LogUtil
-import com.xiasuhuei321.gank_kotlin.extension.getScreenWidth
 import java.lang.Exception
 
 /**
  * Created by xiasuhuei321 on 2017/9/5.
  * author:luo
  * e-mail:[email protected]
  */
-class WeatherView(context: Context, attributeSet: AttributeSet?, defaultStyle: Int) :
+class WeatherView(context: Context, attributeSet: AttributeSet? = null, defaultStyle: Int = 0) :
         SurfaceView(context, attributeSet, defaultStyle), SurfaceHolder.Callback {
     private val TAG = "WeatherView"
 
-    var time = 0L
-    val rainWidth = 5
     // 低级并发，Kotlin中支持的不是很好，所以用一下黑科技
     val lock = Object()
     var type = Weather.RAIN
@@ -28,16 +28,6 @@ class WeatherView(context: Context, attributeSet: AttributeSet?, defaultStyle: I
     @Volatile var canRun = false
     @Volatile var threadQuit = false
 
-    val rains = ArrayList<Rain>()
-
-    constructor(context: Context, attributeSet: AttributeSet) : this(context, attributeSet, 0) {
-        LogUtil.e(TAG, "构建方法2")
-    }
-
-    constructor(context: Context) : this(context, null, 0) {
-        LogUtil.e(TAG, "构建方法1")
-    }
-
     var thread = Thread {
         while (!threadQuit) {
             if (!canRun) {
@@ -71,6 +61,8 @@ class WeatherView(context: Context, attributeSet: AttributeSet?, defaultStyle: I
 
     override fun surfaceChanged(holder: SurfaceHolder?, format: Int, width: Int, height: Int) {
         // surface发生了变化
+//        canRun = true
+
     }
 
     override fun surfaceDestroyed(holder: SurfaceHolder?) {
@@ -101,21 +93,6 @@ class WeatherView(context: Context, attributeSet: AttributeSet?, defaultStyle: I
         thread.start()
     }
 
-    private fun initData() {
-        val space = context.getScreenWidth() / 20
-        var i = 0
-        var currentSpace = 0f
-        // 将其均匀的分布在屏幕x方向上
-        while (i < 20) {
-            val rain = Rain(PointF(currentSpace, 0f), PointF(currentSpace, 0f))
-            rain.originLength = 20f
-            rain.originX = currentSpace
-            rains.add(rain)
-            currentSpace += space
-            i++
-        }
-    }
-
     private fun draw(canvas: Canvas, type: Weather, startTime: Long) {
         // type什么的先放一边，先实现一个
         weatherShapePool.drawRain(canvas)
@@ -128,5 +105,12 @@ class WeatherView(context: Context, attributeSet: AttributeSet?, defaultStyle: I
 
     fun onDestroy() {
         threadQuit = true
+        canRun = true
+        try {
+            synchronized(lock) {
+                lock.notify()
+            }
+        } catch (e: Exception) {
+        }
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -7,7 +7,7 @@
 
 
     <com.xiasuhuei321.gank_kotlin.customview.weather.WeatherView
-        android:id="@+id/wv_test"
+        android:id="@+id/weatherWv"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
@@ -26,6 +26,7 @@
             android:orientation="vertical">
 
             <ImageView
+                android:id="@+id/weatherIv"
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:layout_marginTop="100dp"