陶汉栋 / ParentWork

Download as
Browse Code »

Commit 0cbfbb6813d8fe0c595606e856fc9fc05d0c3071

Authored by 陶汉栋
2 parents 47a38b09 62be613c
Exists in yxb_dev and in 2 other branches developer, wwx

no message

Showing 24 changed files with 907 additions and 43 deletions   Show diff stats
app/src/main/AndroidManifest.xml
  Diff comments   View file @0cbfbb6
@@ -186,6 +186,12 @@ @@ -186,6 +186,12 @@
186 <activity 186 <activity
187 android:name=".ui.activity.orderdetail.OrderDetailActivity" 187 android:name=".ui.activity.orderdetail.OrderDetailActivity"
188 android:launchMode="singleInstance" /> 188 android:launchMode="singleInstance" />
  189 + <activity
  190 + android:name=".ui.activity.report.ReportDetialActivity"
  191 + android:launchMode="singleInstance" />
  192 + <activity
  193 + android:name=".ui.activity.report.ReportSceneActivity"
  194 + android:launchMode="singleInstance" />
189 195
190 <service 196 <service
191 android:name=".ui.service.BadgeIntentService" 197 android:name=".ui.service.BadgeIntentService"
app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java
  Diff comments   View file @0cbfbb6
@@ -33,7 +33,7 @@ public class ChildAdapter extends BaseRecyclerViewAdapter&lt;ChildBean&gt; { @@ -33,7 +33,7 @@ public class ChildAdapter extends BaseRecyclerViewAdapter&lt;ChildBean&gt; {
33 33
34 @Override 34 @Override
35 public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { 35 public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
36 - View view = LayoutInflater.from(context).inflate(R.layout.item_childlist, null); 36 + View view = LayoutInflater.from(context).inflate(R.layout.item_childlist, parent,false);
37 return new MyViewHolder(view); 37 return new MyViewHolder(view);
38 } 38 }
39 39
app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,52 @@ @@ -0,0 +1,52 @@
  1 +package com.shunzhi.parent.adapter;
  2 +
  3 +import android.content.Context;
  4 +import android.content.Intent;
  5 +import android.view.LayoutInflater;
  6 +import android.view.View;
  7 +import android.view.ViewGroup;
  8 +
  9 +import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
  10 +import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
  11 +import com.shunzhi.parent.R;
  12 +import com.shunzhi.parent.bean.report.DeyuDetialBean;
  13 +import com.shunzhi.parent.ui.activity.report.ReportSceneActivity;
  14 +
  15 +/**
  16 + * Created by Administrator on 2018/3/28 0028.
  17 + */
  18 +
  19 +public class DeyuDetialAdapter extends BaseRecyclerViewAdapter<DeyuDetialBean> {
  20 + private Context mContext = null;
  21 +
  22 + public DeyuDetialAdapter(Context context) {
  23 + mContext = context;
  24 + }
  25 +
  26 +
  27 + @Override
  28 + public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
  29 + View view = LayoutInflater.from(mContext).inflate(R.layout.item_deyu_detial, parent, false);
  30 + return new DeyuDetialAdapter.DeyuDetialViewHolder(view);
  31 + }
  32 +
  33 + private class DeyuDetialViewHolder extends BaseRecyclerViewHolder<DeyuDetialBean> {
  34 +
  35 +
  36 + public DeyuDetialViewHolder(View itemView) {
  37 + super(itemView);
  38 +
  39 + }
  40 +
  41 + @Override
  42 + public void onBindViewHolder(final DeyuDetialBean object, int position) {
  43 + itemView.setOnClickListener(new View.OnClickListener() {
  44 + @Override
  45 + public void onClick(View v) {
  46 + mContext.startActivity(new Intent().setClass(mContext, ReportSceneActivity.class));
  47 + }
  48 + });
  49 +
  50 + }
  51 + }
  52 +}
app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java
  Diff comments   View file @0cbfbb6
@@ -2,15 +2,17 @@ package com.shunzhi.parent.adapter; @@ -2,15 +2,17 @@ package com.shunzhi.parent.adapter;
2 2
3 3
4 import android.content.Context; 4 import android.content.Context;
  5 +import android.content.Intent;
5 import android.view.LayoutInflater; 6 import android.view.LayoutInflater;
6 import android.view.View; 7 import android.view.View;
7 import android.view.ViewGroup; 8 import android.view.ViewGroup;
  9 +import android.widget.LinearLayout;
