diff --git a/.idea/modules.xml b/.idea/modules.xml index 889474f..9c7f509 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,8 +4,9 @@ - + + diff --git a/app/libs/processor.jar b/app/libs/processor.jar index f4074fc..736f438 100644 Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ diff --git a/app/src/main/java/com/shunzhi/parent/adapter/ReportSceneAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/ReportSceneAdapter.java new file mode 100644 index 0000000..1f8fca1 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/adapter/ReportSceneAdapter.java @@ -0,0 +1,52 @@ +package com.shunzhi.parent.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.LinearLayout; + +import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter; +import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder; +import com.shunzhi.parent.R; +import com.shunzhi.parent.bean.report.SceneDetialBean; + +/** + * Created by Administrator on 2018/3/30 0030. + */ + +public class ReportSceneAdapter extends BaseRecyclerViewAdapter { + Context context; + + public ReportSceneAdapter(Context context) { + this.context = context; + } + + + @Override + public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(context).inflate(R.layout.item_scene_detial, parent,false); + return new MyViewHolder(view); + } + + private class MyViewHolder extends BaseRecyclerViewHolder { + + LinearLayout item_view; + + public MyViewHolder(View view) { + super(view); + item_view = view.findViewById(R.id.item_view); + } + + @Override + public void onBindViewHolder(SceneDetialBean object, int position) { + item_view.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); + } + + } +} diff --git a/app/src/main/java/com/shunzhi/parent/bean/report/SceneDetialBean.java b/app/src/main/java/com/shunzhi/parent/bean/report/SceneDetialBean.java new file mode 100644 index 0000000..2de420c --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/bean/report/SceneDetialBean.java @@ -0,0 +1,8 @@ +package com.shunzhi.parent.bean.report; + +/** + * Created by Administrator on 2018/3/30 0030. + */ + +public class SceneDetialBean { +} diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportSceneActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportSceneActivity.java index 158793a..cdca10d 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportSceneActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportSceneActivity.java @@ -19,7 +19,7 @@ import com.shunzhi.parent.ui.fragment.report.ReportSceneFragment; * Created by Administrator on 2018/3/28 0028. */ -public class ReportSceneActivity extends BaseMVPCompatActivity implements View.OnClickListener{ +public class ReportSceneActivity extends BaseMVPCompatActivity implements View.OnClickListener { public static void getInstance(Context context) { Intent intent = new Intent(context, ReportSceneActivity.class); context.startActivity(intent); @@ -45,6 +45,7 @@ public class ReportSceneActivity extends BaseMVPCompatActivity implements View. protected void initView(Bundle savedInstanceState) { initViews(); } + private void initViews() { reportSceneFragment = new ReportSceneFragment(); ivBack = findViewById(R.id.back_top); @@ -58,6 +59,7 @@ public class ReportSceneActivity extends BaseMVPCompatActivity implements View. .show(reportSceneFragment).commit(); } + @Override protected int getLayoutId() { return R.layout.activity_report_scene; @@ -65,6 +67,6 @@ public class ReportSceneActivity extends BaseMVPCompatActivity implements View. @Override public void onClick(View v) { - + finish(); } } diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java index 629a3ab..3f19605 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java @@ -3,18 +3,32 @@ package com.shunzhi.parent.ui.fragment.report; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; +import com.share.mvpsdk.view.chartview.ChartView; +import com.share.mvpsdk.view.chartview.data.InputData; import com.shunzhi.parent.R; +import com.shunzhi.parent.adapter.ReportSceneAdapter; +import com.shunzhi.parent.bean.report.SceneDetialBean; + +import java.util.ArrayList; +import java.util.List; /** * Created by Administrator on 2018/3/28 0028. */ public class ReportSceneFragment extends BaseMVPCompatFragment { + private RecyclerView recycle_scene; + private ReportSceneAdapter sceneDetialAdapter; + List list=new ArrayList<>(); + + private ChartView chartView; @NonNull @Override public BasePresenter initPresenter() { @@ -28,7 +42,51 @@ public class ReportSceneFragment extends BaseMVPCompatFragment { @Override public void initUI(View view, @Nullable Bundle savedInstanceState) { + recycle_scene=view.findViewById(R.id.recycle_scene); + chartView=view.findViewById(R.id.chartView); + recycle_scene.setLayoutManager(new LinearLayoutManager(getActivity())); + sceneDetialAdapter=new ReportSceneAdapter(getActivity()); + SceneDetialBean sceneDetialBean=new SceneDetialBean(); + list.add(sceneDetialBean); + list.add(sceneDetialBean); + list.add(sceneDetialBean); + sceneDetialAdapter.addAll(list); + recycle_scene.setAdapter(sceneDetialAdapter); + + initChartViews(); } + + private void initChartViews() { + + chartView.setColors(R.color.textColor,R.color.huodong_blue,R.color.gray); + List inputDataList=new ArrayList<>(); + List inputDataList1=new ArrayList<>(); + List inputDataList2=new ArrayList<>(); + for (int i = 0; i < 7; i++) { + InputData inputData=new InputData("3/"+i,10*i); + inputDataList.add(inputData); + } + + chartView.setChartPaths(inputDataList); + + for (int i = 0; i < 7; i++) { + InputData inputData=new InputData("3/"+i,20*i); + inputDataList1.add(inputData); + } + + chartView.setChartPaths(inputDataList1); + + for (int i = 0; i < 7; i++) { + InputData inputData=new InputData("3/"+i,15*i); + inputDataList2.add(inputData); + } + + chartView.setChartPaths(inputDataList2); + + } + + + } diff --git a/app/src/main/res/layout/fragment_report_scene.xml b/app/src/main/res/layout/fragment_report_scene.xml index 545e83b..4bc2afa 100644 --- a/app/src/main/res/layout/fragment_report_scene.xml +++ b/app/src/main/res/layout/fragment_report_scene.xml @@ -122,25 +122,32 @@ - + + + android:textColor="@color/md_red_500" + android:background="@color/huodong_blue" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- libgit2 0.21.0