From 957b8e9d4bc63524dad27c2f8458856da0bf5c06 Mon Sep 17 00:00:00 2001
From: 张海江 <181069201@qq.com>
Date: Mon, 07 Aug 2017 13:20:28 +0800
Subject: [PATCH] 提交代码
---
app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java b/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
index 9bfeb76..284c5f7 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
@@ -2,8 +2,13 @@
import android.graphics.Color;
import android.os.Bundle;
+import android.support.annotation.IdRes;
import android.view.View;
+import android.widget.ImageView;
+import android.widget.RadioGroup;
+import android.widget.TextView;
+import com.moral.andbrickslib.utils.TimeUtil;
import com.moral.yunfushao.R;
import com.moral.yunfushao.base.BaseActivity;
@@ -34,6 +39,11 @@
Axis axisY;
private List<PointValue> mPointValues = new ArrayList<>();
private List<AxisValue> mAxisXValues = new ArrayList<>();
+
+ private RadioGroup rg_time;
+ private TextView tv_starttime,tv_endtime;
+ private ImageView iv_pre,iv_next;
+ private int type=0;
@Override
protected void getBundleExtras(Bundle extras) {
@@ -50,11 +60,43 @@
tv_title.setText("������������");
chartView = findView(R.id.chart);
initLineChart();
+
+ rg_time = findView(R.id.rg_time);
+ tv_starttime = findView(R.id.tv_starttime);
+ tv_endtime = findView(R.id.tv_endtime);
+ iv_pre = findView(R.id.iv_pre);
+ iv_next = findView(R.id.iv_next);
+ rg_time.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(RadioGroup radioGroup, @IdRes int i) {
+ switch (i){
+ case R.id.rb_week:
+ type = 0;
+ axisX.setName("���������������������"); //������������
+ data.setAxisXBottom(axisX); //x ������������
+ chartView.setLineChartData(data);
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",TimeUtil.getCurrentDate("yyyy-MM-dd"),-1));
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-7));
+ break;
+ case R.id.rb_month:
+ type = 1;
+ axisX.setName("���������������������"); //������������
+ data.setAxisXBottom(axisX); //x ������������
+ chartView.setLineChartData(data);
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",TimeUtil.getCurrentDate("yyyy-MM-dd"),-1));
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-28));
+ break;
+ }
+ }
+ });
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",TimeUtil.getCurrentDate("yyyy-MM-dd"),-1));
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-7));
}
@Override
protected void initListener() {
-
+ iv_pre.setOnClickListener(this);
+ iv_next.setOnClickListener(this);
}
@Override
@@ -67,6 +109,27 @@
switch (view.getId()){
case R.id.tv_left:
finish();
+ break;
+ case R.id.iv_pre:
+ if(type==0){
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),-1));
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-7));
+ }else if(type == 1){
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),-1));
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-28));
+ }
+ break;
+ case R.id.iv_next:
+ if(TimeUtil.getCurrentDate("yyyy-MM-dd").equals(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),1))){
+ return;
+ }
+ if(type==0){
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),1));
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),7));
+ }else if(type == 1){
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),1));
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),28));
+ }
break;
}
@@ -98,7 +161,7 @@
//���������
axisX = new Axis(); //X���
axisX.setHasTiltedLabels(false); //X���������������������������������������������true���������������
- axisX.setName("���������"); //������������
+ axisX.setName("���������������������"); //������������
axisX.setTextSize(10);//������������������
axisX.setTextColor(getResources().getColor(R.color.red_txt));
// axisX.setMaxLabelChars(7); //������������X���������������������������������������X���������������������7<=x<=mAxisXValues.length
--
Gitblit v1.8.0