陶汉栋 / ParentWork

Download as
Browse Code »

Commit 49837d23bf20932b324e200f7d29013b1b8b9d3a

Authored by 姚旭斌
1 parent 07503a80
Exists in yxb_dev and in 2 other branches developer, wwx

no message

Showing 4 changed files with 40 additions and 5 deletions   Show diff stats
app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java
  Diff comments   View file @49837d2
@@ -23,7 +23,7 @@ public interface ReportDetialContract { @@ -23,7 +23,7 @@ public interface ReportDetialContract {
23 } 23 }
24 interface IReportDetialView extends IBaseView { 24 interface IReportDetialView extends IBaseView {
25 void showDetialList(List<DeyuDetialBean> list); 25 void showDetialList(List<DeyuDetialBean> list);
26 - void showDetialInfo(String rank, String scoree, String pscoree, String sceneName); 26 + void showDetialInfo(String rank, String scoree, String bijiao1,String bijiao2,String bijiao3,String bijiao4,String describe);
27 27
28 } 28 }
29 } 29 }
app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java
  Diff comments   View file @49837d2
@@ -46,6 +46,7 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres @@ -46,6 +46,7 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres
46 list.add(bean); //加入list 46 list.add(bean); //加入list
47 } 47 }
48 mIView.showDetialList(list); 48 mIView.showDetialList(list);
  49 + mIView.showDetialInfo("","","","","","","");
49 50
50 51
51 } 52 }
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java
  Diff comments   View file @49837d2
@@ -6,6 +6,7 @@ import android.support.annotation.Nullable; @@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
6 import android.support.v7.widget.LinearLayoutManager; 6 import android.support.v7.widget.LinearLayoutManager;
7 import android.support.v7.widget.RecyclerView; 7 import android.support.v7.widget.RecyclerView;
8 import android.view.View; 8 import android.view.View;
  9 +import android.widget.TextView;
9 10
10 import com.share.mvpsdk.base.BasePresenter; 11 import com.share.mvpsdk.base.BasePresenter;
11 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; 12 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
@@ -14,11 +15,13 @@ import com.share.mvpsdk.view.chartview.data.InputData; @@ -14,11 +15,13 @@ import com.share.mvpsdk.view.chartview.data.InputData;
14 import com.shunzhi.parent.R; 15 import com.shunzhi.parent.R;
15 import com.shunzhi.parent.adapter.DeyuDetialAdapter; 16 import com.shunzhi.parent.adapter.DeyuDetialAdapter;
16 import com.shunzhi.parent.bean.report.DeyuDetialBean; 17 import com.shunzhi.parent.bean.report.DeyuDetialBean;
17 -import com.shunzhi.parent.bean.report.SceneDetialBean;  
18 import com.shunzhi.parent.contract.report.ReportDetialContract; 18 import com.shunzhi.parent.contract.report.ReportDetialContract;
19 import com.shunzhi.parent.presenter.report.ReportDetialPresenter; 19 import com.shunzhi.parent.presenter.report.ReportDetialPresenter;
20 20
  21 +import java.text.SimpleDateFormat;
21 import java.util.ArrayList; 22 import java.util.ArrayList;
  23 +import java.util.Calendar;
  24 +import java.util.Date;
