陶汉栋 / ParentWork

Download as
Browse Code »

Commit b51bca0004d0e5a6a8572eebb5d56008a773ecef

Authored by wwx
1 parent 9603b632
Exists in yxb_dev and in 2 other branches developer, wwx

no message

Showing 12 changed files with 32 additions and 55 deletions   Show diff stats
app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java
  Diff comments   View file @b51bca0
@@ -44,8 +44,7 @@ public class ActivationActivity extends BaseCompatActivity { @@ -44,8 +44,7 @@ public class ActivationActivity extends BaseCompatActivity {
44 bundle.putInt("isactivation", isactivation); 44 bundle.putInt("isactivation", isactivation);
45 activationFragment.setArguments(bundle); 45 activationFragment.setArguments(bundle);
46 fragmentTransaction = getSupportFragmentManager().beginTransaction(); 46 fragmentTransaction = getSupportFragmentManager().beginTransaction();
47 - fragmentTransaction.add(R.id.frame, activationFragment)  
48 - .show(activationFragment).commit(); 47 + fragmentTransaction.add(R.id.frame, activationFragment).show(activationFragment).commit();
49 48
50 } 49 }
51 } 50 }
app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplySigninActivity.java
  Diff comments   View file @b51bca0
@@ -18,11 +18,14 @@ import com.bigkoo.pickerview.listener.OnTimeSelectListener; @@ -18,11 +18,14 @@ import com.bigkoo.pickerview.listener.OnTimeSelectListener;
18 import com.share.mvpsdk.base.BasePresenter; 18 import com.share.mvpsdk.base.BasePresenter;
19 import com.share.mvpsdk.base.activity.BaseMVPCompatActivity; 19 import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
20 import com.shunzhi.parent.R; 20 import com.shunzhi.parent.R;
  21 +import com.shunzhi.parent.bean.ChildBean;
21 import com.shunzhi.parent.presenter.apply.ApplySigninPresenter; 22 import com.shunzhi.parent.presenter.apply.ApplySigninPresenter;
22 import com.shunzhi.parent.ui.fragment.apply.ApplySigninFragment; 23 import com.shunzhi.parent.ui.fragment.apply.ApplySigninFragment;
23 24
  25 +import java.util.ArrayList;
24 import java.util.Calendar; 26 import java.util.Calendar;
25 import java.util.Date; 27 import java.util.Date;
  28 +import java.util.List;
