2322

YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java

@@ -193,7 +193,7 @@ public class LoginActivity extends BaseActivity {
             etPwd.setText("lgy12345");
 
 //            etUse.setText("161619");
-//            etPwd.setText("161619");
+//            etPwd.setText("161619");  
         }
         //使用完一定记得关闭 电源
         mt.RFIDclose();
@@ -363,7 +363,7 @@ public class LoginActivity extends BaseActivity {
                 showToast(UiUtlis.getString(context, R.string.data_error));
             } else {
                 UserInfo userInfo = GsonUtils.GsonToBean(jsonDecode, UserInfo.class);
-                showLog(jsonDecode);
+                //showLog(jsonDecode);
 
                 if (userInfo != null) {
                     UserInfo.User user = userInfo.getRows().get(0);

YFDXJ/app/src/main/java/com/bjzc/yfdxj/service/PushService.java

@@ -52,14 +52,14 @@ public class PushService extends IntentService {
     private void requestData(int[] what) {
 
         Request<String> qy = NoHttp.createStringRequest(Contans.IP + Contans.QY);
-        NohttpUtils.getInstance().add(null, 12, qy, callback, false, false, "");
+        NohttpUtils.getInstance().addNoProgress(null, 12, qy, callback);
         for (int i = 0; i < what.length; i++) {
             switch (what[i]) {
                 //点检
                 case 1:
                     Request<String> requestdj = NoHttp.createStringRequest(Contans.IP + Contans.DJJHLIST, RequestMethod.POST);
                     requestdj.setDefineRequestBodyForJson(createZyJson());
-                    NohttpUtils.getInstance().add(null, 1, requestdj, callback, false, false, "加载中...");
+                    NohttpUtils.getInstance().addNoProgress(null, 1, requestdj, callback);
                     break;
 
             }

YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpResponseListenerNoProgress.java

@@ -21,7 +21,6 @@ import java.text.ParseException;
  */
 public class HttpResponseListenerNoProgress<T> implements OnResponseListener {
 
-    private Activity mActivity;
 
     /**
      * 当前请求
@@ -36,12 +35,10 @@ public class HttpResponseListenerNoProgress<T> implements OnResponseListener {
 
 
     /**
-     * @param mActivity 用来实例化dialog
      * @param mRequest  请求
      * @param callback  请求回调
      */
-    public HttpResponseListenerNoProgress(Activity mActivity, final Request<T> mRequest, HttpListener<T> callback) {
+    public HttpResponseListenerNoProgress(final Request<T> mRequest, HttpListener<T> callback) {
-        this.mActivity = mActivity;
         this.mRequest = mRequest;
         this.callback = callback;
     }
@@ -81,21 +78,6 @@ public class HttpResponseListenerNoProgress<T> implements OnResponseListener {
      */
     @Override
     public void onFailed(int what, Response response) {
-
-        Exception exception = response.getException();
-        if (mActivity != null) {
-            if (exception instanceof NetworkError) {// 网络不好
-                Toast.makeText(mActivity, "网络异常", Toast.LENGTH_SHORT).show();
-            } else if (exception instanceof TimeoutError) {// 请求超时
-                Toast.makeText(mActivity, "请求超时", Toast.LENGTH_SHORT).show();
-            } else if (exception instanceof UnKnownHostError) {// 找不到服务器
-                Toast.makeText(mActivity, "找不到服务器", Toast.LENGTH_SHORT).show();
-            } else if (exception instanceof URLError) {// URL是错的
-                Toast.makeText(mActivity, "url出错", Toast.LENGTH_SHORT).show();
-            } else {
-                Toast.makeText(mActivity, "网络连接超时", Toast.LENGTH_SHORT).show();
-            }
-        }
         if (callback != null)
             callback.onFailed(what, response);
     }

YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NoProgresshttpUtils.java

@@ -81,7 +81,7 @@ public class NoProgresshttpUtils {
 //                showLog(new Gson().toJson(request.headers()));
 //            }
         }
-        mQueue.add(what, request, new HttpResponseListenerNoProgress<T>(mActivity, request, callback));
+        mQueue.add(what, request, new HttpResponseListenerNoProgress<T>(request, callback));
     }
 
     public void showLog(String logText) {

YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NohttpUtils.java

@@ -109,6 +109,21 @@ public class NohttpUtils {
         mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, true, true, "加载中..."));
     }
 
+    public <T> void addNoProgress(Context context, int what, Request<T> request, HttpListener<T> callback) {
+        String tokenTemp = (String) SPUtils.get(context, Contans.LOGIN_TOKEN, "");
+        if(!TextUtils.isEmpty(tokenTemp)){
+            String token = RSAUtils.decryptBASE64StrLocal(tokenTemp);;
+            String credential = "Bearer " + token;
+            request.addHeader("Authorization", credential);
+            showLog(request.url());
+//            if(!TextUtils.isEmpty(token)){
+//                showLog(credential);
+//                showLog(new Gson().toJson(request.headers()));
+//            }
+        }
+        mQueue.add(what, request, new HttpResponseListenerNoProgress<T>(request, callback));
+    }
+
     public void showLog(String logText) {
         if (BuildConfig.LOG_ERROR) {
             if(TextUtils.isEmpty(logText)){