Commit 1eaf1abbf751c6f00df0e7b2698fbbb25040f301
1 parent
45b64f1c
Exists in
yxb_dev
and in
1 other branch
no message
Showing
3 changed files
with
5 additions
and
6 deletions
 
Show diff stats
app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java
| @@ -41,7 +41,7 @@ public class BankActivity extends BaseCompatActivity { | @@ -41,7 +41,7 @@ public class BankActivity extends BaseCompatActivity { | ||
| 41 | } | 41 | } | 
| 42 | }); | 42 | }); | 
| 43 | String info = getIntent().getStringExtra("info"); | 43 | String info = getIntent().getStringExtra("info"); | 
| 44 | - if (TextUtils.isEmpty(info)) | 44 | + if (!TextUtils.isEmpty(info)) | 
| 45 | tv_info.setText(info); | 45 | tv_info.setText(info); | 
| 46 | 46 | ||
| 47 | } | 47 | } | 
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
| @@ -115,11 +115,6 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep | @@ -115,11 +115,6 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep | ||
| 115 | } | 115 | } | 
| 116 | } | 116 | } | 
| 117 | 117 | ||
| 118 | - @Override | ||
| 119 | - public void onResume() { | ||
| 120 | - super.onResume(); | ||
| 121 | - } | ||
| 122 | - | ||
| 123 | private void initCalendarView() { | 118 | private void initCalendarView() { | 
| 124 | 119 | ||
| 125 | showDate(); | 120 | showDate(); | 
| @@ -216,6 +211,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep | @@ -216,6 +211,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep | ||
| 216 | if (TextUtils.isEmpty(childBean.getCardNumber())) { | 211 | if (TextUtils.isEmpty(childBean.getCardNumber())) { | 
| 217 | 212 | ||
| 218 | BankActivity.newInstance(getActivity(), "如果使用该应用,请前往激活孩子校园卡"); | 213 | BankActivity.newInstance(getActivity(), "如果使用该应用,请前往激活孩子校园卡"); | 
| 214 | + return; | ||
| 219 | 215 | ||
| 220 | } | 216 | } | 
| 221 | 217 | 
app/src/main/res/layout/activity_bank.xml
| @@ -10,9 +10,12 @@ | @@ -10,9 +10,12 @@ | ||
| 10 | <include layout="@layout/top" /> | 10 | <include layout="@layout/top" /> | 
| 11 | 11 | ||
| 12 | <TextView | 12 | <TextView | 
| 13 | + android:layout_marginTop="@dimen/size_dp_20" | ||
| 13 | android:id="@+id/tv_info" | 14 | android:id="@+id/tv_info" | 
| 14 | android:layout_width="match_parent" | 15 | android:layout_width="match_parent" | 
| 15 | android:layout_height="wrap_content" | 16 | android:layout_height="wrap_content" | 
| 17 | + android:textSize="@dimen/sp_18" | ||
| 18 | + android:gravity="center_horizontal" | ||
| 16 | android:text="" /> | 19 | android:text="" /> | 
| 17 | 20 | ||
| 18 | 21 |