From 33ca66ef1093baea0ecddfd7fad94091337f5710 Mon Sep 17 00:00:00 2001
From: yxb <15805828761@163.com>
Date: Mon, 14 May 2018 15:32:18 +0800
Subject: [PATCH] no message

---
 .idea/inspectionProfiles/profiles_settings.xml                                     |  6 ------
 .idea/misc.xml                                                                     |  9 +++++----
 .idea/modules.xml                                                                  |  2 --
 .idea/vcs.xml                                                                      |  2 +-
 app/libs/processor.jar                                                             | Bin 5681 -> 0 bytes
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java    | 44 +++++++-------------------------------------
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java |  7 ++++++-
 7 files changed, 19 insertions(+), 51 deletions(-)
 delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml

diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index cb2fdb3..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3963879..dc34569 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,11 +5,12 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="5">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
         </list>
       </value>
     </option>
@@ -24,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1c542c8..df67e8a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,9 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/mvpsdk/mvpsdk.iml" filepath="$PROJECT_DIR$/mvpsdk/mvpsdk.iml" />
-      <module fileurl="file://$PROJECT_DIR$/parentWorkHolper.iml" filepath="$PROJECT_DIR$/parentWorkHolper.iml" />
       <module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" />
-      <module fileurl="file://F:/parentWorkHolper/parentwork.iml" filepath="F:/parentWorkHolper/parentwork.iml" />
       <module fileurl="file://$PROJECT_DIR$/processor/processor.iml" filepath="$PROJECT_DIR$/processor/processor.iml" />
       <module fileurl="file://$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" filepath="$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" />
     </modules>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/libs/processor.jar b/app/libs/processor.jar
index 952eada..7f3ef0c 100644
Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
index c4cd985..499ce1b 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -83,40 +84,11 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
     public void onClick(View v) {
         if (!TextUtils.isEmpty(child_name.getText()) && !TextUtils.isEmpty(child_sex.getText())
                 && !TextUtils.isEmpty(child_grade.getText()) && !TextUtils.isEmpty(child_class.getText())) {
-            if (isNew == 0) {
-                mPresenter.addChild(0,"",Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), true, true, 0, 0, studentId,"");
+            if ("".equals(captcha)) {
+                mPresenter.addChild(0, "", Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), true, true, 0, 0, studentId, "");
             } else {
-                mPresenter.addChild(0,"",Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), false, true, 0, classId, studentId, "");
+                mPresenter.addChild(0, "", Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), false, true, 0, classId, studentId, "");
             }
-        } else {
-            final PopupWindow popupWindow = new PopupWindow();
-            popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
-            popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
-            backgroundAlpha(0.5f);
-            View view = LayoutInflater.from(this).inflate(R.layout.dialog_view, null);
-            TextView dialog_info = view.findViewById(R.id.dialog_info);
-            dialog_info.setText("当前无可绑定孩子，点击确认返回孩子列表");
-            dialog_info.setGravity(Gravity.CENTER);
-            TextView right_btn = view.findViewById(R.id.right_btn);
-            right_btn.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    popupWindow.dismiss();
-                    startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(CheckInfoActivity.this, MyChildActivity.class));
-                    finish();
-                }
-            });
-            TextView cancel_btn = view.findViewById(R.id.cancel_btn);
-            cancel_btn.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    popupWindow.dismiss();
-                    backgroundAlpha(1f);
-                }
-            });
-
-            popupWindow.setContentView(view);
-            popupWindow.showAtLocation(iphone_layout, Gravity.CENTER, 0, 0);
         }
     }
 
@@ -142,8 +114,6 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
             child_sex.setText(sexStr);
             child_grade.setText(childBean.getGradename());
             child_class.setText(childBean.getClassName());
-        } else {
-            ToastUtils.showToast("该账号下无需要绑定的孩子");
         }
         if (currentBean.isNew() == 1) {
             iphone_layout.setVisibility(View.INVISIBLE);
@@ -152,11 +122,11 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
     }
 
     @Override
-    public void addChildSuccess(String account,String  password) {
+    public void addChildSuccess(String account, String password) {
 //        WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO);
         WebViewActivity.getInstance(CheckInfoActivity.this,
-                AppConfig.BASE_URL_ORDER+"/RecommendOrder.aspx?userid="+
-                        AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_HEZUO);
+                AppConfig.BASE_URL_ORDER + "/RecommendOrder.aspx?userid=" +
+                        AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID), AppConfig.BINDING_SUCCESS_HEZUO);
         finish();
 
     }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
index 0abb0b8..6b86dbb 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
@@ -237,7 +237,12 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
     @Override
     public void showChild(CurrentBean currentBean) {
         if (currentBean.isNew() == 0) {
-            startActivity(new Intent().putExtra("school_id", schoolId).setClass(SelectSchoolActivity.this, CheckInfoActivity.class));
+
+            if (currentBean.getStudentClass().size() > 0 && currentBean.getStudentClass() != null) {
+                startActivity(new Intent().putExtra("school_id", schoolId).setClass(SelectSchoolActivity.this, CheckInfoActivity.class));
+            } else {
+                startActivity(new Intent().putExtra("school_id", schoolId).setClass(SelectSchoolActivity.this, InviteCodeActivity.class));
+            }
         } else {
             startActivity(new Intent().putExtra("school_id", schoolId).setClass(SelectSchoolActivity.this, InviteCodeActivity.class));
         }
--
libgit2 0.21.0