diff --git a/.idea/modules.xml b/.idea/modules.xml index 9c7f509..1e51467 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -9,6 +9,7 @@ + diff --git a/app/libs/processor.jar b/app/libs/processor.jar index adae491..bb4f539 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/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java index 5c519c8..653ef8c 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -38,15 +38,15 @@ public class AppConfig { public static String APP_IS_START = "app_is_start"; //http://campus.myjxt.com/ -// public static String BASE_URL="http://60.190.202.57:1000/"; -// public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; -// public static String BASE_URL_FILE="http://60.190.202.57:8196"; + public static String BASE_URL="http://60.190.202.57:1000/"; + public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; + public static String BASE_URL_FILE="http://60.190.202.57:8196"; //正式 - public static String BASE_URL="http://campus.myjxt.com/"; - public static String BASE_URL_ORDER="http://parent.myjxt.com/"; - public static String BASE_URL_FILE="http://manage.myjxt.com"; +// public static String BASE_URL="http://campus.myjxt.com/"; +// public static String BASE_URL_ORDER="http://parent.myjxt.com/"; +// public static String BASE_URL_FILE="http://manage.myjxt.com"; // public static final String url_version = BASE_URL + "api/Common/AppVersion?appType=3"; diff --git a/app/src/main/java/com/shunzhi/parent/bean/report/ChatBean.java b/app/src/main/java/com/shunzhi/parent/bean/report/ChatBean.java new file mode 100644 index 0000000..9b1e922 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/bean/report/ChatBean.java @@ -0,0 +1,26 @@ +package com.shunzhi.parent.bean.report; + +/** + * Created by lenovo on 2018/4/10. + */ + +public class ChatBean { + public String date; + public float gap; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public float getGap() { + return gap; + } + + public void setGap(float gap) { + this.gap = gap; + } +} diff --git a/app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java b/app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java index e9bd8c5..1ffd544 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java @@ -4,9 +4,11 @@ import com.google.gson.JsonObject; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.IBaseModel; import com.share.mvpsdk.base.IBaseView; +import com.shunzhi.parent.bean.report.ChatBean; import com.shunzhi.parent.bean.report.SceneDetialBean; import java.util.List; +import java.util.Map; import io.reactivex.Observable; @@ -23,6 +25,7 @@ public interface ReportSceneContract { } interface IReportSceneView extends IBaseView { void showSceneList(List list); + void showChart(Listlist1, Listlist2, Listlist3); void showSceneInfo(String rank,String scoree,String pscoree,String sceneName); } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java index 46e8fb1..27fac5b 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java @@ -5,6 +5,7 @@ import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.share.mvpsdk.utils.ToastUtils; +import com.shunzhi.parent.bean.report.ChatBean; import com.shunzhi.parent.bean.report.SceneDetialBean; import com.shunzhi.parent.contract.report.ReportSceneContract; import com.shunzhi.parent.model.report.ReportSceneModel; @@ -49,7 +50,30 @@ public class ReportScenePresenter extends ReportSceneContract.ReportScenePresent SceneDetialBean bean = g.fromJson(it.next().toString(), SceneDetialBean.class); //String转化成JavaBean list.add(bean); //加入list } + Listlist1=new ArrayList<>(); + Listlist2=new ArrayList<>(); + Listlist3=new ArrayList<>(); + JsonArray objectGap = data.getAsJsonArray("objectGap"); + JsonArray averageGap = data.getAsJsonArray("averageGap"); + JsonArray highGap = data.getAsJsonArray("highGap"); + Iterator it1 = objectGap.iterator(); //Iterator处理 + while (it1.hasNext()) { //循环 + ChatBean bean = g.fromJson(it1.next().toString(), ChatBean.class); //String转化成JavaBean + list1.add(bean); //加入list + } + Iterator it2 = averageGap.iterator(); //Iterator处理 + while (it2.hasNext()) { //循环 + ChatBean bean = g.fromJson(it2.next().toString(), ChatBean.class); //String转化成JavaBean + list2.add(bean); //加入list + } + Iterator it3 = highGap.iterator(); //Iterator处理 + while (it3.hasNext()) { //循环 + ChatBean bean = g.fromJson(it3.next().toString(), ChatBean.class); //String转化成JavaBean + list3.add(bean); //加入list + } + mIView.showSceneList(list); + mIView.showChart(list1,list2,list3); mIView.showSceneInfo(rank,scoree,pscoree,sceneName); } }, new Consumer() { diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java index 28c4a66..26bcb01 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java @@ -20,6 +20,7 @@ import com.shunzhi.parent.bean.ReportBean; import com.shunzhi.parent.contract.report.ReportContract; import com.shunzhi.parent.popu.ShaiXuanPop; import com.shunzhi.parent.presenter.report.ReportPresenter; +import com.shunzhi.parent.ui.activity.report.ReportSceneActivity; import java.util.List; @@ -60,6 +61,9 @@ public class ChengZhangFragment extends BaseMVPCompatFragment list) { + scenenlist.clear(); + scenenlist.addAll(list); + sceneDetialAdapter.addAll(scenenlist); + sceneDetialAdapter.notifyDataSetChanged(); + } + + @Override + public void showChart(List list1, List list2, List list3) { 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); + List inputDataList3 = new ArrayList<>(); + for (int i = 0; i < list1.size(); i++) { + InputData inputData = new InputData(list1.get(i).getDate(), (long)list1.get(i).getGap()); inputDataList1.add(inputData); } chartView.setChartPaths(inputDataList1); - for (int i = 0; i < 7; i++) { - InputData inputData = new InputData("3/" + i, 15 * i); + for (int i = 0; i < list2.size(); i++) { + InputData inputData = new InputData(list2.get(i).getDate(), (long)list2.get(i).getGap()); inputDataList2.add(inputData); } chartView.setChartPaths(inputDataList2); - } + for (int i = 0; i list) { - scenenlist.clear(); - scenenlist.addAll(list); - sceneDetialAdapter.addAll(scenenlist); - sceneDetialAdapter.notifyDataSetChanged(); } - @SuppressLint("ResourceAsColor") @Override public void showSceneInfo(String rank, String scoree, String pscoree,String sceneName) { tv_rank.setText("等级：" + rank); + Resources res=getResources(); if(!scoree.startsWith("-")){ scoree="+"+scoree; - tv_scoree.setTextColor(R.color.textGreen); + tv_scoree.setTextColor(res.getColor(R.color.textGreen)); }else{ - tv_scoree.setTextColor(R.color.textRed); + tv_scoree.setTextColor(res.getColor(R.color.textRed)); } tv_scoree.setText("得分：" + scoree); tv_pscoree.setText("绩点：" + pscoree); -- libgit2 0.21.0