refactor: make code more clear

ForgetAll · ForgetAll · commit b7fce26732d5 · 2017-09-11T10:23:56.000+08:00
Do more thing in parent than before.
diff --git a/app/src/main/cpp/image-lib.cpp b/app/src/main/cpp/image-lib.cpp
@@ -160,7 +160,7 @@ int *blur_ARGB_8888(int *pix, int w, int h, int radius) {
         yi = x;
         stackpointer = radius;
         for (y = 0; y < h; y++) {
-            // Preserve alpha channel: ( 0xff000000 & pix[yi] )
+            // Preserve shapeAlpha channel: ( 0xff000000 & pix[yi] )
             pix[yi] = (0xff000000 & pix[yi]) | (dv[rsum] << 16) | (dv[gsum] << 8) | dv[bsum];
 
             rsum -= routsum;
diff --git a/app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/Rain.kt b/app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/Rain.kt
@@ -2,11 +2,9 @@ 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
 import java.util.*
 
 /**
@@ -20,7 +18,6 @@ class Rain(start: PointF, end: PointF) : WeatherShape(start, end) {
 
     override var TAG = "Rain"
 
-    var width = 5f
     // 用户可以设置
     var length = 20f
     var originLength = 20f
@@ -29,21 +26,13 @@ class Rain(start: PointF, end: PointF) : WeatherShape(start, end) {
             length = value
         }
 
-    var originX = 0f
     var translateX = 0f
     var timeSpace = 16
     //    var originSpeed = speed
     var rainAlpha = 100
-    private var lastTime = 0L // 从开始到现在下落所经过的时间
     var rainColor = Color.parseColor("#efefef")
 //    override var time: Long = 5000 // 总共下落时间
 
-    var paint = Paint().apply {
-        color = rainColor
-        strokeWidth = width
-        isAntiAlias = true
-        alpha = rainAlpha
-    }
 
     // 计算加速度
     override fun getAcceleration(): Float {
@@ -56,12 +45,7 @@ class Rain(start: PointF, end: PointF) : WeatherShape(start, end) {
     /**
      * 绘制过程在此完成
      */
-    override fun draw(canvas: Canvas) {
-        if (!isInUse) {
-            lastTime += randomPre()
-            initStyle()
-            isInUse = true
-        }
+    override fun drawWhenInUse(canvas: Canvas) {
         val distance = speed * lastTime
         start.y += distance
         end.y += distance
@@ -81,52 +65,68 @@ class Rain(start: PointF, end: PointF) : WeatherShape(start, end) {
         end.y = 0f
     }
 
-    /**
-     * @see WeatherShape
-     */
-    override fun randomPre(): Long {
-        val random = Random()
-        val pre = random.nextInt(1000).toLong()
-//        LogUtil.i("asdf", "random = $delay ")
-        return pre
-    }
+//    override fun initStyle(wtc: () -> Unit) {
+//        super.initStyle(wtc)
+//    }
 
-    // 通过该方法来获取一个随机的初始化样式
-    override fun initStyle() {
+    override fun wtc() {
         val random = Random()
-        // 获取随机透明值
-        rainAlpha = random.nextInt(155) + 50
-        // 获得起点x偏移
-        translateX = random.nextInt(10).toFloat() + 5
-        // 获得长度
         length = random.nextInt(5).toFloat() + originLength
-        // 获得宽度 5 ~ 8
-        width = random.nextInt(3) + 5f
-        if (!isRandom) {
-            start.x = translateX + originX
-            end.x = translateX + originX
-        } else {
-            // 如果是随机雨点，将x坐标随机范围扩大
-            val randomWidth = random.nextInt(context.getScreenWidth())
-            start.x = randomWidth + originX
-            end.x = randomWidth + originX
+        paint.apply {
+            color = rainColor
         }
+    }
+
+
+    // 通过该方法来获取一个随机的初始化样式
+//    override fun initStyle() {
+//        val random = Random()
+//        // 获取随机透明值
+//        rainAlpha = random.nextInt(155) + 50
+//        // 获得起点x偏移
+//        translateX = random.nextInt(10).toFloat() + 5
+//        // 获得长度
+//        length = random.nextInt(5).toFloat() + originLength
+//        // 获得宽度 5 ~ 8
+//        width = random.nextInt(3) + 5f
+//        if (!isRandom) {
+//            start.x = translateX + originX
+//            end.x = translateX + originX
+//        } else {
+//            // 如果是随机雨点，将x坐标随机范围扩大
+//            val randomWidth = random.nextInt(context.getScreenWidth())
+//            start.x = randomWidth + originX
+//            end.x = randomWidth + originX
+//        }
+//        start.y = -length
+//        end.y = 0f
+//        paint.apply {
+//            alpha = rainAlpha
+//            strokeWidth = width
+//            color = rainColor
+//            isAntiAlias = true
+//        }
+//        super.initStyle {
+//
+//        }
+//        val random = Random()
+//        length = random.nextInt(5).toFloat() + originLength
+//        paint.apply {
+//            color = rainColor
+//        }
+
+//    }
+
+    override fun randomSpeed(random: Random): Float {
         // 获取随机速度 0.02 ~ 0.06
         var randomSpeed = random.nextFloat() / 10
         if (randomSpeed - 0.05f > 0.01f) {
             randomSpeed -= 0.05f
         } else if (randomSpeed < 0.02f) {
             randomSpeed = 0.02f
         }
-        speed = randomSpeed
-        start.y = -length
-        end.y = 0f
-        paint.apply {
-            alpha = rainAlpha
-            strokeWidth = width
-            color = rainColor
-            isAntiAlias = true
-        }
+
+        return randomSpeed
     }
 
 
diff --git a/app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/Snow.kt b/app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/Snow.kt
@@ -2,24 +2,42 @@ package com.xiasuhuei321.gank_kotlin.customview.weather
 
 import android.graphics.Canvas
 import android.graphics.PointF
+import java.util.*
 
 /**
  * Created by xiasuhuei321 on 2017/9/5.
  * author:luo
  * e-mail:xiasuhuei321@163.com
  */
 class Snow(start: PointF, end: PointF) : WeatherShape(start, end) {
+
+    /**
+     * 圆心，用户可以改变这个值
+     */
+    var center = calcCenter()
+
+    /**
+     * 半径
+     */
+    var radius = 10f
+
     override fun getAcceleration(): Float {
         return 0f
     }
 
-    override fun draw(canvas: Canvas) {
+    override fun drawWhenInUse(canvas: Canvas) {
+        // 通过圆心与半径确定圆的位置及大小
+        canvas.drawCircle(center.x, center.y, radius, paint)
     }
 
-    override fun randomPre(): Long {
-        return 1
+    fun calcCenter(): PointF {
+        val center = PointF(0f, 0f)
+        center.x = (start.x + end.x) / 2f
+        center.y = (start.y + end.y) / 2f
+        return center
     }
 
-    override fun initStyle() {
+    override fun randomSpeed(random: Random): Float {
+        return 0f
     }
 }
diff --git a/app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/WeatherShape.kt b/app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/WeatherShape.kt
@@ -1,12 +1,29 @@
 package com.xiasuhuei321.gank_kotlin.customview.weather
 
 import android.graphics.Canvas
+import android.graphics.Paint
 import android.graphics.PointF
+import com.xiasuhuei321.gank_kotlin.context
+import com.xiasuhuei321.gank_kotlin.extension.getScreenWidth
+import java.util.*
 
 /**
  * Created by xiasuhuei321 on 2017/9/5.
  * author:luo
  * e-mail:xiasuhuei321@163.com
+ *
+ * desc: All shape's parent class.It describes a shape will have
+ * what feature.It's draw flows are:
+ * 1.Outside the class init some value such as the start and the
+ * end point.
+ * 2.Invoke draw(Canvas) method, in this method, there are still
+ * two flows:
+ * 1) Get random value to init paint, this will affect the shape
+ * draw style.
+ * 2) When the shape is not used, invoke init method, and when it
+ * is not used invoke drawWhenInUse(Canvas) method. It should be
+ * override by user and to implement draw itself.
+ *
  */
 abstract class WeatherShape(val start: PointF, val end: PointF) {
     open var TAG = "WeatherShape"
@@ -27,27 +44,98 @@ abstract class WeatherShape(val start: PointF, val end: PointF) {
     var speed = 0.05f
 
     /**
-     * 总时间
+     * shape的宽度
      */
-    //    abstract var time: Long
+    var width = 5f
+
+    var shapeAlpha = 100
+
+    var paint = Paint().apply {
+        strokeWidth = width
+        isAntiAlias = true
+        alpha = alpha
+    }
+
+    // 总共下落的时间
+    var lastTime = 0L
+    // 原始x坐标位置
+    var originX = 0f
 
     /**
      * 根据自己的规则计算加速度，如果是匀速直接 return 0
      */
     abstract fun getAcceleration(): Float
 
     /**
-     * 绘制自身，具体实现交给子类去实现（可以drawLine，drawBitmap等）
+     * 绘制自身，这里在Shape是非使用的时候进行一些初始化操作
      */
-    abstract fun draw(canvas: Canvas)
+    open fun draw(canvas: Canvas) {
+        if (!isInUse) {
+            lastTime += randomPre()
+            initStyle()
+            isInUse = true
+        } else {
+            drawWhenInUse(canvas)
+        }
+    }
 
     /**
-     * 随机的提前量，让Shape错开
+     * Shape在使用的时候调用此方法
      */
-    abstract fun randomPre(): Long
+    abstract fun drawWhenInUse(canvas: Canvas)
 
     /**
      * 初始化Shape风格
      */
-    abstract fun initStyle()
-}
+    open fun initStyle() {
+        val random = Random()
+        // 获取随机透明度
+        shapeAlpha = random.nextInt(155) + 50
+        // 获得起点x偏移
+        val translateX = random.nextInt(10).toFloat() + 5
+        if (!isRandom) {
+            start.x = translateX + originX
+            end.x = translateX + originX
+        } else {
+            // 如果是随机Shape，将x坐标随机范围扩大到整个屏幕的宽度
+            val randomWidth = random.nextInt(context.getScreenWidth())
+            start.x = randomWidth.toFloat()
+            end.x = randomWidth.toFloat()
+        }
+        speed = randomSpeed(random)
+        // 初始化length的工作留给之后对应的子类去实现
+        // 初始化color也留给子类去实现
+        paint.apply {
+            alpha = shapeAlpha
+            strokeWidth = width
+            isAntiAlias = true
+        }
+        // 如果有什么想要做的，刚好可以在追加上完成，就使用这个函数
+        wtc()
+    }
+
+    /**
+     * 空实现的函数，将会在initStyle中调用。如果现有的
+     * initStyle函数能满足你的需求，但是你还需要追加一些
+     * 东西，你可以通过复写此函数实现
+     * empty body, this will be invoke in initStyle
+     * method.If current initStyle method can // 满足不会。。。
+     * but you still add something, by override this method
+     * can be a good idea.
+     */
+    open fun wtc(): Unit {
+
+    }
+
+    abstract fun randomSpeed(random: Random): Float
+
+    /**
+     * 获取一个随机的提前量，让shape在竖屏上有一个初始的偏移
+     */
+    open fun randomPre(): Long {
+        val random = Random()
+        val pre = random.nextInt(1000).toLong()
+        return pre
+    }
+}
+// TODO 待验证重构之后的代码的正确性
diff --git a/app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/WeatherView.kt b/app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/WeatherView.kt
@@ -16,10 +16,14 @@ import java.lang.Exception
  * author:luo
  * e-mail:xiasuhuei321@163.com
  */
-class WeatherView(context: Context, attributeSet: AttributeSet? = null, defaultStyle: Int = 0) :
+class WeatherView(context: Context, attributeSet: AttributeSet?, defaultStyle: Int) :
         SurfaceView(context, attributeSet, defaultStyle), SurfaceHolder.Callback {
     private val TAG = "WeatherView"
 
+    constructor(context: Context, attributeSet: AttributeSet?) : this(context, attributeSet, 0)
+
+    constructor(context: Context) : this(context, null, 0)
+
     // 低级并发，Kotlin中支持的不是很好，所以用一下黑科技
     val lock = Object()
     var type = Weather.RAIN
@@ -85,6 +89,7 @@ class WeatherView(context: Context, attributeSet: AttributeSet? = null, defaultS
     }
 
     init {
+        LogUtil.i(TAG, "init开始")
         holder.addCallback(this)
         holder.setFormat(PixelFormat.RGBA_8888)
 //        initData()
