Merge branch 'wwx' into yxb_dev

姚旭斌
2 parents 12229e0d b51bca00
Showing 15 changed files with 35 additions and 61 deletions Show diff stats
app/libs/processor.jar
app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java
app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java
app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java
app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplySigninActivity.java
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
app/src/main/res/drawable/close_tipdialog.png
app/src/main/res/layout/apply_replacecard_dialog.xml
app/src/main/res/layout/fragment_activation.xml
app/src/main/res/layout/fragment_apply_replacecard.xml
app/src/main/res/values/colors.xml
app/src/main/res/values/dimens.xml
app/src/main/res/values/styles.xml
@@ -13,5 +13,5 @@ import retrofit2.http.Query;
 public interface ApplyReplaceCardApi {
  
     @GET("/api/OneCard/AddStuCard")
-    Observable<JsonObject> getApplyReplaceCard(@Query("studentId") int studentId,@Query("onecard") String cardId);
+    Observable<JsonObject> getApplyReplaceCard(@Query("studentid") int studentId,@Query("onecard") String cardId);
 }
@@ -14,16 +14,13 @@ import io.reactivex.Observable;
 /**
  * Created by Administrator on 2018/4/18 0018.
  */
-//BaseModel implements OrderDetailContract.IOrderDetailModel
-public class ApplyReplaceCardModel extends BaseModel implements ApplyReplaceCardContract.IApplyReplaceCardModel {
+public class ApplyReplaceCardModel extends BaseModel implements ApplyReplaceCardContract.IApplyReplaceCardModel{
     public static ApplyReplaceCardContract.IApplyReplaceCardModel newInstance() {
         return new ApplyReplaceCardModel();
     }
  
     @Override
     public Observable<JsonObject> getReplaceCardDetailResult(int studentId, String cardId) {
-        String user_id = AppConfig.getAppConfig(AppContext.getContext()).get(AppConfig.USER_ID);
-        return RetrofitCreateHelper.getInstance().createApi(ApplyReplaceCardApi.class, AppConfig.BASE_URL).getApplyReplaceCard(studentId, cardId)
-                .compose(RxHelper.<JsonObject>rxSchedulerHelper());
+        return RetrofitCreateHelper.getInstance().createApi(ApplyReplaceCardApi.class,AppConfig.BASE_URL).getApplyReplaceCard(studentId,cardId).compose(RxHelper.<JsonObject>rxSchedulerHelper());
     }
 }
@@ -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();
  
         }
     }
@@ -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<ChildBean> 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();
  
@@ -79,11 +79,9 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment&lt;ApplyReplace
         if (msg.equals("true")) {
             if (replaceCardDialog == null) {
                 replaceCardDialog = new ReplaceCardDialog(getActivity());
-            } else {
-                replaceCardDialog.setTitle("补卡提示");
-                replaceCardDialog.setText("您已补卡成功！");
-                replaceCardDialog.show();
             }
+            replaceCardDialog.setText("您已补卡成功！");
+            replaceCardDialog.show();
         } else {
             ToastUtils.showToast("补卡失败！");
         }
@@ -44,8 +44,7 @@ import java.util.List;
  * Created by Administrator on 2018/4/10 0010.
  */
  
