Commit bcc5360eeb8111498ae3957e6dee6d4882c30d9e
1 parent
105e0366
Exists in
yxb_dev
and in
2 other branches
no message
Showing
8 changed files
with
128 additions
and
108 deletions
Show diff stats
app/libs/processor.jar
No preview for this file type
app/src/main/AndroidManifest.xml
| @@ -119,13 +119,13 @@ | @@ -119,13 +119,13 @@ | ||
| 119 | 119 | ||
| 120 | 120 | ||
| 121 | <provider | 121 | <provider |
| 122 | - android:authorities="com.shunzhi.parent.fileprovider" | ||
| 123 | android:name="android.support.v4.content.FileProvider" | 122 | android:name="android.support.v4.content.FileProvider" |
| 124 | - android:grantUriPermissions="true" | ||
| 125 | - android:exported="false"> | 123 | + android:authorities="com.shunzhi.parent.fileprovider" |
| 124 | + android:exported="false" | ||
| 125 | + android:grantUriPermissions="true"> | ||
| 126 | <meta-data | 126 | <meta-data |
| 127 | android:name="android.support.FILE_PROVIDER_PATHS" | 127 | android:name="android.support.FILE_PROVIDER_PATHS" |
| 128 | - android:resource="@xml/filepaths"/> | 128 | + android:resource="@xml/filepaths" /> |
| 129 | </provider> | 129 | </provider> |
| 130 | 130 | ||
| 131 | <activity | 131 | <activity |
| @@ -206,17 +206,16 @@ | @@ -206,17 +206,16 @@ | ||
| 206 | <activity | 206 | <activity |
| 207 | android:name=".ui.activity.ActivationActivity" | 207 | android:name=".ui.activity.ActivationActivity" |
| 208 | android:launchMode="singleInstance" | 208 | android:launchMode="singleInstance" |
| 209 | - android:windowSoftInputMode="adjustPan|stateAlwaysHidden"/> | 209 | + android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> |
| 210 | <activity | 210 | <activity |
| 211 | android:name=".ui.activity.BankActivity" | 211 | android:name=".ui.activity.BankActivity" |
| 212 | android:launchMode="singleInstance" | 212 | android:launchMode="singleInstance" |
| 213 | - android:windowSoftInputMode="adjustPan|stateAlwaysHidden"/> | 213 | + android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> |
| 214 | 214 | ||
| 215 | <activity | 215 | <activity |
| 216 | android:name=".ui.activity.apply.ApplyReplaceCardActivity" | 216 | android:name=".ui.activity.apply.ApplyReplaceCardActivity" |
| 217 | android:launchMode="singleInstance" | 217 | android:launchMode="singleInstance" |
| 218 | - android:windowSoftInputMode="adjustPan|stateAlwaysHidden" | ||
| 219 | - /> | 218 | + android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> |
| 220 | 219 | ||
| 221 | <activity | 220 | <activity |
| 222 | android:name=".ui.activity.apply.ApplySigninActivity" | 221 | android:name=".ui.activity.apply.ApplySigninActivity" |
app/src/main/java/com/shunzhi/parent/adapter/AttendanceAdapter.java
| @@ -26,10 +26,12 @@ import com.shunzhi.parent.ui.fragment.apply.ApplySigninFragment; | @@ -26,10 +26,12 @@ import com.shunzhi.parent.ui.fragment.apply.ApplySigninFragment; | ||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | public class AttendanceAdapter extends BaseRecyclerViewAdapter<AttendanceBean> { | 28 | public class AttendanceAdapter extends BaseRecyclerViewAdapter<AttendanceBean> { |
| 29 | + private final String mStudentName; | ||
| 29 | private Context mContext = null; | 30 | private Context mContext = null; |
| 30 | 31 | ||
| 31 | - public AttendanceAdapter(Context context) { | 32 | + public AttendanceAdapter(Context context,String studentName) { |
| 32 | mContext = context; | 33 | mContext = context; |
| 34 | + mStudentName = studentName; | ||
| 33 | } | 35 | } |
| 34 | 36 | ||
| 35 | @Override | 37 | @Override |
| @@ -39,13 +41,13 @@ public class AttendanceAdapter extends BaseRecyclerViewAdapter<AttendanceBean> { | @@ -39,13 +41,13 @@ public class AttendanceAdapter extends BaseRecyclerViewAdapter<AttendanceBean> { | ||
| 39 | } | 41 | } |
| 40 | 42 | ||
| 41 | public class AttendanceViewHolder extends BaseRecyclerViewHolder<AttendanceBean> { | 43 | public class AttendanceViewHolder extends BaseRecyclerViewHolder<AttendanceBean> { |
| 42 | - TextView tv_parent_name,tv_attendance; | 44 | + TextView tv_student_name,tv_attendance; |
| 43 | ImageView iv_photo; | 45 | ImageView iv_photo; |
| 44 | 46 | ||
| 45 | public AttendanceViewHolder(View itemView) { | 47 | public AttendanceViewHolder(View itemView) { |
| 46 | super(itemView); | 48 | super(itemView); |
| 47 | 49 | ||
| 48 | - tv_parent_name = itemView.findViewById(R.id.tv_parent_name); | 50 | + tv_student_name = itemView.findViewById(R.id.tv_student_name); |
| 49 | tv_attendance = itemView.findViewById(R.id.tv_attendance); | 51 | tv_attendance = itemView.findViewById(R.id.tv_attendance); |
| 50 | iv_photo = itemView.findViewById(R.id.iv_photo); | 52 | iv_photo = itemView.findViewById(R.id.iv_photo); |
| 51 | } | 53 | } |
| @@ -54,6 +56,7 @@ public class AttendanceAdapter extends BaseRecyclerViewAdapter<AttendanceBean> { | @@ -54,6 +56,7 @@ public class AttendanceAdapter extends BaseRecyclerViewAdapter<AttendanceBean> { | ||
| 54 | public void onBindViewHolder(AttendanceBean object, int position) { | 56 | public void onBindViewHolder(AttendanceBean object, int position) { |
| 55 | Log.i("AttendanceAdapter:",object.getSituation()); | 57 | Log.i("AttendanceAdapter:",object.getSituation()); |
| 56 | tv_attendance.setText(object.getSituation()); | 58 | tv_attendance.setText(object.getSituation()); |
| 59 | + tv_student_name.setText(mStudentName); | ||
| 57 | if (TextUtils.isEmpty(object.getHead_image())){ | 60 | if (TextUtils.isEmpty(object.getHead_image())){ |
| 58 | iv_photo.setImageResource(R.drawable.photo); | 61 | iv_photo.setImageResource(R.drawable.photo); |
| 59 | }else { | 62 | }else { |
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
| @@ -9,6 +9,7 @@ import android.util.Log; | @@ -9,6 +9,7 @@ import android.util.Log; | ||
| 9 | import android.view.View; | 9 | import android.view.View; |
| 10 | import android.widget.Button; | 10 | import android.widget.Button; |
| 11 | import android.widget.EditText; | 11 | import android.widget.EditText; |
| 12 | +import android.widget.TextView; | ||
| 12 | import android.widget.Toast; | 13 | import android.widget.Toast; |
| 13 | 14 | ||
| 14 | import com.google.gson.Gson; | 15 | import com.google.gson.Gson; |
| @@ -33,6 +34,7 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace | @@ -33,6 +34,7 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace | ||
| 33 | private EditText et_cardnum; | 34 | private EditText et_cardnum; |
| 34 | private String cardnum = ""; | 35 | private String cardnum = ""; |
| 35 | private ChildBean currChildBean = new ChildBean(); | 36 | private ChildBean currChildBean = new ChildBean(); |
| 37 | + private TextView et_carduser; | ||
| 36 | 38 | ||
| 37 | @NonNull | 39 | @NonNull |
| 38 | @Override | 40 | @Override |
| @@ -51,12 +53,14 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace | @@ -51,12 +53,14 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace | ||
| 51 | bt_sure = view.findViewById(R.id.bt_sure); | 53 | bt_sure = view.findViewById(R.id.bt_sure); |
| 52 | bt_cancel = view.findViewById(R.id.bt_cancle); | 54 | bt_cancel = view.findViewById(R.id.bt_cancle); |
| 53 | et_cardnum = view.findViewById(R.id.et_cardnum); | 55 | et_cardnum = view.findViewById(R.id.et_cardnum); |
| 56 | + et_carduser =view.findViewById(R.id.et_carduser); | ||
| 54 | bt_sure.setOnClickListener(this); | 57 | bt_sure.setOnClickListener(this); |
| 55 | Gson g = new Gson(); | 58 | Gson g = new Gson(); |
| 56 | String jsonStr = getArguments().getString("childJson"); | 59 | String jsonStr = getArguments().getString("childJson"); |
| 57 | if (!TextUtils.isEmpty(jsonStr)) { | 60 | if (!TextUtils.isEmpty(jsonStr)) { |
| 58 | currChildBean = g.fromJson(jsonStr, ChildBean.class); | 61 | currChildBean = g.fromJson(jsonStr, ChildBean.class); |
| 59 | et_cardnum.setText(currChildBean.getCardNumber()); | 62 | et_cardnum.setText(currChildBean.getCardNumber()); |
| 63 | + et_carduser.setText(currChildBean.getStudentName()); | ||
| 60 | } | 64 | } |
| 61 | 65 | ||
| 62 | 66 |
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java
| @@ -58,6 +58,7 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | @@ -58,6 +58,7 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | ||
| 58 | private String currdate = ""; | 58 | private String currdate = ""; |
| 59 | List<AttendanceBean> signinlist = new ArrayList<>(); | 59 | List<AttendanceBean> signinlist = new ArrayList<>(); |
| 60 | private ChildBean currChildBean = new ChildBean(); | 60 | private ChildBean currChildBean = new ChildBean(); |
| 61 | + private TextView tv_student_name; | ||
| 61 | 62 | ||
| 62 | 63 | ||
| 63 | public BasePresenter initPresenter() { | 64 | public BasePresenter initPresenter() { |
| @@ -77,27 +78,29 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | @@ -77,27 +78,29 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | ||
| 77 | tv_kaoqin_date = view.findViewById(R.id.tv_kaoqin_date); | 78 | tv_kaoqin_date = view.findViewById(R.id.tv_kaoqin_date); |
| 78 | tv_kaoqin_num = view.findViewById(R.id.tv_kaoqin_num); | 79 | tv_kaoqin_num = view.findViewById(R.id.tv_kaoqin_num); |
| 79 | iv_calendar = view.findViewById(R.id.iv_calendar); | 80 | iv_calendar = view.findViewById(R.id.iv_calendar); |
| 81 | + tv_student_name = view.findViewById(R.id.tv_student_name); | ||
| 82 | + recycle_attendance = view.findViewById(R.id.recycle_attendance); | ||
| 83 | + currdate = getNowTime(); | ||
| 84 | + tv_kaoqin_date.setText(getNowTime()); | ||
| 85 | + initLunarPicker(); | ||
| 86 | + iv_calendar.setOnClickListener(this); | ||
| 80 | Gson g = new Gson(); | 87 | Gson g = new Gson(); |
| 81 | String jsonStr = getArguments().getString("childStr"); | 88 | String jsonStr = getArguments().getString("childStr"); |
| 82 | - if (!TextUtils.isEmpty(jsonStr)) | 89 | + if (!TextUtils.isEmpty(jsonStr)) { |
| 83 | currChildBean = g.fromJson(jsonStr, ChildBean.class); | 90 | currChildBean = g.fromJson(jsonStr, ChildBean.class); |
| 84 | - | ||
| 85 | - initLunarPicker(); | ||
| 86 | - iv_calendar.setOnClickListener(this); | ||
| 87 | - | ||
| 88 | - currdate = getNowTime(); | ||
| 89 | - tv_kaoqin_date.setText(getNowTime()); | ||
| 90 | - recycle_attendance = view.findViewById(R.id.recycle_attendance); | ||
| 91 | - | ||
| 92 | - recycle_attendance.setLayoutManager(new LinearLayoutManager(getActivity())); | ||
| 93 | - attendanceAdapter = new AttendanceAdapter(getActivity()); | ||
| 94 | - recycle_attendance.setAdapter(attendanceAdapter); | 91 | + tv_kaoqin_user.setText(currChildBean.getStudentName()); |
| 92 | + tv_student_name.setText(currChildBean.getStudentName()); | ||
| 93 | + recycle_attendance.setLayoutManager(new LinearLayoutManager(getActivity())); | ||
| 94 | + attendanceAdapter = new AttendanceAdapter(getActivity(),currChildBean.getStudentName()); | ||
| 95 | + recycle_attendance.setAdapter(attendanceAdapter); | ||
| 96 | + } | ||
| 95 | getData(); | 97 | getData(); |
| 96 | - | ||
| 97 | } | 98 | } |
| 98 | 99 | ||
| 99 | private void getData() { | 100 | private void getData() { |
| 100 | - mPresenter.SigninDetail(currChildBean.getStudentId(), currChildBean.getSchoolId(), currdate); | 101 | +// mPresenter.SigninDetail(currChildBean.getStudentId(), currChildBean.getSchoolId(), currdate); |
| 102 | + mPresenter.SigninDetail(185, 1, currdate); | ||
| 103 | + | ||
| 101 | } | 104 | } |
| 102 | 105 | ||
| 103 | /** | 106 | /** |
| @@ -118,15 +121,17 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | @@ -118,15 +121,17 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | ||
| 118 | case R.id.iv_calendar: | 121 | case R.id.iv_calendar: |
| 119 | pvCustomLunar.show(); | 122 | pvCustomLunar.show(); |
| 120 | break; | 123 | break; |
| 124 | + default: | ||
| 125 | + break; | ||
| 121 | } | 126 | } |
| 122 | } | 127 | } |
| 123 | 128 | ||
| 124 | private void initLunarPicker() { | 129 | private void initLunarPicker() { |
| 125 | Calendar selectedDate = Calendar.getInstance();//系统当前时间 | 130 | Calendar selectedDate = Calendar.getInstance();//系统当前时间 |
| 126 | Calendar startDate = Calendar.getInstance(); | 131 | Calendar startDate = Calendar.getInstance(); |
| 127 | - startDate.set(1900, 1, 1); | 132 | + startDate.set(1900, 0, 1); |
| 128 | Calendar endDate = Calendar.getInstance(); | 133 | Calendar endDate = Calendar.getInstance(); |
| 129 | - endDate.set(2099, 12, 31); | 134 | + endDate.set(2099, 11, 31); |
| 130 | //AppContext.getInstance().startLocation(); | 135 | //AppContext.getInstance().startLocation(); |
| 131 | //时间选择器 | 136 | //时间选择器 |
| 132 | pvCustomLunar = new TimePickerBuilder(getActivity(), new OnTimeSelectListener() { | 137 | pvCustomLunar = new TimePickerBuilder(getActivity(), new OnTimeSelectListener() { |
| @@ -145,30 +150,30 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | @@ -145,30 +150,30 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | ||
| 145 | public void onTimeSelectChanged(Date date) { | 150 | public void onTimeSelectChanged(Date date) { |
| 146 | Log.i("pvTime", date.toString()); | 151 | Log.i("pvTime", date.toString()); |
| 147 | } | 152 | } |
| 148 | - }).build(); | ||
| 149 | -// .setDate(selectedDate) | ||
| 150 | -// .setRangDate(startDate, endDate) | ||
| 151 | -// .setLayoutRes(R.layout.pickerview_custom_lunar, new CustomListener() { | ||
| 152 | -// @Override | ||
| 153 | -// public void customLayout(View v) { | ||
| 154 | -// final TextView tvSubmit = (TextView) v.findViewById(R.id.tv_finish); | ||
| 155 | -// ImageView ivCancel = (ImageView) v.findViewById(R.id.iv_cancel); | ||
| 156 | -// tvSubmit.setOnClickListener(new View.OnClickListener() { | ||
| 157 | -// @Override | ||
| 158 | -// public void onClick(View v) { | ||
| 159 | -// pvCustomLunar.dismiss(); | ||
| 160 | -// pvCustomLunar.returnData(); | ||
| 161 | -// initData(); | ||
| 162 | -// } | ||
| 163 | -// }); | ||
| 164 | -// ivCancel.setOnClickListener(new View.OnClickListener() { | ||
| 165 | -// @Override | ||
| 166 | -// public void onClick(View v) { | ||
| 167 | -// pvCustomLunar.dismiss(); | ||
| 168 | -// } | ||
| 169 | -// }); | ||
| 170 | -// } | ||
| 171 | -// }).build(); | 153 | + // }).build(); |
| 154 | + }).setDate(selectedDate) | ||
| 155 | + .setRangDate(startDate, endDate) | ||
| 156 | + .setLayoutRes(R.layout.pickerview_custom_lunar, new CustomListener() { | ||
| 157 | + @Override | ||
| 158 | + public void customLayout(View v) { | ||
| 159 | + final TextView tvSubmit = (TextView) v.findViewById(R.id.tv_finish); | ||
| 160 | + ImageView ivCancel = (ImageView) v.findViewById(R.id.iv_cancel); | ||
| 161 | + tvSubmit.setOnClickListener(new View.OnClickListener() { | ||
| 162 | + @Override | ||
| 163 | + public void onClick(View v) { | ||
| 164 | + pvCustomLunar.dismiss(); | ||
| 165 | + pvCustomLunar.returnData(); | ||
| 166 | + initData(); | ||
| 167 | + } | ||
| 168 | + }); | ||
| 169 | + ivCancel.setOnClickListener(new View.OnClickListener() { | ||
| 170 | + @Override | ||
| 171 | + public void onClick(View v) { | ||
| 172 | + pvCustomLunar.dismiss(); | ||
| 173 | + } | ||
| 174 | + }); | ||
| 175 | + } | ||
| 176 | + }).build(); | ||
| 172 | } | 177 | } |
| 173 | 178 | ||
| 174 | 179 | ||
| @@ -180,10 +185,12 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | @@ -180,10 +185,12 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | ||
| 180 | 185 | ||
| 181 | @Override | 186 | @Override |
| 182 | public void showDetialList(List<AttendanceBean> list) { | 187 | public void showDetialList(List<AttendanceBean> list) { |
| 183 | - | 188 | + Log.i("showDetialList", String.valueOf(list.size())); |
| 184 | if (list.size() == 0) { | 189 | if (list.size() == 0) { |
| 185 | layout_tv.setVisibility(View.VISIBLE); | 190 | layout_tv.setVisibility(View.VISIBLE); |
| 191 | + recycle_attendance.setVisibility(View.GONE); | ||
| 186 | } else { | 192 | } else { |
| 193 | + layout_tv.setVisibility(View.GONE); | ||
| 187 | recycle_attendance.setVisibility(View.VISIBLE); | 194 | recycle_attendance.setVisibility(View.VISIBLE); |
| 188 | signinlist.clear(); | 195 | signinlist.clear(); |
| 189 | signinlist.addAll(list); | 196 | signinlist.addAll(list); |
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
| @@ -178,43 +178,43 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep | @@ -178,43 +178,43 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep | ||
| 178 | 178 | ||
| 179 | @Override | 179 | @Override |
| 180 | public void onClick(View view) { | 180 | public void onClick(View view) { |
| 181 | - if (childBean.getCount() == 0) { | ||
| 182 | - final PopupWindow popupWindow = new PopupWindow(); | ||
| 183 | - popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT); | ||
| 184 | - popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT); | ||
| 185 | - backgroundAlpha(0.5f); | ||
| 186 | - View view1 = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view, null); | ||
| 187 | - TextView dialog_info = view1.findViewById(R.id.dialog_info); | ||
| 188 | - dialog_info.setText("请前往订购中心\n订购“智能校卫”\n才能够使用相关应用功能"); | ||
| 189 | - dialog_info.setGravity(Gravity.CENTER); | ||
| 190 | - TextView right_btn = view1.findViewById(R.id.right_btn); | ||
| 191 | - right_btn.setText("前往订购"); | ||
| 192 | - right_btn.setOnClickListener(new View.OnClickListener() { | ||
| 193 | - @Override | ||
| 194 | - public void onClick(View v) { | ||
| 195 | - popupWindow.dismiss(); | ||
| 196 | - backgroundAlpha(1f); | ||
| 197 | - Bundle bundle = new Bundle(); | ||
| 198 | - bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" + | ||
| 199 | - AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID)); | ||
| 200 | - bundle.putInt("type", AppConfig.ORDER_CENTER); | ||
| 201 | - startNewActivity(WebViewActivity.class, bundle); | ||
| 202 | - | ||
| 203 | - } | ||
| 204 | - }); | ||
| 205 | - TextView cancel_btn = view1.findViewById(R.id.cancel_btn); | ||
| 206 | - cancel_btn.setOnClickListener(new View.OnClickListener() { | ||
| 207 | - @Override | ||
| 208 | - public void onClick(View v) { | ||
| 209 | - popupWindow.dismiss(); | ||
| 210 | - backgroundAlpha(1f); | ||
| 211 | - } | ||
| 212 | - }); | ||
| 213 | - | ||
| 214 | - popupWindow.setContentView(view1); | ||
| 215 | - popupWindow.showAtLocation(recyclerView, Gravity.CENTER, 0, 0); | ||
| 216 | - return; | ||
| 217 | - } | 181 | +// if (childBean.getCount() == 0) { |
| 182 | +// final PopupWindow popupWindow = new PopupWindow(); | ||
| 183 | +// popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT); | ||
| 184 | +// popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT); | ||
| 185 | +// backgroundAlpha(0.5f); | ||
| 186 | +// View view1 = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view, null); | ||
| 187 | +// TextView dialog_info = view1.findViewById(R.id.dialog_info); | ||
| 188 | +// dialog_info.setText("请前往订购中心\n订购“智能校卫”\n才能够使用相关应用功能"); | ||
| 189 | +// dialog_info.setGravity(Gravity.CENTER); | ||
| 190 | +// TextView right_btn = view1.findViewById(R.id.right_btn); | ||
| 191 | +// right_btn.setText("前往订购"); | ||
| 192 | +// right_btn.setOnClickListener(new View.OnClickListener() { | ||
| 193 | +// @Override | ||
| 194 | +// public void onClick(View v) { | ||
| 195 | +// popupWindow.dismiss(); | ||
| 196 | +// backgroundAlpha(1f); | ||
| 197 | +// Bundle bundle = new Bundle(); | ||
| 198 | +// bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" + | ||
| 199 | +// AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID)); | ||
| 200 | +// bundle.putInt("type", AppConfig.ORDER_CENTER); | ||
| 201 | +// startNewActivity(WebViewActivity.class, bundle); | ||
| 202 | +// | ||
| 203 | +// } | ||
| 204 | +// }); | ||
| 205 | +// TextView cancel_btn = view1.findViewById(R.id.cancel_btn); | ||
| 206 | +// cancel_btn.setOnClickListener(new View.OnClickListener() { | ||
| 207 | +// @Override | ||
| 208 | +// public void onClick(View v) { | ||
| 209 | +// popupWindow.dismiss(); | ||
| 210 | +// backgroundAlpha(1f); | ||
| 211 | +// } | ||
| 212 | +// }); | ||
| 213 | +// | ||
| 214 | +// popupWindow.setContentView(view1); | ||
| 215 | +// popupWindow.showAtLocation(recyclerView, Gravity.CENTER, 0, 0); | ||
| 216 | +// return; | ||
| 217 | +// } | ||
| 218 | 218 | ||
| 219 | if (TextUtils.isEmpty(childBean.getCardNumber())) { | 219 | if (TextUtils.isEmpty(childBean.getCardNumber())) { |
| 220 | 220 |
app/src/main/res/layout/fragment_apply_signin.xml
| @@ -62,7 +62,6 @@ | @@ -62,7 +62,6 @@ | ||
| 62 | android:textSize="@dimen/textSize16" /> | 62 | android:textSize="@dimen/textSize16" /> |
| 63 | </LinearLayout> | 63 | </LinearLayout> |
| 64 | 64 | ||
| 65 | - | ||
| 66 | <LinearLayout | 65 | <LinearLayout |
| 67 | android:layout_width="match_parent" | 66 | android:layout_width="match_parent" |
| 68 | android:layout_height="0dp" | 67 | android:layout_height="0dp" |
| @@ -127,25 +126,33 @@ | @@ -127,25 +126,33 @@ | ||
| 127 | android:textColor="@color/hintTextColor" | 126 | android:textColor="@color/hintTextColor" |
| 128 | android:textSize="@dimen/textSize16" /> | 127 | android:textSize="@dimen/textSize16" /> |
| 129 | </LinearLayout> | 128 | </LinearLayout> |
| 129 | + </LinearLayout> | ||
| 130 | 130 | ||
| 131 | - <LinearLayout | ||
| 132 | - android:id="@+id/layout_tv" | ||
| 133 | - android:layout_width="match_parent" | ||
| 134 | - android:layout_height="0dp" | ||
| 135 | - android:layout_weight="2" | ||
| 136 | - android:gravity="center" | ||
| 137 | - android:orientation="horizontal" | ||
| 138 | - android:visibility="gone"> | 131 | + <LinearLayout |
| 132 | + android:id="@+id/layout_tv" | ||
| 133 | + android:layout_width="match_parent" | ||
| 134 | + android:layout_height="0dp" | ||
| 135 | + android:layout_weight="1" | ||
| 136 | + android:gravity="center" | ||
| 137 | + android:orientation="horizontal" | ||
| 138 | + android:visibility="visible"> | ||
| 139 | + | ||
| 140 | + <TextView | ||
| 141 | + android:id="@+id/tv_student_name" | ||
| 142 | + android:layout_width="wrap_content" | ||
| 143 | + android:layout_height="wrap_content" | ||
| 144 | + android:text="张三" | ||
| 145 | + android:textColor="@color/textRed" | ||
| 146 | + android:textSize="@dimen/textSize20" /> | ||
| 139 | 147 | ||
| 140 | - <TextView | ||
| 141 | - android:id="@+id/tv_tips" | ||
| 142 | - android:layout_width="wrap_content" | ||
| 143 | - android:layout_height="wrap_content" | ||
| 144 | - android:text="张三今日无刷卡记录!" | ||
| 145 | - android:textColor="@color/textRed" | ||
| 146 | - android:textSize="@dimen/textSize20" /> | ||
| 147 | - </LinearLayout> | ||
| 148 | 148 | ||
| 149 | + <TextView | ||
| 150 | + android:id="@+id/tv_tips" | ||
| 151 | + android:layout_width="wrap_content" | ||
| 152 | + android:layout_height="wrap_content" | ||
| 153 | + android:text="今日无刷卡记录!" | ||
| 154 | + android:textColor="@color/textRed" | ||
| 155 | + android:textSize="@dimen/textSize20" /> | ||
| 149 | </LinearLayout> | 156 | </LinearLayout> |
| 150 | 157 | ||
| 151 | <android.support.v7.widget.RecyclerView | 158 | <android.support.v7.widget.RecyclerView |
| @@ -153,7 +160,7 @@ | @@ -153,7 +160,7 @@ | ||
| 153 | android:layout_width="match_parent" | 160 | android:layout_width="match_parent" |
| 154 | android:layout_height="wrap_content" | 161 | android:layout_height="wrap_content" |
| 155 | android:background="@color/bgColor" | 162 | android:background="@color/bgColor" |
| 156 | - android:visibility="visible"> | 163 | + android:visibility="gone"> |
| 157 | 164 | ||
| 158 | </android.support.v7.widget.RecyclerView> | 165 | </android.support.v7.widget.RecyclerView> |
| 159 | </LinearLayout> | 166 | </LinearLayout> |
| 160 | \ No newline at end of file | 167 | \ No newline at end of file |
app/src/main/res/layout/item_apply_signin.xml
| @@ -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="张三" |