陶汉栋 / ParentWork

Download as
Browse Code »

Commit 90f718a57be25234353c56f50d0d6d6c634c38c9

Authored by 陶汉栋
2 parents 0f4556a5 00b1dae0
Exists in yxb_dev and in 1 other branch developer

Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer

Showing 6 changed files with 27 additions and 9 deletions   Show diff stats
app/libs/processor.jar
View file @90f718a
No preview for this file type
app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java
  Diff comments   View file @90f718a
... ... @@ -25,8 +25,6 @@ public class ActivationActivity extends BaseCompatActivity {
25 25 intent.putExtra("studentId", studentId);
26 26 intent.putExtra("isactivation", isactivation);
27 27 activity.startActivity(intent);
28   -
29   -
30 28 }
31 29  
32 30 @Override
... ... @@ -45,7 +43,6 @@ public class ActivationActivity extends BaseCompatActivity {
45 43 activationFragment.setArguments(bundle);
46 44 fragmentTransaction = getSupportFragmentManager().beginTransaction();
47 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
  Diff comments   View file @90f718a
... ... @@ -21,15 +21,20 @@ import com.shunzhi.parent.R;
21 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 25 Intent intent = new Intent(context, BankActivity.class);
26 26 intent.putExtra("info", info);
  27 + intent.putExtra("childName", childName);
  28 + intent.putExtra("studentId", studentId);
  29 + intent.putExtra("isactivation", isactivation);
27 30 context.startActivity(intent);
28 31 }
29 32  
30 33  
31 34 TextView tv_info, center_title;
32 35 ImageView back_top;
  36 + String childName;
  37 + int studentId,isactivition;
33 38  
34 39 @Override
35 40 protected void initView(Bundle savedInstanceState) {
... ... @@ -37,6 +42,9 @@ public class BankActivity extends BaseCompatActivity {
37 42 center_title = findViewById(R.id.center_title);
38 43 center_title.setText("");
39 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 48 back_top.setOnClickListener(new View.OnClickListener() {
41 49 @Override
42 50 public void onClick(View v) {
... ... @@ -49,9 +57,23 @@ public class BankActivity extends BaseCompatActivity {
49 57 Spannable span = new SpannableString(info);
50 58 span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)), 11, 13, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
51 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 67 } else {
53 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/ReportFragment.java
  Diff comments   View file @90f718a
... ... @@ -12,7 +12,6 @@ import android.support.v4.app.FragmentManager;
12 12 import android.support.v4.app.FragmentPagerAdapter;
13 13 import android.support.v4.view.ViewPager;
14 14 import android.text.TextUtils;
15   -import android.util.Log;
16 15 import android.view.Menu;
17 16 import android.view.MenuItem;
18 17 import android.view.View;
... ... @@ -201,7 +200,7 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
201 200 }
202 201  
203 202 if (null != chengZhangFragment1) chengZhangFragment1.setChildJson(jsonStr);
204   -
  203 + if (null != chengZhangFragment2) chengZhangFragment2.showNoData();
205 204 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
206 205 }
207 206 createSchoolMenu();
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
  Diff comments   View file @90f718a
... ... @@ -195,8 +195,8 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
195 195 progressDialog.show();
196 196 // Log.e("1111--==", l.getTime() + "");
197 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 200 } else if (loginAndRegister.getText().toString().trim().equals("注册")) {
201 201 mPresenter.registerResult(phoneNumber.getText().toString(), idCode.getText().toString(), password.getText().toString());
202 202 } else if (loginAndRegister.getText().toString().trim().equals("确定")) {
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
  Diff comments   View file @90f718a
... ... @@ -244,7 +244,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
244 244 }
245 245  
246 246 if (TextUtils.isEmpty(childBean.getCardNumber())) {
247   - BankActivity.newInstance(getActivity(), "如果使用该应用，请前往激活孩子校园卡");
  247 + BankActivity.newInstance(getActivity(), "如果使用该应用，请前往激活孩子校园卡",childBean.getStudentName(),childBean.getStudentId(),0);
248 248 return true;
249 249  
250 250 }
... ...