diff --git a/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java b/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java
index 287afed..50112c2 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java
@@ -23,7 +23,7 @@ public interface ReportDetialContract {
}
interface IReportDetialView extends IBaseView {
void showDetialList(List<DeyuDetialBean> list);
- void showDetialInfo(String rank, String scoree, String pscoree, String sceneName);
+ void showDetialInfo(String rank, String scoree, String bijiao1,String bijiao2,String bijiao3,String bijiao4,String describe);
}
}
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java
index d6b52db..4d1e2d5 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java
@@ -46,6 +46,7 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres
list.add(bean); //加入list
}
mIView.showDetialList(list);
+ mIView.showDetialInfo("","","","","","","");
}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java
index ebec6d1..49596bc 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java
@@ -6,6 +6,7 @@ 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,11 +15,13 @@ import com.share.mvpsdk.view.chartview.data.InputData;
import com.shunzhi.parent.R;
import com.shunzhi.parent.adapter.DeyuDetialAdapter;
import com.shunzhi.parent.bean.report.DeyuDetialBean;
-import com.shunzhi.parent.bean.report.SceneDetialBean;
import com.shunzhi.parent.contract.report.ReportDetialContract;
import com.shunzhi.parent.presenter.report.ReportDetialPresenter;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
/**
@@ -32,6 +35,9 @@ implements ReportDetialContract.IReportDetialView{
private DeyuDetialAdapter deyuDetialAdapter;
List<DeyuDetialBean>list=new ArrayList<>();
+ private TextView tv_source,tv_bijiao1,tv_bijiao2,tv_bijiao3,tv_bijiao4,tv_date,tv_ranking,tv_describe;
+
+
private ChartView chartView;
@NonNull
@Override
@@ -48,6 +54,20 @@ implements ReportDetialContract.IReportDetialView{
public void initUI(View view, @Nullable Bundle savedInstanceState) {
recycle_deyu=view.findViewById(R.id.recycle_deyu);
chartView=view.findViewById(R.id.chartView);
+ tv_source = view.findViewById(R.id.tv_source);
+ tv_bijiao1 = view.findViewById(R.id.tv_bijiao1);
+ tv_bijiao2 = view.findViewById(R.id.tv_bijiao2);
+ tv_bijiao3 = view.findViewById(R.id.tv_bijiao3);
+ tv_bijiao4 = view.findViewById(R.id.tv_bijiao4);
+ tv_date = view.findViewById(R.id.tv_date);
+ tv_ranking = view.findViewById(R.id.tv_ranking);
+ tv_describe = view.findViewById(R.id.tv_describe);
+ Calendar c=Calendar.getInstance();
+ Date date=c.getTime();
+ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+ String dateStr=sdf.format(date);
+ tv_date.setText(dateStr);
+
recycle_deyu.setLayoutManager(new LinearLayoutManager(getActivity()));
deyuDetialAdapter=new DeyuDetialAdapter(getActivity());
deyuDetialAdapter.addAll(list);
@@ -78,12 +98,18 @@ implements ReportDetialContract.IReportDetialView{
}
@Override
- public void showDetialList(List<SceneDetialBean> list) {
+ public void showDetialList(List<DeyuDetialBean> list) {
}
@Override
- public void showDetialInfo(String rank, String scoree, String pscoree, String sceneName) {
-
+ public void showDetialInfo(String rank, String scoree, String bijiao1,String bijiao2,String bijiao3,String bijiao4,String describe) {
+ tv_source.setText(scoree);
+ tv_bijiao1 .setText(bijiao1);
+ tv_bijiao2 .setText(bijiao2);
+ tv_bijiao3 .setText(bijiao3);
+ tv_bijiao4 .setText(bijiao4);
+ tv_ranking.setText(rank);
+ tv_describe .setText(describe);
}
}
diff --git a/app/src/main/res/layout/fragment_report_detial.xml b/app/src/main/res/layout/fragment_report_detial.xml
index 877354d..8cb8b72 100644
--- a/app/src/main/res/layout/fragment_report_detial.xml
+++ b/app/src/main/res/layout/fragment_report_detial.xml
@@ -60,6 +60,7 @@
android:textSize="@dimen/sp_16" />
<TextView
+ android:id="@+id/tv_source"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@@ -70,6 +71,7 @@
android:textSize="@dimen/dp_36" />
<TextView
+ android:id="@+id/tv_bijiao1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@@ -80,6 +82,7 @@
android:textSize="@dimen/sp_16" />
<TextView
+ android:id="@+id/tv_bijiao2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
@@ -99,6 +102,7 @@
android:orientation="vertical">
<TextView
+ android:id="@+id/tv_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@@ -109,6 +113,7 @@
android:textSize="@dimen/sp_16" />
<TextView
+ android:id="@+id/tv_ranking"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@@ -119,6 +124,7 @@
android:textSize="@dimen/dp_36" />
<TextView
+ android:id="@+id/tv_bijiao3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@@ -129,6 +135,7 @@
android:textSize="@dimen/sp_16" />
<TextView
+ android:id="@+id/tv_bijiao4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
@@ -145,6 +152,7 @@
</LinearLayout>
<TextView
+ android:id="@+id/tv_describe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_dp_30"
--
libgit2 0.21.0