From 24a5ea4a93631d0821d1a0fa730dd6475ba2eda5 Mon Sep 17 00:00:00 2001 From: 姚旭斌 <15805828761@163.com> Date: Wed, 4 Apr 2018 09:47:58 +0800 Subject: [PATCH] no message --- app/libs/processor.jar | Bin 5038 -> 0 bytes app/src/main/assets/migrations/3.sql | 3 +++ app/src/main/java/com/shunzhi/parent/AppConfig.java | 14 +++++++------- app/src/main/java/com/shunzhi/parent/adapter/ReportSceneAdapter.java | 12 ++++++++++++ app/src/main/java/com/shunzhi/parent/api/ReportApi.java | 16 ++++++++++++++++ app/src/main/java/com/shunzhi/parent/bean/report/SceneDetialBean.java | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- app/src/main/java/com/shunzhi/parent/contract/report/ReportContract.java | 2 +- app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java | 29 +++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/model/report/ReportModel.java | 5 ----- app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java | 26 ++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java | 70 +++++++++++++++++++++++++++++++++++++++++++++++++--------------------- app/src/main/res/layout/fragment_report_scene.xml | 4 ++++ app/src/main/res/layout/item_report_deyu.xml | 2 +- 14 files changed, 291 insertions(+), 36 deletions(-) create mode 100644 app/src/main/assets/migrations/3.sql create mode 100644 app/src/main/java/com/shunzhi/parent/api/ReportApi.java create mode 100644 app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java create mode 100644 app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java create mode 100644 app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java diff --git a/app/libs/processor.jar b/app/libs/processor.jar index 486ef7a..50813e0 100644 Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ diff --git a/app/src/main/assets/migrations/3.sql b/app/src/main/assets/migrations/3.sql new file mode 100644 index 0000000..24d224b --- /dev/null +++ b/app/src/main/assets/migrations/3.sql @@ -0,0 +1,3 @@ +ALTER table test ADD COLUMN age INTEGER +ALTER table test ADD COLUMN area INTEGER +ALTER table test ADD COLUMN name TEXT diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java index 0a51b78..653ef8c 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -38,16 +38,16 @@ 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 final String url_version = BASE_URL + "api/Common/AppVersion?appType=3"; +// 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/adapter/ReportSceneAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/ReportSceneAdapter.java index 1f8fca1..94faa84 100644 --- a/app/src/main/java/com/shunzhi/parent/adapter/ReportSceneAdapter.java +++ b/app/src/main/java/com/shunzhi/parent/adapter/ReportSceneAdapter.java @@ -5,6 +5,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import android.widget.TextView; import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter; import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder; @@ -32,14 +33,25 @@ public class ReportSceneAdapter extends BaseRecyclerViewAdapter private class MyViewHolder extends BaseRecyclerViewHolder { LinearLayout item_view; + TextView leavel,txt_info,count,name,time; public MyViewHolder(View view) { super(view); item_view = view.findViewById(R.id.item_view); + leavel=view.findViewById(R.id.leavel); + txt_info=view.findViewById(R.id.txt_info); + count=view.findViewById(R.id.count); + name=view.findViewById(R.id.name); + time=view.findViewById(R.id.time); } @Override public void onBindViewHolder(SceneDetialBean object, int position) { + leavel.setText(object.getDimensionName()); + txt_info.setText(object.getSceneName()+"-"+object.getLableName()); + count.setText(object.getScore()); + name.setText(object.getStudentName()); + time.setText(object.getRecordTime()); item_view.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/shunzhi/parent/api/ReportApi.java b/app/src/main/java/com/shunzhi/parent/api/ReportApi.java new file mode 100644 index 0000000..37bd7d1 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/api/ReportApi.java @@ -0,0 +1,16 @@ +package com.shunzhi.parent.api; + +import com.google.gson.JsonObject; + +import io.reactivex.Observable; +import retrofit2.http.GET; +import retrofit2.http.Query; + +/** + * Created by Administrator on 2018/4/3 0003. + */ + +public interface ReportApi { + @GET("/api/EvaluationLabel/GetSceneAnalysisDetails") + Observable getSceneDetial(@Query("ObjectId") String ObjectId, @Query("SchoolId") int SchoolId, @Query("ObjectType") int ObjectType); +} 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 index 2de420c..e045df5 100644 --- a/app/src/main/java/com/shunzhi/parent/bean/report/SceneDetialBean.java +++ b/app/src/main/java/com/shunzhi/parent/bean/report/SceneDetialBean.java @@ -1,8 +1,84 @@ package com.shunzhi.parent.bean.report; +import java.io.Serializable; + /** * Created by Administrator on 2018/3/30 0030. */ -public class SceneDetialBean { +public class SceneDetialBean implements Serializable{ +String describe; +String lableName; +String dimensionName; +String sceneName; +String studentName; +String className; +String recordTime; +String score; + + public String getScore() { + return score; + } + + public void setScore(String score) { + this.score = score; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getLableName() { + return lableName; + } + + public void setLableName(String lableName) { + this.lableName = lableName; + } + + public String getDimensionName() { + return dimensionName; + } + + public void setDimensionName(String dimensionName) { + this.dimensionName = dimensionName; + } + + public String getSceneName() { + return sceneName; + } + + public void setSceneName(String sceneName) { + this.sceneName = sceneName; + } + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } + + public String getRecordTime() { + return recordTime; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + } diff --git a/app/src/main/java/com/shunzhi/parent/contract/report/ReportContract.java b/app/src/main/java/com/shunzhi/parent/contract/report/ReportContract.java index 0e10054..47f2071 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/report/ReportContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/report/ReportContract.java @@ -21,7 +21,7 @@ public interface ReportContract { } interface IReportModel extends IBaseModel{ Observable getReportResult(); - void getReports(); + } interface IReportView extends IBaseView{ void UpdateList(Listlist); 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 new file mode 100644 index 0000000..c800aa9 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java @@ -0,0 +1,29 @@ +package com.shunzhi.parent.contract.report; + +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.SceneDetialBean; + +import java.util.List; + +import io.reactivex.Observable; + +/** + * Created by Administrator on 2018/4/3 0003. + */ + +public interface ReportSceneContract { + abstract class ReportScenePresenter extends BasePresenter{ + public abstract void reportSceneResult(String objectId,int schoolId,int objectType); + } + interface IReportSceneModel extends IBaseModel { + Observable getReportSceneResult(String objectId, int schoolId, int objectType); + } + interface IReportSceneView extends IBaseView { + void showSceneList(List list); + void showSceneInfo(String rank,String scoree,String pscoree,String sceneName); + + } +} diff --git a/app/src/main/java/com/shunzhi/parent/model/report/ReportModel.java b/app/src/main/java/com/shunzhi/parent/model/report/ReportModel.java index ba6b044..5d8f943 100644 --- a/app/src/main/java/com/shunzhi/parent/model/report/ReportModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/report/ReportModel.java @@ -18,9 +18,4 @@ public class ReportModel implements ReportContract.IReportModel { public Observable getReportResult() { return null; } - - @Override - public void getReports() { - - } } diff --git a/app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java b/app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java new file mode 100644 index 0000000..fe1ba40 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java @@ -0,0 +1,26 @@ +package com.shunzhi.parent.model.report; + +import com.google.gson.JsonObject; +import com.share.mvpsdk.helper.RetrofitCreateHelper; +import com.share.mvpsdk.helper.RxHelper; +import com.shunzhi.parent.AppConfig; +import com.shunzhi.parent.api.ReportApi; +import com.shunzhi.parent.contract.report.ReportSceneContract; + +import io.reactivex.Observable; + +/** + * Created by Administrator on 2018/4/3 0003. + */ + +public class ReportSceneModel implements ReportSceneContract.IReportSceneModel { + + public static ReportSceneModel newInstance() { + return new ReportSceneModel(); + } + @Override + public Observable getReportSceneResult(String ObjectId, int schoolId, int objectType) { + return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL) + .getSceneDetial(ObjectId,schoolId,objectType).compose(RxHelper.rxSchedulerHelper()); + } +} 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 new file mode 100644 index 0000000..c44a7f0 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java @@ -0,0 +1,66 @@ +package com.shunzhi.parent.presenter.report; + + +import android.util.Log; + +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.SceneDetialBean; +import com.shunzhi.parent.contract.report.ReportSceneContract; +import com.shunzhi.parent.model.report.ReportSceneModel; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import io.reactivex.functions.Consumer; + +/** + * Created by Administrator on 2018/4/3 0003. + */ + +public class ReportScenePresenter extends ReportSceneContract.ReportScenePresenter { + @Override + public ReportSceneContract.IReportSceneModel getModel() { + return ReportSceneModel.newInstance(); + } + + @Override + public void onStart() { + + } + + @Override + public void reportSceneResult(String objectId, int schoolId, int objectType) { + mRxManager.register(mIModel.getReportSceneResult(objectId, schoolId, objectType).subscribe(new Consumer() { + @Override + public void accept(JsonObject jsonObject) throws Exception { + ToastUtils.showToast(jsonObject.toString()); + JsonObject data = jsonObject.getAsJsonObject("data"); + JsonArray behaviorArray = data.getAsJsonArray("behavior"); + String rank = data.get("rank").getAsString(); + String scoree = data.get("scoree").getAsString(); + String pscoree = data.get("pscoree").getAsString(); + String sceneName = data.get("sceneName").getAsString(); + Gson g = new Gson(); + List list = new ArrayList<>(); + Iterator it = behaviorArray.iterator(); //Iterator处理 + int i=0; + while (it.hasNext()) { //循环 + SceneDetialBean bean = g.fromJson(it.next().toString(), SceneDetialBean.class); //String转化成JavaBean + list.add(bean); //加入list + } + mIView.showSceneList(list); + mIView.showSceneInfo(rank,scoree,pscoree,sceneName); + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + + } + })); + + } +} 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 3f19605..9fdc79f 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 @@ -1,11 +1,13 @@ package com.shunzhi.parent.ui.fragment.report; +import android.annotation.SuppressLint; 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 android.widget.TextView; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; @@ -14,6 +16,8 @@ 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 com.shunzhi.parent.contract.report.ReportSceneContract; +import com.shunzhi.parent.presenter.report.ReportScenePresenter; import java.util.ArrayList; import java.util.List; @@ -22,17 +26,19 @@ import java.util.List; * Created by Administrator on 2018/3/28 0028. */ -public class ReportSceneFragment extends BaseMVPCompatFragment { +public class ReportSceneFragment extends BaseMVPCompatFragment + implements ReportSceneContract.IReportSceneView { private RecyclerView recycle_scene; - private ReportSceneAdapter sceneDetialAdapter; - List list=new ArrayList<>(); - + private ReportSceneAdapter sceneDetialAdapter; + List scenenlist = new ArrayList<>(); + private TextView tv_rank, tv_scoree, tv_pscoree,tv_sceneName; private ChartView chartView; + @NonNull @Override public BasePresenter initPresenter() { - return null; + return new ReportScenePresenter(); } @Override @@ -42,17 +48,17 @@ 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 = view.findViewById(R.id.recycle_scene); + chartView = view.findViewById(R.id.chartView); + tv_rank = view.findViewById(R.id.rank); + tv_scoree = view.findViewById(R.id.scoree); + tv_pscoree = view.findViewById(R.id.pscoree); + tv_sceneName = view.findViewById(R.id.sceneName); 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); + sceneDetialAdapter = new ReportSceneAdapter(getActivity()); + sceneDetialAdapter.addAll(scenenlist); recycle_scene.setAdapter(sceneDetialAdapter); - + mPresenter.reportSceneResult("102697", 1, 0); initChartViews(); @@ -60,26 +66,26 @@ public class ReportSceneFragment extends BaseMVPCompatFragment { 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<>(); + 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); + 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); + 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); + InputData inputData = new InputData("3/" + i, 15 * i); inputDataList2.add(inputData); } @@ -88,5 +94,27 @@ public class ReportSceneFragment extends BaseMVPCompatFragment { } + @Override + public void showSceneList(List 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); + if(!scoree.startsWith("-")){ + scoree="+"+scoree; + tv_scoree.setTextColor(R.color.textGreen); + }else{ + tv_scoree.setTextColor(R.color.textRed); + } + tv_scoree.setText("得分：" + scoree); + tv_pscoree.setText("绩点：" + pscoree); + tv_sceneName.setText(sceneName); + } } diff --git a/app/src/main/res/layout/fragment_report_scene.xml b/app/src/main/res/layout/fragment_report_scene.xml index 4bc2afa..4ea1a8c 100644 --- a/app/src/main/res/layout/fragment_report_scene.xml +++ b/app/src/main/res/layout/fragment_report_scene.xml @@ -64,6 +64,7 @@ android:orientation="vertical"> -- libgit2 0.21.0