diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/ContactFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/ContactFragment.java index 691aa03..7e88d73 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/ContactFragment.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/ContactFragment.java @@ -120,7 +120,7 @@ public class ContactFragment extends BaseFragment { public void getDatas() { - HttpUtils.getApi().getContactList().enqueue(new BaseCallBack(getContext()) { + HttpUtils.getApi(context).getContactList().enqueue(new BaseCallBack(getContext()) { @Override public void onSuccess(Call call, Response response) { 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 49c5a86..ee847bf 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 @@ -353,12 +353,10 @@ public class LoginActivity extends BaseActivity { @Override public void onSucceed(int what, Response response) throws ParseException { String json = response.get(); - //String json = "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"; - showLog("-----login-----"); showLog(json); - String jsonDecode = RSAUtils.decryptBASE64Str(json); + String jsonDecode = RSAUtils.decryptBASE64StrClient(json); if (TextUtils.isEmpty(jsonDecode)) { showToast(UiUtlis.getString(context, R.string.data_error)); } else { @@ -502,7 +500,7 @@ public class LoginActivity extends BaseActivity { } private void checkUpdateApk() { - HttpUtils.getApi().getCheckUpdataApk().enqueue(new BaseCallBackNoProgress(context) { + HttpUtils.getApi(context).getCheckUpdataApk().enqueue(new BaseCallBackNoProgress(context) { @Override public void onSuccess(Call call, retrofit2.Response response) { ApkUpdateBean appUploadInfo = response.body(); @@ -540,7 +538,7 @@ public class LoginActivity extends BaseActivity { .apkUrl(downloadURL) .apkName("云浮电厂点巡检.apk") .smallIcon(R.mipmap.logo1) - .showNewerToast(true) + .showNewerToast(false) .apkVersionCode(Integer.parseInt(versionCode)) .apkVersionName(versionName) .apkDescription(description) diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java index a2fdb81..8a7a100 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java @@ -460,7 +460,7 @@ public class MainActivity extends BaseActivity3 { private void checkUpdateApk() { - HttpUtils.getApi().getCheckUpdataApk().enqueue(new BaseCallBackNoProgress(context) { + HttpUtils.getApi(context).getCheckUpdataApk().enqueue(new BaseCallBackNoProgress(context) { @Override public void onSuccess(Call call, retrofit2.Response response) { ApkUpdateBean appUploadInfo = response.body(); @@ -498,7 +498,7 @@ public class MainActivity extends BaseActivity3 { .apkUrl(downloadURL) .apkName("云浮电厂点巡检.apk") .smallIcon(R.mipmap.logo1) - .showNewerToast(true) + .showNewerToast(false) .apkVersionCode(Integer.parseInt(versionCode)) .apkVersionName(versionName) .apkDescription(description) diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/QxgdActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/QxgdActivity.java index 15044fb..42429c5 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/QxgdActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/QxgdActivity.java @@ -152,7 +152,7 @@ public class QxgdActivity extends BaseActivity3 { private void GETJZ() { - HttpUtils.GETMAXIMOIP().GetJzList().enqueue(new BaseCallBack(context) { + HttpUtils.GETMAXIMOIP(context).GetJzList().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { JzBean bean1 = response.body(); @@ -173,7 +173,7 @@ public class QxgdActivity extends BaseActivity3 { private void GETZY() { - HttpUtils.GETMAXIMOIP().GetZyList().enqueue(new BaseCallBack(context) { + HttpUtils.GETMAXIMOIP(context).GetZyList().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { JzBean bean = response.body(); @@ -195,7 +195,7 @@ public class QxgdActivity extends BaseActivity3 { private void GETLX() { - HttpUtils.GETMAXIMOIP().GetLxist().enqueue(new BaseCallBack(context) { + HttpUtils.GETMAXIMOIP(context).GetLxist().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { JzBean bean = response.body(); @@ -217,7 +217,7 @@ public class QxgdActivity extends BaseActivity3 { private void GETQXDJ() { - HttpUtils.GETMAXIMOIP().GetQXDJist().enqueue(new BaseCallBack(context) { + HttpUtils.GETMAXIMOIP(context).GetQXDJist().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { JzBean bean = response.body(); @@ -238,7 +238,7 @@ public class QxgdActivity extends BaseActivity3 { private void GETGDAP() { - HttpUtils.GETMAXIMOIP().GetGDAPist().enqueue(new BaseCallBack(context) { + HttpUtils.GETMAXIMOIP(context).GetGDAPist().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { JzBean bean = response.body(); @@ -289,7 +289,7 @@ public class QxgdActivity extends BaseActivity3 { private void UploadDatas() { - HttpUtils.GETMAXIMOIP().UploadQXgd(GetInfo()).enqueue(new BaseCallBack(context) { + HttpUtils.GETMAXIMOIP(context).UploadQXgd(GetInfo()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { QXGDResultBean bean = response.body(); diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java index 6e136e2..29c1760 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/ScxsjhFragment.java @@ -348,10 +348,10 @@ public class ScxsjhFragment extends BaseFragment { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url()); - if(!TextUtils.isEmpty(token)){ - showLog(credential); - //showLog(new Gson().toJson(request.headers())); - } +// if(!TextUtils.isEmpty(token)){ +// showLog(credential); +// showLog(new Gson().toJson(request.headers())); +// } } request.setDefineRequestBodyForJson(json); queue.add(1, request, new OnResponseListener<>(){ @@ -497,10 +497,10 @@ public class ScxsjhFragment extends BaseFragment { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url()); - if(!TextUtils.isEmpty(token)){ - showLog(credential); - //showLog(new Gson().toJson(request.headers())); - } +// if(!TextUtils.isEmpty(token)){ +// showLog(credential); +// showLog(new Gson().toJson(request.headers())); +// } } request.setDefineRequestBodyForJson(json); queue.add(2, request, new OnResponseListener<>(){ diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XJStatisticsActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XJStatisticsActivity.java index a2ec70f..5af4a47 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XJStatisticsActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XJStatisticsActivity.java @@ -125,7 +125,7 @@ public class XJStatisticsActivity extends BaseActivity3 { public void selectText(String text, int position) { if(professionList!=null&&professionList.size()>0){ Profession profession = professionList.get(position); - Log.i("app",profession.getZyid()); + //Log.i("app",profession.getZyid()); getStatisticsData(profession.getZyid()); } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XzxsjhFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XzxsjhFragment.java index 45be4d9..cc453f9 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XzxsjhFragment.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XzxsjhFragment.java @@ -311,10 +311,10 @@ public class XzxsjhFragment extends BaseFragment { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url()); - if(!TextUtils.isEmpty(token)){ - showLog(credential); - //showLog(new Gson().toJson(request.headers())); - } +// if(!TextUtils.isEmpty(token)){ +// showLog(credential); +// showLog(new Gson().toJson(request.headers())); +// } } request.setDefineRequestBodyForJson(createZyJson(zxid, jhmc)); queue.add(1, request, new HttpResponseListener<>(getActivity(), request, callback, false, false, "")); @@ -330,10 +330,10 @@ public class XzxsjhFragment extends BaseFragment { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url()); - if(!TextUtils.isEmpty(token)){ - showLog(credential); - //showLog(new Gson().toJson(request.headers())); - } +// if(!TextUtils.isEmpty(token)){ +// showLog(credential); +// showLog(new Gson().toJson(request.headers())); +// } } request.setDefineRequestBodyForJson(createZyJsonBA(zxid)); queue.add(2, request, new HttpResponseListener<>(getActivity(), request, callbackBA, false, false, "")); diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/yhpc/YhpcDataListActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/yhpc/YhpcDataListActivity.java index 253deda..bce72ca 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/yhpc/YhpcDataListActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/yhpc/YhpcDataListActivity.java @@ -192,7 +192,7 @@ public class YhpcDataListActivity extends BaseActivity3 { String yhwz = dataBaseYhpc.getWTQY(); - Api api = RetrofitHttpUtils.getApi(); + Api api = RetrofitHttpUtils.getApi(context); RequestBody body = RequestBody.create(MediaType.parse("application/json"), json); api.upload_yhpcxx(body).enqueue(new BaseCallBack(context) { @Override @@ -234,7 +234,7 @@ public class YhpcDataListActivity extends BaseActivity3 { RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file); builder.addFormDataPart("file", file.getName(), imageBody); } - RetrofitHttpUtils.getApi().upload_yhpcPhoto(ID, "0", SCR, builder.build()).enqueue(new BaseCallBack(context) { + RetrofitHttpUtils.getApi(context).upload_yhpcPhoto(ID, "0", SCR, builder.build()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean3 resultBean = response.body(); diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpUtils.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpUtils.java index 647200a..55233c7 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpUtils.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpUtils.java @@ -1,8 +1,11 @@ package com.bjzc.yfdxj.utils; import android.content.Context; +import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; + import com.bjzc.yfdxj.contans.Contans; import java.io.IOException; @@ -40,27 +43,27 @@ public class HttpUtils { private HttpUtils(Context context, String url) { Retrofit mRetrofit = new Retrofit.Builder() .baseUrl(url) - .client(getOkHttpClient()) + .client(getOkHttpClient(context)) .addConverterFactory(GsonConverterFactory.create()) .build(); api = mRetrofit.create(Api.class); HttpUtils.context = context; } - public static Api getApi() { - return getApi(Contans.IP); + public static Api getApi(Context context) { + return getApi(Contans.IP, context); } - public static Api GETMAXIMOIP() { - return getApi(Contans.MAXIMOIP); + public static Api GETMAXIMOIP(Context context) { + return getApi(Contans.MAXIMOIP, context); } - public static Api getApi(String url) { + public static Api getApi(String url, Context context) { Retrofit mRetrofit = new Retrofit.Builder() .baseUrl(url) - .client(getOkHttpClient()) + .client(getOkHttpClient(context)) .addConverterFactory(GsonConverterFactory.create()) .build(); Api api = mRetrofit.create(Api.class); @@ -69,10 +72,10 @@ public class HttpUtils { } - private static OkHttpClient getOkHttpClient() { - - OkHttpClient.Builder httpClientBuilder = new OkHttpClient - .Builder(); + private static OkHttpClient getOkHttpClient(Context context) { + HttpUtils.context = context; + OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder(); + httpClientBuilder.addNetworkInterceptor(new TokenHeaderInterceptor()); //OkHttp进行添加拦截器loggingInterceptor httpClientBuilder.addInterceptor(new LoggingInterceptor()); @@ -84,6 +87,22 @@ public class HttpUtils { return httpClientBuilder.build(); } + public static class TokenHeaderInterceptor implements Interceptor { + @NonNull + @Override + public Response intercept(@NonNull Chain chain) throws IOException { + String tokenTemp = (String) SPUtils.get(context, Contans.LOGIN_TOKEN, ""); + if (!TextUtils.isEmpty(tokenTemp)) { + String token = RSAUtils.decryptBASE64StrLocal(tokenTemp); + String credential = "Bearer " + token; + Request originalRequest = chain.request(); + Request updateRequest = originalRequest.newBuilder().header("Authorization", credential).build(); + return chain.proceed(updateRequest); + } + return chain.proceed(chain.request()); + } + } + public static class LoggingInterceptor implements Interceptor { @Override public Response intercept(Chain chain) throws IOException { 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 44c5ef1..48f4e67 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 @@ -76,10 +76,10 @@ public class NoProgresshttpUtils { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url()); - if(!TextUtils.isEmpty(token)){ - showLog(credential); - showLog(new Gson().toJson(request.headers())); - } +// if(!TextUtils.isEmpty(token)){ +// showLog(credential); +// showLog(new Gson().toJson(request.headers())); +// } } mQueue.add(what, request, new HttpResponseListenerNoProgress(mActivity, request, callback)); } 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 2309972..359e89d 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 @@ -85,10 +85,10 @@ public class NohttpUtils { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url()); - if(!TextUtils.isEmpty(token)){ - showLog(credential); - //showLog(new Gson().toJson(request.headers())); - } +// if(!TextUtils.isEmpty(token)){ +// showLog(credential); +// showLog(new Gson().toJson(request.headers())); +// } } mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, canCanel, isLoading, msg)); } @@ -101,10 +101,10 @@ public class NohttpUtils { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url()); - if(!TextUtils.isEmpty(token)){ - showLog(credential); - //showLog(new Gson().toJson(request.headers())); - } +// if(!TextUtils.isEmpty(token)){ +// showLog(credential); +// showLog(new Gson().toJson(request.headers())); +// } } mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, true, true, "加载中...")); } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/RetrofitHttpUtils.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/RetrofitHttpUtils.java index 5f825c2..17d5593 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/RetrofitHttpUtils.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/RetrofitHttpUtils.java @@ -1,8 +1,11 @@ package com.bjzc.yfdxj.utils; import android.content.Context; +import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; + import com.bjzc.yfdxj.contans.Contans; import java.io.IOException; @@ -38,26 +41,26 @@ public class RetrofitHttpUtils { private RetrofitHttpUtils(Context context, String url) { Retrofit mRetrofit = new Retrofit.Builder() .baseUrl(url) - .client(getOkHttpClient()) + .client(getOkHttpClient(context)) .addConverterFactory(GsonConverterFactory.create()) .build(); api = mRetrofit.create(Api.class); RetrofitHttpUtils.context = context; } - public static Api getApi() { - return getApi(Contans.IP); + public static Api getApi(Context context) { + return getApi(Contans.IP,context); } - public static Api GETMAXIMOIP() { - return getApi(Contans.MAXIMOIP); + public static Api GETMAXIMOIP(Context context) { + return getApi(Contans.MAXIMOIP,context); } - public static Api getApi(String url) { + public static Api getApi(String url, Context context) { Retrofit mRetrofit = new Retrofit.Builder() .baseUrl(url) - .client(getOkHttpClient()) + .client(getOkHttpClient(context)) .addConverterFactory(GsonConverterFactory.create()) .build(); Api api = mRetrofit.create(Api.class); @@ -66,10 +69,10 @@ public class RetrofitHttpUtils { } - public static OkHttpClient getOkHttpClient() { - - OkHttpClient.Builder httpClientBuilder = new OkHttpClient - .Builder(); + public static OkHttpClient getOkHttpClient(Context context) { + RetrofitHttpUtils.context = context; + OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder(); + httpClientBuilder.addNetworkInterceptor(new TokenHeaderInterceptor()); //OkHttp进行添加拦截器loggingInterceptor httpClientBuilder.addInterceptor(new LoggingInterceptor()); @@ -109,4 +112,20 @@ public class RetrofitHttpUtils { return response; } } + + public static class TokenHeaderInterceptor implements Interceptor { + @NonNull + @Override + public Response intercept(@NonNull Chain chain) throws IOException { + String tokenTemp = (String) SPUtils.get(context, Contans.LOGIN_TOKEN, ""); + if (!TextUtils.isEmpty(tokenTemp)) { + String token = RSAUtils.decryptBASE64StrLocal(tokenTemp); + String credential = "Bearer " + token; + Request originalRequest = chain.request(); + Request updateRequest = originalRequest.newBuilder().header("Authorization", credential).build(); + return chain.proceed(updateRequest); + } + return chain.proceed(chain.request()); + } + } }