Skip to content

Commit f67cc38

Browse files
committed
更新MPAndroidChart版本,修复一些bug
1 parent 8b22891 commit f67cc38

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

app/src/main/java/com/cyy/charthelper/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private void initMulitleBarChart() {
140140
.setGroupSpace(0.4f)
141141
// x,y轴动画时间和类型
142142
.setDurationMillis(2000)
143-
.setEasing(Easing.EasingOption.Linear)
143+
.setEasing(Easing.Linear)
144144
// 多柱状图颜色
145145
.setBarColors(chartColors)
146146
// X轴是否显示自定义数据,在IBarData接口中定义
@@ -182,7 +182,7 @@ private void initSingleBarChart() {
182182
.setBarWidth(0.6f)
183183
// x,y轴动画时间和类型
184184
.setDurationMillis(2000)
185-
.setEasing(Easing.EasingOption.Linear)
185+
.setEasing(Easing.Linear)
186186
// 单柱状图颜色
187187
.setBarColor(Color.parseColor("#00FF00"))
188188
// X轴是否显示自定义数据,在IBarData接口中定义
@@ -214,7 +214,7 @@ private void initPieChart() {
214214
// 动画时间
215215
.setDurationMillis(2000)
216216
// 动画类型
217-
.setEasing(Easing.EasingOption.EaseInOutQuad)
217+
.setEasing(Easing.EaseInOutQuad)
218218
// 旋转角度
219219
.setRawRotationAngle(90)
220220
// 中心图表孔旁边的透明圆的半径

chart/src/main/java/com/horen/chart/barchart/BarChartHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public class BarChartHelper {
109109
/**
110110
* 动画类型
111111
*/
112-
private Easing.EasingOption mEasing;
112+
private Easing.EasingFunction mEasing;
113113
/**
114114
* 颜色集合
115115
*/
@@ -383,7 +383,7 @@ public static class Builder {
383383
/**
384384
* 动画类型
385385
*/
386-
private Easing.EasingOption mEasing = Easing.EasingOption.Linear;
386+
private Easing.EasingFunction mEasing = Easing.Linear;
387387
/**
388388
* 颜色集合
389389
*/
@@ -500,7 +500,7 @@ public Builder setDurationMillis(int durationMillis) {
500500
return this;
501501
}
502502

503-
public Builder setEasing(Easing.EasingOption mEasing) {
503+
public Builder setEasing(Easing.EasingFunction mEasing) {
504504
this.mEasing = mEasing;
505505
return this;
506506
}

chart/src/main/java/com/horen/chart/linechart/LineChartHelper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ public void showMultipleLineChart(List<List<ILineChartData>> lineSetData, List<S
122122
}
123123
//将图表动画显示之前进行缩放
124124
lineChart.getViewPortHandler().refresh(m, lineChart, false);
125-
lineChart.animateY(1500, Easing.EasingOption.Linear);
126-
lineChart.animateX(1000, Easing.EasingOption.Linear);
125+
lineChart.animateY(1500, Easing.Linear);
126+
lineChart.animateX(1000, Easing.Linear);
127127
}
128128

129129

@@ -168,7 +168,7 @@ public void showSingleLineChart(List<ILineChartData> barChartData, int color, in
168168
}
169169
//将图表动画显示之前进行缩放
170170
lineChart.getViewPortHandler().refresh(m, lineChart, false);
171-
lineChart.animateY(1500, Easing.EasingOption.Linear);
172-
lineChart.animateX(1000, Easing.EasingOption.Linear);
171+
lineChart.animateY(1500, Easing.Linear);
172+
lineChart.animateX(1000, Easing.Linear);
173173
}
174174
}

chart/src/main/java/com/horen/chart/piechart/PieChartHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class PieChartHelper {
7373
/**
7474
* 动画类型
7575
*/
76-
private Easing.EasingOption easing;
76+
private Easing.EasingFunction easing;
7777
/**
7878
* Label文字颜色
7979
*/
@@ -223,7 +223,7 @@ public Builder() {
223223
/**
224224
* 动画类型
225225
*/
226-
private Easing.EasingOption easing = Easing.EasingOption.EaseInOutQuad;
226+
private Easing.EasingFunction easing = Easing.EaseInOutQuad;
227227
/**
228228
* Label文字颜色
229229
*/
@@ -313,7 +313,7 @@ public Builder setDurationMillis(int durationMillis) {
313313
return this;
314314
}
315315

316-
public Builder setEasing(Easing.EasingOption easing) {
316+
public Builder setEasing(Easing.EasingFunction easing) {
317317
this.easing = easing;
318318
return this;
319319
}

0 commit comments

Comments
 (0)