26 29
27 /** 30 /**
28 * Created by wwx on 2018/4/10 0010. 31 * Created by wwx on 2018/4/10 0010.
@@ -31,11 +34,12 @@ import java.util.Date; @@ -31,11 +34,12 @@ import java.util.Date;
31 */ 34 */
32 35
33 public class ApplySigninActivity extends BaseMVPCompatActivity implements View.OnClickListener{ 36 public class ApplySigninActivity extends BaseMVPCompatActivity implements View.OnClickListener{
34 - public static void getInstance(Context context) { 37 +
  38 + public static void getInstance(Context context,ChildBean childBean) {
35 Intent intent = new Intent(context, ApplySigninActivity.class); 39 Intent intent = new Intent(context, ApplySigninActivity.class);
36 context.startActivity(intent); 40 context.startActivity(intent);
37 } 41 }
38 - 42 + List<ChildBean> childBeanList = new ArrayList<>();
39 FragmentTransaction fragmentTransaction = null; 43 FragmentTransaction fragmentTransaction = null;
40 ApplySigninFragment applySigninFragment = null; 44 ApplySigninFragment applySigninFragment = null;
41 ImageView ivBack; 45 ImageView ivBack;
@@ -56,7 +60,8 @@ public class ApplySigninActivity extends BaseMVPCompatActivity implements View.O @@ -56,7 +60,8 @@ public class ApplySigninActivity extends BaseMVPCompatActivity implements View.O
56 center_title.setText("考勤"); 60 center_title.setText("考勤");
57 61
58 ivBack.setOnClickListener(this); 62 ivBack.setOnClickListener(this);
59 - 63 +// Bundle bundle = new Bundle();
  64 +// bundle.putString("studentId",childBeanList.listIterator("studentId"));
60 fragmentTransaction = getSupportFragmentManager().beginTransaction(); 65 fragmentTransaction = getSupportFragmentManager().beginTransaction();
61 fragmentTransaction.add(R.id.frame_signin,applySigninFragment).show(applySigninFragment).commit(); 66 fragmentTransaction.add(R.id.frame_signin,applySigninFragment).show(applySigninFragment).commit();
62 67
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
  Diff comments   View file @b51bca0
@@ -79,11 +79,9 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment&lt;ApplyReplace @@ -79,11 +79,9 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment&lt;ApplyReplace
79 if (msg.equals("true")) { 79 if (msg.equals("true")) {
80 if (replaceCardDialog == null) { 80 if (replaceCardDialog == null) {
81 replaceCardDialog = new ReplaceCardDialog(getActivity()); 81 replaceCardDialog = new ReplaceCardDialog(getActivity());
82 - } else {  
83 - replaceCardDialog.setTitle("补卡提示");  
84 - replaceCardDialog.setText("您已补卡成功！");  
85 - replaceCardDialog.show();  
86 } 82 }
  83 + replaceCardDialog.setText("您已补卡成功！");
  84 + replaceCardDialog.show();
87 } else { 85 } else {
88 ToastUtils.showToast("补卡失败！"); 86 ToastUtils.showToast("补卡失败！");
89 } 87 }
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java
  Diff comments   View file @b51bca0
@@ -44,8 +44,7 @@ import java.util.List; @@ -44,8 +44,7 @@ import java.util.List;
44 * Created by Administrator on 2018/4/10 0010. 44 * Created by Administrator on 2018/4/10 0010.
45 */ 45 */
46 46
47 -public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContract.ApplySigninPresenter, ApplySigninContract.IApplySigninModel> implements View.OnClickListener,  
48 - ApplySigninContract.IApplySigninView{ 47 +public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContract.ApplySigninPresenter, ApplySigninContract.IApplySigninModel> implements View.OnClickListener, ApplySigninContract.IApplySigninView{
49 private RecyclerView recycle_attendance; 48 private RecyclerView recycle_attendance;
50 private AttendanceAdapter attendanceAdapter; 49 private AttendanceAdapter attendanceAdapter;
51 List<AttendanceBean> list=new ArrayList<>(); 50 List<AttendanceBean> list=new ArrayList<>();
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
  Diff comments   View file @b51bca0
@@ -150,10 +150,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep @@ -150,10 +150,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
150 public void onClick(View view) { 150 public void onClick(View view) {
151 switch (view.getId()) { 151 switch (view.getId()) {
152 case R.id.layout_kaoqin: 152 case R.id.layout_kaoqin:
153 - ApplySigninActivity.getInstance(getActivity()); 153 + //ApplySigninActivity.getInstance(getActivity());
154 break; 154 break;
155 case R.id.layout_buka: 155 case R.id.layout_buka:
156 - ApplyReplaceCardActivity.getInstance(getActivity()); 156 + //ApplyReplaceCardActivity.getInstance(getActivity());
157 break; 157 break;
158 case R.id.layout_qingjia: 158 case R.id.layout_qingjia:
159 break; 159 break;
app/src/main/res/drawable/close_tipdialog.png 0 → 100644
View file @b51bca0

1.24 KB
app/src/main/res/layout/apply_replacecard_dialog.xml
  Diff comments   View file @b51bca0
1 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 1 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 android:layout_width="fill_parent" 2 android:layout_width="fill_parent"
3 android:layout_height="fill_parent" 3 android:layout_height="fill_parent"
4 - android:background="@color/white"  
5 - android:layout_gravity="center"  
6 android:orientation="vertical"> 4 android:orientation="vertical">
7 5
8 <ImageView 6 <ImageView
9 android:id="@+id/replace_tips_iv" 7 android:id="@+id/replace_tips_iv"
10 android:layout_width="25dp" 8 android:layout_width="25dp"
11 - android:layout_height="25dp"  
12 - android:layout_gravity="right|center_vertical"  
13 - android:background="@drawable/wait_fail" /> 9 + android:layout_height="42dp"
  10 + android:layout_gravity="right"
  11 + android:layout_marginRight="@dimen/dp_30"
  12 + android:background="@drawable/close_tipdialog" />
14 13
15 <TextView 14 <TextView
  15 + android:background="@color/white"
16 android:id="@+id/replace_tips" 16 android:id="@+id/replace_tips"
17 android:layout_width="270dp" 17 android:layout_width="270dp"
18 android:layout_height="150dp" 18 android:layout_height="150dp"
19 android:gravity="center" 19 android:gravity="center"
20 android:text="您已补卡成功！" 20 android:text="您已补卡成功！"
21 android:textColor="@color/txt_black" 21 android:textColor="@color/txt_black"
22 - android:textSize="@dimen/size_dp_20"/> 22 + android:textSize="@dimen/size_dp_20" />
23 </LinearLayout> 23 </LinearLayout>
24 \ No newline at end of file 24 \ No newline at end of file
app/src/main/res/layout/fragment_activation.xml
  Diff comments   View file @b51bca0
@@ -17,9 +17,9 @@ @@ -17,9 +17,9 @@
17 android:layout_centerInParent="true" 17 android:layout_centerInParent="true"
18 android:layout_marginLeft="30dp" 18 android:layout_marginLeft="30dp"
19 android:layout_marginRight="30dp" 19 android:layout_marginRight="30dp"
20 - android:paddingTop="30dp"  
21 android:background="@drawable/report_white" 20 android:background="@drawable/report_white"
22 - android:orientation="vertical"> 21 + android:orientation="vertical"
  22 + android:paddingTop="30dp">
23 23
24 <LinearLayout 24 <LinearLayout
25 android:layout_width="match_parent" 25 android:layout_width="match_parent"
@@ -68,22 +68,22 @@ @@ -68,22 +68,22 @@
68 68
69 69
70 </LinearLayout> 70 </LinearLayout>
  71 +
71 <TextView 72 <TextView
72 android:layout_width="wrap_content" 73 android:layout_width="wrap_content"
73 android:layout_height="wrap_content" 74 android:layout_height="wrap_content"
74 - android:layout_weight="1"  
75 - /> 75 + android:layout_weight="1" />
  76 +
76 <TextView 77 <TextView
77 android:id="@+id/tv_submit" 78 android:id="@+id/tv_submit"
78 android:layout_width="match_parent" 79 android:layout_width="match_parent"
79 android:layout_height="wrap_content" 80 android:layout_height="wrap_content"
80 - android:textSize="@dimen/textSize20"  
81 - android:padding="5dp"  
82 android:background="@drawable/rudiobtn_blue" 81 android:background="@drawable/rudiobtn_blue"
  82 + android:gravity="center"
  83 + android:padding="5dp"
83 android:text="确定" 84 android:text="确定"
84 android:textColor="@color/white" 85 android:textColor="@color/white"
85 - android:gravity="center"  
86 - /> 86 + android:textSize="@dimen/textSize20" />
87 87
88 </LinearLayout> 88 </LinearLayout>
89 </RelativeLayout> 89 </RelativeLayout>
app/src/main/res/layout/fragment_apply_replacecard.xml
  Diff comments   View file @b51bca0
@@ -93,34 +93,6 @@ @@ -93,34 +93,6 @@
93 93
94 </LinearLayout> 94 </LinearLayout>
95 95
96 -  
97 - <LinearLayout  
98 - android:layout_width="match_parent"  
99 - android:layout_height="0dp"  
100 - android:layout_weight="2"  
101 - android:orientation="horizontal">  
102 -  
103 - <TextView  
104 - android:id="@+id/tv_cardnumber"  
105 - android:layout_width="0dp"  
106 - android:layout_height="wrap_content"  
107 - android:layout_margin="@dimen/dp_8"  
108 - android:layout_weight="1.2"  
109 - android:text="考勤次数:"  
110 - android:textColor="@color/hintTextColor"  
111 - android:textSize="@dimen/textSize16" />  
112 -  
113 - <TextView  
114 - android:id="@+id/et_cardnumber"  
115 - android:layout_weight="2.8"  
116 - android:layout_width="0dp"  
117 - android:layout_margin="@dimen/dp_8"  
118 - android:layout_height="wrap_content"  
119 - android:gravity="center"  
120 - android:text="0次"  
121 - android:textColor="@color/hintTextColor"  
122 - android:textSize="@dimen/textSize16" />  
123 - </LinearLayout>  
124 <TextView 96 <TextView
125 android:layout_width="fill_parent" 97 android:layout_width="fill_parent"
126 android:layout_height="1dp" 98 android:layout_height="1dp"
app/src/main/res/values/colors.xml
  Diff comments   View file @b51bca0
@@ -27,4 +27,6 @@ @@ -27,4 +27,6 @@
27 <color name="deyu_textColor">#60b3f6</color> 27 <color name="deyu_textColor">#60b3f6</color>
28 <color name="deyu_BlueColor">#2b71c4</color> 28 <color name="deyu_BlueColor">#2b71c4</color>
29 <color name="line_color">#80bebebe</color> 29 <color name="line_color">#80bebebe</color>
  30 +
  31 + <color name="backgroud_null">#00000000</color>
30 </resources> 32 </resources>
app/src/main/res/values/dimens.xml
  Diff comments   View file @b51bca0
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 <dimen name="smallSpace">6dp</dimen> 31 <dimen name="smallSpace">6dp</dimen>
32 32
33 <dimen name="dp_066">0.66dp</dimen> 33 <dimen name="dp_066">0.66dp</dimen>
  34 + <dimen name="dp_2">2dp</dimen>
34 <dimen name="dp_4">4dp</dimen> 35 <dimen name="dp_4">4dp</dimen>
35 <dimen name="dp_5">5dp</dimen> 36 <dimen name="dp_5">5dp</dimen>
36 <dimen name="dp_8">8dp</dimen> 37 <dimen name="dp_8">8dp</dimen>
app/src/main/res/values/styles.xml
  Diff comments   View file @b51bca0
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
32 <item name="colorAccent">@color/colorAccent</item> 32 <item name="colorAccent">@color/colorAccent</item>
33 <item name="colorPrimaryDark">@color/colorPrimaryDark</item> 33 <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
34 <item name="android:gravity">center</item> 34 <item name="android:gravity">center</item>
  35 + <item name="android:windowBackground">@color/transparent</item>
35 <item name="android:windowCloseOnTouchOutside">false</item> 36 <item name="android:windowCloseOnTouchOutside">false</item>
36 </style> 37 </style>
37 38