From b51bca0004d0e5a6a8572eebb5d56008a773ecef Mon Sep 17 00:00:00 2001 From: wwx <1143403680@qq.com> Date: Thu, 19 Apr 2018 17:57:13 +0800 Subject: [PATCH] no message --- app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java | 3 +-- app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplySigninActivity.java | 11 ++++++++--- app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java | 6 ++---- app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java | 3 +-- app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java | 4 ++-- app/src/main/res/drawable/close_tipdialog.png | Bin 0 -> 1265 bytes app/src/main/res/layout/apply_replacecard_dialog.xml | 12 ++++++------ app/src/main/res/layout/fragment_activation.xml | 16 ++++++++-------- app/src/main/res/layout/fragment_apply_replacecard.xml | 28 ---------------------------- app/src/main/res/values/colors.xml | 2 ++ app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/styles.xml | 1 + 12 files changed, 32 insertions(+), 55 deletions(-) create mode 100644 app/src/main/res/drawable/close_tipdialog.png diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java index 26c4f5d..131380a 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java @@ -44,8 +44,7 @@ public class ActivationActivity extends BaseCompatActivity { bundle.putInt("isactivation", isactivation); activationFragment.setArguments(bundle); fragmentTransaction = getSupportFragmentManager().beginTransaction(); - fragmentTransaction.add(R.id.frame, activationFragment) - .show(activationFragment).commit(); + fragmentTransaction.add(R.id.frame, activationFragment).show(activationFragment).commit(); } } diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplySigninActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplySigninActivity.java index 3241b77..4a4ea37 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplySigninActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplySigninActivity.java @@ -18,11 +18,14 @@ import com.bigkoo.pickerview.listener.OnTimeSelectListener; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.activity.BaseMVPCompatActivity; import com.shunzhi.parent.R; +import com.shunzhi.parent.bean.ChildBean; import com.shunzhi.parent.presenter.apply.ApplySigninPresenter; import com.shunzhi.parent.ui.fragment.apply.ApplySigninFragment; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.List; /** * Created by wwx on 2018/4/10 0010. @@ -31,11 +34,12 @@ import java.util.Date; */ public class ApplySigninActivity extends BaseMVPCompatActivity implements View.OnClickListener{ - public static void getInstance(Context context) { + + public static void getInstance(Context context,ChildBean childBean) { Intent intent = new Intent(context, ApplySigninActivity.class); context.startActivity(intent); } - + List childBeanList = new ArrayList<>(); FragmentTransaction fragmentTransaction = null; ApplySigninFragment applySigninFragment = null; ImageView ivBack; @@ -56,7 +60,8 @@ public class ApplySigninActivity extends BaseMVPCompatActivity implements View.O center_title.setText("考勤"); ivBack.setOnClickListener(this); - +// Bundle bundle = new Bundle(); +// bundle.putString("studentId",childBeanList.listIterator("studentId")); fragmentTransaction = getSupportFragmentManager().beginTransaction(); fragmentTransaction.add(R.id.frame_signin,applySigninFragment).show(applySigninFragment).commit(); diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java index 48b8962..ba487c4 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java @@ -79,11 +79,9 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment implements View.OnClickListener, - ApplySigninContract.IApplySigninView{ +public class ApplySigninFragment extends BaseMVPCompatFragment implements View.OnClickListener, ApplySigninContract.IApplySigninView{ private RecyclerView recycle_attendance; private AttendanceAdapter attendanceAdapter; List list=new ArrayList<>(); diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java index 3846a7e..78491d1 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java @@ -150,10 +150,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment + android:layout_height="42dp" + android:layout_gravity="right" + android:layout_marginRight="@dimen/dp_30" + android:background="@drawable/close_tipdialog" /> + android:textSize="@dimen/size_dp_20" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_activation.xml b/app/src/main/res/layout/fragment_activation.xml index 34bb1af..921752a 100644 --- a/app/src/main/res/layout/fragment_activation.xml +++ b/app/src/main/res/layout/fragment_activation.xml @@ -17,9 +17,9 @@ android:layout_centerInParent="true" android:layout_marginLeft="30dp" android:layout_marginRight="30dp" - android:paddingTop="30dp" android:background="@drawable/report_white" - android:orientation="vertical"> + android:orientation="vertical" + android:paddingTop="30dp"> + + android:layout_weight="1" /> + + android:textSize="@dimen/textSize20" /> diff --git a/app/src/main/res/layout/fragment_apply_replacecard.xml b/app/src/main/res/layout/fragment_apply_replacecard.xml index a256ae9..23eefd6 100644 --- a/app/src/main/res/layout/fragment_apply_replacecard.xml +++ b/app/src/main/res/layout/fragment_apply_replacecard.xml @@ -93,34 +93,6 @@ - - - - - - - #60b3f6 #2b71c4 #80bebebe + + #00000000 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 0137b7b..b2f3bc7 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -31,6 +31,7 @@ 6dp 0.66dp + 2dp 4dp 5dp 8dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7ab3c72..65971e8 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -32,6 +32,7 @@ @color/colorAccent @color/colorPrimaryDark center + @color/transparent false -- libgit2 0.21.0