8 10
9 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter; 11 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
10 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder; 12 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
11 import com.shunzhi.parent.R; 13 import com.shunzhi.parent.R;
12 import com.shunzhi.parent.bean.ReportBean; 14 import com.shunzhi.parent.bean.ReportBean;
13 -import com.shunzhi.parent.views.ProgressView; 15 +import com.shunzhi.parent.ui.activity.report.ReportDetialActivity;
14 16
15 /** 17 /**
16 * Created by Administrator on 2018/3/9 0009. 18 * Created by Administrator on 2018/3/9 0009.
@@ -27,25 +29,32 @@ public class ReportAdapter extends BaseRecyclerViewAdapter&lt;ReportBean&gt; { @@ -27,25 +29,32 @@ public class ReportAdapter extends BaseRecyclerViewAdapter&lt;ReportBean&gt; {
27 29
28 @Override 30 @Override
29 public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { 31 public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
30 - View view = LayoutInflater.from(context).inflate(R.layout.item_report, null); 32 + View view = LayoutInflater.from(context).inflate(R.layout.item_report_deyu, parent,false);
31 return new MyViewHolder(view); 33 return new MyViewHolder(view);
32 } 34 }
33 35
34 private class MyViewHolder extends BaseRecyclerViewHolder<ReportBean> { 36 private class MyViewHolder extends BaseRecyclerViewHolder<ReportBean> {
35 37
36 - ProgressView ringView;  
37 - 38 + // ProgressView ringView;
  39 + LinearLayout deyu_content;
38 40
39 public MyViewHolder(View view) { 41 public MyViewHolder(View view) {
40 super(view); 42 super(view);
41 - ringView = view.findViewById(R.id.ring); 43 +// ringView = view.findViewById(R.id.ring);
  44 + deyu_content = view.findViewById(R.id.deyu_content);
42 } 45 }
43 46
44 @Override 47 @Override
45 public void onBindViewHolder(ReportBean object, int position) { 48 public void onBindViewHolder(ReportBean object, int position) {
46 - ringView.setMaxCount(100.0f);  
47 - ringView.setCurrentCount(100);  
48 - ringView.setScore(100); 49 +// ringView.setMaxCount(100.0f);
  50 +// ringView.setCurrentCount(100);
  51 +// ringView.setScore(100);
  52 + deyu_content.setOnClickListener(new View.OnClickListener() {
  53 + @Override
  54 + public void onClick(View v) {
  55 + context.startActivity(new Intent().setClass(context, ReportDetialActivity.class));
  56 + }
  57 + });
49 } 58 }
50 59
51 } 60 }
app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
  Diff comments   View file @0cbfbb6
@@ -51,7 +51,7 @@ public class SchoolListAdapter extends BaseRecyclerViewAdapter&lt;SortBean&gt; { @@ -51,7 +51,7 @@ public class SchoolListAdapter extends BaseRecyclerViewAdapter&lt;SortBean&gt; {
51 51
52 @Override 52 @Override
53 public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { 53 public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
54 - View view = LayoutInflater.from(context).inflate(R.layout.item_school, null); 54 + View view = LayoutInflater.from(context).inflate(R.layout.item_school, parent,false);
55 return new MyViewHolder(view); 55 return new MyViewHolder(view);
56 } 56 }
57 57
app/src/main/java/com/shunzhi/parent/bean/report/DeyuDetialBean.java 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
  1 +package com.shunzhi.parent.bean.report;
  2 +
  3 +/**
  4 + * Created by Administrator on 2018/3/28 0028.
  5 + */
  6 +
  7 +public class DeyuDetialBean {
  8 +}
app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportDetialActivity.java 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,72 @@ @@ -0,0 +1,72 @@
  1 +package com.shunzhi.parent.ui.activity.report;
  2 +
  3 +import android.content.Context;
  4 +import android.content.Intent;
  5 +import android.os.Bundle;
  6 +import android.support.annotation.NonNull;
  7 +import android.support.v4.app.FragmentTransaction;
  8 +import android.view.View;
  9 +import android.widget.FrameLayout;
  10 +import android.widget.ImageView;
  11 +import android.widget.TextView;
  12 +
  13 +import com.share.mvpsdk.base.BasePresenter;
  14 +import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
  15 +import com.shunzhi.parent.R;
  16 +import com.shunzhi.parent.ui.fragment.report.ReportDetialFragment;
  17 +
  18 +/**
  19 + * Created by Administrator on 2018/3/28 0028.
  20 + */
  21 +
  22 +public class ReportDetialActivity extends BaseMVPCompatActivity implements View.OnClickListener{
  23 + public static void getInstance(Context context) {
  24 + Intent intent = new Intent(context, ReportDetialActivity.class);
  25 + context.startActivity(intent);
  26 + }
  27 +
  28 + TextView center_title;
  29 +
  30 + ImageView ivBack;
  31 +
  32 + FrameLayout frame_detial;
  33 +
  34 + FragmentTransaction fragmentTransaction = null;
  35 +
  36 + ReportDetialFragment reportDetialFragment = null;
  37 +
  38 + @NonNull
  39 + @Override
  40 + public BasePresenter initPresenter() {
  41 + return null;
  42 + }
  43 +
  44 + @Override
  45 + protected void initView(Bundle savedInstanceState) {
  46 + initViews();
  47 + }
  48 +
  49 + private void initViews() {
  50 + reportDetialFragment = new ReportDetialFragment();
  51 + ivBack = findViewById(R.id.back_top);
  52 + frame_detial = findViewById(R.id.frame_detial);
  53 + center_title = findViewById(R.id.center_title);
  54 + center_title.setText("德育报告");
  55 + ivBack.setOnClickListener(this);
  56 +
  57 + fragmentTransaction = getSupportFragmentManager().beginTransaction();
  58 + fragmentTransaction.add(R.id.frame_detial, reportDetialFragment)
  59 + .show(reportDetialFragment).commit();
  60 +
  61 + }
  62 +
  63 + @Override
  64 + protected int getLayoutId() {
  65 + return R.layout.activity_report_detial;
  66 + }
  67 +
  68 + @Override
  69 + public void onClick(View v) {
  70 + finish();
  71 + }
  72 +}
