Skip to content

Commit d3d2eab

Browse files
huangyanbinhuangyanbin
committed
增加注释
支持自定义每条线样式
1 parent 17a1bd8 commit d3d2eab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+944
-166
lines changed

‎app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<activity android:name=".BarLineChartActivity"/>
3131
<activity android:name=".Pie3DChartActivity"/>
3232
<activity android:name=".RotateActivity"/>
33+
<activity android:name=".CustomLineChartActivity"/>
3334

3435
</application>
3536

‎app/src/main/java/com/bin/david/smartchart/AreaChartActivity.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515
import com.daivd.chart.component.base.IComponent;
1616
import com.daivd.chart.core.LineChart;
1717
import com.daivd.chart.data.ChartData;
18-
import com.daivd.chart.group.cross.DoubleDriCross;
19-
import com.daivd.chart.group.level.LevelLine;
2018
import com.daivd.chart.data.LineData;
19+
import com.daivd.chart.provider.component.cross.DoubleDriCross;
20+
import com.daivd.chart.provider.component.level.LevelLine;
21+
import com.daivd.chart.data.BarData;
2122
import com.daivd.chart.data.style.FontStyle;
2223
import com.daivd.chart.data.style.LineStyle;
2324
import com.daivd.chart.data.style.PointStyle;
2425
import com.daivd.chart.listener.OnClickColumnListener;
25-
import com.daivd.chart.group.mark.BubbleMarkView;
26-
import com.daivd.chart.group.point.Point;
26+
import com.daivd.chart.provider.component.mark.BubbleMarkView;
27+
import com.daivd.chart.provider.component.point.Point;
2728

2829
import java.util.ArrayList;
2930
import java.util.List;

‎app/src/main/java/com/bin/david/smartchart/Bar3DChartActivity.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
import com.daivd.chart.component.base.IComponent;
1111
import com.daivd.chart.core.Bar3DChart;
1212
import com.daivd.chart.data.ChartData;
13-
import com.daivd.chart.group.level.LevelLine;
14-
import com.daivd.chart.data.LineData;
13+
import com.daivd.chart.provider.component.level.LevelLine;
14+
import com.daivd.chart.data.BarData;
1515
import com.daivd.chart.data.style.FontStyle;
1616
import com.daivd.chart.data.style.PointStyle;
1717
import com.daivd.chart.listener.OnClickColumnListener;
18-
import com.daivd.chart.group.mark.BubbleMarkView;
19-
import com.daivd.chart.group.point.Point;
18+
import com.daivd.chart.provider.component.mark.BubbleMarkView;
19+
import com.daivd.chart.provider.component.point.Point;
2020

