优化

wangyiqian · Dec 17, 2021 · e3fc574 · e3fc574
1 parent d0ad2b6
commit e3fc574
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
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
@@ -134,7 +134,7 @@ open class KChart(
                                 yMax = max(yMax, kEntity.getClosePrice())
                             }
                             kEntity.getAvgPrice()?.let { avgPrice ->
-                                if (chartConfig.showAvgLine) {
+                                if (needDrawAvgPriceLine()) {
                                     yMin = min(yMin, avgPrice)
                                     yMax = max(yMax, avgPrice)
                                 }
@@ -191,6 +191,7 @@ open class KChart(
                 drawBarKChart(canvas)
             }
         }
+        drawAvgPriceLine(canvas)
         drawHighestAndLowestLabel(canvas)
         drawIndex(canvas)
     }
@@ -671,12 +672,12 @@ open class KChart(
             )
             preIdx = idx
         }
-
-        drawAvgPriceLine(canvas)
     }
 
+    private fun needDrawAvgPriceLine() = chartConfig.showAvgLine && (chartConfig.kChartType is KChartConfig.KChartType.LINE || chartConfig.kChartType is KChartConfig.KChartType.MOUNTAIN)
+
     private fun drawAvgPriceLine(canvas: Canvas) {
-        if (chartConfig.showAvgLine) {
+        if (needDrawAvgPriceLine()) {
 
             avgPriceLinePaint.strokeWidth = chartConfig.avgLineStrokeWidth
             avgPriceLinePaint.color = chartConfig.avgLineColor
@@ -843,8 +844,6 @@ open class KChart(
             )
             preIdx = idx
         }
-
-        drawAvgPriceLine(canvas)
     }
 
     private fun drawLabels(canvas: Canvas) {

diff --git a/samples/build.gradle b/samples/build.gradle
@@ -70,6 +70,6 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation 'com.google.android:flexbox:2.0.1'
 
-//    implementation project(':lib')
-    implementation 'com.github.wangyiqian:StockChart:1.0.14'
+    implementation project(':lib')
+//    implementation 'com.github.wangyiqian:StockChart:1.0.14'
 }