app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportSceneActivity.java 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,70 @@ @@ -0,0 +1,70 @@
  1 +package com.shunzhi.parent.ui.activity.report;
  2 +
  3 +import android.content.Context;
  4 +import android.content.Intent;
  5 +import android.os.Bundle;
  6 +import android.support.annotation.NonNull;
  7 +import android.support.v4.app.FragmentTransaction;
  8 +import android.view.View;
  9 +import android.widget.FrameLayout;
  10 +import android.widget.ImageView;
  11 +import android.widget.TextView;
  12 +
  13 +import com.share.mvpsdk.base.BasePresenter;
  14 +import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
  15 +import com.shunzhi.parent.R;
  16 +import com.shunzhi.parent.ui.fragment.report.ReportSceneFragment;
  17 +
  18 +/**
  19 + * Created by Administrator on 2018/3/28 0028.
  20 + */
  21 +
  22 +public class ReportSceneActivity extends BaseMVPCompatActivity implements View.OnClickListener{
  23 + public static void getInstance(Context context) {
  24 + Intent intent = new Intent(context, ReportSceneActivity.class);
  25 + context.startActivity(intent);
  26 + }
  27 +
  28 + TextView center_title;
  29 +
  30 + ImageView ivBack;
  31 +
  32 + FrameLayout frame_scene;
  33 +
  34 + FragmentTransaction fragmentTransaction = null;
  35 +
  36 + ReportSceneFragment reportSceneFragment = null;
  37 +
  38 + @NonNull
  39 + @Override
  40 + public BasePresenter initPresenter() {
  41 + return null;
  42 + }
  43 +
  44 + @Override
  45 + protected void initView(Bundle savedInstanceState) {
  46 + initViews();
  47 + }
  48 + private void initViews() {
  49 + reportSceneFragment = new ReportSceneFragment();
  50 + ivBack = findViewById(R.id.back_top);
  51 + frame_scene = findViewById(R.id.frame_scene);
  52 + center_title = findViewById(R.id.center_title);
  53 + center_title.setText("场景详情");
  54 + ivBack.setOnClickListener(this);
  55 +
  56 + fragmentTransaction = getSupportFragmentManager().beginTransaction();
  57 + fragmentTransaction.add(R.id.frame_scene, reportSceneFragment)
  58 + .show(reportSceneFragment).commit();
  59 +
  60 + }
  61 + @Override
  62 + protected int getLayoutId() {
  63 + return R.layout.activity_report_scene;
  64 + }
  65 +
  66 + @Override
  67 + public void onClick(View v) {
  68 +
  69 + }
  70 +}
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,53 @@ @@ -0,0 +1,53 @@
  1 +package com.shunzhi.parent.ui.fragment.report;
  2 +
  3 +import android.os.Bundle;
  4 +import android.support.annotation.NonNull;
  5 +import android.support.annotation.Nullable;
  6 +import android.support.v7.widget.LinearLayoutManager;
  7 +import android.support.v7.widget.RecyclerView;
  8 +import android.view.View;
  9 +
  10 +import com.share.mvpsdk.base.BasePresenter;
  11 +import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
  12 +import com.shunzhi.parent.R;
  13 +import com.shunzhi.parent.adapter.DeyuDetialAdapter;
  14 +import com.shunzhi.parent.bean.report.DeyuDetialBean;
  15 +
  16 +import java.util.ArrayList;
  17 +import java.util.List;
  18 +
  19 +/**
  20 + * Created by Administrator on 2018/3/28 0028.
  21 + */
  22 +
  23 +public class ReportDetialFragment extends BaseMVPCompatFragment {
  24 +
  25 + private RecyclerView recycle_deyu;
  26 + private DeyuDetialAdapter deyuDetialAdapter;
  27 + List<DeyuDetialBean>list=new ArrayList<>();
  28 + @NonNull
  29 + @Override
  30 + public BasePresenter initPresenter() {
  31 + return null;
  32 + }
  33 +
  34 + @Override
  35 + public int getLayoutId() {
  36 + return R.layout.fragment_report_detial;
  37 + }
  38 +
  39 + @Override
  40 + public void initUI(View view, @Nullable Bundle savedInstanceState) {
  41 + recycle_deyu=view.findViewById(R.id.recycle_deyu);
  42 + recycle_deyu.setLayoutManager(new LinearLayoutManager(getActivity()));
  43 + deyuDetialAdapter=new DeyuDetialAdapter(getActivity());
  44 + DeyuDetialBean deyuDetialBean=new DeyuDetialBean();
  45 + list.add(deyuDetialBean);
  46 + list.add(deyuDetialBean);
  47 + list.add(deyuDetialBean);
  48 + deyuDetialAdapter.addAll(list);
  49 + recycle_deyu.setAdapter(deyuDetialAdapter);
  50 +
  51 +
  52 + }
  53 +}
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
  1 +package com.shunzhi.parent.ui.fragment.report;
  2 +
  3 +import android.os.Bundle;
  4 +import android.support.annotation.NonNull;
  5 +import android.support.annotation.Nullable;
  6 +import android.view.View;
  7 +
  8 +import com.share.mvpsdk.base.BasePresenter;
  9 +import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
  10 +import com.shunzhi.parent.R;
  11 +
  12 +/**
  13 + * Created by Administrator on 2018/3/28 0028.
  14 + */
  15 +
  16 +public class ReportSceneFragment extends BaseMVPCompatFragment {
  17 +
  18 + @NonNull
  19 + @Override
  20 + public BasePresenter initPresenter() {
  21 + return null;
  22 + }
  23 +
  24 + @Override
  25 + public int getLayoutId() {
  26 + return R.layout.fragment_report_scene;
  27 + }
  28 +
  29 + @Override
  30 + public void initUI(View view, @Nullable Bundle savedInstanceState) {
  31 +
  32 +
  33 + }
  34 +}
app/src/main/res/drawable-xhdpi/scene_detial.png 0 → 100644
View file @0cbfbb6

35.1 KB
app/src/main/res/drawable-xhdpi/scene_detial1.png 0 → 100644
View file @0cbfbb6

22.7 KB
app/src/main/res/drawable-xhdpi/screen.png
View file @0cbfbb6

395 Bytes | W: | H:

375 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable/report_white.xml
  Diff comments   View file @0cbfbb6
