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

姚旭斌
2 parents 549cd182 1f5a358d
Showing 9 changed files with 288 additions and 38 deletions Show diff stats
app/gradle/wrapper/gradle-wrapper.jar
app/gradle/wrapper/gradle-wrapper.properties
app/gradlew
app/gradlew.bat
app/libs/processor.jar
app/local.properties
app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
@@ -0,0 +1,6 @@
+#Thu May 24 14:51:22 GMT+08:00 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
@@ -0,0 +1,9 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu May 24 14:51:19 GMT+08:00 2018
+ndk.dir=D\:\\work_yxb\\Android\\Sdk\\ndk-bundle
+sdk.dir=D\:\\work_yxb\\Android\\Sdk
@@ -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&lt;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&lt;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&lt;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();
  
     }
@@ -237,7 +237,12 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity&lt;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));
         }
@@ -98,8 +98,12 @@ public class WebViewActivity extends BaseCompatActivity {
         token = getIntent().getStringExtra("token");
         url = getIntent().getStringExtra("url");
         if (token != null && !"".equals(token) && !TextUtils.isEmpty(token)) {
+            if (token.length() < 21)
+                token = "";
             url = url + "&Token=" + token;
+
         }
+        Log.e("sss--==", url);
         if (type == AppConfig.BINDING_SUCCESS_HEZUO) {
             binding_success.setVisibility(View.VISIBLE);
             binding_success2.setVisibility(View.GONE);
...	...	@@ -0,0 +1,6 @@
	1	+#Thu May 24 14:51:22 GMT+08:00 2018
	2	+distributionBase=GRADLE_USER_HOME
	3	+distributionPath=wrapper/dists
	4	+zipStoreBase=GRADLE_USER_HOME
	5	+zipStorePath=wrapper/dists
	6	+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
...	...
...	...	@@ -0,0 +1,172 @@
	1	+#!/usr/bin/env sh
	2	+
	3	+##############################################################################
	4	+##
	5	+## Gradle start up script for UN*X
	6	+##
	7	+##############################################################################
	8	+
	9	+# Attempt to set APP_HOME
	10	+# Resolve links: $0 may be a link
	11	+PRG="$0"
	12	+# Need this for relative symlinks.
	13	+while [ -h "$PRG" ] ; do
	14	+ ls=`ls -ld "$PRG"`
	15	+ link=`expr "$ls" : '.-> \(.\)$'`
	16	+ if expr "$link" : '/.*' > /dev/null; then
	17	+ PRG="$link"
	18	+ else
	19	+ PRG=`dirname "$PRG"`"/$link"
	20	+ fi
	21	+done
	22	+SAVED="`pwd`"
	23	+cd "`dirname \"$PRG\"`/" >/dev/null
	24	+APP_HOME="`pwd -P`"
	25	+cd "$SAVED" >/dev/null
	26	+
	27	+APP_NAME="Gradle"
	28	+APP_BASE_NAME=`basename "$0"`
	29	+
	30	+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
	31	+DEFAULT_JVM_OPTS=""
	32	+
	33	+# Use the maximum available, or set MAX_FD != -1 to use that value.
	34	+MAX_FD="maximum"
	35	+
	36	+warn () {
	37	+ echo "$*"
	38	+}
	39	+
	40	+die () {
	41	+ echo
	42	+ echo "$*"
	43	+ echo
	44	+ exit 1
	45	+}
	46	+
	47	+# OS specific support (must be 'true' or 'false').
	48	+cygwin=false
	49	+msys=false
	50	+darwin=false
	51	+nonstop=false
	52	+case "`uname`" in
	53	+ CYGWIN* )
	54	+ cygwin=true
	55	+ ;;
	56	+ Darwin* )
	57	+ darwin=true
	58	+ ;;
	59	+ MINGW* )
	60	+ msys=true
	61	+ ;;
	62	+ NONSTOP* )
	63	+ nonstop=true
	64	+ ;;
	65	+esac
	66	+
	67	+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
	68	+
	69	+# Determine the Java command to use to start the JVM.
	70	+if [ -n "$JAVA_HOME" ] ; then
	71	+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
	72	+ # IBM's JDK on AIX uses strange locations for the executables
	73	+ JAVACMD="$JAVA_HOME/jre/sh/java"
	74	+ else
	75	+ JAVACMD="$JAVA_HOME/bin/java"
	76	+ fi
	77	+ if [ ! -x "$JAVACMD" ] ; then
	78	+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
	79	+
	80	+Please set the JAVA_HOME variable in your environment to match the
	81	+location of your Java installation."
	82	+ fi
	83	+else
	84	+ JAVACMD="java"
	85	+ which java >/dev/null 2>&1 \|\| die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
	86	+
	87	+Please set the JAVA_HOME variable in your environment to match the
	88	+location of your Java installation."
	89	+fi
	90	+
	91	+# Increase the maximum file descriptors if we can.
	92	+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
	93	+ MAX_FD_LIMIT=`ulimit -H -n`
	94	+ if [ $? -eq 0 ] ; then
	95	+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
	96	+ MAX_FD="$MAX_FD_LIMIT"
	97	+ fi
	98	+ ulimit -n $MAX_FD
	99	+ if [ $? -ne 0 ] ; then
	100	+ warn "Could not set maximum file descriptor limit: $MAX_FD"
	101	+ fi
	102	+ else
	103	+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
	104	+ fi
	105	+fi
	106	+
	107	+# For Darwin, add options to specify how the application appears in the dock
	108	+if $darwin; then
	109	+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
	110	+fi
	111	+
	112	+# For Cygwin, switch paths to Windows format before running java
	113	+if $cygwin ; then
	114	+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
	115	+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
	116	+ JAVACMD=`cygpath --unix "$JAVACMD"`
	117	+
	118	+ # We build the pattern for arguments to be converted via cygpath
	119	+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
	120	+ SEP=""
	121	+ for dir in $ROOTDIRSRAW ; do
	122	+ ROOTDIRS="$ROOTDIRS$SEP$dir"
	123	+ SEP="\|"
	124	+ done
	125	+ OURCYGPATTERN="(^($ROOTDIRS))"
	126	+ # Add a user-defined pattern to the cygpath arguments
	127	+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
	128	+ OURCYGPATTERN="$OURCYGPATTERN\|($GRADLE_CYGPATTERN)"
	129	+ fi
	130	+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
	131	+ i=0
	132	+ for arg in "$@" ; do
	133	+ CHECK=`echo "$arg"\|egrep -c "$OURCYGPATTERN" -`
	134	+ CHECK2=`echo "$arg"\|egrep -c "^-"` ### Determine if an option
	135	+
	136	+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
	137	+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
	138	+ else
	139	+ eval `echo args$i`="\"$arg\""
	140	+ fi
	141	+ i=$((i+1))
	142	+ done
	143	+ case $i in
	144	+ (0) set -- ;;
	145	+ (1) set -- "$args0" ;;
	146	+ (2) set -- "$args0" "$args1" ;;
	147	+ (3) set -- "$args0" "$args1" "$args2" ;;
	148	+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
	149	+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
	150	+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
	151	+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
	152	+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
	153	+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
	154	+ esac
	155	+fi
	156	+
	157	+# Escape application args
	158	+save () {
	159	+ for i do printf %s\\n "$i" \| sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
	160	+ echo " "
	161	+}
	162	+APP_ARGS=$(save "$@")
	163	+
	164	+# Collect all arguments for the java command, following the shell quoting and substitution rules
	165	+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
	166	+
	167	+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
	168	+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
	169	+ cd "$(dirname "$0")"
	170	+fi
	171	+
	172	+exec "$JAVACMD" "$@"
