Commit 4e90fba28178fdb60c2a03d20d4fb12ce91fa269
1 parent
9097b24e
Exists in
yxb_dev
and in
1 other branch
no message
Showing
4 changed files
with
27 additions
and
8 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java
| @@ -25,8 +25,6 @@ public class ActivationActivity extends BaseCompatActivity { | @@ -25,8 +25,6 @@ public class ActivationActivity extends BaseCompatActivity { | ||
| 25 | intent.putExtra("studentId", studentId); | 25 | intent.putExtra("studentId", studentId); |
| 26 | intent.putExtra("isactivation", isactivation); | 26 | intent.putExtra("isactivation", isactivation); |
| 27 | activity.startActivity(intent); | 27 | activity.startActivity(intent); |
| 28 | - | ||
| 29 | - | ||
| 30 | } | 28 | } |
| 31 | 29 | ||
| 32 | @Override | 30 | @Override |
| @@ -45,7 +43,6 @@ public class ActivationActivity extends BaseCompatActivity { | @@ -45,7 +43,6 @@ public class ActivationActivity extends BaseCompatActivity { | ||
| 45 | activationFragment.setArguments(bundle); | 43 | activationFragment.setArguments(bundle); |
| 46 | fragmentTransaction = getSupportFragmentManager().beginTransaction(); | 44 | fragmentTransaction = getSupportFragmentManager().beginTransaction(); |
| 47 | fragmentTransaction.add(R.id.frame, activationFragment).show(activationFragment).commit(); | 45 | fragmentTransaction.add(R.id.frame, activationFragment).show(activationFragment).commit(); |
| 48 | - | ||
| 49 | } | 46 | } |
| 50 | } | 47 | } |
| 51 | 48 |
app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java
| @@ -21,15 +21,20 @@ import com.shunzhi.parent.R; | @@ -21,15 +21,20 @@ import com.shunzhi.parent.R; | ||
| 21 | public class BankActivity extends BaseCompatActivity { | 21 | public class BankActivity extends BaseCompatActivity { |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | - public static void newInstance(Context context, String info) { | 24 | + public static void newInstance(Context context, String info,String childName,int studentId,int isactivation) { |
| 25 | Intent intent = new Intent(context, BankActivity.class); | 25 | Intent intent = new Intent(context, BankActivity.class); |
| 26 | intent.putExtra("info", info); | 26 | intent.putExtra("info", info); |
| 27 | + intent.putExtra("childName", childName); | ||
| 28 | + intent.putExtra("studentId", studentId); | ||
| 29 | + intent.putExtra("isactivation", isactivation); | ||
| 27 | context.startActivity(intent); | 30 | context.startActivity(intent); |
| 28 | } | 31 | } |
| 29 | 32 | ||
| 30 | 33 | ||
| 31 | TextView tv_info, center_title; | 34 | TextView tv_info, center_title; |
| 32 | ImageView back_top; | 35 | ImageView back_top; |
| 36 | + String childName; | ||
| 37 | + int studentId,isactivition; | ||
| 33 | 38 | ||
| 34 | @Override | 39 | @Override |
| 35 | protected void initView(Bundle savedInstanceState) { | 40 | protected void initView(Bundle savedInstanceState) { |
| @@ -37,6 +42,9 @@ public class BankActivity extends BaseCompatActivity { | @@ -37,6 +42,9 @@ public class BankActivity extends BaseCompatActivity { | ||
| 37 | center_title = findViewById(R.id.center_title); | 42 | center_title = findViewById(R.id.center_title); |
| 38 | center_title.setText(""); | 43 | center_title.setText(""); |
| 39 | back_top = findViewById(R.id.back_top); | 44 | back_top = findViewById(R.id.back_top); |
| 45 | + studentId=getIntent().getIntExtra("studentId",0); | ||
| 46 | + isactivition=getIntent().getIntExtra("isactivition",0); | ||
| 47 | + childName=getIntent().getStringExtra("childName"); | ||
| 40 | back_top.setOnClickListener(new View.OnClickListener() { | 48 | back_top.setOnClickListener(new View.OnClickListener() { |
| 41 | @Override | 49 | @Override |
| 42 | public void onClick(View v) { | 50 | public void onClick(View v) { |
| @@ -47,11 +55,25 @@ public class BankActivity extends BaseCompatActivity { | @@ -47,11 +55,25 @@ public class BankActivity extends BaseCompatActivity { | ||
| 47 | if (!TextUtils.isEmpty(info)) { | 55 | if (!TextUtils.isEmpty(info)) { |
| 48 | if (info.equals("如果使用该应用，请前往激活孩子校园卡")) { | 56 | if (info.equals("如果使用该应用，请前往激活孩子校园卡")) { |
| 49 | Spannable span = new SpannableString(info); | 57 | Spannable span = new SpannableString(info); |
| 50 | - span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)), 11, 23, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); | 58 | + span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)), 11, 13, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); |
| 51 | tv_info.setText(span); | 59 | tv_info.setText(span); |
| 60 | + tv_info.setOnClickListener(new View.OnClickListener() { | ||
| 61 | + @Override | ||
| 62 | + public void onClick(View v) { | ||
| 63 | + ActivationActivity.newInstance(BankActivity.this,"",studentId,isactivition,childName); | ||
| 64 | + finish(); | ||
| 65 | + } | ||
| 66 | + }); | ||
| 52 | } else { | 67 | } else { |
| 53 | tv_info.setText(info); | 68 | tv_info.setText(info); |
| 69 | + tv_info.setOnClickListener(new View.OnClickListener() { | ||
| 70 | + @Override | ||
| 71 | + public void onClick(View v) { | ||
| 72 | + | ||
| 73 | + } | ||
| 74 | + }); | ||
| 54 | } | 75 | } |
| 76 | + | ||
| 55 | } | 77 | } |
| 56 | 78 | ||
| 57 | } | 79 | } |
app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
| @@ -195,8 +195,8 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist | @@ -195,8 +195,8 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist | ||
| 195 | progressDialog.show(); | 195 | progressDialog.show(); |
| 196 | // Log.e("1111--==", l.getTime() + ""); | 196 | // Log.e("1111--==", l.getTime() + ""); |
| 197 | if (loginAndRegister.getText().toString().trim().equals("登录")) { | 197 | if (loginAndRegister.getText().toString().trim().equals("登录")) { |
| 198 | -// mPresenter.loginResult(phoneNumber.getText().toString(), password.getText().toString()); | ||
| 199 | - mPresenter.isParentJudge(phoneNumber.getText().toString(),password.getText().toString()); | 198 | + mPresenter.loginResult(phoneNumber.getText().toString(), password.getText().toString()); |
| 199 | +// mPresenter.isParentJudge(phoneNumber.getText().toString(),password.getText().toString()); | ||
| 200 | } else if (loginAndRegister.getText().toString().trim().equals("注册")) { | 200 | } else if (loginAndRegister.getText().toString().trim().equals("注册")) { |
| 201 | mPresenter.registerResult(phoneNumber.getText().toString(), idCode.getText().toString(), password.getText().toString()); | 201 | mPresenter.registerResult(phoneNumber.getText().toString(), idCode.getText().toString(), password.getText().toString()); |
| 202 | } else if (loginAndRegister.getText().toString().trim().equals("确定")) { | 202 | } else if (loginAndRegister.getText().toString().trim().equals("确定")) { |
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
| @@ -243,7 +243,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep | @@ -243,7 +243,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep | ||
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | if (TextUtils.isEmpty(childBean.getCardNumber())) { | 245 | if (TextUtils.isEmpty(childBean.getCardNumber())) { |
| 246 | - BankActivity.newInstance(getActivity(), "如果使用该应用，请前往激活孩子校园卡"); | 246 | + BankActivity.newInstance(getActivity(), "如果使用该应用，请前往激活孩子校园卡",childBean.getStudentName(),childBean.getStudentId(),0); |
| 247 | return true; | 247 | return true; |
| 248 | 248 | ||
| 249 | } | 249 | } |