@@ -2,5 +2,5 @@ @@ -2,5 +2,5 @@
2 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android"> 2 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
3 <stroke android:color="#00000000" android:width="1dp"/> 3 <stroke android:color="#00000000" android:width="1dp"/>
4 <solid android:color="@color/white" /> 4 <solid android:color="@color/white" />
5 - <corners android:radius="10dp"/> 5 + <corners android:radius="@dimen/size_dp_10"/>
6 </shape> 6 </shape>
7 \ No newline at end of file 7 \ No newline at end of file
app/src/main/res/drawable/rudiobtn_report_deyu.xml 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <stroke android:color="#00000000" android:width="1dp"/>
  4 + <!--<solid android:color="#AACFFC" />-->
  5 + <gradient
  6 + android:startColor="#64b5f6"
  7 + android:endColor="#c2e9fb"
  8 + android:angle="315" />
  9 +
  10 + <corners android:radius="@dimen/size_dp_10"/>
  11 +</shape>
0 \ No newline at end of file 12 \ No newline at end of file
app/src/main/res/drawable/rudiobtn_report_top.xml
  Diff comments   View file @0cbfbb6
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android"> 2 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
3 <stroke android:color="#00000000" android:width="1dp"/> 3 <stroke android:color="#00000000" android:width="1dp"/>
4 - <solid android:color="#AACFFC" /> 4 + <!--<solid android:color="#AACFFC" />-->
  5 + <gradient
  6 + android:startColor="#64b5f6"
  7 + android:endColor="#c2e9fb"
  8 + android:angle="315" />
  9 +
5 <corners android:topLeftRadius="10dp" android:topRightRadius="10dp"/> 10 <corners android:topLeftRadius="10dp" android:topRightRadius="10dp"/>
6 </shape> 11 </shape>
7 \ No newline at end of file 12 \ No newline at end of file
app/src/main/res/layout/activity_report_detial.xml 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + xmlns:app="http://schemas.android.com/apk/res-auto"
  4 + xmlns:tools="http://schemas.android.com/tools"
  5 + android:layout_width="match_parent"
  6 + android:layout_height="match_parent"
  7 + android:orientation="vertical"
  8 + tools:context="com.shunzhi.parent.ui.activity.report.ReportDetialActivity">
  9 +
  10 + <include layout="@layout/top"/>
  11 +
  12 +
  13 + <FrameLayout
  14 + android:layout_width="match_parent"
  15 + android:layout_height="match_parent"
  16 + android:id="@+id/frame_detial"
  17 + ></FrameLayout>
  18 +
  19 +</LinearLayout>
app/src/main/res/layout/activity_report_scene.xml 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + xmlns:app="http://schemas.android.com/apk/res-auto"
  4 + xmlns:tools="http://schemas.android.com/tools"
  5 + android:layout_width="match_parent"
  6 + android:layout_height="match_parent"
  7 + android:orientation="vertical"
  8 + tools:context="com.shunzhi.parent.ui.activity.report.ReportSceneActivity">
  9 +
  10 + <include layout="@layout/top"/>
  11 +
  12 +
  13 + <FrameLayout
  14 + android:layout_width="match_parent"
  15 + android:layout_height="match_parent"
  16 + android:id="@+id/frame_scene"
  17 + ></FrameLayout>
  18 +
  19 +</LinearLayout>
app/src/main/res/layout/fragment_report.xml
  Diff comments   View file @0cbfbb6
@@ -22,17 +22,16 @@ @@ -22,17 +22,16 @@
22 android:drawablePadding="10dp" 22 android:drawablePadding="10dp"
23 android:drawableRight="@drawable/pull" 23 android:drawableRight="@drawable/pull"
24 android:text="" 24 android:text=""
25 - android:visibility="gone"  
26 android:textColor="@color/textColor" 25 android:textColor="@color/textColor"
27 android:textSize="@dimen/textSize16" /> 26 android:textSize="@dimen/textSize16" />
28 27
29 <TextView 28 <TextView
  29 + android:id="@+id/tvDate"
30 android:layout_width="wrap_content" 30 android:layout_width="wrap_content"
31 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
32 android:layout_gravity="center_vertical" 32 android:layout_gravity="center_vertical"
33 android:layout_weight="1" 33 android:layout_weight="1"
34 android:gravity="center_horizontal" 34 android:gravity="center_horizontal"
35 - android:id="@+id/tvDate"  
36 android:text="报告" 35 android:text="报告"
37 android:textColor="@color/white" 36 android:textColor="@color/white"
38 android:textSize="@dimen/textSize18" /> 37 android:textSize="@dimen/textSize18" />
@@ -43,32 +42,33 @@ @@ -43,32 +42,33 @@
43 android:layout_height="wrap_content" 42 android:layout_height="wrap_content"
44 android:layout_gravity="center_vertical" 43 android:layout_gravity="center_vertical"
45 android:drawableRight="@drawable/screen" 44 android:drawableRight="@drawable/screen"
46 - android:visibility="gone"  
47 android:text="筛选" 45 android:text="筛选"
48 - android:textColor="@color/textColor" 46 + android:textColor="@color/white"
49 android:textSize="@dimen/textSize16" /> 47 android:textSize="@dimen/textSize16" />
50 </LinearLayout> 48 </LinearLayout>
51 -<RelativeLayout  
52 - android:layout_width="match_parent"  
53 - android:layout_height="match_parent"  
54 - android:background="@color/white"  
55 -  
56 - >  
57 - <TextView  
58 - android:layout_width="wrap_content"  
59 - android:layout_height="wrap_content"  
60 - android:layout_centerInParent="true"  
61 - android:textSize="@dimen/size_dp_16"  
62 - android:textColor="@color/xueqing_blue"  
63 - android:background="@drawable/baogao_back"  
64 - android:lineSpacingExtra="@dimen/size_dp_5"  
65 - android:id="@+id/tvNoData"  
66 - />  
67 -</RelativeLayout>  
68 - <LinearLayout 49 +
  50 + <RelativeLayout
