长按高亮线支持虚线

wangyiqian · Nov 27, 2022 · 5d59876 · 5d59876
1 parent edf3b1b
commit 5d59876
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ allprojects {
 ```
 ```groovy
 dependencies {
-    implementation 'com.github.wangyiqian:StockChart:1.1.9'
+    implementation 'com.github.wangyiqian:StockChart:1.1.11'
 }
 ```
 ### 2. 布局文件加入StockChart布局
@@ -140,9 +140,11 @@ Data.loadDayData(this, 0) { kEntities: List<IKEntity> ->
 |showHighlightHorizontalLine|是否支持长按高亮横线|
 |highlightHorizontalLineWidth|长按高亮横线宽度|
 |highlightHorizontalLineColor|长按高亮横线颜色|
+|highlightHorizontalLinePathEffect|长按高亮横线虚线|
 |showHighlightVerticalLine|是否支持长按高亮竖线|
 |highlightVerticalLineWidth|长按高亮竖线宽度|
 |highlightVerticalLineColor|长按高亮竖线颜色|
+|highlightVerticalLinePathEffect|长按高亮竖线虚线|
 |riseColor|涨色值|
 |downColor|跌色值|
 |backgroundColor|背景色|

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
@@ -224,6 +224,8 @@ open class KChart(
                         stockChart.getConfig().highlightHorizontalLineColor
                     highlightHorizontalLinePaint.strokeWidth =
                         stockChart.getConfig().highlightHorizontalLineWidth
+                    highlightHorizontalLinePaint.pathEffect =
+                        stockChart.getConfig().highlightHorizontalLinePathEffect
 
                     var highlightHorizontalLineLeft = getChartDisplayArea().left
                     var highlightHorizontalLineRight = getChartDisplayArea().right
@@ -339,6 +341,8 @@ open class KChart(
                         stockChart.getConfig().highlightVerticalLineColor
                     highlightVerticalLinePaint.strokeWidth =
                         stockChart.getConfig().highlightVerticalLineWidth
+                    highlightVerticalLinePaint.pathEffect =
+                        stockChart.getConfig().highlightVerticalLinePathEffect
 
                     tmp2FloatArray[0] = highlight.getIdx() + 0.5f
                     tmp2FloatArray[1] = 0f

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
@@ -188,6 +188,8 @@ class KdjChart(stockChart: IStockChart, chartConfig: KdjChartConfig) :
                         stockChart.getConfig().highlightHorizontalLineColor
                     highlightHorizontalLinePaint.strokeWidth =
                         stockChart.getConfig().highlightHorizontalLineWidth
+                    highlightHorizontalLinePaint.pathEffect =
+                        stockChart.getConfig().highlightHorizontalLinePathEffect
 
                     var highlightHorizontalLineLeft = getChartDisplayArea().left
                     var highlightHorizontalLineRight = getChartDisplayArea().right
@@ -303,6 +305,8 @@ class KdjChart(stockChart: IStockChart, chartConfig: KdjChartConfig) :
                         stockChart.getConfig().highlightVerticalLineColor
                     highlightVerticalLinePaint.strokeWidth =
                         stockChart.getConfig().highlightVerticalLineWidth
+                    highlightVerticalLinePaint.pathEffect =
+                        stockChart.getConfig().highlightVerticalLinePathEffect
 
                     tmp2FloatArray[0] = highlight.getIdx() + 0.5f
                     tmp2FloatArray[1] = 0f

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
@@ -225,6 +225,8 @@ class MacdChart(
                         stockChart.getConfig().highlightHorizontalLineColor
                     highlightHorizontalLinePaint.strokeWidth =
                         stockChart.getConfig().highlightHorizontalLineWidth
+                    highlightHorizontalLinePaint.pathEffect =
+                        stockChart.getConfig().highlightHorizontalLinePathEffect
 
                     var highlightHorizontalLineLeft = getChartDisplayArea().left
                     var highlightHorizontalLineRight = getChartDisplayArea().right
@@ -339,6 +341,8 @@ class MacdChart(
                         stockChart.getConfig().highlightVerticalLineColor
                     highlightVerticalLinePaint.strokeWidth =
                         stockChart.getConfig().highlightVerticalLineWidth
+                    highlightVerticalLinePaint.pathEffect =
+                        stockChart.getConfig().highlightVerticalLinePathEffect
 
                     tmp2FloatArray[0] = highlight.getIdx() + 0.5f
                     tmp2FloatArray[1] = 0f

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
@@ -119,6 +119,8 @@ class VolumeChart(
                         stockChart.getConfig().highlightHorizontalLineColor
                     highlightHorizontalLinePaint.strokeWidth =
                         stockChart.getConfig().highlightHorizontalLineWidth
+                    highlightHorizontalLinePaint.pathEffect =
+                        stockChart.getConfig().highlightHorizontalLinePathEffect
 
                     var highlightHorizontalLineLeft = getChartDisplayArea().left
                     var highlightHorizontalLineRight = getChartDisplayArea().right
@@ -233,6 +235,8 @@ class VolumeChart(
                         stockChart.getConfig().highlightVerticalLineColor
                     highlightVerticalLinePaint.strokeWidth =
                         stockChart.getConfig().highlightVerticalLineWidth
+                    highlightVerticalLinePaint.pathEffect =
+                        stockChart.getConfig().highlightVerticalLinePathEffect
 
                     tmp2FloatArray[0] = highlight.getIdx() + 0.5f
                     tmp2FloatArray[1] = 0f

diff --git a/samples/build.gradle b/samples/build.gradle
@@ -71,5 +71,5 @@ dependencies {
     implementation 'com.google.android:flexbox:2.0.1'
 
 //    implementation project(':lib')
-    implementation 'com.github.wangyiqian:StockChart:1.1.10'
+    implementation 'com.github.wangyiqian:StockChart:1.1.11'
 }