Commit c1b6c5121a5c73a00a0d15a129ae5154b49413b8
Exists in
yxb_dev
and in
1 other branch
Merge branch 'wwx' into yxb_dev
# Conflicts: # app/libs/processor.jar
Showing
2 changed files
with
5 additions
and
19 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java
| @@ -85,25 +85,12 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | @@ -85,25 +85,12 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | ||
| 85 | attendanceAdapter = new AttendanceAdapter(getActivity(),currChildBean.getStudentName()); | 85 | attendanceAdapter = new AttendanceAdapter(getActivity(),currChildBean.getStudentName()); |
| 86 | recycle_attendance.setAdapter(attendanceAdapter); | 86 | recycle_attendance.setAdapter(attendanceAdapter); |
| 87 | } | 87 | } |
| 88 | - | ||
| 89 | - initLunarPicker(); | ||
| 90 | - iv_calendar.setOnClickListener(this); | ||
| 91 | - tv_kaoqin_user.setText(currChildBean.getStudentName()); | ||
| 92 | - tv_tips.setText(currChildBean.getStudentName() + "今日无刷卡记录"); | ||
| 93 | - currdate = getNowTime(); | ||
| 94 | - tv_kaoqin_date.setText(getNowTime()); | ||
| 95 | - recycle_attendance = view.findViewById(R.id.recycle_attendance); | ||
| 96 | - | ||
| 97 | - recycle_attendance.setLayoutManager(new LinearLayoutManager(getActivity())); | ||
| 98 | - attendanceAdapter = new AttendanceAdapter(getActivity(),currChildBean.getStudentName()); | ||
| 99 | - recycle_attendance.setAdapter(attendanceAdapter); | ||
| 100 | getData(); | 88 | getData(); |
| 101 | } | 89 | } |
| 102 | 90 | ||
| 103 | private void getData() { | 91 | private void getData() { |
| 104 | -// mPresenter.SigninDetail(currChildBean.getStudentId(), currChildBean.getSchoolId(), currdate); | ||
| 105 | - mPresenter.SigninDetail(185, 1, currdate); | ||
| 106 | - | 92 | + mPresenter.SigninDetail(currChildBean.getStudentId(), currChildBean.getSchoolId(), currdate); |
| 93 | +// mPresenter.SigninDetail(185, 1, currdate);//测试接口 | ||
| 107 | } | 94 | } |
| 108 | 95 | ||
| 109 | /** | 96 | /** |
app/src/main/res/layout/fragment_cheng_zhang.xml
| @@ -5,13 +5,13 @@ | @@ -5,13 +5,13 @@ | ||
| 5 | android:background="@color/white" | 5 | android:background="@color/white" |
| 6 | tools:context="com.shunzhi.parent.ui.fragment.report.ChengZhangFragment"> | 6 | tools:context="com.shunzhi.parent.ui.fragment.report.ChengZhangFragment"> |
| 7 | 7 | ||
| 8 | - <include layout="@layout/layout_chengzhang"/> | 8 | + <include layout="@layout/layout_chengzhang" /> |
| 9 | 9 | ||
| 10 | <LinearLayout | 10 | <LinearLayout |
| 11 | - android:layout_margin="@dimen/size_dp_10" | ||
| 12 | android:id="@+id/layout_report" | 11 | android:id="@+id/layout_report" |
| 13 | android:layout_width="match_parent" | 12 | android:layout_width="match_parent" |
| 14 | android:layout_height="match_parent" | 13 | android:layout_height="match_parent" |
| 14 | + android:layout_margin="@dimen/size_dp_10" | ||
| 15 | android:orientation="vertical"> | 15 | android:orientation="vertical"> |
| 16 | 16 | ||
| 17 | <!--<include layout="@layout/layout_week" /> android:layout_below="@+id/linearlayout"--> | 17 | <!--<include layout="@layout/layout_week" /> android:layout_below="@+id/linearlayout"--> |
| @@ -48,8 +48,7 @@ | @@ -48,8 +48,7 @@ | ||
| 48 | android:id="@+id/recycle_report" | 48 | android:id="@+id/recycle_report" |
| 49 | android:layout_width="match_parent" | 49 | android:layout_width="match_parent" |
| 50 | android:layout_height="match_parent" | 50 | android:layout_height="match_parent" |
| 51 | - android:background="@color/bgColor" | ||
| 52 | - > | 51 | + android:background="@color/bgColor"> |
| 53 | 52 | ||
| 54 | </android.support.v7.widget.RecyclerView> | 53 | </android.support.v7.widget.RecyclerView> |
| 55 | 54 |