69 android:layout_width="match_parent" 51 android:layout_width="match_parent"
70 android:layout_height="match_parent" 52 android:layout_height="match_parent"
  53 + android:background="@color/white"
71 android:visibility="gone" 54 android:visibility="gone"
  55 +
  56 + >
  57 +
  58 + <TextView
  59 + android:id="@+id/tvNoData"
  60 + android:layout_width="wrap_content"
  61 + android:layout_height="wrap_content"
  62 + android:layout_centerInParent="true"
  63 + android:background="@drawable/baogao_back"
  64 + android:lineSpacingExtra="@dimen/size_dp_5"
  65 + android:textColor="@color/xueqing_blue"
  66 + android:textSize="@dimen/size_dp_16" />
  67 + </RelativeLayout>
  68 +
  69 + <LinearLayout
  70 + android:layout_width="match_parent"
  71 + android:layout_height="match_parent"
72 android:orientation="vertical"> 72 android:orientation="vertical">
73 73
74 <!--<include layout="@layout/layout_week" /> android:layout_below="@+id/linearlayout"--> 74 <!--<include layout="@layout/layout_week" /> android:layout_below="@+id/linearlayout"-->
@@ -99,18 +99,17 @@ @@ -99,18 +99,17 @@
99 app:mcv_dateTextAppearance="@style/TextAppearance.MaterialCalendarWidget.Date" 99 app:mcv_dateTextAppearance="@style/TextAppearance.MaterialCalendarWidget.Date"
100 app:mcv_selectionColor="@color/huodong_blue" 100 app:mcv_selectionColor="@color/huodong_blue"
101 app:mcv_showTopBar="false" 101 app:mcv_showTopBar="false"
102 - app:mcv_showWeekView="false"  
103 - /> 102 + app:mcv_showWeekView="false" />
104 103
105 104
106 - <android.support.v7.widget.RecyclerView  
107 - android:id="@+id/recycle_report"  
108 - android:layout_width="match_parent"  
109 - android:layout_height="match_parent"  
110 - android:background="@color/bgColor"  
111 - android:padding="@dimen/size_dp_10"> 105 + <android.support.v7.widget.RecyclerView
  106 + android:id="@+id/recycle_report"
  107 + android:layout_width="match_parent"
  108 + android:layout_height="match_parent"
  109 + android:background="@color/bgColor"
  110 + android:padding="@dimen/size_dp_10">
