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

陶汉栋
2 parents 0f4556a5 00b1dae0
Showing 6 changed files with 27 additions and 9 deletions Show diff stats
app/libs/processor.jar
app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java
app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java
app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.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();
-
         }
     }
@@ -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) {
@@ -49,9 +57,23 @@ public class BankActivity extends BaseCompatActivity {
                 Spannable span = new SpannableString(info);
                 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) {
+
+                    }
+                });
             }
+
         }
     }
@@ -12,7 +12,6 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -201,7 +200,7 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;MyChildContract.MyChil
                 }
                 if (null != chengZhangFragment1) chengZhangFragment1.setChildJson(jsonStr);
-
+                if (null != chengZhangFragment2) chengZhangFragment2.showNoData();
                 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
             }
             createSchoolMenu();
@@ -195,8 +195,8 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment&lt;LoginAndRegist
             progressDialog.show();
 //            Log.e("1111--==", l.getTime() + "");
             if (loginAndRegister.getText().toString().trim().equals("登录")) {
-//                mPresenter.loginResult(phoneNumber.getText().toString(), password.getText().toString());
-                mPresenter.isParentJudge(phoneNumber.getText().toString(),password.getText().toString());
+                mPresenter.loginResult(phoneNumber.getText().toString(), password.getText().toString());
+//                mPresenter.isParentJudge(phoneNumber.getText().toString(),password.getText().toString());
             } else if (loginAndRegister.getText().toString().trim().equals("注册")) {
                 mPresenter.registerResult(phoneNumber.getText().toString(), idCode.getText().toString(), password.getText().toString());
             } else if (loginAndRegister.getText().toString().trim().equals("确定")) {
@@ -244,7 +244,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
         }
         if (TextUtils.isEmpty(childBean.getCardNumber())) {
-            BankActivity.newInstance(getActivity(), "如果使用该应用，请前往激活孩子校园卡");
+            BankActivity.newInstance(getActivity(), "如果使用该应用，请前往激活孩子校园卡",childBean.getStudentName(),childBean.getStudentId(),0);
             return true;
         }
	@@ -244,7 +244,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep		@@ -244,7 +244,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
244	}	244	}
245		245
246	if (TextUtils.isEmpty(childBean.getCardNumber())) {	246	if (TextUtils.isEmpty(childBean.getCardNumber())) {
247	- BankActivity.newInstance(getActivity(), "如果使用该应用，请前往激活孩子校园卡");	247	+ BankActivity.newInstance(getActivity(), "如果使用该应用，请前往激活孩子校园卡",childBean.getStudentName(),childBean.getStudentId(),0);
248	return true;	248	return true;
249		249
250	}	250	}