diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java index 800e1c9..3b3d690 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java +++ b/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); diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/service/PushService.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/service/PushService.java index bf4bc1e..2e52d17 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/service/PushService.java +++ b/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 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 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; } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpResponseListenerNoProgress.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpResponseListenerNoProgress.java index 923d415..465abf4 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpResponseListenerNoProgress.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpResponseListenerNoProgress.java @@ -21,7 +21,6 @@ import java.text.ParseException; */ public class HttpResponseListenerNoProgress implements OnResponseListener { - private Activity mActivity; /** * 当前请求 @@ -36,12 +35,10 @@ public class HttpResponseListenerNoProgress implements OnResponseListener { /** - * @param mActivity 用来实例化dialog * @param mRequest 请求 * @param callback 请求回调 */ - public HttpResponseListenerNoProgress(Activity mActivity, final Request mRequest, HttpListener callback) { - this.mActivity = mActivity; + public HttpResponseListenerNoProgress(final Request mRequest, HttpListener callback) { this.mRequest = mRequest; this.callback = callback; } @@ -81,21 +78,6 @@ public class HttpResponseListenerNoProgress 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); } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NoProgresshttpUtils.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NoProgresshttpUtils.java index 48f4e67..808bde0 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NoProgresshttpUtils.java +++ b/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(mActivity, request, callback)); + mQueue.add(what, request, new HttpResponseListenerNoProgress(request, callback)); } public void showLog(String logText) { diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NohttpUtils.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NohttpUtils.java index 359e89d..41236f0 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NohttpUtils.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NohttpUtils.java @@ -109,6 +109,21 @@ public class NohttpUtils { mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, true, true, "加载中...")); } + public void addNoProgress(Context context, int what, Request request, HttpListener 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(request, callback)); + } + public void showLog(String logText) { if (BuildConfig.LOG_ERROR) { if(TextUtils.isEmpty(logText)){