...	...
...	...	@@ -0,0 +1,84 @@
	1	+@if "%DEBUG%" == "" @echo off
	2	+@rem ##########################################################################
	3	+@rem
	4	+@rem Gradle startup script for Windows
	5	+@rem
	6	+@rem ##########################################################################
	7	+
	8	+@rem Set local scope for the variables with windows NT shell
	9	+if "%OS%"=="Windows_NT" setlocal
	10	+
	11	+set DIRNAME=%~dp0
	12	+if "%DIRNAME%" == "" set DIRNAME=.
	13	+set APP_BASE_NAME=%~n0
	14	+set APP_HOME=%DIRNAME%
	15	+
	16	+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
	17	+set DEFAULT_JVM_OPTS=
	18	+
	19	+@rem Find java.exe
	20	+if defined JAVA_HOME goto findJavaFromJavaHome
	21	+
	22	+set JAVA_EXE=java.exe
	23	+%JAVA_EXE% -version >NUL 2>&1
	24	+if "%ERRORLEVEL%" == "0" goto init
	25	+
	26	+echo.
	27	+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
	28	+echo.
	29	+echo Please set the JAVA_HOME variable in your environment to match the
	30	+echo location of your Java installation.
	31	+
	32	+goto fail
	33	+
	34	+:findJavaFromJavaHome
	35	+set JAVA_HOME=%JAVA_HOME:"=%
	36	+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
	37	+
	38	+if exist "%JAVA_EXE%" goto init
	39	+
	40	+echo.
	41	+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
	42	+echo.
	43	+echo Please set the JAVA_HOME variable in your environment to match the
	44	+echo location of your Java installation.
	45	+
	46	+goto fail
	47	+
	48	+:init
	49	+@rem Get command-line arguments, handling Windows variants
	50	+
	51	+if not "%OS%" == "Windows_NT" goto win9xME_args
	52	+
	53	+:win9xME_args
	54	+@rem Slurp the command line arguments.
	55	+set CMD_LINE_ARGS=
	56	+set _SKIP=2
	57	+
	58	+:win9xME_args_slurp
	59	+if "x%~1" == "x" goto execute
	60	+
	61	+set CMD_LINE_ARGS=%*
	62	+
	63	+:execute
	64	+@rem Setup the command line
	65	+
	66	+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
	67	+
	68	+@rem Execute Gradle
	69	+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
	70	+
	71	+:end
	72	+@rem End local scope for the variables with windows NT shell
	73	+if "%ERRORLEVEL%"=="0" goto mainEnd
	74	+
	75	+:fail
	76	+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
	77	+rem the _cmd.exe /c_ return code!
	78	+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
	79	+exit /b 1
	80	+
	81	+:mainEnd
	82	+if "%OS%"=="Windows_NT" endlocal
	83	+
	84	+:omega
