From cfbdb1fc4c54d51f83d21963eb4c635f8bb9846b Mon Sep 17 00:00:00 2001 From: hwf452 Date: Mon, 17 Mar 2025 11:44:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80=20=E9=83=A8=E4=BB=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=BC=8F=E6=8E=89=E4=BA=86https=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=EF=BC=8C=E7=8E=B0=E5=9C=A8=E5=8A=A0=E4=B8=8A=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkRiskListReportAttachmentAdapter.java | 15 +++ .../zhdcoa/service/UploadDataService.java | 96 +++++++++++++++ .../zhdcoa/ui/activity/ActivitySHYK.java | 20 ++-- .../zhdcoa/ui/activity/ActivitySavedhxx.java | 6 +- .../zhdcoa/ui/activity/AjhGzActivity.java | 24 ++-- .../ui/activity/ApplyChangeShiftActivity.java | 6 +- .../ui/activity/ApplyConferenceActivity.java | 14 +-- .../ApplyConferenceAuditActivity.java | 12 +- .../ui/activity/ApplySuppliesActivity.java | 14 +-- .../ui/activity/ApplyTakeOutActivity.java | 14 +-- .../activity/ApplyTravelDetailActivity.java | 27 ++--- .../zhdcoa/ui/activity/AscFragment.java | 67 +++++++++++ .../ui/activity/AxwaqgcglHmActivity.java | 18 ++- .../zhdcoa/ui/activity/AxzFragment.java | 36 ++++++ .../ui/activity/ClcrzsqcxinfoActivity.java | 11 +- .../ui/activity/ConferenceAudioActivity.java | 16 ++- .../ui/activity/ConferenceDateActivity.java | 24 ++-- .../zhdcoa/ui/activity/DjdscFragment.java | 51 ++++++++ .../rehome/zhdcoa/ui/activity/HmActivity.java | 36 +++--- .../zhdcoa/ui/activity/JstkActivity.java | 33 +++--- .../zhdcoa/ui/activity/LlrActivity.java | 36 +++--- .../zhdcoa/ui/activity/MyTaskActivity.java | 14 +-- .../ui/activity/OthersTaskActivity.java | 6 +- .../ui/activity/OthersTaskDetailActivity.java | 35 +++--- .../ui/activity/PhotoRiskViewActivity.java | 16 +++ .../zhdcoa/ui/activity/XscFragment.java | 96 +++++++++++++++ .../zhdcoa/ui/activity/XscbglActivity.java | 23 ++-- .../zhdcoa/ui/activity/XxzjhFragment.java | 110 ++++++++++++++++++ .../zhdcoa/ui/activity/XzLsgkActivity.java | 37 +++--- .../zhdcoa/ui/activity/XzjhFragment.java | 68 +++++++++++ .../zhdcoa/ui/activity/dqgzglActivity.java | 19 +-- 31 files changed, 747 insertions(+), 253 deletions(-) diff --git a/app/src/main/java/com/rehome/zhdcoa/adapter/WorkRiskListReportAttachmentAdapter.java b/app/src/main/java/com/rehome/zhdcoa/adapter/WorkRiskListReportAttachmentAdapter.java index 259b3cc..d103509 100644 --- a/app/src/main/java/com/rehome/zhdcoa/adapter/WorkRiskListReportAttachmentAdapter.java +++ b/app/src/main/java/com/rehome/zhdcoa/adapter/WorkRiskListReportAttachmentAdapter.java @@ -148,6 +148,21 @@ public class WorkRiskListReportAttachmentAdapter extends RecyclerView.Adapter() { @Override public void onStart(int what) { diff --git a/app/src/main/java/com/rehome/zhdcoa/service/UploadDataService.java b/app/src/main/java/com/rehome/zhdcoa/service/UploadDataService.java index 48a6c2d..742fb30 100755 --- a/app/src/main/java/com/rehome/zhdcoa/service/UploadDataService.java +++ b/app/src/main/java/com/rehome/zhdcoa/service/UploadDataService.java @@ -2,6 +2,8 @@ package com.rehome.zhdcoa.service; import android.app.IntentService; import android.content.Intent; +import android.text.TextUtils; + import com.rehome.zhdcoa.App; import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.DBModel.Djjh; @@ -53,6 +55,10 @@ import java.util.Map; import static org.litepal.crud.DataSupport.where; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; + /** * 上传已完成数据 */ @@ -380,6 +386,21 @@ public class UploadDataService extends IntentService { //showLog(xf.toString()); Request request = NoHttp.createStringRequest(Contans.IP + Contans.XFDJJHSC + "?cjscr=" + UiUtlis.encoder(App.getInstance().getUserInfo().getManid()), RequestMethod.POST); request.setDefineRequestBodyForJson(UiUtlis.encoder(xfjson)); + if(!TextUtils.isEmpty(request.url())){ + String url =request.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(this); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(0, request, new HttpResponseListener<>(null, request, callback, false, false, "")); //NohttpUtils.getInstance().add(null, 0, request, callback, false, false, ""); List xcjss = DataSupport.findAll(XfXcjsInfo.class); @@ -389,6 +410,21 @@ public class UploadDataService extends IntentService { "&jhid=" + UiUtlis.encoder(info.getJhid()) + "&filename=" + UiUtlis.encoder(info.getFilename()) + "&djr=" + UiUtlis.encoder(info.getDjr()) + "&xfid=" + UiUtlis.encoder(info.getXfid()), RequestMethod.POST); xcjs.add(Contans.FILEPS, new FileBinary(new File(info.getPath()))); + if(!TextUtils.isEmpty(xcjs.url())){ + String url =xcjs.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(this); + if (socketFactory != null) { + xcjs.setSSLSocketFactory(socketFactory); + xcjs.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(1, xcjs, new HttpResponseListener<>(null, xcjs, callback, false, false, "")); //NohttpUtils.getInstance().add(null, 1, xcjs, callback, false, false, "上传中..."); } @@ -398,6 +434,21 @@ public class UploadDataService extends IntentService { //showLog(ba.toString()); Request baxc = NoHttp.createStringRequest(Contans.IP + Contans.BAXCJHSC + "?cjscr=" + UiUtlis.encoder(App.getInstance().getUserInfo().getManid()), RequestMethod.POST); baxc.setDefineRequestBodyForJson(UiUtlis.encoder(bajson)); + if(!TextUtils.isEmpty(baxc.url())){ + String url =baxc.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(this); + if (socketFactory != null) { + baxc.setSSLSocketFactory(socketFactory); + baxc.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(2, baxc, new HttpResponseListener<>(null, baxc, callback, false, false, "")); //NohttpUtils.getInstance().add(null, 2, baxc, callback, false, false, ""); @@ -411,6 +462,21 @@ public class UploadDataService extends IntentService { Request yhpc = NoHttp.createStringRequest(Contans.IP + Contans.YHPC + "?cjscr=" + UiUtlis.encoder(App.getInstance().getUserInfo().getManid()), RequestMethod.POST); String json1 = "{\"Rows\":" + GsonUtils.GsonString(info) + ",\"Total\": " + info.size() + "}"; yhpc.setDefineRequestBodyForJson(json1); + if(!TextUtils.isEmpty(yhpc.url())){ + String url =yhpc.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(this); + if (socketFactory != null) { + yhpc.setSSLSocketFactory(socketFactory); + yhpc.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(3, yhpc, new HttpResponseListener<>(null, yhpc, callback, false, false, "")); //NohttpUtils.getInstance().add(null, 3, yhpc, callback, false, false, ""); } @@ -418,6 +484,21 @@ public class UploadDataService extends IntentService { requestCount++; Request lyxc = NoHttp.createStringRequest(Contans.IP + Contans.LYXCSC + "?cjscr=" + UiUtlis.encoder(App.getInstance().getUserInfo().getManid()), RequestMethod.POST); lyxc.setDefineRequestBodyForJson(UiUtlis.encoder(lyjson)); + if(!TextUtils.isEmpty(lyxc.url())){ + String url =lyxc.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(this); + if (socketFactory != null) { + lyxc.setSSLSocketFactory(socketFactory); + lyxc.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(4, lyxc, new HttpResponseListener<>(null, lyxc, callback, false, false, "")); //NohttpUtils.getInstance().add(null, 4, lyxc, callback, false, false, ""); @@ -429,6 +510,21 @@ public class UploadDataService extends IntentService { "&jhid=" + UiUtlis.encoder(lyinfo.getJhid()) + "&filename=" + UiUtlis.encoder(lyinfo.getFilename()) + "&djr=" + UiUtlis.encoder(lyinfo.getDjr()) + "&xfid=" + UiUtlis.encoder(lyinfo.getXfid()), RequestMethod.POST); xcjs.add(Contans.FILEPS, new FileBinary(new File(lyinfo.getPath()))); + if(!TextUtils.isEmpty(xcjs.url())){ + String url =xcjs.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(this); + if (socketFactory != null) { + xcjs.setSSLSocketFactory(socketFactory); + xcjs.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(5, xcjs, new HttpResponseListener<>(null, xcjs, callback, false, false, "")); //NohttpUtils.getInstance().add(null, 5, xcjs, callback, false, false, ""); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivitySHYK.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivitySHYK.java index 86ea4c9..92ce775 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivitySHYK.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivitySHYK.java @@ -193,17 +193,15 @@ public class ActivitySHYK extends BaseActivity { protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK && data != null) { - switch (requestCode) { -// case REQUEST_CODE_SCAN: -// String scanResult = data.getStringExtra(Intents.Scan.RESULT); -// if (scanResult != null) { -// showLog(scanResult); -// UploadQD(scanResult); -// } -// break; - case REQUEST_CODE_PHOTO: - parsePhoto(data); - break; + // case REQUEST_CODE_SCAN: + // String scanResult = data.getStringExtra(Intents.Scan.RESULT); + // if (scanResult != null) { + // showLog(scanResult); + // UploadQD(scanResult); + // } + // break; + if (requestCode == REQUEST_CODE_PHOTO) { + parsePhoto(data); } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivitySavedhxx.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivitySavedhxx.java index 3f1cfca..fd5fe62 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivitySavedhxx.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivitySavedhxx.java @@ -122,11 +122,7 @@ public class ActivitySavedhxx extends BaseActivity { super.onActivityResult(requestCode, resultCode, data); - switch (requestCode) { - case 1: - - break; - + if (requestCode == 1) { } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AjhGzActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AjhGzActivity.java index d75587e..694c30f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AjhGzActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AjhGzActivity.java @@ -240,20 +240,18 @@ public class AjhGzActivity extends BaseActivity2 { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - switch (requestCode) { - case 1: - if (resultCode == RESULT_OK) { - Bundle bundle = data.getExtras(); - ewm = bundle.getString("result"); - Intent intent = new Intent(AjhGzActivity.this, AjhAndSbjdActivity.class); - //intent.putExtra("lx",true); - intent.putExtra(Contans.NFCOREWM, true); - intent.putExtra(Contans.KEY_BQBM, ewm); + if (requestCode == 1) { + if (resultCode == RESULT_OK) { + Bundle bundle = data.getExtras(); + ewm = bundle.getString("result"); + Intent intent = new Intent(AjhGzActivity.this, AjhAndSbjdActivity.class); + //intent.putExtra("lx",true); + intent.putExtra(Contans.NFCOREWM, true); + intent.putExtra(Contans.KEY_BQBM, ewm); // intent.putExtra(Contans.KEY_BQBM, "HX0001"); - intent.putExtra(Contans.KEY_FLAG, Contans.DLB); - startActivity(intent); - } - break; + intent.putExtra(Contans.KEY_FLAG, Contans.DLB); + startActivity(intent); + } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShiftActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShiftActivity.java index 8c9b369..1078f5a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShiftActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShiftActivity.java @@ -131,10 +131,8 @@ public class ApplyChangeShiftActivity extends BaseActivity { protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { - switch (requestCode) { - case REQUEST_CODE_ADD: - getListDatas(); - break; + if (requestCode == REQUEST_CODE_ADD) { + getListDatas(); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceActivity.java index 8101d8c..bfc518c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceActivity.java @@ -58,14 +58,12 @@ public class ApplyConferenceActivity extends BaseActivity implements ApplyListUt protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { - switch (requestCode) { - case REQUEST_CODE_ADD: - ApplyListUtils.newBuilder() - .setListView(lv) - .setParams(Contans.LISTCODE.APPLYCONFERENCE, userInfo.getManid()) - .setListener(this) - .builder(context); - break; + if (requestCode == REQUEST_CODE_ADD) { + ApplyListUtils.newBuilder() + .setListView(lv) + .setParams(Contans.LISTCODE.APPLYCONFERENCE, userInfo.getManid()) + .setListener(this) + .builder(context); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceAuditActivity.java index 86da6a6..715fce5 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceAuditActivity.java @@ -419,13 +419,11 @@ public class ApplyConferenceAuditActivity extends BaseActivity implements View.O if (resultCode == RESULT_OK) { - switch (requestCode) { - case REQUEST_MEETROOM: - if (data != null) { - bean = (DropDownBean.RowsBean) data.getExtras().get(Contans.KEY.SELECT_MEETROOM); - ilConferenceHysmc.setContent(bean.getText()); - } - break; + if (requestCode == REQUEST_MEETROOM) { + if (data != null) { + bean = (DropDownBean.RowsBean) data.getExtras().get(Contans.KEY.SELECT_MEETROOM); + ilConferenceHysmc.setContent(bean.getText()); + } } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesActivity.java index 6828637..ba403ae 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesActivity.java @@ -71,14 +71,12 @@ public class ApplySuppliesActivity extends BaseActivity implements ApplyListUtil if (resultCode == RESULT_OK) { - switch (requestCode) { - case REQUEST_CODE_ADD: - ApplyListUtils.newBuilder() - .setParams(Contans.LISTCODE.APPLYSUPPLIES, userInfo.getManid()) - .setListView(lv) - .setListener(this) - .builder(context); - break; + if (requestCode == REQUEST_CODE_ADD) { + ApplyListUtils.newBuilder() + .setParams(Contans.LISTCODE.APPLYSUPPLIES, userInfo.getManid()) + .setListView(lv) + .setListener(this) + .builder(context); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutActivity.java index 17fa5e5..a7eb955 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutActivity.java @@ -53,14 +53,12 @@ public class ApplyTakeOutActivity extends BaseActivity implements ApplyListUtils if (resultCode == RESULT_OK) { - switch (requestCode) { - case REQUEST_CODE_ADD: - ApplyListUtils.newBuilder() - .setParams(Contans.LISTCODE.APPLYORDER,userInfo.getManid()) - .setListView(lv) - .setListener(this) - .builder(context); - break; + if (requestCode == REQUEST_CODE_ADD) { + ApplyListUtils.newBuilder() + .setParams(Contans.LISTCODE.APPLYORDER, userInfo.getManid()) + .setListView(lv) + .setListener(this) + .builder(context); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelDetailActivity.java index 123f2cc..d85fc56 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelDetailActivity.java @@ -315,23 +315,20 @@ public class ApplyTravelDetailActivity extends BaseActivity { super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { - switch (requestCode) { - case REQUEST_PUSH_USER: - - if (data != null) { - userInfos = data.getParcelableArrayListExtra(Contans.KEY.SELECT_PUSH_USER); - String str = ""; - - for (int i = 0; i < userInfos.size(); i++) { - if (i == userInfos.size() - 1) { - str += userInfos.get(i).getMan_name(); - } else { - str += userInfos.get(i).getMan_name() + ","; - } + if (requestCode == REQUEST_PUSH_USER) { + if (data != null) { + userInfos = data.getParcelableArrayListExtra(Contans.KEY.SELECT_PUSH_USER); + String str = ""; + + for (int i = 0; i < userInfos.size(); i++) { + if (i == userInfos.size() - 1) { + str += userInfos.get(i).getMan_name(); + } else { + str += userInfos.get(i).getMan_name() + ","; } - ilTravelEntourage.setContent(str); } - break; + ilTravelEntourage.setContent(str); + } } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AscFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AscFragment.java index 22d3f68..3aaf8a1 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AscFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AscFragment.java @@ -4,6 +4,8 @@ import android.content.DialogInterface; import android.graphics.Color; import android.os.Bundle; import androidx.appcompat.app.AlertDialog; + +import android.text.TextUtils; import android.view.View; import android.widget.Button; import android.widget.CheckBox; @@ -25,6 +27,7 @@ import com.rehome.zhdcoa.entity.StatusInfo; import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpResponseListener; +import com.rehome.zhdcoa.utils.NohttpUtils; import com.rehome.zhdcoa.utils.SPUtils; import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.WaitDialog; @@ -43,6 +46,10 @@ import java.util.List; import java.util.Map; import com.rehome.zhdcoa.App; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; + /** * Created by ruihong on 2017/10/30. @@ -319,6 +326,21 @@ public class AscFragment extends BaseFragment { request.addHeader("Authorization", credential); showLog(request.url()); } + if(!TextUtils.isEmpty(request.url())){ + String url =request.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(0, request, new HttpResponseListener<>(getActivity(), request, callback, false, false, "")); //NohttpUtils.getInstance().add(getActivity(), 0, request, callback, false, false, "上传中..."); @@ -338,6 +360,21 @@ public class AscFragment extends BaseFragment { request1.addHeader("Authorization", credential); showLog(request1.url()); } + if(!TextUtils.isEmpty(request1.url())){ + String url =request1.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request1.setSSLSocketFactory(socketFactory); + request1.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(1, request1, new HttpResponseListener<>(getActivity(), request1, callback, false, false, "")); //NohttpUtils.getInstance().add(getActivity(), 1, request1, callback, false, false, ""); } @@ -357,6 +394,21 @@ public class AscFragment extends BaseFragment { request2.addHeader("Authorization", credential); showLog(request2.url()); } + if(!TextUtils.isEmpty(request2.url())){ + String url =request2.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request2.setSSLSocketFactory(socketFactory); + request2.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(2, request2, new HttpResponseListener<>(getActivity(), request2, callback, false, false, "")); //NohttpUtils.getInstance().add(getActivity(), 2, request2, callback, false, false, "上传中..."); } @@ -373,6 +425,21 @@ public class AscFragment extends BaseFragment { yhpctp.addHeader("Authorization", credential); showLog(yhpctp.url()); } + if(!TextUtils.isEmpty(yhpctp.url())){ + String url =yhpctp.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + yhpctp.setSSLSocketFactory(socketFactory); + yhpctp.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(3, yhpctp, new HttpResponseListener<>(getActivity(), yhpctp, callback, false, false, "")); } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglHmActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglHmActivity.java index 4e2c348..b913398 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglHmActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglHmActivity.java @@ -387,16 +387,14 @@ public class AxwaqgcglHmActivity extends BaseActivity2 { @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - switch (requestCode) { - case 1: - if (resultCode == Activity.RESULT_OK) { - Bundle bundle = data.getExtras(); - Intent intent = new Intent(AxwaqgcglHmActivity.this, AxwaqgcglDetaliActivity.class); - intent.putExtra(Contans.KEY_BQBM, (String) bundle.get("result")); - intent.putExtra(Contans.NFCOREWM, true); - startActivity(intent); - } - break; + if (requestCode == 1) { + if (resultCode == Activity.RESULT_OK) { + Bundle bundle = data.getExtras(); + Intent intent = new Intent(AxwaqgcglHmActivity.this, AxwaqgcglDetaliActivity.class); + intent.putExtra(Contans.KEY_BQBM, (String) bundle.get("result")); + intent.putExtra(Contans.NFCOREWM, true); + startActivity(intent); + } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxzFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxzFragment.java index dd0d0d4..0f795af 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxzFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxzFragment.java @@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity; import android.content.ContentValues; import android.os.Bundle; +import android.text.TextUtils; import android.view.View; import android.widget.AdapterView; import android.widget.Button; @@ -21,6 +22,7 @@ import com.rehome.zhdcoa.base.BaseFragment; import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpResponseListener; +import com.rehome.zhdcoa.utils.NohttpUtils; import com.rehome.zhdcoa.utils.SPUtils; import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.WaitDialog; @@ -32,6 +34,10 @@ import org.litepal.crud.DataSupport; import java.util.ArrayList; import java.util.List; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; + /** * Created by ruihong on 2017/10/30. */ @@ -186,6 +192,21 @@ public class AxzFragment extends BaseFragment { request.addHeader("Authorization", credential); showLog(request.url()); } + if(!TextUtils.isEmpty(request.url())){ + String url =request.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(0, request, new HttpResponseListener<>(getActivity(), request, callback, true, true, "加载中...")); } @@ -199,6 +220,21 @@ public class AxzFragment extends BaseFragment { request.addHeader("Authorization", credential); showLog(request.url()); } + if(!TextUtils.isEmpty(request.url())){ + String url =request.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(1, request, new HttpResponseListener(getActivity(), request, callback, false, false, "")); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxinfoActivity.java index ad0e4e6..b831101 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxinfoActivity.java @@ -298,13 +298,10 @@ public class ClcrzsqcxinfoActivity extends BaseActivity implements View.OnClickL protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { - switch (requestCode) { - case 1: - rowsBean = (DwBean.RowsBean) data.getExtras().get("DW"); - ilDw.setContent(rowsBean.getText()); - dwcode = rowsBean.getValue(); - break; - + if (requestCode == 1) { + rowsBean = (DwBean.RowsBean) data.getExtras().get("DW"); + ilDw.setContent(rowsBean.getText()); + dwcode = rowsBean.getValue(); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ConferenceAudioActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ConferenceAudioActivity.java index f86e9b5..68b2c36 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ConferenceAudioActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ConferenceAudioActivity.java @@ -1059,16 +1059,14 @@ public class ConferenceAudioActivity extends BaseActivity { public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { //录音权限申请回调 super.onRequestPermissionsResult(requestCode, permissions, grantResults); - switch (requestCode) { - case AUDIO_REQUEST_CODE: - if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - Toast.makeText(this, "授权成功！", Toast.LENGTH_SHORT).show(); - doPlay(); - } else { - Toast.makeText(this, "授权被拒绝！", Toast.LENGTH_SHORT).show(); + if (requestCode == AUDIO_REQUEST_CODE) { + if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + Toast.makeText(this, "授权成功！", Toast.LENGTH_SHORT).show(); + doPlay(); + } else { + Toast.makeText(this, "授权被拒绝！", Toast.LENGTH_SHORT).show(); - } - break; + } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ConferenceDateActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ConferenceDateActivity.java index f8d02d9..4649b8e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ConferenceDateActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ConferenceDateActivity.java @@ -134,20 +134,18 @@ public class ConferenceDateActivity extends BaseActivity implements DateLayout. protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { - switch (requestCode) { - case REQUEST_MEETROOM: - if (data != null) { - bean = (DropDownBean.RowsBean) data.getExtras().get(Contans.KEY.SELECT_MEETROOM); - - if (bean.getText().equals("全部")) { - setToolbarTitle("会议一览表"); - bean = null; - } else { - setToolbarTitle(bean.getText()); - } - getMouthConferenceDate(); + if (requestCode == REQUEST_MEETROOM) { + if (data != null) { + bean = (DropDownBean.RowsBean) data.getExtras().get(Contans.KEY.SELECT_MEETROOM); + + if (bean.getText().equals("全部")) { + setToolbarTitle("会议一览表"); + bean = null; + } else { + setToolbarTitle(bean.getText()); } - break; + getMouthConferenceDate(); + } } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DjdscFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DjdscFragment.java index 35d3630..08ed2df 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DjdscFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DjdscFragment.java @@ -3,6 +3,7 @@ package com.rehome.zhdcoa.ui.activity; import android.content.ContentValues; import android.content.DialogInterface; import android.graphics.Color; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -23,6 +24,7 @@ import com.rehome.zhdcoa.entity.StatusInfo; import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpResponseListener; +import com.rehome.zhdcoa.utils.NohttpUtils; import com.rehome.zhdcoa.utils.SPUtils; import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.WaitDialog; @@ -44,6 +46,10 @@ import static org.litepal.crud.DataSupport.updateAll; import static org.litepal.crud.DataSupport.where; import com.rehome.zhdcoa.App; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; + /** * Created by ruihong on 2017/10/28. @@ -407,6 +413,21 @@ public class DjdscFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(request.url())){ + String url =request.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(0, request, new HttpResponseListener<>(getActivity(), request, callback, false, false, "")); //NohttpUtils.getInstance().add(getActivity(), 0, request, callback, true, false, "上传中..."); @@ -429,6 +450,21 @@ public class DjdscFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(request1.url())){ + String url =request1.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request1.setSSLSocketFactory(socketFactory); + request1.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(1, request1, new HttpResponseListener<>(getActivity(), request1, callback, false, false, "")); //NohttpUtils.getInstance().add(getActivity(), 1, request1, callback, true, false, "上传中..."); } @@ -449,6 +485,21 @@ public class DjdscFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(xcjs.url())){ + String url =xcjs.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + xcjs.setSSLSocketFactory(socketFactory); + xcjs.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(2, xcjs, new HttpResponseListener<>(getActivity(), xcjs, callback, false, false, "")); //NohttpUtils.getInstance().add(getActivity(), 2, xcjs, callback, true, false, "上传中..."); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HmActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HmActivity.java index c84c6d6..b5e4640 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HmActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HmActivity.java @@ -83,28 +83,24 @@ public class HmActivity extends BaseActivity { protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { - switch (requestCode) { - - case 3: - if (data != null) { - tsry2 = data.getParcelableArrayListExtra("qy"); - String str = ""; - String areaid = "";//工作区域id - - for (int i = 0; i < tsry2.size(); i++) { - if (i == tsry2.size() - 1) { - str += tsry2.get(i).getMan_name(); - areaid += tsry2.get(i).getMan_id(); - } else { - str += tsry2.get(i).getMan_name() + ","; - areaid += tsry2.get(i).getMan_id() + ","; - } + if (requestCode == 3) { + if (data != null) { + tsry2 = data.getParcelableArrayListExtra("qy"); + String str = ""; + String areaid = "";//工作区域id + + for (int i = 0; i < tsry2.size(); i++) { + if (i == tsry2.size() - 1) { + str += tsry2.get(i).getMan_name(); + areaid += tsry2.get(i).getMan_id(); + } else { + str += tsry2.get(i).getMan_name() + ","; + areaid += tsry2.get(i).getMan_id() + ","; } - ilQy.setContent(str); - QYID = str; } - break; - + ilQy.setContent(str); + QYID = str; + } } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/JstkActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/JstkActivity.java index 5d7c412..8fea9e1 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/JstkActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/JstkActivity.java @@ -166,26 +166,23 @@ public class JstkActivity extends BaseActivity2 { public void onSucceed(int what, Response response) { try { - switch (what) { - case 0: -// String json = "{\"Rows\":[{\"ponum\":\"P1800\",\"itemnum\":\"IT02890\",\"description\":\"高钠电极 100045\",\"quantity\":\"10\",\"matrectransid\":\"114044\",\"returnnum\":\"10\"},{\"ponum\":\"P1800\",\"itemnum\":\"IT01109\",\"description\":\"层压钢锁38mm\",\"quantity\":\"2\",\"matrectransid\":\"114054\",\"returnnum\":\"1\"},{\"ponum\":\"P1800\",\"itemnum\":\"IT01109\",\"description\":\"层压钢锁38mm\",\"quantity\":\"1\",\"matrectransid\":\"114058\",\"returnnum\":\"1\"},{\"ponum\":\"P1800\",\"itemnum\":\"IT01109\",\"description\":\"层压钢锁38mm\",\"quantity\":\"1\",\"matrectransid\":\"114063\",\"returnnum\":\"1\"}],\"Total\":\"4\"}"; - JstkInfo info = GsonUtils.GsonToBean(response.get(), JstkInfo.class); - if (info != null) { - if (!info.getTotal().equals("0")) { - jstks.clear(); - jstks.addAll(info.getRows()); - setListAdapter(); - clearView(); - } else { - ll.setVisibility(View.GONE); - jstks.clear(); - if (adapter != null) { - adapter.notifyDataSetChanged(); - } - showToast("未查询到该采购单数据"); + if (what == 0) {// String json = "{\"Rows\":[{\"ponum\":\"P1800\",\"itemnum\":\"IT02890\",\"description\":\"高钠电极 100045\",\"quantity\":\"10\",\"matrectransid\":\"114044\",\"returnnum\":\"10\"},{\"ponum\":\"P1800\",\"itemnum\":\"IT01109\",\"description\":\"层压钢锁38mm\",\"quantity\":\"2\",\"matrectransid\":\"114054\",\"returnnum\":\"1\"},{\"ponum\":\"P1800\",\"itemnum\":\"IT01109\",\"description\":\"层压钢锁38mm\",\"quantity\":\"1\",\"matrectransid\":\"114058\",\"returnnum\":\"1\"},{\"ponum\":\"P1800\",\"itemnum\":\"IT01109\",\"description\":\"层压钢锁38mm\",\"quantity\":\"1\",\"matrectransid\":\"114063\",\"returnnum\":\"1\"}],\"Total\":\"4\"}"; + JstkInfo info = GsonUtils.GsonToBean(response.get(), JstkInfo.class); + if (info != null) { + if (!info.getTotal().equals("0")) { + jstks.clear(); + jstks.addAll(info.getRows()); + setListAdapter(); + clearView(); + } else { + ll.setVisibility(View.GONE); + jstks.clear(); + if (adapter != null) { + adapter.notifyDataSetChanged(); } + showToast("未查询到该采购单数据"); } - break; + } } } catch (Exception e) { showToast("数据出错"); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LlrActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LlrActivity.java index e679ac1..393ac23 100755 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LlrActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LlrActivity.java @@ -113,29 +113,27 @@ public class LlrActivity extends BaseActivity2 { @Override public void onSucceed(int what, Response response) { - switch (what) { - case 0: - info = GsonUtils.GsonToBean(response.get(), LlrInfo.class); - if (info != null) { - if (info.getTotal() != 0) { - list.clear(); - list.addAll(info.getRows()); - if (adapter == null) { - adapter = new LlrAdapter(LlrActivity.this, list); - lv.setAdapter(adapter); - } else { - adapter.notifyDataSetChanged(); - } + if (what == 0) { + info = GsonUtils.GsonToBean(response.get(), LlrInfo.class); + if (info != null) { + if (info.getTotal() != 0) { + list.clear(); + list.addAll(info.getRows()); + if (adapter == null) { + adapter = new LlrAdapter(LlrActivity.this, list); + lv.setAdapter(adapter); } else { - list.clear(); - if (adapter != null) { - adapter.notifyDataSetChanged(); - } + adapter.notifyDataSetChanged(); } } else { - showToast(UiUtlis.getString(context, R.string.data_error)); + list.clear(); + if (adapter != null) { + adapter.notifyDataSetChanged(); + } } - break; + } else { + showToast(UiUtlis.getString(context, R.string.data_error)); + } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskActivity.java index d88b1a7..50efb70 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskActivity.java @@ -56,14 +56,12 @@ public class MyTaskActivity extends BaseActivity implements ApplyListUtils.OnIte protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { - switch (requestCode) { - case REQUEST_CODE_ADD: - ApplyListUtils.newBuilder() - .setParams(Contans.LISTCODE.MYTASK,userInfo.getManid()) - .setListener(this) - .setListView(lv) - .builder(context); - break; + if (requestCode == REQUEST_CODE_ADD) { + ApplyListUtils.newBuilder() + .setParams(Contans.LISTCODE.MYTASK, userInfo.getManid()) + .setListener(this) + .setListView(lv) + .builder(context); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskActivity.java index bb3e370..f0cdac8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskActivity.java @@ -107,10 +107,8 @@ public class OthersTaskActivity extends BaseActivity implements ApplyListUtils. super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { - switch (requestCode) { - case REQUEST_CODE_ADD: - getListDatas(); - break; + if (requestCode == REQUEST_CODE_ADD) { + getListDatas(); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskDetailActivity.java index 6a5bc43..e33fb52 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskDetailActivity.java @@ -454,27 +454,24 @@ public class OthersTaskDetailActivity extends BaseActivity implements SaveApplyU protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { - switch (requestCode) { - case REQUEST_PUSH_USER: - - if (data != null) { - userInfos = data.getParcelableArrayListExtra(Contans.KEY.SELECT_PUSH_USER); - - names = ""; - ids = ""; - - for (int i = 0; i < userInfos.size(); i++) { - if (i == userInfos.size() - 1) { - names += userInfos.get(i).getMan_name(); - ids += userInfos.get(i).getMan_id(); - } else { - names += userInfos.get(i).getMan_name() + ","; - ids += userInfos.get(i).getMan_id() + ","; - } + if (requestCode == REQUEST_PUSH_USER) { + if (data != null) { + userInfos = data.getParcelableArrayListExtra(Contans.KEY.SELECT_PUSH_USER); + + names = ""; + ids = ""; + + for (int i = 0; i < userInfos.size(); i++) { + if (i == userInfos.size() - 1) { + names += userInfos.get(i).getMan_name(); + ids += userInfos.get(i).getMan_id(); + } else { + names += userInfos.get(i).getMan_name() + ","; + ids += userInfos.get(i).getMan_id() + ","; } - ilTaskName.setContent(names); } - break; + ilTaskName.setContent(names); + } } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PhotoRiskViewActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PhotoRiskViewActivity.java index 8c9f75d..4a5fc98 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PhotoRiskViewActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PhotoRiskViewActivity.java @@ -71,6 +71,22 @@ public class PhotoRiskViewActivity extends AppCompatActivity { } } + if(!TextUtils.isEmpty(request.url())){ + String url =request.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(PhotoRiskViewActivity.this); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } + queue.add(3, request, new OnResponseListener<>() { @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscFragment.java index 1ddf8f8..39ab8a9 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscFragment.java @@ -6,6 +6,7 @@ import android.os.Bundle; import androidx.appcompat.app.AlertDialog; +import android.text.TextUtils; import android.view.View; import android.widget.AdapterView; import android.widget.Button; @@ -32,6 +33,7 @@ import com.rehome.zhdcoa.entity.StatusInfo; import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpResponseListener; +import com.rehome.zhdcoa.utils.NohttpUtils; import com.rehome.zhdcoa.utils.SPUtils; import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.WaitDialog; @@ -55,6 +57,10 @@ import static org.litepal.crud.DataSupport.where; import com.rehome.zhdcoa.App; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; + /** * Created by ruihong on 2017/10/30. */ @@ -612,6 +618,21 @@ public class XscFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(request.url())){ + String url =request.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(0, request, new HttpResponseListener<>(getActivity(), request, callback, false, false, "加载中...")); //NohttpUtils.getInstance().add(getActivity(), 0, request, callback, false, false, "上传中..."); List xcjss = DataSupport.findAll(XfXcjsInfo.class); @@ -633,6 +654,21 @@ public class XscFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if (!TextUtils.isEmpty(xcjs.url())) { + String url = xcjs.url(); + if (url.startsWith("https://219.131.195.3:7100") || url.startsWith("https://219.131.195.3:7011") || url.startsWith("https://219.131.195.3:7081") || url.startsWith("https://219.131.195.3:7082")) { + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + xcjs.setSSLSocketFactory(socketFactory); + xcjs.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(1, xcjs, new HttpResponseListener<>(getActivity(), xcjs, callback, false, false, "加载中...")); } //NohttpUtils.getInstance().add(getActivity(), 1, xcjs, callback, false, false, "上传中..."); @@ -651,6 +687,21 @@ public class XscFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(baxc.url())){ + String url =baxc.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + baxc.setSSLSocketFactory(socketFactory); + baxc.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(2, baxc, new HttpResponseListener<>(getActivity(), baxc, callback, false, false, "加载中...")); //NohttpUtils.getInstance().add(getActivity(), 2, baxc, callback, false, false, "上传中..."); @@ -672,6 +723,21 @@ public class XscFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(yhpc.url())){ + String url =yhpc.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + yhpc.setSSLSocketFactory(socketFactory); + yhpc.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(3, yhpc, new HttpResponseListener<>(getActivity(), yhpc, callback, false, false, "加载中...")); //NohttpUtils.getInstance().add(getActivity(), 3, yhpc, callback, false, false, ""); } @@ -687,6 +753,21 @@ public class XscFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(lyxc.url())){ + String url =lyxc.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + lyxc.setSSLSocketFactory(socketFactory); + lyxc.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(4, lyxc, new HttpResponseListener<>(getActivity(), lyxc, callback, false, false, "加载中...")); //NohttpUtils.getInstance().add(getActivity(), 4, lyxc, callback, false, false, "上传中..."); @@ -706,6 +787,21 @@ public class XscFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(xcjs.url())){ + String url =xcjs.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + xcjs.setSSLSocketFactory(socketFactory); + xcjs.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(5, xcjs, new HttpResponseListener<>(getActivity(), xcjs, callback, false, false, "加载中...")); //NohttpUtils.getInstance().add(getActivity(), 5, xcjs, callback, false, false, "上传中..."); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbglActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbglActivity.java index 6d37ddd..de6aee4 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbglActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbglActivity.java @@ -52,21 +52,16 @@ public class XscbglActivity extends BaseActivity2 { @Override public void onItemClick(AdapterView adapterView, View view, int i, long l) { Intent intent = null; - switch (i) { - case 0: - intent = new Intent(XscbglActivity.this, XsBackLogActivity.class); - break; - case 1: - intent = new Intent(XscbglActivity.this, XsHistoryActivity.class); - break; - case 2: - intent = new Intent(XscbglActivity.this, NFCInfoActivity.class); - break; - case 3: - intent = new Intent(XscbglActivity.this, QrCodeInfoActivity.class); - break; - + if(i==0){ + intent = new Intent(XscbglActivity.this, XsBackLogActivity.class); + }else if(i==1){ + intent = new Intent(XscbglActivity.this, XsHistoryActivity.class); + }else if(i==2){ + intent = new Intent(XscbglActivity.this, NFCInfoActivity.class); + }else if(i==3){ + intent = new Intent(XscbglActivity.this, QrCodeInfoActivity.class); } + if (intent != null) { startActivity(intent); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XxzjhFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XxzjhFragment.java index ef0fa86..3479c55 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XxzjhFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XxzjhFragment.java @@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity; import android.content.ContentValues; import android.os.Bundle; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -43,6 +44,10 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; + /** * Created by ruihong on 2017/10/30. */ @@ -214,6 +219,21 @@ public class XxzjhFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(request.url())){ + String url =request.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(0, request, new HttpResponseListener<>(getActivity(), request, callback, true, true, "加载中...")); //NohttpUtils.getInstance().add(getActivity(), 0, request, callback, true, true, "加载中..."); @@ -232,6 +252,21 @@ public class XxzjhFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(request.url())){ + String url =request.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(1, request, new HttpResponseListener<>(getActivity(), request, callback, false, false, "")); //NohttpUtils.getInstance().add(getActivity(), 1, request, callback, false, false, "下载计划中..."); @@ -247,6 +282,21 @@ public class XxzjhFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(request1.url())){ + String url =request1.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request1.setSSLSocketFactory(socketFactory); + request1.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(2, request1, new HttpResponseListener<>(getActivity(), request1, callback, false, false, "加载中...")); //NohttpUtils.getInstance().add(getActivity(), 2, request1, callback, false, false, "下载计划中..."); @@ -261,6 +311,21 @@ public class XxzjhFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(request2.url())){ + String url =request2.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request2.setSSLSocketFactory(socketFactory); + request2.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(3, request2, new HttpResponseListener<>(getActivity(), request2, callback, false, false, "加载中...")); //NohttpUtils.getInstance().add(getActivity(), 3, request2, callback, false, false, "下载计划中"); } else if (xctypes.equals("2")) { @@ -275,6 +340,21 @@ public class XxzjhFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(xfba.url())){ + String url =xfba.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + xfba.setSSLSocketFactory(socketFactory); + xfba.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(4, xfba, new HttpResponseListener<>(getActivity(), xfba, callback, false, false, "加载中...")); //NohttpUtils.getInstance().add(getActivity(), 4, xfba, callback, false, false, "下载计划中"); } else if (xctypes.equals("3")) { @@ -289,6 +369,21 @@ public class XxzjhFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(lyxc.url())){ + String url =lyxc.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + lyxc.setSSLSocketFactory(socketFactory); + lyxc.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(5, lyxc, new HttpResponseListener<>(getActivity(), lyxc, callback, false, false, "加载中...")); //NohttpUtils.getInstance().add(getActivity(), 5, lyxc, callback, false, false, "下载计划中"); requestCount++; @@ -302,6 +397,21 @@ public class XxzjhFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(lyxcqy.url())){ + String url =lyxcqy.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + lyxcqy.setSSLSocketFactory(socketFactory); + lyxcqy.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(6, lyxcqy, new HttpResponseListener<>(getActivity(), lyxcqy, callback, false, false, "加载中...")); NohttpUtils.getInstance().add(getActivity(), 6, lyxcqy, callback, false, false, "下载计划中"); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzLsgkActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzLsgkActivity.java index 2d262dd..657c9a0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzLsgkActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzLsgkActivity.java @@ -126,29 +126,26 @@ public class XzLsgkActivity extends BaseActivity { super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { - switch (requestCode) { - case REQUEST_PUSH_USERLEADER: - - if (data != null) { - tsry = data.getParcelableArrayListExtra(Contans.KEY.SELECT_PUSH_USER); - String str = ""; - String strid = ""; - - for (int i = 0; i < tsry.size(); i++) { - if (i == tsry.size() - 1) { - str += tsry.get(i).getMan_name(); - strid += tsry.get(i).getMan_id(); - } else { - str += tsry.get(i).getMan_name() + ","; - strid += tsry.get(i).getMan_id() + ","; - } + if (requestCode == REQUEST_PUSH_USERLEADER) { + if (data != null) { + tsry = data.getParcelableArrayListExtra(Contans.KEY.SELECT_PUSH_USER); + String str = ""; + String strid = ""; + + for (int i = 0; i < tsry.size(); i++) { + if (i == tsry.size() - 1) { + str += tsry.get(i).getMan_name(); + strid += tsry.get(i).getMan_id(); + } else { + str += tsry.get(i).getMan_name() + ","; + strid += tsry.get(i).getMan_id() + ","; } - ilTsry.setContent(str); - ID = strid; + } + ilTsry.setContent(str); + ID = strid; - } - break; + } } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java index cfb38ca..a3ce9e7 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java @@ -31,6 +31,7 @@ import com.rehome.zhdcoa.base.BaseFragment; import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpResponseListener; +import com.rehome.zhdcoa.utils.NohttpUtils; import com.rehome.zhdcoa.utils.SPUtils; import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.WaitDialog; @@ -45,6 +46,10 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; + /** * Created by ruihong on 2017/10/28. */ @@ -243,6 +248,22 @@ public class XzjhFragment extends BaseFragment { // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(request.url())){ + String url =request.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } + queue.add(0, request, new HttpResponseListener<>(getActivity(), request, callback, false, false, "")); Request request1 = NoHttp.createStringRequest(Contans.IP + Contans.QXGDZY); @@ -255,6 +276,22 @@ public class XzjhFragment extends BaseFragment { // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(request1.url())){ + String url =request1.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request1.setSSLSocketFactory(socketFactory); + request1.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } + queue.add(9, request1, new HttpResponseListener<>(getActivity(), request1, callback, false, false, "")); } @@ -276,6 +313,22 @@ public class XzjhFragment extends BaseFragment { // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(request.url())){ + String url =request.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } + queue.add(1, request, new HttpResponseListener<>(getActivity(), request, callback, false, false, "")); List ajhjhs = DataSupport.where("djjhid = ? and download = ?", jhid, "0").find(Ajhjh.class); @@ -291,6 +344,21 @@ public class XzjhFragment extends BaseFragment { // showLog(credential); // showLog(new Gson().toJson(request.headers())); } + if(!TextUtils.isEmpty(request1.url())){ + String url =request1.url(); + if(url.startsWith("https://219.131.195.3:7100")||url.startsWith("https://219.131.195.3:7011")||url.startsWith("https://219.131.195.3:7081")||url.startsWith("https://219.131.195.3:7082")){ + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); + if (socketFactory != null) { + request1.setSSLSocketFactory(socketFactory); + request1.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } queue.add(2, request1, new HttpResponseListener<>(getActivity(), request1, callback, false, false, "")); } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/dqgzglActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/dqgzglActivity.java index 0bef591..319f3cc 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/dqgzglActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/dqgzglActivity.java @@ -50,19 +50,12 @@ public class dqgzglActivity extends BaseActivity2 { gv.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int i, long l) { - Intent intent = null; - switch (i) { - case 0: - intent = new Intent(dqgzglActivity.this, XsDqgzZxActivity.class); - break; - case 1: - intent = new Intent(dqgzglActivity.this, XsDqgzBgActivity.class); - break; - case 2: - intent = new Intent(dqgzglActivity.this, XsDqgzTjActivity.class); - break; - - } + Intent intent = switch (i) { + case 0 -> new Intent(dqgzglActivity.this, XsDqgzZxActivity.class); + case 1 -> new Intent(dqgzglActivity.this, XsDqgzBgActivity.class); + case 2 -> new Intent(dqgzglActivity.this, XsDqgzTjActivity.class); + default -> null; + }; if (intent != null) { startActivity(intent); }