22 import java.util.List; 25 import java.util.List;
23 26
24 /** 27 /**
@@ -32,6 +35,9 @@ implements ReportDetialContract.IReportDetialView{ @@ -32,6 +35,9 @@ implements ReportDetialContract.IReportDetialView{
32 private DeyuDetialAdapter deyuDetialAdapter; 35 private DeyuDetialAdapter deyuDetialAdapter;
33 List<DeyuDetialBean>list=new ArrayList<>(); 36 List<DeyuDetialBean>list=new ArrayList<>();
34 37
  38 + private TextView tv_source,tv_bijiao1,tv_bijiao2,tv_bijiao3,tv_bijiao4,tv_date,tv_ranking,tv_describe;
  39 +
  40 +
35 private ChartView chartView; 41 private ChartView chartView;
36 @NonNull 42 @NonNull
37 @Override 43 @Override
@@ -48,6 +54,20 @@ implements ReportDetialContract.IReportDetialView{ @@ -48,6 +54,20 @@ implements ReportDetialContract.IReportDetialView{
48 public void initUI(View view, @Nullable Bundle savedInstanceState) { 54 public void initUI(View view, @Nullable Bundle savedInstanceState) {
49 recycle_deyu=view.findViewById(R.id.recycle_deyu); 55 recycle_deyu=view.findViewById(R.id.recycle_deyu);
50 chartView=view.findViewById(R.id.chartView); 56 chartView=view.findViewById(R.id.chartView);
  57 + tv_source = view.findViewById(R.id.tv_source);
  58 + tv_bijiao1 = view.findViewById(R.id.tv_bijiao1);
  59 + tv_bijiao2 = view.findViewById(R.id.tv_bijiao2);
  60 + tv_bijiao3 = view.findViewById(R.id.tv_bijiao3);
  61 + tv_bijiao4 = view.findViewById(R.id.tv_bijiao4);
  62 + tv_date = view.findViewById(R.id.tv_date);
  63 + tv_ranking = view.findViewById(R.id.tv_ranking);
  64 + tv_describe = view.findViewById(R.id.tv_describe);
  65 + Calendar c=Calendar.getInstance();
  66 + Date date=c.getTime();
  67 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
  68 + String dateStr=sdf.format(date);
  69 + tv_date.setText(dateStr);
  70 +
51 recycle_deyu.setLayoutManager(new LinearLayoutManager(getActivity())); 71 recycle_deyu.setLayoutManager(new LinearLayoutManager(getActivity()));
52 deyuDetialAdapter=new DeyuDetialAdapter(getActivity()); 72 deyuDetialAdapter=new DeyuDetialAdapter(getActivity());
53 deyuDetialAdapter.addAll(list); 73 deyuDetialAdapter.addAll(list);
@@ -78,12 +98,18 @@ implements ReportDetialContract.IReportDetialView{ @@ -78,12 +98,18 @@ implements ReportDetialContract.IReportDetialView{
78 } 98 }
79 99
80 @Override 100 @Override
81 - public void showDetialList(List<SceneDetialBean> list) { 101 + public void showDetialList(List<DeyuDetialBean> list) {
82 102
83 } 103 }
84 104
85 @Override 105 @Override
86 - public void showDetialInfo(String rank, String scoree, String pscoree, String sceneName) {  
87 - 106 + public void showDetialInfo(String rank, String scoree, String bijiao1,String bijiao2,String bijiao3,String bijiao4,String describe) {
  107 + tv_source.setText(scoree);
  108 + tv_bijiao1 .setText(bijiao1);
  109 + tv_bijiao2 .setText(bijiao2);
  110 + tv_bijiao3 .setText(bijiao3);
  111 + tv_bijiao4 .setText(bijiao4);
  112 + tv_ranking.setText(rank);
  113 + tv_describe .setText(describe);
88 } 114 }
89 } 115 }
app/src/main/res/layout/fragment_report_detial.xml
  Diff comments   View file @49837d2
@@ -60,6 +60,7 @@ @@ -60,6 +60,7 @@
60 android:textSize="@dimen/sp_16" /> 60 android:textSize="@dimen/sp_16" />
61 61
62 <TextView 62 <TextView
  63 + android:id="@+id/tv_source"
63 android:layout_width="wrap_content" 64 android:layout_width="wrap_content"
64 android:layout_height="wrap_content" 65 android:layout_height="wrap_content"
65 android:gravity="center" 66 android:gravity="center"
@@ -70,6 +71,7 @@ @@ -70,6 +71,7 @@
70 android:textSize="@dimen/dp_36" /> 71 android:textSize="@dimen/dp_36" />
71 72
72 <TextView 73 <TextView
  74 + android:id="@+id/tv_bijiao1"
73 android:layout_width="wrap_content" 75 android:layout_width="wrap_content"
74 android:layout_height="wrap_content" 76 android:layout_height="wrap_content"
75 android:layout_marginTop="10dp" 77 android:layout_marginTop="10dp"
@@ -80,6 +82,7 @@ @@ -80,6 +82,7 @@
80 android:textSize="@dimen/sp_16" /> 82 android:textSize="@dimen/sp_16" />
81 83
82 <TextView 84 <TextView
  85 + android:id="@+id/tv_bijiao2"
83 android:layout_width="wrap_content" 86 android:layout_width="wrap_content"
84 android:layout_height="wrap_content" 87 android:layout_height="wrap_content"
85 android:layout_marginTop="5dp" 88 android:layout_marginTop="5dp"
@@ -99,6 +102,7 @@ @@ -99,6 +102,7 @@
99 android:orientation="vertical"> 102 android:orientation="vertical">
100 103
101 <TextView 104 <TextView
  105 + android:id="@+id/tv_date"
102 android:layout_width="wrap_content" 106 android:layout_width="wrap_content"
103 android:layout_height="wrap_content" 107 android:layout_height="wrap_content"
104 android:layout_gravity="center" 108 android:layout_gravity="center"
@@ -109,6 +113,7 @@ @@ -109,6 +113,7 @@
109 android:textSize="@dimen/sp_16" /> 113 android:textSize="@dimen/sp_16" />
110 114
111 <TextView 115 <TextView
  116 + android:id="@+id/tv_ranking"
112 android:layout_width="wrap_content" 117 android:layout_width="wrap_content"
113 android:layout_height="wrap_content" 118 android:layout_height="wrap_content"
114 android:gravity="center" 119 android:gravity="center"
@@ -119,6 +124,7 @@ @@ -119,6 +124,7 @@
119 android:textSize="@dimen/dp_36" /> 124 android:textSize="@dimen/dp_36" />
120 125
121 <TextView 126 <TextView
  127 + android:id="@+id/tv_bijiao3"
122 android:layout_width="wrap_content" 128 android:layout_width="wrap_content"
123 android:layout_height="wrap_content" 129 android:layout_height="wrap_content"
124 android:layout_marginTop="10dp" 130 android:layout_marginTop="10dp"
@@ -129,6 +135,7 @@ @@ -129,6 +135,7 @@
129 android:textSize="@dimen/sp_16" /> 135 android:textSize="@dimen/sp_16" />
130 136
131 <TextView 137 <TextView
  138 + android:id="@+id/tv_bijiao4"
132 android:layout_width="wrap_content" 139 android:layout_width="wrap_content"
133 android:layout_height="wrap_content" 140 android:layout_height="wrap_content"
134 android:layout_marginTop="5dp" 141 android:layout_marginTop="5dp"
@@ -145,6 +152,7 @@ @@ -145,6 +152,7 @@
145 </LinearLayout> 152 </LinearLayout>
146 153
147 <TextView 154 <TextView
  155 + android:id="@+id/tv_describe"
148 android:layout_width="match_parent" 156 android:layout_width="match_parent"
149 android:layout_height="wrap_content" 157 android:layout_height="wrap_content"
150 android:layout_marginTop="@dimen/size_dp_30" 158 android:layout_marginTop="@dimen/size_dp_30"