...	...
...	...	@@ -0,0 +1,9 @@
	1	+## This file must NOT be checked into Version Control Systems,
	2	+# as it contains information specific to your local configuration.
	3	+#
	4	+# Location of the SDK. This is only used by Gradle.
	5	+# For customization when using a Version Control System, please read the
	6	+# header note.
	7	+#Thu May 24 14:51:19 GMT+08:00 2018
	8	+ndk.dir=D\:\\work_yxb\\Android\\Sdk\\ndk-bundle
	9	+sdk.dir=D\:\\work_yxb\\Android\\Sdk
...	...
...	...	@@ -4,6 +4,7 @@ import android.content.Intent;
4	4	import android.os.Bundle;
5	5	import android.support.annotation.NonNull;
6	6	import android.text.TextUtils;
	7	+import android.util.Log;
7	8	import android.view.Gravity;
8	9	import android.view.LayoutInflater;
9	10	import android.view.View;
...	...	@@ -83,40 +84,11 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
83	84	public void onClick(View v) {
84	85	if (!TextUtils.isEmpty(child_name.getText()) && !TextUtils.isEmpty(child_sex.getText())
85	86	&& !TextUtils.isEmpty(child_grade.getText()) && !TextUtils.isEmpty(child_class.getText())) {
86		- if (isNew == 0) {
87		- mPresenter.addChild(0,"",Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), true, true, 0, 0, studentId,"");
	87	+ if ("".equals(captcha)) {
	88	+ mPresenter.addChild(0, "", Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), true, true, 0, 0, studentId, "");
88	89	} else {
89		- mPresenter.addChild(0,"",Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), false, true, 0, classId, studentId, "");
	90	+ mPresenter.addChild(0, "", Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), false, true, 0, classId, studentId, "");
90	91	}
91		- } else {
92		- final PopupWindow popupWindow = new PopupWindow();
93		- popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
94		- popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
95		- backgroundAlpha(0.5f);
96		- View view = LayoutInflater.from(this).inflate(R.layout.dialog_view, null);
97		- TextView dialog_info = view.findViewById(R.id.dialog_info);
98		- dialog_info.setText("当前无可绑定孩子，点击确认返回孩子列表");
99		- dialog_info.setGravity(Gravity.CENTER);
100		- TextView right_btn = view.findViewById(R.id.right_btn);
101		- right_btn.setOnClickListener(new View.OnClickListener() {
102		- @Override
103		- public void onClick(View v) {
104		- popupWindow.dismiss();
105		- startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(CheckInfoActivity.this, MyChildActivity.class));
106		- finish();
107		- }
108		- });
109		- TextView cancel_btn = view.findViewById(R.id.cancel_btn);
110		- cancel_btn.setOnClickListener(new View.OnClickListener() {
111		- @Override
112		- public void onClick(View v) {
113		- popupWindow.dismiss();
114		- backgroundAlpha(1f);
115		- }
116		- });
117		-
118		- popupWindow.setContentView(view);
119		- popupWindow.showAtLocation(iphone_layout, Gravity.CENTER, 0, 0);
120	92	}
121	93	}
122	94
...	...	@@ -142,8 +114,6 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
142	114	child_sex.setText(sexStr);
143	115	child_grade.setText(childBean.getGradename());
144	116	child_class.setText(childBean.getClassName());
145		- } else {
146		- ToastUtils.showToast("该账号下无需要绑定的孩子");
147	117	}
148	118	if (currentBean.isNew() == 1) {
149	119	iphone_layout.setVisibility(View.INVISIBLE);
...	...	@@ -152,11 +122,11 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
152	122	}
153	123
154	124	@Override
155		- public void addChildSuccess(String account,String password) {
	125	+ public void addChildSuccess(String account, String password) {
156	126	// WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO);
157	127	WebViewActivity.getInstance(CheckInfoActivity.this,
158		- AppConfig.BASE_URL_ORDER+"/RecommendOrder.aspx?userid="+
159		- AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_HEZUO);
	128	+ AppConfig.BASE_URL_ORDER + "/RecommendOrder.aspx?userid=" +
	129	+ AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID), AppConfig.BINDING_SUCCESS_HEZUO);
160	130	finish();
161	131
162	132	}
...	...
...	...	@@ -237,7 +237,12 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
237	237	@Override
238	238	public void showChild(CurrentBean currentBean) {
239	239	if (currentBean.isNew() == 0) {
240		- startActivity(new Intent().putExtra("school_id", schoolId).setClass(SelectSchoolActivity.this, CheckInfoActivity.class));
	240	+
	241	+ if (currentBean.getStudentClass().size() > 0 && currentBean.getStudentClass() != null) {
	242	+ startActivity(new Intent().putExtra("school_id", schoolId).setClass(SelectSchoolActivity.this, CheckInfoActivity.class));
	243	+ } else {
	244	+ startActivity(new Intent().putExtra("school_id", schoolId).setClass(SelectSchoolActivity.this, InviteCodeActivity.class));
	245	+ }
241	246	} else {
242	247	startActivity(new Intent().putExtra("school_id", schoolId).setClass(SelectSchoolActivity.this, InviteCodeActivity.class));
243	248	}
...	...
...	...	@@ -98,8 +98,12 @@ public class WebViewActivity extends BaseCompatActivity {
98	98	token = getIntent().getStringExtra("token");
99	99	url = getIntent().getStringExtra("url");
100	100	if (token != null && !"".equals(token) && !TextUtils.isEmpty(token)) {
	101	+ if (token.length() < 21)
	102	+ token = "";
101	103	url = url + "&Token=" + token;
	104	+
102	105	}
	106	+ Log.e("sss--==", url);
103	107	if (type == AppConfig.BINDING_SUCCESS_HEZUO) {
104	108	binding_success.setVisibility(View.VISIBLE);
105	109	binding_success2.setVisibility(View.GONE);
...	...