diff --git a/.idea/modules.xml b/.idea/modules.xml
index 45d1910..051c5c9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,8 +4,9 @@
-
+
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9b2e63d..9ee7b74 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -186,6 +186,12 @@
+
+
{
@Override
public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- View view = LayoutInflater.from(context).inflate(R.layout.item_childlist, null);
+ View view = LayoutInflater.from(context).inflate(R.layout.item_childlist, parent,false);
return new MyViewHolder(view);
}
diff --git a/app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java
new file mode 100644
index 0000000..1090e93
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java
@@ -0,0 +1,52 @@
+package com.shunzhi.parent.adapter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+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.DeyuDetialBean;
+import com.shunzhi.parent.ui.activity.report.ReportSceneActivity;
+
+/**
+ * Created by Administrator on 2018/3/28 0028.
+ */
+
+public class DeyuDetialAdapter extends BaseRecyclerViewAdapter {
+ private Context mContext = null;
+
+ public DeyuDetialAdapter(Context context) {
+ mContext = context;
+ }
+
+
+ @Override
+ public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ View view = LayoutInflater.from(mContext).inflate(R.layout.item_deyu_detial, parent, false);
+ return new DeyuDetialAdapter.DeyuDetialViewHolder(view);
+ }
+
+ private class DeyuDetialViewHolder extends BaseRecyclerViewHolder {
+
+
+ public DeyuDetialViewHolder(View itemView) {
+ super(itemView);
+
+ }
+
+ @Override
+ public void onBindViewHolder(final DeyuDetialBean object, int position) {
+ itemView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mContext.startActivity(new Intent().setClass(mContext, ReportSceneActivity.class));
+ }
+ });
+
+ }
+ }
+}
diff --git a/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java
index fdd54b9..c38ffdb 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java
@@ -2,15 +2,17 @@ package com.shunzhi.parent.adapter;
import android.content.Context;
+import android.content.Intent;
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.ReportBean;
-import com.shunzhi.parent.views.ProgressView;
+import com.shunzhi.parent.ui.activity.report.ReportDetialActivity;
/**
* Created by Administrator on 2018/3/9 0009.
@@ -27,25 +29,32 @@ public class ReportAdapter extends BaseRecyclerViewAdapter {
@Override
public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- View view = LayoutInflater.from(context).inflate(R.layout.item_report, null);
+ View view = LayoutInflater.from(context).inflate(R.layout.item_report_deyu, parent,false);
return new MyViewHolder(view);
}
private class MyViewHolder extends BaseRecyclerViewHolder {
- ProgressView ringView;
-
+ // ProgressView ringView;
+ LinearLayout deyu_content;
public MyViewHolder(View view) {
super(view);
- ringView = view.findViewById(R.id.ring);
+// ringView = view.findViewById(R.id.ring);
+ deyu_content = view.findViewById(R.id.deyu_content);
}
@Override
public void onBindViewHolder(ReportBean object, int position) {
- ringView.setMaxCount(100.0f);
- ringView.setCurrentCount(100);
- ringView.setScore(100);
+// ringView.setMaxCount(100.0f);
+// ringView.setCurrentCount(100);
+// ringView.setScore(100);
+ deyu_content.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ context.startActivity(new Intent().setClass(context, ReportDetialActivity.class));
+ }
+ });
}
}
diff --git a/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
index d6e4701..2214e1a 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
@@ -51,7 +51,7 @@ public class SchoolListAdapter extends BaseRecyclerViewAdapter {
@Override
public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- View view = LayoutInflater.from(context).inflate(R.layout.item_school, null);
+ View view = LayoutInflater.from(context).inflate(R.layout.item_school, parent,false);
return new MyViewHolder(view);
}
diff --git a/app/src/main/java/com/shunzhi/parent/bean/report/DeyuDetialBean.java b/app/src/main/java/com/shunzhi/parent/bean/report/DeyuDetialBean.java
new file mode 100644
index 0000000..7537ccc
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/bean/report/DeyuDetialBean.java
@@ -0,0 +1,8 @@
+package com.shunzhi.parent.bean.report;
+
+/**
+ * Created by Administrator on 2018/3/28 0028.
+ */
+
+public class DeyuDetialBean {
+}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportDetialActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportDetialActivity.java
new file mode 100644
index 0000000..072d152
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportDetialActivity.java
@@ -0,0 +1,72 @@
+package com.shunzhi.parent.ui.activity.report;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentTransaction;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.share.mvpsdk.base.BasePresenter;
+import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
+import com.shunzhi.parent.R;
+import com.shunzhi.parent.ui.fragment.report.ReportDetialFragment;
+
+/**
+ * Created by Administrator on 2018/3/28 0028.
+ */
+
+public class ReportDetialActivity extends BaseMVPCompatActivity implements View.OnClickListener{
+ public static void getInstance(Context context) {
+ Intent intent = new Intent(context, ReportDetialActivity.class);
+ context.startActivity(intent);
+ }
+
+ TextView center_title;
+
+ ImageView ivBack;
+
+ FrameLayout frame_detial;
+
+ FragmentTransaction fragmentTransaction = null;
+
+ ReportDetialFragment reportDetialFragment = null;
+
+ @NonNull
+ @Override
+ public BasePresenter initPresenter() {
+ return null;
+ }
+
+ @Override
+ protected void initView(Bundle savedInstanceState) {
+ initViews();
+ }
+
+ private void initViews() {
+ reportDetialFragment = new ReportDetialFragment();
+ ivBack = findViewById(R.id.back_top);
+ frame_detial = findViewById(R.id.frame_detial);
+ center_title = findViewById(R.id.center_title);
+ center_title.setText("德育报告");
+ ivBack.setOnClickListener(this);
+
+ fragmentTransaction = getSupportFragmentManager().beginTransaction();
+ fragmentTransaction.add(R.id.frame_detial, reportDetialFragment)
+ .show(reportDetialFragment).commit();
+
+ }
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.activity_report_detial;
+ }
+
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+}
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
new file mode 100644
index 0000000..158793a
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportSceneActivity.java
@@ -0,0 +1,70 @@
+package com.shunzhi.parent.ui.activity.report;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentTransaction;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.share.mvpsdk.base.BasePresenter;
+import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
+import com.shunzhi.parent.R;
+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 static void getInstance(Context context) {
+ Intent intent = new Intent(context, ReportSceneActivity.class);
+ context.startActivity(intent);
+ }
+
+ TextView center_title;
+
+ ImageView ivBack;
+
+ FrameLayout frame_scene;
+
+ FragmentTransaction fragmentTransaction = null;
+
+ ReportSceneFragment reportSceneFragment = null;
+
+ @NonNull
+ @Override
+ public BasePresenter initPresenter() {
+ return null;
+ }
+
+ @Override
+ protected void initView(Bundle savedInstanceState) {
+ initViews();
+ }
+ private void initViews() {
+ reportSceneFragment = new ReportSceneFragment();
+ ivBack = findViewById(R.id.back_top);
+ frame_scene = findViewById(R.id.frame_scene);
+ center_title = findViewById(R.id.center_title);
+ center_title.setText("场景详情");
+ ivBack.setOnClickListener(this);
+
+ fragmentTransaction = getSupportFragmentManager().beginTransaction();
+ fragmentTransaction.add(R.id.frame_scene, reportSceneFragment)
+ .show(reportSceneFragment).commit();
+
+ }
+ @Override
+ protected int getLayoutId() {
+ return R.layout.activity_report_scene;
+ }
+
+ @Override
+ public void onClick(View v) {
+
+ }
+}
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
new file mode 100644
index 0000000..5554575
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java
@@ -0,0 +1,53 @@
+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.shunzhi.parent.R;
+import com.shunzhi.parent.adapter.DeyuDetialAdapter;
+import com.shunzhi.parent.bean.report.DeyuDetialBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/3/28 0028.
+ */
+
+public class ReportDetialFragment extends BaseMVPCompatFragment {
+
+ private RecyclerView recycle_deyu;
+ private DeyuDetialAdapter deyuDetialAdapter;
+ Listlist=new ArrayList<>();
+ @NonNull
+ @Override
+ public BasePresenter initPresenter() {
+ return null;
+ }
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.fragment_report_detial;
+ }
+
+ @Override
+ public void initUI(View view, @Nullable Bundle savedInstanceState) {
+ recycle_deyu=view.findViewById(R.id.recycle_deyu);
+ recycle_deyu.setLayoutManager(new LinearLayoutManager(getActivity()));
+ deyuDetialAdapter=new DeyuDetialAdapter(getActivity());
+ DeyuDetialBean deyuDetialBean=new DeyuDetialBean();
+ list.add(deyuDetialBean);
+ list.add(deyuDetialBean);
+ list.add(deyuDetialBean);
+ deyuDetialAdapter.addAll(list);
+ recycle_deyu.setAdapter(deyuDetialAdapter);
+
+
+ }
+}
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
new file mode 100644
index 0000000..629a3ab
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java
@@ -0,0 +1,34 @@
+package com.shunzhi.parent.ui.fragment.report;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.share.mvpsdk.base.BasePresenter;
+import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
+import com.shunzhi.parent.R;
+
+/**
+ * Created by Administrator on 2018/3/28 0028.
+ */
+
+public class ReportSceneFragment extends BaseMVPCompatFragment {
+
+ @NonNull
+ @Override
+ public BasePresenter initPresenter() {
+ return null;
+ }
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.fragment_report_scene;
+ }
+
+ @Override
+ public void initUI(View view, @Nullable Bundle savedInstanceState) {
+
+
+ }
+}
diff --git a/app/src/main/res/drawable-xhdpi/scene_detial.png b/app/src/main/res/drawable-xhdpi/scene_detial.png
new file mode 100644
index 0000000..ad49f71
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/scene_detial.png differ
diff --git a/app/src/main/res/drawable-xhdpi/scene_detial1.png b/app/src/main/res/drawable-xhdpi/scene_detial1.png
new file mode 100644
index 0000000..76cb095
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/scene_detial1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/screen.png b/app/src/main/res/drawable-xhdpi/screen.png
index 591bc98..3bd2f03 100644
Binary files a/app/src/main/res/drawable-xhdpi/screen.png and b/app/src/main/res/drawable-xhdpi/screen.png differ
diff --git a/app/src/main/res/drawable/report_white.xml b/app/src/main/res/drawable/report_white.xml
index 0f54385..f745ae3 100644
--- a/app/src/main/res/drawable/report_white.xml
+++ b/app/src/main/res/drawable/report_white.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rudiobtn_report_deyu.xml b/app/src/main/res/drawable/rudiobtn_report_deyu.xml
new file mode 100644
index 0000000..d7af6b4
--- /dev/null
+++ b/app/src/main/res/drawable/rudiobtn_report_deyu.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rudiobtn_report_top.xml b/app/src/main/res/drawable/rudiobtn_report_top.xml
index 8a9e975..f55a8b0 100644
--- a/app/src/main/res/drawable/rudiobtn_report_top.xml
+++ b/app/src/main/res/drawable/rudiobtn_report_top.xml
@@ -1,6 +1,11 @@
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_report_detial.xml b/app/src/main/res/layout/activity_report_detial.xml
new file mode 100644
index 0000000..9c33b31
--- /dev/null
+++ b/app/src/main/res/layout/activity_report_detial.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_report_scene.xml b/app/src/main/res/layout/activity_report_scene.xml
new file mode 100644
index 0000000..ef810ab
--- /dev/null
+++ b/app/src/main/res/layout/activity_report_scene.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml
index 601fa2b..baf52c4 100644
--- a/app/src/main/res/layout/fragment_report.xml
+++ b/app/src/main/res/layout/fragment_report.xml
@@ -22,17 +22,16 @@
android:drawablePadding="10dp"
android:drawableRight="@drawable/pull"
android:text=""
- android:visibility="gone"
android:textColor="@color/textColor"
android:textSize="@dimen/textSize16" />
@@ -43,32 +42,33 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:drawableRight="@drawable/screen"
- android:visibility="gone"
android:text="筛选"
- android:textColor="@color/textColor"
+ android:textColor="@color/white"
android:textSize="@dimen/textSize16" />
-
-
-
-
+
+
+
+
+
@@ -99,18 +99,17 @@
app:mcv_dateTextAppearance="@style/TextAppearance.MaterialCalendarWidget.Date"
app:mcv_selectionColor="@color/huodong_blue"
app:mcv_showTopBar="false"
- app:mcv_showWeekView="false"
- />
+ app:mcv_showWeekView="false" />
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_report_scene.xml b/app/src/main/res/layout/fragment_report_scene.xml
new file mode 100644
index 0000000..545e83b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_report_scene.xml
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/item_deyu_detial.xml b/app/src/main/res/layout/item_deyu_detial.xml
new file mode 100644
index 0000000..93d5aad
--- /dev/null
+++ b/app/src/main/res/layout/item_deyu_detial.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/item_report_deyu.xml b/app/src/main/res/layout/item_report_deyu.xml
new file mode 100644
index 0000000..809d885
--- /dev/null
+++ b/app/src/main/res/layout/item_report_deyu.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6d1f1b9..7ee2ea0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -20,4 +20,6 @@
#757575
#5FB762
#00000000
+ #60b3f6
+ #2b71c4
--
libgit2 0.21.0