2121
import java.util.ArrayList;
2222
import java.util.List;
@@ -38,25 +38,25 @@ protected void onCreate(Bundle savedInstanceState) {
3838
chartYDataList.add("Singapore");
3939

4040

41-
List<LineData> ColumnDatas = new ArrayList<>();
41+
List<BarData> ColumnDatas = new ArrayList<>();
4242
ArrayList<Double> tempList1 = new ArrayList<>();
4343
tempList1.add(26d);
4444
tempList1.add(35d);
4545
tempList1.add(40d);
4646
tempList1.add(10d);
4747

4848

49-
LineData columnData1 = new LineData("Temperature","℃",getResources().getColor(R.color.arc3),tempList1);
49+
BarData columnData1 = new BarData("Temperature","℃",getResources().getColor(R.color.arc3),tempList1);
5050
ArrayList<Double> humidityList = new ArrayList<>();
5151
humidityList.add(60d);
5252
humidityList.add(50d);
5353
humidityList.add(30d);
5454
humidityList.add(65d);
5555

56-
LineData columnData2 = new LineData("Humidity","RH%",getResources().getColor(R.color.arc2),humidityList);
56+
BarData columnData2 = new BarData("Humidity","RH%",getResources().getColor(R.color.arc2),humidityList);
5757
ColumnDatas.add(columnData1);
5858
ColumnDatas.add(columnData2);
59-
ChartData<LineData> chartData = new ChartData<>("3D bar chart",chartYDataList,ColumnDatas);
59+
ChartData<BarData> chartData = new ChartData<>("3D bar chart",chartYDataList,ColumnDatas);
6060
bar3DChart.setChartData(chartData);
6161
bar3DChart.startChartAnim(1000);
6262
bar3DChart.setZoom(true);
@@ -80,9 +80,9 @@ protected void onCreate(Bundle savedInstanceState) {
8080
bar3DChart.getLeftVerticalAxis().getGridStyle().setEffect(effects);
8181
vaxis.getGridStyle().setColor(R.color.arc_inteval);
8282
bar3DChart.getLegend().setDirection(IComponent.TOP);
83-
bar3DChart.setOnClickColumnListener(new OnClickColumnListener<LineData>() {
83+
bar3DChart.setOnClickColumnListener(new OnClickColumnListener<BarData>() {
8484
@Override
85-
public void onClickColumn(LineData lineData, int position) {
85+
public void onClickColumn(BarData lineData, int position) {
8686
Toast.makeText(Bar3DChartActivity.this,lineData.getChartYDataList().get(position)+lineData.getUnit(),Toast.LENGTH_SHORT).show();
8787
}
8888
});

‎app/src/main/java/com/bin/david/smartchart/BarChartActivity.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
import com.daivd.chart.component.base.IComponent;
1111
import com.daivd.chart.core.BarChart;
1212
import com.daivd.chart.data.ChartData;
13-
import com.daivd.chart.group.level.LevelLine;
14-
import com.daivd.chart.data.LineData;
13+
import com.daivd.chart.provider.component.level.LevelLine;
14+
import com.daivd.chart.data.BarData;
1515
import com.daivd.chart.data.style.FontStyle;
1616
import com.daivd.chart.data.style.PointStyle;
1717
import com.daivd.chart.listener.OnClickColumnListener;
18-
import com.daivd.chart.group.mark.BubbleMarkView;
19-
import com.daivd.chart.group.point.Point;
18+
import com.daivd.chart.provider.component.mark.BubbleMarkView;
19+
import com.daivd.chart.provider.component.point.Point;
2020

2121
import java.util.ArrayList;
2222
import java.util.List;
@@ -38,25 +38,25 @@ protected void onCreate(Bundle savedInstanceState) {
3838
chartYDataList.add("Singapore");
3939

4040

41-
List<LineData> ColumnDatas = new ArrayList<>();
41+
List<BarData> ColumnDatas = new ArrayList<>();
4242
ArrayList<Double> tempList1 = new ArrayList<>();
4343
tempList1.add(26d);
4444
tempList1.add(35d);
4545
tempList1.add(40d);
4646
tempList1.add(10d);
4747

4848

49-
LineData columnData1 = new LineData("Temperature","℃",getResources().getColor(R.color.arc3),tempList1);
49+
BarData columnData1 = new BarData("Temperature","℃",getResources().getColor(R.color.arc3),tempList1);
5050
ArrayList<Double> humidityList = new ArrayList<>();
5151
humidityList.add(60d);
5252
humidityList.add(50d);
5353
humidityList.add(30d);
5454
humidityList.add(65d);
5555

56-
LineData columnData2 = new LineData("Humidity","RH%",getResources().getColor(R.color.arc2),humidityList);
56+
BarData columnData2 = new BarData("Humidity","RH%",getResources().getColor(R.color.arc2),humidityList);
5757
ColumnDatas.add(columnData1);
5858
ColumnDatas.add(columnData2);
59-
ChartData<LineData> chartData = new ChartData<>("bar chart",chartYDataList,ColumnDatas);
59+
ChartData<BarData> chartData = new ChartData<>("bar chart",chartYDataList,ColumnDatas);
6060
barChart.setChartData(chartData);
6161
barChart.startChartAnim(1000);
6262
barChart.setZoom(true);
@@ -80,9 +80,9 @@ protected void onCreate(Bundle savedInstanceState) {
8080
vaxis.setDrawGrid(true);
8181
vaxis.getGridStyle().setColor(R.color.arc_inteval);
8282
barChart.getLegend().setDirection(IComponent.TOP);
83-
barChart.setOnClickColumnListener(new OnClickColumnListener<LineData>() {
83+
barChart.setOnClickColumnListener(new OnClickColumnListener<BarData>() {
8484
@Override
85-
public void onClickColumn(LineData lineData, int position) {
85+
public void onClickColumn(BarData lineData, int position) {
8686
Toast.makeText(BarChartActivity.this,lineData.getChartYDataList().get(position)+lineData.getUnit(),Toast.LENGTH_SHORT).show();
8787
}
8888
});

‎app/src/main/java/com/bin/david/smartchart/BarLineChartActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import com.daivd.chart.data.style.FontStyle;
2121
import com.daivd.chart.data.style.LineStyle;
2222
import com.daivd.chart.data.style.PointStyle;
23-
import com.daivd.chart.group.cross.DoubleDriCross;
24-
import com.daivd.chart.group.level.LevelLine;
25-
import com.daivd.chart.group.mark.BubbleMarkView;
26-
import com.daivd.chart.group.point.Point;
23+
import com.daivd.chart.provider.component.cross.DoubleDriCross;
24+
import com.daivd.chart.provider.component.level.LevelLine;
25+
import com.daivd.chart.provider.component.mark.BubbleMarkView;
26+
import com.daivd.chart.provider.component.point.Point;
2727

2828
import java.util.ArrayList;
2929
import java.util.List;

0 commit comments

Comments
 (0)