Merge branch 'wwx' into yxb_dev

姚旭斌
2 parents 1eaf1abb e28a131f
Showing 8 changed files with 108 additions and 77 deletions Show diff stats
app/libs/processor.jar
app/src/main/AndroidManifest.xml
app/src/main/java/com/shunzhi/parent/adapter/AttendanceAdapter.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/layout/fragment_apply_signin.xml
app/src/main/res/layout/item_apply_signin.xml
@@ -119,13 +119,13 @@
         <provider
-            android:authorities="com.shunzhi.parent.fileprovider"
             android:name="android.support.v4.content.FileProvider"
-            android:grantUriPermissions="true"
-            android:exported="false">
+            android:authorities="com.shunzhi.parent.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/filepaths"/>
+                android:resource="@xml/filepaths" />
         </provider>
         <activity
@@ -206,17 +206,16 @@
         <activity
             android:name=".ui.activity.ActivationActivity"
             android:launchMode="singleInstance"
-            android:windowSoftInputMode="adjustPan|stateAlwaysHidden"/>
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
         <activity
             android:name=".ui.activity.BankActivity"
             android:launchMode="singleInstance"
-            android:windowSoftInputMode="adjustPan|stateAlwaysHidden"/>
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
         <activity
             android:name=".ui.activity.apply.ApplyReplaceCardActivity"
             android:launchMode="singleInstance"
-            android:windowSoftInputMode="adjustPan|stateAlwaysHidden"
-            />
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
         <activity
             android:name=".ui.activity.apply.ApplySigninActivity"