112 111
113 - </android.support.v7.widget.RecyclerView> 112 + </android.support.v7.widget.RecyclerView>
114 113
115 <LinearLayout 114 <LinearLayout
116 android:id="@+id/weekview_top" 115 android:id="@+id/weekview_top"
app/src/main/res/layout/fragment_report_detial.xml 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,191 @@ @@ -0,0 +1,191 @@
  1 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2 + xmlns:tools="http://schemas.android.com/tools"
  3 + android:layout_width="match_parent"
  4 + android:layout_height="match_parent"
  5 + android:background="@color/bgColor"
  6 + android:orientation="vertical"
  7 + tools:context="com.shunzhi.parent.ui.fragment.ReportFragment">
  8 +
  9 + <RelativeLayout
  10 + android:layout_width="match_parent"
  11 + android:layout_height="match_parent"
  12 + android:background="@color/white"
  13 + android:visibility="gone"
  14 +
  15 + >
  16 +
  17 + <TextView
  18 + android:id="@+id/tvNoData"
  19 + android:layout_width="wrap_content"
  20 + android:layout_height="wrap_content"
  21 + android:layout_centerInParent="true"
  22 + android:background="@drawable/baogao_back"
  23 + android:lineSpacingExtra="@dimen/size_dp_5"
  24 + android:textColor="@color/xueqing_blue"
  25 + android:textSize="@dimen/size_dp_16" />
  26 + </RelativeLayout>
  27 +
  28 + <LinearLayout
  29 + android:layout_width="match_parent"
  30 + android:layout_height="match_parent"
  31 + android:orientation="vertical"
  32 + android:padding="@dimen/size_dp_10">
  33 +
  34 + <!--<include layout="@layout/layout_week" /> android:layout_below="@+id/linearlayout"-->
  35 + <LinearLayout
  36 + android:layout_width="match_parent"
  37 + android:layout_height="wrap_content"
  38 + android:background="@drawable/rudiobtn_report_deyu"
  39 + android:orientation="vertical">
  40 +
  41 + <LinearLayout
  42 + android:layout_width="match_parent"
  43 + android:layout_height="wrap_content"
  44 + android:orientation="horizontal">
  45 +
  46 + <LinearLayout
  47 + android:layout_width="wrap_content"
  48 + android:layout_height="match_parent"
  49 + android:layout_weight="1"
  50 + android:orientation="vertical">
  51 +
  52 + <TextView
  53 + android:layout_width="wrap_content"
  54 + android:layout_height="wrap_content"
  55 + android:layout_gravity="center"
  56 + android:layout_marginTop="10dp"
  57 + android:gravity="center"
  58 + android:text="德育得分"
  59 + android:textColor="@color/deyu_BlueColor"
  60 + android:textSize="@dimen/sp_16" />
  61 +
  62 + <TextView
  63 + android:layout_width="wrap_content"
  64 + android:layout_height="wrap_content"
  65 + android:gravity="center"
  66 + android:padding="@dimen/size_dp_5"
  67 + android:text="4.3分"
  68 + android:layout_gravity="center"
  69 + android:textColor="@color/white"
  70 + android:textSize="@dimen/dp_36" />
  71 +
  72 + <TextView
  73 + android:layout_width="wrap_content"
  74 + android:layout_height="wrap_content"
  75 + android:layout_marginTop="10dp"
  76 + android:gravity="center"
  77 + android:layout_gravity="center"
  78 + android:text="同期上升1.1分"
  79 + android:textColor="@color/white"
  80 + android:textSize="@dimen/sp_16" />
  81 +
  82 + <TextView
  83 + android:layout_width="wrap_content"
  84 + android:layout_height="wrap_content"
  85 + android:layout_marginTop="5dp"
  86 + android:gravity="center"
  87 + android:layout_gravity="center"
  88 + android:text="高于平均分1.1分"
  89 + android:textColor="@color/white"
  90 + android:textSize="@dimen/sp_16" />
  91 +
  92 +
  93 + </LinearLayout>
  94 +
  95 + <LinearLayout
  96 + android:layout_width="wrap_content"
  97 + android:layout_height="match_parent"
  98 + android:layout_weight="1"
  99 + android:orientation="vertical">
  100 +
  101 + <TextView
  102 + android:layout_width="wrap_content"
  103 + android:layout_height="wrap_content"
  104 + android:layout_gravity="center"
  105 + android:layout_marginTop="@dimen/size_dp_10"
  106 + android:gravity="center"
  107 + android:text="2018年03月08日"
  108 + android:textColor="@color/deyu_BlueColor"
  109 + android:textSize="@dimen/sp_16" />
  110 +
  111 + <TextView
  112 + android:layout_width="wrap_content"
  113 + android:layout_height="wrap_content"
  114 + android:gravity="center"
  115 + android:layout_gravity="center"
  116 + android:padding="@dimen/size_dp_5"
  117 + android:text="第三名"
  118 + android:textColor="@color/white"
  119 + android:textSize="@dimen/dp_36" />
  120 +
  121 + <TextView
  122 + android:layout_width="wrap_content"
  123 + android:layout_height="wrap_content"
  124 + android:layout_marginTop="10dp"
  125 + android:gravity="center"
  126 + android:layout_gravity="center"
  127 + android:text="同期上升5名"
  128 + android:textColor="@color/white"
  129 + android:textSize="@dimen/sp_16" />
  130 +
  131 + <TextView
  132 + android:layout_width="wrap_content"
  133 + android:layout_height="wrap_content"
  134 + android:layout_marginTop="5dp"
  135 + android:gravity="center"
  136 + android:layout_gravity="center"
  137 + android:text="高于平均排名1.1名"
  138 + android:textColor="@color/white"
  139 + android:textSize="@dimen/sp_16" />
  140 +
  141 +
  142 + </LinearLayout>
  143 +
  144 +
  145 + </LinearLayout>
  146 +
  147 + <TextView
  148 + android:layout_width="match_parent"
  149 + android:layout_height="wrap_content"
  150 + android:layout_marginTop="@dimen/size_dp_30"
  151 + android:layout_marginBottom="@dimen/size_dp_20"
  152 + android:layout_marginLeft="@dimen/size_dp_25"
  153 + android:layout_marginRight="@dimen/size_dp_25"
  154 + android:gravity="center"
  155 + android:lineSpacingExtra="@dimen/size_dp_5"
  156 + android:text="哎哟不错哦，德育评价打败了88%的同学！注意行为规范将更上一层"
  157 + android:textColor="@color/deyu_BlueColor"
  158 + android:textSize="@dimen/sp_16" />
  159 +
  160 +
  161 + </LinearLayout>
  162 +
  163 + <LinearLayout
  164 + android:layout_width="match_parent"
  165 + android:layout_height="wrap_content"
  166 + android:layout_marginTop="@dimen/size_dp_10">
  167 +
  168 + <TextView
  169 + android:layout_width="match_parent"
  170 + android:layout_height="200dp"
  171 + android:text="图表控件"
  172 + android:layout_gravity="center"
  173 + android:gravity="center"
  174 + android:textColor="@color/md_red_500"
  175 + android:background="@color/huodong_blue" />
  176 +
  177 + </LinearLayout>
  178 +
  179 +
  180 + <android.support.v7.widget.RecyclerView
  181 + android:id="@+id/recycle_deyu"
  182 + android:layout_width="match_parent"
  183 + android:layout_height="wrap_content"
  184 + android:layout_marginTop="@dimen/size_dp_10"
  185 + android:background="@color/bgColor">
  186 +
  187 + </android.support.v7.widget.RecyclerView>
  188 +
  189 + </LinearLayout>
  190 +
  191 +</LinearLayout>
