From bad8dd9705a18e1c06c3cb14aa3947b7fbca8233 Mon Sep 17 00:00:00 2001
From: taohd <2821744554@qq.com>
Date: Wed, 11 Jul 2018 09:04:29 +0800
Subject: [PATCH] no message

---
 .idea/caches/build_file_checksums.ser                                   | Bin 590 -> 0 bytes
 .idea/misc.xml                                                          |  7 ++++---
 app/src/main/AndroidManifest.xml                                        | 13 +++++++++++++
 app/src/main/java/com/shunzhi/expressscanner/AppReceiver.java           | 31 +++++++++++++++++++++++++++++++
 app/src/main/java/com/shunzhi/expressscanner/fragment/MainFragment.java |  5 ++++-
 app/src/main/java/com/shunzhi/expressscanner/present/MainPresenter.java |  6 +++++-
 app/src/main/res/layout/fragment_main.xml                               |  1 +
 7 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/com/shunzhi/expressscanner/AppReceiver.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 5bec547..d4e04b3 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..99202cc 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>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0fa05cd..39fa504 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,8 +21,21 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.HOME"/>
+                <category android:name="android.intent.category.HOME_FIRST"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.HOME.SEADEE"/>
+                <category android:name="android.intent.category.MONKEY"/>
             </intent-filter>
         </activity>
+        <receiver android:name=".AppReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+
+                <category android:name="android.intent.category.HOME" />
+            </intent-filter>
+        </receiver>
         <activity
             android:name=".base.BaseActivity"
             android:label="@string/title_activity_base"
diff --git a/app/src/main/java/com/shunzhi/expressscanner/AppReceiver.java b/app/src/main/java/com/shunzhi/expressscanner/AppReceiver.java
new file mode 100644
index 0000000..80cfcbc
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/expressscanner/AppReceiver.java
@@ -0,0 +1,31 @@
+package com.shunzhi.expressscanner;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.util.Log;
+
+
+/**
+ * Created by Ender on 2015/11/22.
+ */
+public class AppReceiver extends BroadcastReceiver {
+    private static final String TAG = "AppReceiver";
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        //判断进程/服务是否存在，否则启动
+        Log.i(TAG, "onReceive");
+
+        if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
+
+            //AppManager.getAppManager().finishAllActivity();
+            Intent mIntent = new Intent(context, MainActivity.class);
+            mIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(mIntent);
+        }
+
+    }
+
+}
\ No newline at end of file
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 f1f7655..e2d86cb 100644
--- a/app/src/main/java/com/shunzhi/expressscanner/fragment/MainFragment.java
+++ b/app/src/main/java/com/shunzhi/expressscanner/fragment/MainFragment.java
@@ -136,8 +136,11 @@ public class MainFragment extends BaseMVPCompatFragment<MainContract.MainPresent
 
             @Override
             public void afterTextChanged(Editable editable) {
-                if (editable.length() >= 3 && tvCommint.getText().toString().equals("确定录入")&&editable.length()<11)
+                if (editable.length() >= 2 && tvCommint.getText().toString().equals("确定录入")&&editable.length()<11)
                     mPresenter.SearchExpressPhone(editable.toString());
+                else {
+                    if (myPopu!=null)myPopu.dismiss();
+                }
             }
         });
     }
diff --git a/app/src/main/java/com/shunzhi/expressscanner/present/MainPresenter.java b/app/src/main/java/com/shunzhi/expressscanner/present/MainPresenter.java
index f438c78..9e32887 100644
--- a/app/src/main/java/com/shunzhi/expressscanner/present/MainPresenter.java
+++ b/app/src/main/java/com/shunzhi/expressscanner/present/MainPresenter.java
@@ -40,11 +40,12 @@ public class MainPresenter extends MainContract.MainPresenter {
     }
 
     @Override
-    public void login(String loginName, String loginPwd) {
+    public void login(final String loginName, final String loginPwd) {
 
         mRxManager.register(mIModel.login(loginName, loginPwd).subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
+                Log.d("55555", "login=" + jsonObject.toString());
                 String access_token = jsonObject.get("access_token").getAsString();
                 AppConfig.getAppConfig().set(AppConfig.ACCESS_TOKEN, access_token);
                 RetrofitCreateHelper.getInstance().setAuthorization(access_token);
@@ -54,6 +55,7 @@ public class MainPresenter extends MainContract.MainPresenter {
             @Override
             public void accept(Throwable throwable) throws Exception {
                 try {
+                    login(loginName,loginPwd);
                     OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -68,6 +70,7 @@ public class MainPresenter extends MainContract.MainPresenter {
         mRxManager.register(mIModel.getCurrentInfo().subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
+                Log.d("55555", "getCurrentInfo=" + jsonObject.toString());
                 if (jsonObject.get("status").getAsInt() == 1) {
                     JsonObject data = jsonObject.getAsJsonObject("data");
                     AppConfig.getAppConfig().set(AppConfig.CURRENT_USERID, data.get("id").getAsString());
@@ -114,6 +117,7 @@ public class MainPresenter extends MainContract.MainPresenter {
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
+                Log.d("55555","getExpressInfo="+throwable.toString());
                 ToastUtils.showToast(throwable.toString());
             }
         }));
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 8805e3f..96f49ed 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -101,6 +101,7 @@
                 android:hint="请输入11位手机号"
                 android:maxLines="1"
                 android:singleLine="true"
+                android:inputType="phone"
                 android:textColor="@color/text_color_dark"
                 android:textColorHint="@color/gray"
                 android:textSize="@dimen/sp_14" />
--
libgit2 0.21.0