指标支持扩展、细节优化

wangyiqian · Jan 13, 2022 · 827a726 · 827a726
1 parent bae2934
commit 827a726
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 37 deletions.
diff --git a/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/base/BaseChildChart.kt b/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/base/BaseChildChart.kt
@@ -18,7 +18,9 @@ import android.view.View
 import android.view.ViewGroup
 import com.github.wangyiqian.stockchart.IStockChart
 import com.github.wangyiqian.stockchart.StockChart
+import com.github.wangyiqian.stockchart.entities.FLAG_EMPTY
 import com.github.wangyiqian.stockchart.entities.GestureEvent
+import com.github.wangyiqian.stockchart.entities.containFlag
 import com.github.wangyiqian.stockchart.listener.OnKEntitiesChangedListener
 
 /**
@@ -246,4 +248,20 @@ abstract class BaseChildChart<C : BaseChildChartConfig> @JvmOverloads constructo
     override fun getConfig() = chartConfig
 
     override fun onTap(event: GestureEvent) {}
+
+    override fun isRise(idx: Int) =
+        if (getKEntities()[idx].getClosePrice() == getKEntities()[idx].getOpenPrice()) {
+            if (idx - 1 in getKEntities().indices) {
+                val preKEntity = getKEntities()[idx - 1]
+                if (!preKEntity.containFlag(FLAG_EMPTY)) {
+                    getKEntities()[idx].getClosePrice() >= preKEntity.getClosePrice()
+                } else {
+                    true
+                }
+            } else {
+                true
+            }
+        } else {
+            getKEntities()[idx].getClosePrice() > getKEntities()[idx].getOpenPrice()
+        }
 }
diff --git a/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/base/IChildChart.kt b/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/base/IChildChart.kt
@@ -92,6 +92,11 @@ interface IChildChart {
      */
     fun onTap(event: GestureEvent)
 
+    /**
+     * 涨跌判断
+     */
+    fun isRise(idx: Int): Boolean
+
     fun getHighlightValue(highlightX: Float, highlightY: Float, highlightValue: FloatArray) {
         highlightValue[0] = highlightX
         highlightValue[1] = highlightY

diff --git a/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/kchart/KChart.kt b/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/kchart/KChart.kt
@@ -838,22 +838,6 @@ open class KChart(
         }
     }
 
-    private fun isRise(idx: Int) =
-        if (getKEntities()[idx].getClosePrice() == getKEntities()[idx].getOpenPrice()) {
-            if (idx - 1 in getKEntities().indices) {
-                val preKEntity = getKEntities()[idx - 1]
-                if (!preKEntity.containFlag(FLAG_EMPTY)) {
-                    getKEntities()[idx].getClosePrice() >= preKEntity.getClosePrice()
-                } else {
-                    true
-                }
-            } else {
-                true
-            }
-        } else {
-            getKEntities()[idx].getClosePrice() > getKEntities()[idx].getOpenPrice()
-        }
-
     private fun drawLineKChart(canvas: Canvas) {
         lineKChartLinePaint.strokeWidth = chartConfig.lineChartStrokeWidth
         lineKChartLinePaint.color = chartConfig.lineChartColor

diff --git a/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/kdjchart/KdjChart.kt b/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/kdjchart/KdjChart.kt
@@ -17,6 +17,7 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import com.github.wangyiqian.stockchart.IStockChart
 import com.github.wangyiqian.stockchart.childchart.base.BaseChildChart
+import kotlin.math.abs
 
 /**
  * @author wangyiqian E-mail: [email protected]
@@ -59,8 +60,15 @@ class KdjChart(stockChart: IStockChart, chartConfig: KdjChartConfig) :
                     }
                 }
         }
-        result[0] = yMin
-        result[1] = yMax
+
+        if (abs(yMin - yMax) > 0.0001) {
+            result[0] = yMin
+            result[1] = yMax
+        } else { // 约等于0
+            var delta = 2
+            result[0] = yMin - delta
+            result[1] = yMax + delta
+        }
     }
 
     override fun preDrawBackground(canvas: Canvas) {

diff --git a/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/macdchart/MacdChart.kt b/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/macdchart/MacdChart.kt
@@ -17,6 +17,7 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import com.github.wangyiqian.stockchart.IStockChart
 import com.github.wangyiqian.stockchart.childchart.base.BaseChildChart
+import kotlin.math.abs
 
 /**
  * MACD指标图
@@ -63,8 +64,16 @@ class MacdChart(
                     }
                 }
         }
-        result[0] = yMin
-        result[1] = yMax
+
+        if (abs(yMin - yMax) > 0.0001) {
+            result[0] = yMin
+            result[1] = yMax
+        } else { // 约等于0
+            var delta = 2
+            result[0] = yMin - delta
+            result[1] = yMax + delta
+        }
+
     }
 
     override fun preDrawBackground(canvas: Canvas) {

diff --git a/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/volumechart/VolumeChart.kt b/lib/src/main/java/com/github/wangyiqian/stockchart/childchart/volumechart/VolumeChart.kt
@@ -100,22 +100,6 @@ class VolumeChart(
         }
     }
 
-    private fun isRise(idx: Int) =
-        if (getKEntities()[idx].getClosePrice() == getKEntities()[idx].getOpenPrice()) {
-            if (idx - 1 in getKEntities().indices) {
-                val preKEntity = getKEntities()[idx - 1]
-                if (!preKEntity.containFlag(FLAG_EMPTY)) {
-                    getKEntities()[idx].getClosePrice() >= preKEntity.getClosePrice()
-                } else {
-                    true
-                }
-            } else {
-                true
-            }
-        } else {
-            getKEntities()[idx].getClosePrice() > getKEntities()[idx].getOpenPrice()
-        }
-
     override fun preDrawHighlight(canvas: Canvas) {}
 
     override fun drawHighlight(canvas: Canvas) {

diff --git a/lib/src/main/java/com/github/wangyiqian/stockchart/index/Index.kt b/lib/src/main/java/com/github/wangyiqian/stockchart/index/Index.kt
@@ -20,7 +20,7 @@ import com.github.wangyiqian.stockchart.entities.IKEntity
  * @author wangyiqian E-mail: [email protected]
  * @version 创建时间: 2021/2/18
  */
-sealed class Index(
+open abstract class Index(
     var param: String,
     var startText: String,
     var startTextColor: Int,