app/src/main/res/layout/fragment_report_scene.xml 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,153 @@ @@ -0,0 +1,153 @@
  1 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2 + xmlns:tools="http://schemas.android.com/tools"
  3 + android:layout_width="match_parent"
  4 + android:layout_height="match_parent"
  5 + android:background="@color/bgColor"
  6 + android:orientation="vertical"
  7 + tools:context="com.shunzhi.parent.ui.fragment.ReportFragment">
  8 +
  9 + <RelativeLayout
  10 + android:layout_width="match_parent"
  11 + android:layout_height="match_parent"
  12 + android:background="@color/white"
  13 + android:visibility="gone"
  14 +
  15 + >
  16 +
  17 + <TextView
  18 + android:id="@+id/tvNoData"
  19 + android:layout_width="wrap_content"
  20 + android:layout_height="wrap_content"
  21 + android:layout_centerInParent="true"
  22 + android:background="@drawable/baogao_back"
  23 + android:lineSpacingExtra="@dimen/size_dp_5"
  24 + android:textColor="@color/xueqing_blue"
  25 + android:textSize="@dimen/size_dp_16" />
  26 + </RelativeLayout>
  27 +
  28 + <LinearLayout
  29 + android:layout_width="match_parent"
  30 + android:layout_height="match_parent"
  31 + android:orientation="vertical"
  32 + android:padding="@dimen/size_dp_10">
  33 +
  34 + <!--<include layout="@layout/layout_week" /> android:layout_below="@+id/linearlayout"-->
  35 + <LinearLayout
  36 + android:layout_width="match_parent"
  37 + android:layout_height="wrap_content"
  38 + android:background="@drawable/report_white"
  39 + android:orientation="vertical">
  40 +
  41 + <LinearLayout
  42 + android:id="@+id/layout_top"
  43 + android:layout_width="match_parent"
  44 + android:layout_height="wrap_content"
  45 + android:weightSum="2"
  46 + android:orientation="horizontal">
  47 +
  48 +
  49 +
  50 + <ImageView
  51 + android:id="@+id/image"
  52 + android:layout_width="0dp"
  53 + android:layout_height="match_parent"
  54 + android:layout_weight="1"
  55 + android:padding="@dimen/size_dp_20"
  56 + android:src="@drawable/scene_detial1" />
  57 +
  58 +
  59 + <LinearLayout
  60 + android:layout_margin="@dimen/size_dp_10"
  61 + android:layout_width="0dp"
  62 + android:layout_height="match_parent"
  63 + android:layout_weight="1"
  64 + android:orientation="vertical">
  65 +
  66 + <TextView
  67 + android:layout_width="wrap_content"
  68 + android:layout_height="wrap_content"
  69 + android:gravity="center"
  70 + android:text="文明礼仪"
  71 + android:textColor="@color/deyu_BlueColor"
  72 + android:textSize="@dimen/sp_16" />
  73 +
  74 + <TextView
  75 + android:layout_width="wrap_content"
  76 + android:layout_height="wrap_content"
  77 + android:layout_marginTop="10dp"
  78 + android:gravity="center"
  79 + android:text="得分：85分"
  80 + android:textColor="@color/deyu_textColor"
  81 + android:textSize="@dimen/sp_16" />
  82 +
  83 + <TextView
  84 + android:layout_width="wrap_content"
  85 + android:layout_height="wrap_content"
  86 + android:layout_marginTop="10dp"
  87 + android:gravity="center"
  88 + android:text="绩点：4.3分"
  89 + android:textColor="@color/deyu_textColor"
  90 + android:textSize="@dimen/sp_16" />
  91 +
  92 + <TextView
  93 + android:layout_width="wrap_content"
  94 + android:layout_height="wrap_content"
  95 + android:layout_marginTop="5dp"
  96 + android:gravity="center"
  97 + android:text="等级：A-"
  98 + android:textColor="@color/deyu_textColor"
  99 + android:textSize="@dimen/sp_16" />
  100 +
  101 + <TextView
  102 + android:layout_width="wrap_content"
  103 + android:layout_height="wrap_content"
  104 + android:layout_marginTop="5dp"
  105 + android:gravity="center"
  106 + android:text="指导意见："
  107 + android:textColor="@color/deyu_BlueColor"
  108 + android:textSize="@dimen/sp_16" />
  109 +
  110 + <TextView
  111 + android:layout_width="wrap_content"
  112 + android:layout_height="wrap_content"
  113 + android:layout_marginTop="5dp"
  114 + android:text="与上期相比有进步，保持文明礼仪，注意行为规范"
  115 + android:textColor="@color/deyu_BlueColor"
  116 + android:textSize="@dimen/sp_14" />
  117 +
  118 +
  119 + </LinearLayout>
  120 +
  121 +
  122 + </LinearLayout>
  123 + </LinearLayout>
  124 +
  125 + <LinearLayout
  126 + android:layout_width="match_parent"
  127 + android:layout_height="wrap_content"
  128 + android:layout_marginTop="@dimen/size_dp_10">
  129 +
  130 + <TextView
  131 + android:layout_width="match_parent"
  132 + android:layout_height="200dp"
  133 + android:layout_gravity="center"
  134 + android:background="@color/huodong_blue"
  135 + android:gravity="center"
  136 + android:text="图表控件"
  137 + android:textColor="@color/md_red_500" />
  138 +
  139 + </LinearLayout>
  140 +
  141 +
  142 + <android.support.v7.widget.RecyclerView
  143 + android:id="@+id/recycle_deyu"
  144 + android:layout_width="match_parent"
  145 + android:layout_height="wrap_content"
  146 + android:layout_marginTop="@dimen/size_dp_10"
  147 + android:background="@color/bgColor">
  148 +
  149 + </android.support.v7.widget.RecyclerView>
  150 +
  151 + </LinearLayout>
  152 +
  153 +</LinearLayout>
