Commit fcfeec87e4e42723a089dfb64f8f72cb5a0f64ef
1 parent
73e6410c
Exists in
yxb_dev
and in
2 other branches
no message
Showing
4 changed files
with
10 additions
and
7 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
| @@ -8,6 +8,7 @@ import com.google.gson.Gson; | @@ -8,6 +8,7 @@ import com.google.gson.Gson; | ||
| 8 | import com.google.gson.JsonArray; | 8 | import com.google.gson.JsonArray; |
| 9 | import com.google.gson.JsonObject; | 9 | import com.google.gson.JsonObject; |
| 10 | import com.share.mvpsdk.utils.OkHttpExceptionUtil; | 10 | import com.share.mvpsdk.utils.OkHttpExceptionUtil; |
| 11 | +import com.share.mvpsdk.utils.ToastUtils; | ||
| 11 | import com.shunzhi.parent.R; | 12 | import com.shunzhi.parent.R; |
| 12 | import com.shunzhi.parent.bean.GuangGaoBean; | 13 | import com.shunzhi.parent.bean.GuangGaoBean; |
| 13 | import com.shunzhi.parent.bean.ToolBean; | 14 | import com.shunzhi.parent.bean.ToolBean; |
| @@ -71,7 +72,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { | @@ -71,7 +72,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { | ||
| 71 | } | 72 | } |
| 72 | mIView.showBanners(guangGaoBeanList); | 73 | mIView.showBanners(guangGaoBeanList); |
| 73 | } else { | 74 | } else { |
| 74 | -// ToastUtils.showToast(jsonObject.get("message").getAsString()); | 75 | + ToastUtils.showToast(jsonObject.get("message").getAsString()); |
| 75 | } | 76 | } |
| 76 | } | 77 | } |
| 77 | }, new Consumer<Throwable>() { | 78 | }, new Consumer<Throwable>() { |
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
| @@ -72,7 +72,7 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace | @@ -72,7 +72,7 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace | ||
| 72 | switch (view.getId()) { | 72 | switch (view.getId()) { |
| 73 | case R.id.bt_sure: | 73 | case R.id.bt_sure: |
| 74 | cardnum = et_cardnum.getText().toString().trim(); | 74 | cardnum = et_cardnum.getText().toString().trim(); |
| 75 | - ToastUtils.showToast("cardnum:" + cardnum); | 75 | +// ToastUtils.showToast("cardnum:" + cardnum); |
| 76 | Log.i("ApplyReplaceCardFragment:data", cardnum); | 76 | Log.i("ApplyReplaceCardFragment:data", cardnum); |
| 77 | if (TextUtils.isEmpty(cardnum)) { | 77 | if (TextUtils.isEmpty(cardnum)) { |
| 78 | ToastUtils.showToast("卡号不能为空，请重新输入!"); | 78 | ToastUtils.showToast("卡号不能为空，请重新输入!"); |
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java
| @@ -89,8 +89,8 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | @@ -89,8 +89,8 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | ||
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | private void getData() { | 91 | private void getData() { |
| 92 | - mPresenter.SigninDetail(currChildBean.getStudentId(), currChildBean.getSchoolId(), currdate); | ||
| 93 | -// mPresenter.SigninDetail(185, 1, currdate);//测试接口 | 92 | +// mPresenter.SigninDetail(currChildBean.getStudentId(), currChildBean.getSchoolId(), currdate); |
| 93 | + mPresenter.SigninDetail(185, 1, currdate);//测试接口 | ||
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | /** | 96 | /** |
| @@ -121,7 +121,7 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | @@ -121,7 +121,7 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra | ||
| 121 | Calendar startDate = Calendar.getInstance(); | 121 | Calendar startDate = Calendar.getInstance(); |
| 122 | startDate.set(1900, 0, 1); | 122 | startDate.set(1900, 0, 1); |
| 123 | Calendar endDate = Calendar.getInstance(); | 123 | Calendar endDate = Calendar.getInstance(); |
| 124 | - endDate.set(2099, 11, 31); | 124 | + endDate.set(2099, 11, 31);//注意：mouth是从0开始计算的，下面宕机的原因可能是之前这边设置的问题 |
| 125 | //AppContext.getInstance().startLocation(); | 125 | //AppContext.getInstance().startLocation(); |
| 126 | //时间选择器 | 126 | //时间选择器 |
| 127 | pvCustomLunar = new TimePickerBuilder(getActivity(), new OnTimeSelectListener() { | 127 | pvCustomLunar = new TimePickerBuilder(getActivity(), new OnTimeSelectListener() { |
app/src/main/res/layout/fragment_apply_replacecard.xml
| @@ -37,15 +37,16 @@ | @@ -37,15 +37,16 @@ | ||
| 37 | android:layout_width="match_parent" | 37 | android:layout_width="match_parent" |
| 38 | android:layout_height="0dp" | 38 | android:layout_height="0dp" |
| 39 | android:layout_weight="2" | 39 | android:layout_weight="2" |
| 40 | + android:gravity="center" | ||
| 40 | android:background="@drawable/report_white" | 41 | android:background="@drawable/report_white" |
| 41 | android:orientation="horizontal"> | 42 | android:orientation="horizontal"> |
| 42 | 43 | ||
| 43 | <TextView | 44 | <TextView |
| 44 | android:layout_weight="1.2" | 45 | android:layout_weight="1.2" |
| 45 | android:id="@+id/tv_carduser" | 46 | android:id="@+id/tv_carduser" |
| 46 | - android:layout_margin="@dimen/dp_8" | ||
| 47 | android:layout_width="0dp" | 47 | android:layout_width="0dp" |
| 48 | android:layout_height="wrap_content" | 48 | android:layout_height="wrap_content" |
| 49 | + android:paddingLeft="@dimen/margin_small" | ||
| 49 | android:text="补卡人:" | 50 | android:text="补卡人:" |
| 50 | android:textColor="@color/hintTextColor" | 51 | android:textColor="@color/hintTextColor" |
| 51 | android:textSize="@dimen/textSize16" /> | 52 | android:textSize="@dimen/textSize16" /> |
| @@ -66,6 +67,7 @@ | @@ -66,6 +67,7 @@ | ||
| 66 | android:layout_width="match_parent" | 67 | android:layout_width="match_parent" |
| 67 | android:layout_height="0dp" | 68 | android:layout_height="0dp" |
| 68 | android:layout_weight="2" | 69 | android:layout_weight="2" |
| 70 | + android:gravity="center" | ||
| 69 | android:orientation="horizontal"> | 71 | android:orientation="horizontal"> |
| 70 | 72 | ||
| 71 | <TextView | 73 | <TextView |
| @@ -73,7 +75,7 @@ | @@ -73,7 +75,7 @@ | ||
| 73 | android:layout_weight="1.2" | 75 | android:layout_weight="1.2" |
| 74 | android:layout_width="0dp" | 76 | android:layout_width="0dp" |
| 75 | android:layout_height="wrap_content" | 77 | android:layout_height="wrap_content" |
| 76 | - android:layout_margin="@dimen/dp_8" | 78 | + android:paddingLeft="@dimen/margin_small" |
| 77 | android:text="卡号:" | 79 | android:text="卡号:" |
| 78 | android:textColor="@color/hintTextColor" | 80 | android:textColor="@color/hintTextColor" |
| 79 | android:textSize="@dimen/textSize16" /> | 81 | android:textSize="@dimen/textSize16" /> |