-public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContract.ApplySigninPresenter, ApplySigninContract.IApplySigninModel> implements View.OnClickListener,
-        ApplySigninContract.IApplySigninView{
+public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContract.ApplySigninPresenter, ApplySigninContract.IApplySigninModel> implements View.OnClickListener, ApplySigninContract.IApplySigninView{
     private RecyclerView recycle_attendance;
     private AttendanceAdapter attendanceAdapter;
     List<AttendanceBean> list=new ArrayList<>();
@@ -150,10 +150,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.layout_kaoqin:
-                ApplySigninActivity.getInstance(getActivity());
+                //ApplySigninActivity.getInstance(getActivity());
                 break;
             case R.id.layout_buka:
-                ApplyReplaceCardActivity.getInstance(getActivity());
+                //ApplyReplaceCardActivity.getInstance(getActivity());
                 break;
             case R.id.layout_qingjia:
                 break;
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/white"
-    android:layout_gravity="center"
     android:orientation="vertical">
  
     <ImageView
         android:id="@+id/replace_tips_iv"
         android:layout_width="25dp"
-        android:layout_height="25dp"
-        android:layout_gravity="right|center_vertical"
-        android:background="@drawable/wait_fail" />
+        android:layout_height="42dp"
+        android:layout_gravity="right"
+        android:layout_marginRight="@dimen/dp_30"
+        android:background="@drawable/close_tipdialog" />
  
     <TextView
+        android:background="@color/white"
         android:id="@+id/replace_tips"
         android:layout_width="270dp"
         android:layout_height="150dp"
         android:gravity="center"
         android:text="您已补卡成功！"
         android:textColor="@color/txt_black"
-        android:textSize="@dimen/size_dp_20"/>
+        android:textSize="@dimen/size_dp_20" />
 </LinearLayout>
 \ No newline at end of file
@@ -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">
  
             <LinearLayout
                 android:layout_width="match_parent"
@@ -68,22 +68,22 @@
  
  
             </LinearLayout>
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                />
+                android:layout_weight="1" />
+
             <TextView
                 android:id="@+id/tv_submit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/textSize20"
-                android:padding="5dp"
                 android:background="@drawable/rudiobtn_blue"
+                android:gravity="center"
+                android:padding="5dp"
                 android:text="确定"
                 android:textColor="@color/white"
-                android:gravity="center"
-                />
+                android:textSize="@dimen/textSize20" />
  
         </LinearLayout>
     </RelativeLayout>
@@ -93,34 +93,6 @@
  
         </LinearLayout>
  
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="2"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/tv_cardnumber"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_8"
-                android:layout_weight="1.2"
-                android:text="考勤次数:"
-                android:textColor="@color/hintTextColor"
-                android:textSize="@dimen/textSize16" />
-
-            <TextView
-                android:id="@+id/et_cardnumber"
-                android:layout_weight="2.8"
-                android:layout_width="0dp"
-                android:layout_margin="@dimen/dp_8"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="0次"
-                android:textColor="@color/hintTextColor"
-                android:textSize="@dimen/textSize16" />
-        </LinearLayout>
     <TextView
         android:layout_width="fill_parent"
         android:layout_height="1dp"
@@ -27,4 +27,6 @@
     <color name="deyu_textColor">#60b3f6</color>
     <color name="deyu_BlueColor">#2b71c4</color>
     <color name="line_color">#80bebebe</color>
+
+    <color name="backgroud_null">#00000000</color>
 </resources>
@@ -31,6 +31,7 @@
     <dimen name="smallSpace">6dp</dimen>
  
     <dimen name="dp_066">0.66dp</dimen>
+    <dimen name="dp_2">2dp</dimen>
     <dimen name="dp_4">4dp</dimen>
     <dimen name="dp_5">5dp</dimen>
     <dimen name="dp_8">8dp</dimen>
@@ -32,6 +32,7 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="android:gravity">center</item>
+        <item name="android:windowBackground">@color/transparent</item>
         <item name="android:windowCloseOnTouchOutside">false</item>
     </style>
...	...	@@ -13,5 +13,5 @@ import retrofit2.http.Query;
13	13	public interface ApplyReplaceCardApi {
14	14
15	15	@GET("/api/OneCard/AddStuCard")
16		- Observable<JsonObject> getApplyReplaceCard(@Query("studentId") int studentId,@Query("onecard") String cardId);
	16	+ Observable<JsonObject> getApplyReplaceCard(@Query("studentid") int studentId,@Query("onecard") String cardId);
17	17	}
...	...
...	...	@@ -14,16 +14,13 @@ import io.reactivex.Observable;
14	14	/**
15	15	* Created by Administrator on 2018/4/18 0018.
16	16	*/
17		-//BaseModel implements OrderDetailContract.IOrderDetailModel
18		-public class ApplyReplaceCardModel extends BaseModel implements ApplyReplaceCardContract.IApplyReplaceCardModel {
	17	+public class ApplyReplaceCardModel extends BaseModel implements ApplyReplaceCardContract.IApplyReplaceCardModel{
19	18	public static ApplyReplaceCardContract.IApplyReplaceCardModel newInstance() {
20	19	return new ApplyReplaceCardModel();
21	20	}
22	21
23	22	@Override
24	23	public Observable<JsonObject> getReplaceCardDetailResult(int studentId, String cardId) {
25		- String user_id = AppConfig.getAppConfig(AppContext.getContext()).get(AppConfig.USER_ID);
26		- return RetrofitCreateHelper.getInstance().createApi(ApplyReplaceCardApi.class, AppConfig.BASE_URL).getApplyReplaceCard(studentId, cardId)
27		- .compose(RxHelper.<JsonObject>rxSchedulerHelper());
	24	+ return RetrofitCreateHelper.getInstance().createApi(ApplyReplaceCardApi.class,AppConfig.BASE_URL).getApplyReplaceCard(studentId,cardId).compose(RxHelper.<JsonObject>rxSchedulerHelper());
28	25	}
29	26	}
...	...
...	...	@@ -44,8 +44,7 @@ public class ActivationActivity extends BaseCompatActivity {
44	44	bundle.putInt("isactivation", isactivation);
45	45	activationFragment.setArguments(bundle);
46	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	}
...	...
...	...	@@ -18,11 +18,14 @@ import com.bigkoo.pickerview.listener.OnTimeSelectListener;
18	18	import com.share.mvpsdk.base.BasePresenter;
19	19	import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
20	20	import com.shunzhi.parent.R;
	21	+import com.shunzhi.parent.bean.ChildBean;
21	22	import com.shunzhi.parent.presenter.apply.ApplySigninPresenter;
22	23	import com.shunzhi.parent.ui.fragment.apply.ApplySigninFragment;
23	24
	25	+import java.util.ArrayList;
24	26	import java.util.Calendar;
25	27	import java.util.Date;
	28	+import java.util.List;
26	29
27	30	/**
28	31	* Created by wwx on 2018/4/10 0010.
...	...	@@ -31,11 +34,12 @@ import java.util.Date;
31	34	*/
32	35
33	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	39	Intent intent = new Intent(context, ApplySigninActivity.class);
36	40	context.startActivity(intent);
37	41	}
38		-
	42	+ List<ChildBean> childBeanList = new ArrayList<>();
39	43	FragmentTransaction fragmentTransaction = null;
40	44	ApplySigninFragment applySigninFragment = null;
41	45	ImageView ivBack;
...	...	@@ -56,7 +60,8 @@ public class ApplySigninActivity extends BaseMVPCompatActivity implements View.O
56	60	center_title.setText("考勤");
57	61
58	62	ivBack.setOnClickListener(this);
59		-
	63	+// Bundle bundle = new Bundle();
	64	+// bundle.putString("studentId",childBeanList.listIterator("studentId"));
60	65	fragmentTransaction = getSupportFragmentManager().beginTransaction();
61	66	fragmentTransaction.add(R.id.frame_signin,applySigninFragment).show(applySigninFragment).commit();
62	67
...	...
...	...	@@ -79,11 +79,9 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace
79	79	if (msg.equals("true")) {
80	80	if (replaceCardDialog == null) {
81	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	85	} else {
88	86	ToastUtils.showToast("补卡失败！");
89	87	}
...	...
...	...	@@ -44,8 +44,7 @@ import java.util.List;
44	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	48	private RecyclerView recycle_attendance;
50	49	private AttendanceAdapter attendanceAdapter;
51	50	List<AttendanceBean> list=new ArrayList<>();
...	...
...	...	@@ -150,10 +150,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
150	150	public void onClick(View view) {
151	151	switch (view.getId()) {
152	152	case R.id.layout_kaoqin:
153		- ApplySigninActivity.getInstance(getActivity());
	153	+ //ApplySigninActivity.getInstance(getActivity());
154	154	break;
155	155	case R.id.layout_buka:
156		- ApplyReplaceCardActivity.getInstance(getActivity());
	156	+ //ApplyReplaceCardActivity.getInstance(getActivity());
157	157	break;
158	158	case R.id.layout_qingjia:
159	159	break;
...	...
1	1	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2	2	android:layout_width="fill_parent"
3	3	android:layout_height="fill_parent"
4		- android:background="@color/white"
5		- android:layout_gravity="center"
6	4	android:orientation="vertical">
7	5
8	6	<ImageView
9	7	android:id="@+id/replace_tips_iv"
10	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	14	<TextView
	15	+ android:background="@color/white"
16	16	android:id="@+id/replace_tips"
17	17	android:layout_width="270dp"
18	18	android:layout_height="150dp"
19	19	android:gravity="center"
20	20	android:text="您已补卡成功！"
21	21	android:textColor="@color/txt_black"
22		- android:textSize="@dimen/size_dp_20"/>
	22	+ android:textSize="@dimen/size_dp_20" />
23	23	</LinearLayout>
24	24	\ No newline at end of file
...	...
...	...	@@ -17,9 +17,9 @@
17	17	android:layout_centerInParent="true"
18	18	android:layout_marginLeft="30dp"
19	19	android:layout_marginRight="30dp"
20		- android:paddingTop="30dp"
21	20	android:background="@drawable/report_white"
22		- android:orientation="vertical">
	21	+ android:orientation="vertical"
	22	+ android:paddingTop="30dp">
23	23
24	24	<LinearLayout
25	25	android:layout_width="match_parent"
...	...	@@ -68,22 +68,22 @@
68	68
69	69
70	70	</LinearLayout>
	71	+
71	72	<TextView
72	73	android:layout_width="wrap_content"
73	74	android:layout_height="wrap_content"
74		- android:layout_weight="1"
75		- />
	75	+ android:layout_weight="1" />
	76	+
76	77	<TextView
77	78	android:id="@+id/tv_submit"
78	79	android:layout_width="match_parent"
79	80	android:layout_height="wrap_content"
80		- android:textSize="@dimen/textSize20"
81		- android:padding="5dp"
82	81	android:background="@drawable/rudiobtn_blue"
	82	+ android:gravity="center"
	83	+ android:padding="5dp"
83	84	android:text="确定"
84	85	android:textColor="@color/white"
85		- android:gravity="center"
86		- />
	86	+ android:textSize="@dimen/textSize20" />
87	87
88	88	</LinearLayout>
89	89	</RelativeLayout>
...	...
...	...	@@ -93,34 +93,6 @@
93	93
94	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	96	<TextView
125	97	android:layout_width="fill_parent"
126	98	android:layout_height="1dp"
...	...