From 4e90fba28178fdb60c2a03d20d4fb12ce91fa269 Mon Sep 17 00:00:00 2001 From: 姚旭斌 <15805828761@163.com> Date: Sat, 5 May 2018 15:23:51 +0800 Subject: [PATCH] no message --- app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java | 3 --- app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java | 26 ++++++++++++++++++++++++-- app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java | 4 ++-- app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java | 2 +- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java index 131380a..59c1827 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java @@ -25,8 +25,6 @@ public class ActivationActivity extends BaseCompatActivity { intent.putExtra("studentId", studentId); intent.putExtra("isactivation", isactivation); activity.startActivity(intent); - - } @Override @@ -45,7 +43,6 @@ public class ActivationActivity extends BaseCompatActivity { activationFragment.setArguments(bundle); fragmentTransaction = getSupportFragmentManager().beginTransaction(); fragmentTransaction.add(R.id.frame, activationFragment).show(activationFragment).commit(); - } } diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java index a198acb..07b5b24 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java @@ -21,15 +21,20 @@ import com.shunzhi.parent.R; public class BankActivity extends BaseCompatActivity { - public static void newInstance(Context context, String info) { + public static void newInstance(Context context, String info,String childName,int studentId,int isactivation) { Intent intent = new Intent(context, BankActivity.class); intent.putExtra("info", info); + intent.putExtra("childName", childName); + intent.putExtra("studentId", studentId); + intent.putExtra("isactivation", isactivation); context.startActivity(intent); } TextView tv_info, center_title; ImageView back_top; + String childName; + int studentId,isactivition; @Override protected void initView(Bundle savedInstanceState) { @@ -37,6 +42,9 @@ public class BankActivity extends BaseCompatActivity { center_title = findViewById(R.id.center_title); center_title.setText(""); back_top = findViewById(R.id.back_top); + studentId=getIntent().getIntExtra("studentId",0); + isactivition=getIntent().getIntExtra("isactivition",0); + childName=getIntent().getStringExtra("childName"); back_top.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -47,11 +55,25 @@ public class BankActivity extends BaseCompatActivity { if (!TextUtils.isEmpty(info)) { if (info.equals("如果使用该应用，请前往激活孩子校园卡")) { Spannable span = new SpannableString(info); - span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)), 11, 23, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)), 11, 13, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); tv_info.setText(span); + tv_info.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ActivationActivity.newInstance(BankActivity.this,"",studentId,isactivition,childName); + finish(); + } + }); } else { tv_info.setText(info); + tv_info.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); } + } } diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java index 91fad29..914cf9f 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java @@ -195,8 +195,8 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment