diff --git a/.gitignore b/.gitignore index 39fb081..1dac1b8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /build /captures .externalNativeBuild +app/release/app-release.apk diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 8db90f2..5bec547 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 3963879..75dac50 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,7 +24,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 9f5e4a9..c0a2b09 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "com.shunzhi.expressscanner" minSdkVersion 16 targetSdkVersion 26 - versionCode 101 - versionName "1.0.1" + versionCode 100 + versionName "1.0.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/com/shunzhi/expressscanner/AppConfig.java b/app/src/main/java/com/shunzhi/expressscanner/AppConfig.java index 0733919..ab88ec9 100644 --- a/app/src/main/java/com/shunzhi/expressscanner/AppConfig.java +++ b/app/src/main/java/com/shunzhi/expressscanner/AppConfig.java @@ -11,20 +11,19 @@ import android.text.TextUtils; public class AppConfig { -// public static String BASE_URL="http://ecampus.zjyzzx.net/"; -// - public static String BASE_URL="http://campus.myjxt.com/"; + public static String BASE_URL = "http://ecampus.zjyzzx.net/"; - public static String LOGIN_NAME="18358585337"; - public static String LOGIN_PWD="585337"; + public static String LOGIN_NAME = "18906750655"; + public static String LOGIN_PWD = "750655"; public static String ACCESS_TOKEN = "access_token"; public static final String OPEN_SCAN = "open_scan"; public static String CURRENT_USERID = "current_userid"; - public static String SCHOOL_ID="school_id"; + public static String SCHOOL_ID = "school_id"; public static String url_apk = "http://update.myjxt.com/express.apk"; private static AppConfig appConfig = null; + public static AppConfig getAppConfig() { if (appConfig == null) { appConfig = new AppConfig(); diff --git a/app/src/main/java/com/shunzhi/expressscanner/fragment/MainFragment.java b/app/src/main/java/com/shunzhi/expressscanner/fragment/MainFragment.java index dab89da..a0b47c9 100644 --- a/app/src/main/java/com/shunzhi/expressscanner/fragment/MainFragment.java +++ b/app/src/main/java/com/shunzhi/expressscanner/fragment/MainFragment.java @@ -14,6 +14,7 @@ import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.Editable; +import android.text.TextUtils; import android.text.TextWatcher; import android.view.LayoutInflater; import android.view.View; @@ -251,6 +252,10 @@ public class MainFragment extends BaseMVPCompatFragment