@@ -26,10 +26,12 @@ import com.shunzhi.parent.ui.fragment.apply.ApplySigninFragment;
  */
 public class AttendanceAdapter extends BaseRecyclerViewAdapter<AttendanceBean> {
+    private final String mStudentName;
     private Context mContext = null;
-    public AttendanceAdapter(Context context) {
+    public AttendanceAdapter(Context context,String studentName) {
         mContext = context;
+        mStudentName = studentName;
     }
     @Override
@@ -39,13 +41,13 @@ public class AttendanceAdapter extends BaseRecyclerViewAdapter&lt;AttendanceBean&gt; {
     }
     public class AttendanceViewHolder extends BaseRecyclerViewHolder<AttendanceBean> {
-        TextView tv_parent_name,tv_attendance;
+        TextView tv_student_name,tv_attendance;
         ImageView iv_photo;
         public AttendanceViewHolder(View itemView) {
             super(itemView);
-            tv_parent_name = itemView.findViewById(R.id.tv_parent_name);
+            tv_student_name = itemView.findViewById(R.id.tv_student_name);
             tv_attendance = itemView.findViewById(R.id.tv_attendance);
             iv_photo = itemView.findViewById(R.id.iv_photo);
         }
@@ -54,6 +56,7 @@ public class AttendanceAdapter extends BaseRecyclerViewAdapter&lt;AttendanceBean&gt; {
         public void onBindViewHolder(AttendanceBean object, int position) {
             Log.i("AttendanceAdapter:",object.getSituation());
             tv_attendance.setText(object.getSituation());
+            tv_student_name.setText(mStudentName);
             if (TextUtils.isEmpty(object.getHead_image())){
                 iv_photo.setImageResource(R.drawable.photo);
             }else {
@@ -9,6 +9,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 import android.widget.Toast;
 import com.google.gson.Gson;
@@ -33,6 +34,7 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment&lt;ApplyReplace
     private EditText et_cardnum;
     private String cardnum = "";
     private ChildBean currChildBean = new ChildBean();
+    private TextView et_carduser;
     @NonNull
     @Override
@@ -51,12 +53,14 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment&lt;ApplyReplace
         bt_sure = view.findViewById(R.id.bt_sure);
         bt_cancel = view.findViewById(R.id.bt_cancle);
         et_cardnum = view.findViewById(R.id.et_cardnum);
+        et_carduser =view.findViewById(R.id.et_carduser);
         bt_sure.setOnClickListener(this);
         Gson g = new Gson();
         String jsonStr = getArguments().getString("childJson");
         if (!TextUtils.isEmpty(jsonStr)) {
             currChildBean = g.fromJson(jsonStr, ChildBean.class);
             et_cardnum.setText(currChildBean.getCardNumber());
+            et_carduser.setText(currChildBean.getStudentName());
         }
@@ -49,6 +49,7 @@ public class ApplySigninFragment extends BaseMVPCompatFragment&lt;ApplySigninContra
     private String currdate = "";
     List<AttendanceBean> signinlist = new ArrayList<>();
     private ChildBean currChildBean = new ChildBean();
+    private TextView tv_student_name;
     public BasePresenter initPresenter() {
@@ -68,10 +69,23 @@ public class ApplySigninFragment extends BaseMVPCompatFragment&lt;ApplySigninContra
         tv_kaoqin_date = view.findViewById(R.id.tv_kaoqin_date);
         tv_kaoqin_num = view.findViewById(R.id.tv_kaoqin_num);
         iv_calendar = view.findViewById(R.id.iv_calendar);
+        tv_student_name = view.findViewById(R.id.tv_student_name);
+        recycle_attendance = view.findViewById(R.id.recycle_attendance);
+        currdate = getNowTime();
+        tv_kaoqin_date.setText(getNowTime());
+        initLunarPicker();
+        iv_calendar.setOnClickListener(this);
         Gson g = new Gson();
         String jsonStr = getArguments().getString("childStr");
-        if (!TextUtils.isEmpty(jsonStr))
+        if (!TextUtils.isEmpty(jsonStr)) {
             currChildBean = g.fromJson(jsonStr, ChildBean.class);
+            tv_kaoqin_user.setText(currChildBean.getStudentName());
+            tv_student_name.setText(currChildBean.getStudentName());
+            recycle_attendance.setLayoutManager(new LinearLayoutManager(getActivity()));
+            attendanceAdapter = new AttendanceAdapter(getActivity(),currChildBean.getStudentName());
+            recycle_attendance.setAdapter(attendanceAdapter);
+        }
+
         initLunarPicker();
         iv_calendar.setOnClickListener(this);
         tv_kaoqin_user.setText(currChildBean.getStudentName());
@@ -81,14 +95,15 @@ public class ApplySigninFragment extends BaseMVPCompatFragment&lt;ApplySigninContra
         recycle_attendance = view.findViewById(R.id.recycle_attendance);
         recycle_attendance.setLayoutManager(new LinearLayoutManager(getActivity()));
-        attendanceAdapter = new AttendanceAdapter(getActivity());
+        attendanceAdapter = new AttendanceAdapter(getActivity(),currChildBean.getStudentName());
         recycle_attendance.setAdapter(attendanceAdapter);
         getData();
-
     }
     private void getData() {
-        mPresenter.SigninDetail(currChildBean.getStudentId(), currChildBean.getSchoolId(), currdate);
+//        mPresenter.SigninDetail(currChildBean.getStudentId(), currChildBean.getSchoolId(), currdate);
+        mPresenter.SigninDetail(185, 1, currdate);
+
     }
     /**
@@ -109,15 +124,17 @@ public class ApplySigninFragment extends BaseMVPCompatFragment&lt;ApplySigninContra
             case R.id.iv_calendar:
                 pvCustomLunar.show();
                 break;
+            default:
+                break;
         }
     }
     private void initLunarPicker() {
         Calendar selectedDate = Calendar.getInstance();//系统当前时间
         Calendar startDate = Calendar.getInstance();
-        startDate.set(1900, 1, 1);
+        startDate.set(1900, 0, 1);
         Calendar endDate = Calendar.getInstance();
-        endDate.set(2099, 12, 31);
+        endDate.set(2099, 11, 31);
         //AppContext.getInstance().startLocation();
         //时间选择器
         pvCustomLunar = new TimePickerBuilder(getActivity(), new OnTimeSelectListener() {
@@ -137,7 +154,7 @@ public class ApplySigninFragment extends BaseMVPCompatFragment&lt;ApplySigninContra
                 Log.i("pvTime", date.toString());
             }
         }).build();
-//                .setDate(selectedDate)
+//        }).setDate(selectedDate)
 //                .setRangDate(startDate, endDate)
 //                .setLayoutRes(R.layout.pickerview_custom_lunar, new CustomListener() {
 //                    @Override
@@ -171,11 +188,12 @@ public class ApplySigninFragment extends BaseMVPCompatFragment&lt;ApplySigninContra
     @Override
     public void showDetialList(List<AttendanceBean> list) {
-
+        Log.i("showDetialList", String.valueOf(list.size()));
         if (list.size() == 0) {
             layout_tv.setVisibility(View.VISIBLE);
             recycle_attendance.setVisibility(View.GONE);
         } else {
+            layout_tv.setVisibility(View.GONE);
             recycle_attendance.setVisibility(View.VISIBLE);
             layout_tv.setVisibility(View.GONE);
             signinlist.clear();
@@ -188,6 +206,6 @@ public class ApplySigninFragment extends BaseMVPCompatFragment&lt;ApplySigninContra
     @Override
     public void showDetialInfo(List<AttendanceBean> list) {
         String num = String.valueOf(list.size());
-        tv_kaoqin_num.setText(num);
+        tv_kaoqin_num.setText(num+"次");
     }
 }
@@ -170,43 +170,43 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
     @Override
     public void onClick(View view) {
-        if (childBean.getCount() == 0) {
-            final PopupWindow popupWindow = new PopupWindow();
-            popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
-            popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
-            backgroundAlpha(0.5f);
-            View view1 = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view, null);
-            TextView dialog_info = view1.findViewById(R.id.dialog_info);
-            dialog_info.setText("请前往订购中心\n订购“智能校卫”\n才能够使用相关应用功能");
-            dialog_info.setGravity(Gravity.CENTER);
-            TextView right_btn = view1.findViewById(R.id.right_btn);
-            right_btn.setText("前往订购");
-            right_btn.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    popupWindow.dismiss();
-                    backgroundAlpha(1f);
-                    Bundle bundle = new Bundle();
-                    bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
-                            AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
-                    bundle.putInt("type", AppConfig.ORDER_CENTER);
-                    startNewActivity(WebViewActivity.class, bundle);
-
-                }
-            });
-            TextView cancel_btn = view1.findViewById(R.id.cancel_btn);
-            cancel_btn.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    popupWindow.dismiss();
-                    backgroundAlpha(1f);
-                }
-            });
-
-            popupWindow.setContentView(view1);
-            popupWindow.showAtLocation(recyclerView, Gravity.CENTER, 0, 0);
-            return;
-        }
+//        if (childBean.getCount() == 0) {
+//            final PopupWindow popupWindow = new PopupWindow();
+//            popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+//            popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+//            backgroundAlpha(0.5f);
+//            View view1 = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view, null);
+//            TextView dialog_info = view1.findViewById(R.id.dialog_info);
+//            dialog_info.setText("请前往订购中心\n订购“智能校卫”\n才能够使用相关应用功能");
+//            dialog_info.setGravity(Gravity.CENTER);
+//            TextView right_btn = view1.findViewById(R.id.right_btn);
+//            right_btn.setText("前往订购");
+//            right_btn.setOnClickListener(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    popupWindow.dismiss();
+//                    backgroundAlpha(1f);
+//                    Bundle bundle = new Bundle();
+//                    bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
+//                            AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
+//                    bundle.putInt("type", AppConfig.ORDER_CENTER);
+//                    startNewActivity(WebViewActivity.class, bundle);
+//
+//                }
+//            });
+//            TextView cancel_btn = view1.findViewById(R.id.cancel_btn);
+//            cancel_btn.setOnClickListener(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    popupWindow.dismiss();
+//                    backgroundAlpha(1f);
+//                }
+//            });
+//
+//            popupWindow.setContentView(view1);
+//            popupWindow.showAtLocation(recyclerView, Gravity.CENTER, 0, 0);
+//            return;
+//        }
         if (TextUtils.isEmpty(childBean.getCardNumber())) {
@@ -62,7 +62,6 @@
                 android:textSize="@dimen/textSize16" />
         </LinearLayout>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -123,29 +122,37 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="2.8"
                 android:gravity="center"
-                android:text="5"
+                android:text="0次"
                 android:textColor="@color/hintTextColor"
                 android:textSize="@dimen/textSize16" />
         </LinearLayout>
+    </LinearLayout>
-        <LinearLayout
-            android:id="@+id/layout_tv"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="2"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:visibility="gone">
+    <LinearLayout
+        android:id="@+id/layout_tv"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:visibility="visible">
+
+        <TextView
+            android:id="@+id/tv_student_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="张三"
+            android:textColor="@color/textRed"
+            android:textSize="@dimen/textSize20" />
-            <TextView
-                android:id="@+id/tv_tips"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="张三今日无刷卡记录!"
-                android:textColor="@color/textRed"
-                android:textSize="@dimen/textSize20" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/tv_tips"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="今日无刷卡记录!"
+            android:textColor="@color/textRed"
+            android:textSize="@dimen/textSize20" />
     </LinearLayout>
     <android.support.v7.widget.RecyclerView
@@ -153,7 +160,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/bgColor"
-        android:visibility="visible">
+        android:visibility="gone">
     </android.support.v7.widget.RecyclerView>
 </LinearLayout>
 \ No newline at end of file
@@ -53,7 +53,7 @@
                     android:textSize="@dimen/size_dp_18" />
                 <TextView
-                    android:id="@+id/tv_parent_name"
+                    android:id="@+id/tv_student_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="张三"
	@@ -53,7 +53,7 @@		@@ -53,7 +53,7 @@
53	android:textSize="@dimen/size_dp_18" />	53	android:textSize="@dimen/size_dp_18" />
54		54
55	<TextView	55	<TextView
56	- android:id="@+id/tv_parent_name"	56	+ android:id="@+id/tv_student_name"
57	android:layout_width="wrap_content"	57	android:layout_width="wrap_content"
58	android:layout_height="wrap_content"	58	android:layout_height="wrap_content"
59	android:text="张三"	59	android:text="张三"