diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/NoProgresshttpUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/NoProgresshttpUtils.java deleted file mode 100644 index 52b97e1..0000000 --- a/app/src/main/java/com/rehome/zhdcoa/utils/NoProgresshttpUtils.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.rehome.zhdcoa.utils; - - -import android.app.Activity; -import android.content.Context; -import android.text.TextUtils; -import android.util.Log; - -import com.google.gson.Gson; -import com.rehome.zhdcoa.App; -import com.rehome.zhdcoa.BuildConfig; -import com.rehome.zhdcoa.R; -import com.yolanda.nohttp.NoHttp; -import com.yolanda.nohttp.download.DownloadQueue; -import com.yolanda.nohttp.rest.Request; -import com.yolanda.nohttp.rest.RequestQueue; - -import java.security.KeyStore; -import java.security.SecureRandom; -import java.security.cert.CertificateFactory; - -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManagerFactory; - -/** - * Nohttp工具类 - */ -public class NoProgresshttpUtils { - - private static NoProgresshttpUtils sUtils; - private RequestQueue mQueue; - - /** - * 下载队列. - */ - private static DownloadQueue downloadQueue; - - private NoProgresshttpUtils() { - mQueue = NoHttp.newRequestQueue(8); - } - - /** - * DCL单例模式 双层锁 - * - * @return - */ - public static NoProgresshttpUtils getInstance() { - if (sUtils == null) { - synchronized (NohttpUtils.class) { - if (sUtils == null) { - sUtils = new NoProgresshttpUtils(); - } - } - } - return sUtils; - } - - /** - * 下载队列. - */ - public static DownloadQueue getDownloadInstance() { - if (downloadQueue == null) - downloadQueue = NoHttp.newDownloadQueue(1); - return downloadQueue; - } - - - public void add(int what, Request request, HttpListener callback) { - if (App.getInstance().getUserInfo() != null && App.getInstance().getUserInfo().getToken() != null) { - String token = App.getInstance().getUserInfo().getToken(); - String credential = "Bearer " + token; - request.addHeader("Authorization", credential); - showLog(request.url()); -// 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)) { - Log.i("app", "logText is null"); - } else { - Log.i("app", logText); - } - } - } - - /** - * 取消这个sign这个标记的所有请求 - * - * @param sign - */ - public void cancelBySign(Object sign) { - mQueue.cancelBySign(sign); - } - - /** - * 取消队列中所有请求 - */ - public void cancelAll() { - mQueue.cancelAll(); - } - - /** - * 退出App停止所有请求 - */ - public void stopAll() { - mQueue.stop(); - } - - public static SSLSocketFactory getSSLSocketFactory(Context context) { - try { - CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509"); - KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); - keyStore.load(null); - String certificateAlias = Integer.toString(0); - keyStore.setCertificateEntry(certificateAlias, certificateFactory. - generateCertificate(context.getResources().openRawResource(R.raw.ca1))); - SSLContext sslContext = SSLContext.getInstance("TLS"); - final TrustManagerFactory trustManagerFactory = - TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - trustManagerFactory.init(keyStore); - sslContext.init - ( - null, - trustManagerFactory.getTrustManagers(), - new SecureRandom() - ); - return sslContext.getSocketFactory(); - } catch (Exception ex) { - ex.printStackTrace(); - } - return null; - } -} \ No newline at end of file diff --git a/app/src/main/res/raw/domain.cer b/app/src/main/res/raw/domain.cer new file mode 100644 index 0000000..2370111 Binary files /dev/null and b/app/src/main/res/raw/domain.cer differ