From ed8a6586e38e7991eaa6460360bd0ceeda556cd0 Mon Sep 17 00:00:00 2001 From: wangyiqian Date: Thu, 23 Dec 2021 18:36:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AD=90=E5=9B=BE=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E6=9B=BF=E6=8D=A2=E9=95=BF=E6=8C=89=E9=AB=98=E4=BA=AE?= =?UTF-8?q?=E5=80=BC=E7=9A=84=E9=BB=98=E8=AE=A4=E8=AE=A1=E7=AE=97=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/github/wangyiqian/stockchart/StockChart.kt | 4 +--- .../wangyiqian/stockchart/childchart/base/IChildChart.kt | 6 ++++++ samples/build.gradle | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/src/main/java/com/github/wangyiqian/stockchart/StockChart.kt b/lib/src/main/java/com/github/wangyiqian/stockchart/StockChart.kt index 049bd0c..451cc82 100644 --- a/lib/src/main/java/com/github/wangyiqian/stockchart/StockChart.kt +++ b/lib/src/main/java/com/github/wangyiqian/stockchart/StockChart.kt @@ -350,9 +350,7 @@ class StockChart @JvmOverloads constructor(context: Context, attrs: AttributeSet childCharts.forEach { childChart -> val childChartX = x - childChart.view().left val childChartY = y - childChart.view().top - tmp2FloatArray[0] = childChartX - tmp2FloatArray[1] = childChartY - childChart.mapPointsReal2Value(tmp2FloatArray) + childChart.getHighlightValue(childChartX, childChartY, tmp2FloatArray) val valueX = tmp2FloatArray[0] val valueY = tmp2FloatArray[1] var highlight = highlightMap[childChart] 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 index 5154fa1..a677e1b 100644 --- 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 @@ -91,4 +91,10 @@ interface IChildChart { * 点击 */ fun onTap(event: GestureEvent) + + fun getHighlightValue(highlightX: Float, highlightY: Float, highlightValue: FloatArray) { + highlightValue[0] = highlightX + highlightValue[1] = highlightY + mapPointsReal2Value(highlightValue) + } } \ No newline at end of file diff --git a/samples/build.gradle b/samples/build.gradle index d737bb8..c64cc76 100644 --- 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.17' + implementation project(':lib') +// implementation 'com.github.wangyiqian:StockChart:1.0.17' } \ No newline at end of file