Commit b8545123a644f95715a06809a25e2f0b1f0d1bd3

Authored by 陶汉栋
1 parent dec84d10
Exists in master

no message

.gitignore
... ... @@ -7,3 +7,4 @@
7 7 /build
8 8 /captures
9 9 .externalNativeBuild
  10 +app/release/app-release.apk
... ...
.idea/caches/build_file_checksums.ser
No preview for this file type
.idea/misc.xml
... ... @@ -24,7 +24,7 @@
24 24 </value>
25 25 </option>
26 26 </component>
27   - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
  27 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
28 28 <output url="file://$PROJECT_DIR$/build/classes" />
29 29 </component>
30 30 <component name="ProjectType">
... ...
app/build.gradle
... ... @@ -14,8 +14,8 @@ android {
14 14 applicationId "com.shunzhi.expressscanner"
15 15 minSdkVersion 16
16 16 targetSdkVersion 26
17   - versionCode 101
18   - versionName "1.0.1"
  17 + versionCode 100
  18 + versionName "1.0.0"
19 19 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
20 20 }
21 21 buildTypes {
... ...
app/src/main/java/com/shunzhi/expressscanner/AppConfig.java
... ... @@ -11,20 +11,19 @@ import android.text.TextUtils;
11 11  
12 12 public class AppConfig {
13 13  
14   -// public static String BASE_URL="http://ecampus.zjyzzx.net/";
15   -//
16   - public static String BASE_URL="http://campus.myjxt.com/";
  14 + public static String BASE_URL = "http://ecampus.zjyzzx.net/";
17 15  
18   - public static String LOGIN_NAME="18358585337";
19   - public static String LOGIN_PWD="585337";
  16 + public static String LOGIN_NAME = "18906750655";
  17 + public static String LOGIN_PWD = "750655";
20 18  
21 19 public static String ACCESS_TOKEN = "access_token";
22 20 public static final String OPEN_SCAN = "open_scan";
23 21 public static String CURRENT_USERID = "current_userid";
24   - public static String SCHOOL_ID="school_id";
  22 + public static String SCHOOL_ID = "school_id";
25 23 public static String url_apk = "http://update.myjxt.com/express.apk";
26 24  
27 25 private static AppConfig appConfig = null;
  26 +
28 27 public static AppConfig getAppConfig() {
29 28 if (appConfig == null) {
30 29 appConfig = new AppConfig();
... ...
app/src/main/java/com/shunzhi/expressscanner/fragment/MainFragment.java
... ... @@ -14,6 +14,7 @@ import android.support.annotation.Nullable;
14 14 import android.support.v7.widget.LinearLayoutManager;
15 15 import android.support.v7.widget.RecyclerView;
16 16 import android.text.Editable;
  17 +import android.text.TextUtils;
17 18 import android.text.TextWatcher;
18 19 import android.view.LayoutInflater;
19 20 import android.view.View;
... ... @@ -251,6 +252,10 @@ public class MainFragment extends BaseMVPCompatFragment&lt;MainContract.MainPresent
251 252 ToastUtils.showToast("请输入合法的手机号");
252 253 return;
253 254 }
  255 + if (TextUtils.isEmpty(etName.getText().toString())){
  256 + ToastUtils.showToast("不存在该手机号码,请核对手机号");
  257 + return;
  258 + }
254 259 ExpressBean expressBean = new ExpressBean();
255 260 expressBean.expressCode = etExpressCode.getText().toString();
256 261 expressBean.teacherNum = etTel.getText().toString();
... ...