app/src/main/res/layout/item_deyu_detial.xml 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="match_parent"
  4 + android:background="@color/white"
  5 + android:divider="@color/divider_gray"
  6 + android:layout_marginTop="@dimen/size_dp_10"
  7 + android:layout_height="wrap_content">
  8 +
  9 + <LinearLayout
  10 + android:id="@+id/item_view"
  11 + android:layout_margin="10dp"
  12 + android:layout_width="match_parent"
  13 + android:layout_height="wrap_content">
  14 +
  15 + <LinearLayout
  16 + android:layout_width="wrap_content"
  17 + android:layout_height="wrap_content"
  18 + android:layout_weight="1"
  19 + android:orientation="vertical">
  20 +
  21 + <TextView
  22 + android:id="@+id/txt_childname"
  23 + android:layout_width="wrap_content"
  24 + android:layout_height="wrap_content"
  25 + android:textSize="@dimen/txtsize_title"
  26 + android:text="行为规范" />
  27 + <LinearLayout
  28 + android:layout_marginTop="10dp"
  29 + android:layout_width="wrap_content"
  30 + android:layout_height="wrap_content">
  31 +
  32 + <TextView
  33 + android:id="@+id/jidian"
  34 + android:layout_width="wrap_content"
  35 + android:layout_height="wrap_content"
  36 + android:text="绩点：4.3 增长1.1分" />
  37 + <TextView
  38 + android:layout_marginLeft="10dp"
  39 + android:id="@+id/paiming"
  40 + android:layout_width="wrap_content"
  41 + android:layout_height="wrap_content"
  42 + android:text="排名：第三名 增长1名" />
  43 + </LinearLayout>
  44 +
  45 + </LinearLayout>
  46 +
  47 +
  48 +
  49 + <TextView
  50 + android:id="@+id/go_buy"
  51 + android:layout_width="wrap_content"
  52 + android:layout_height="wrap_content"
  53 + android:paddingTop="5dp"
  54 + android:paddingBottom="5dp"
  55 + android:paddingLeft="10dp"
  56 + android:paddingRight="10dp"
  57 + android:layout_gravity="center_vertical"
  58 + android:gravity="center"
  59 + android:textSize="@dimen/txtsize_headline"
  60 + android:textColor="@color/textGreen"
  61 + android:text="A-" />
  62 +
  63 + </LinearLayout>
  64 +
  65 +</LinearLayout>
app/src/main/res/layout/item_report_deyu.xml 0 → 100644
  Diff comments   View file @0cbfbb6
@@ -0,0 +1,96 @@ @@ -0,0 +1,96 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="match_parent"
  4 + android:layout_height="wrap_content">
  5 +
  6 + <LinearLayout
  7 + android:layout_width="match_parent"
  8 + android:layout_height="250dp"
  9 + android:layout_marginTop="@dimen/size_dp_10"
  10 + android:background="@drawable/report_white"
  11 + android:orientation="vertical">
  12 +
  13 + <TextView
  14 + android:layout_width="match_parent"
  15 + android:layout_height="40dp"
  16 + android:background="@drawable/rudiobtn_report_top"
  17 + android:gravity="center_vertical"
  18 + android:paddingLeft="20dp"
  19 + android:text="今日德育报告"
  20 + android:textColor="@color/deyu_BlueColor"
  21 + android:textSize="@dimen/sp_16" />
  22 +
  23 + <LinearLayout
  24 + android:id="@+id/deyu_content"
  25 + android:layout_width="match_parent"
  26 + android:layout_height="wrap_content"
  27 + android:layout_weight="1"
  28 + android:orientation="horizontal">
  29 +
  30 + <LinearLayout
  31 + android:layout_width="wrap_content"
  32 + android:layout_height="match_parent"
  33 + android:layout_marginTop="10dp"
  34 + android:layout_weight="1"
  35 + android:gravity="center"
  36 + android:orientation="vertical">
  37 +
  38 + <TextView
  39 + android:layout_width="wrap_content"
  40 + android:layout_height="wrap_content"
  41 + android:gravity="center"
  42 + android:text="4.3分"
  43 + android:textColor="@color/deyu_textColor"
  44 + android:textSize="@dimen/txtsize_num" />
  45 +
  46 + <TextView
  47 + android:layout_width="match_parent"
  48 + android:layout_height="wrap_content"
  49 + android:layout_marginTop="20dp"
  50 + android:gravity="center"
  51 + android:text="获得A-评价"
  52 + android:textColor="@color/deyu_textColor"
  53 + android:textSize="@dimen/sp_16" />
  54 + </LinearLayout>
  55 +
  56 +
  57 + <LinearLayout
  58 + android:layout_width="wrap_content"
  59 + android:layout_height="match_parent"
  60 + android:layout_marginTop="10dp"
  61 + android:layout_weight="1"
  62 + android:gravity="center"
  63 + android:orientation="vertical">
  64 +
  65 + <TextView
  66 + android:layout_width="wrap_content"
  67 + android:layout_height="wrap_content"
  68 + android:gravity="center"
  69 + android:text="第三名"
  70 + android:textColor="@color/deyu_textColor"
  71 + android:textSize="@dimen/txtsize_num" />
  72 +
  73 + <TextView
  74 + android:layout_width="match_parent"
  75 + android:layout_height="wrap_content"
  76 + android:layout_marginTop="20dp"
  77 + android:gravity="center"
  78 + android:text="名次上升一名"
  79 + android:textColor="@color/deyu_textColor"
  80 + android:textSize="@dimen/sp_16" />
  81 + </LinearLayout>
  82 +
  83 + </LinearLayout>
  84 +
  85 + <TextView
  86 + android:layout_width="match_parent"
  87 + android:layout_height="wrap_content"
  88 + android:height="40dp"
  89 + android:gravity="center"
  90 + android:paddingLeft="20dp"
  91 + android:text="3月4日语文作业"
  92 + android:textColor="@color/deyu_BlueColor"
  93 + android:textSize="@dimen/sp_14" />
  94 +
  95 + </LinearLayout>
  96 +</LinearLayout>
app/src/main/res/values/colors.xml
  Diff comments   View file @0cbfbb6
@@ -20,4 +20,6 @@ @@ -20,4 +20,6 @@
20 <color name="text_color">#757575</color> 20 <color name="text_color">#757575</color>
21 <color name="textGreen">#5FB762</color> 21 <color name="textGreen">#5FB762</color>
22 <color name="transparent">#00000000</color> 22 <color name="transparent">#00000000</color>
  23 + <color name="deyu_textColor">#60b3f6</color>
  24 + <color name="deyu_BlueColor">#2b71c4</color>
23 </resources> 25 </resources>