From 2da7de0a60ffae5e81b189b9990a74433e6ffe3b Mon Sep 17 00:00:00 2001 From: hwf452 Date: Fri, 14 Mar 2025 18:33:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E7=BD=91=E6=8E=A5=E5=8F=A3=E6=94=B9?= =?UTF-8?q?=E6=88=90https?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/activity/ActivityCreatQRCode.java | 2 +- .../zhdcoa/ui/activity/ActivityMZDH.java | 6 +- .../zhdcoa/ui/activity/ActivitySHYK.java | 6 +- .../zhdcoa/ui/activity/ActivitySavedhxx.java | 2 +- .../zhdcoa/ui/activity/ActivityWdhy.java | 6 +- .../ui/activity/Activity_ExamOnline.java | 8 +- .../zhdcoa/ui/activity/Activity_PDFView.java | 2 +- .../ui/activity/Activity_Yjyajx_Action.java | 4 +- .../zhdcoa/ui/activity/Activity_Zxdjtp.java | 4 +- .../zhdcoa/ui/activity/Activity_Zxtp.java | 4 +- .../ui/activity/AddDagerEnterApplyActivity.kt | 4 +- .../ui/activity/ApplyAboutMeActivity.kt | 4 +- .../ui/activity/ApplyChangeShiftActivity.java | 2 +- .../ApplyChangeShiftDetailActivity.java | 2 +- .../ApplyChangeShitfAuditActivity.java | 4 +- .../ApplyConferenceAuditActivity.java | 4 +- .../ApplyConferenceDetailActivity.java | 2 +- .../ui/activity/ApplyDinnerAuditActivity.java | 2 +- .../activity/ApplyDinnerDetailActivity.java | 4 +- .../ui/activity/ApplyLeaveActivity.java | 2 +- .../ui/activity/ApplyLeaveAuditActivity.java | 6 +- .../ui/activity/ApplyLeaveDetailActivity.java | 4 +- .../activity/ApplyOfficeAddAuditActivity.java | 2 +- .../ApplyOfficeAddDetailActivity.java | 2 +- .../activity/ApplyReceiveAuditActivity.java | 2 +- .../activity/ApplyReceiveDetailActivity.java | 6 +- .../activity/ApplySuppliesAuditActivity.java | 2 +- .../activity/ApplySuppliesDetailActivity.java | 2 +- .../activity/ApplyTakeOutAuditActivity.java | 2 +- .../activity/ApplyTakeOutDetailActivity.java | 2 +- .../ui/activity/ApplyTravelAuditActivity.java | 6 +- .../activity/ApplyTravelDetailActivity.java | 4 +- .../ui/activity/ApplyVehicleActivity.java | 2 +- .../activity/ApplyVehicleAuditActivity.java | 6 +- .../activity/ApplyVehicleDetailActivity.java | 2 +- .../ui/activity/AttendanceCheckActivity.java | 2 +- .../zhdcoa/ui/activity/BfwwActivity.java | 2 +- .../zhdcoa/ui/activity/BfwwinfoActivity.java | 2 +- .../zhdcoa/ui/activity/BmListActivity.java | 2 +- .../zhdcoa/ui/activity/BzclmxActivity.java | 2 +- .../ui/activity/CbsMemberSelectActivity.java | 2 +- .../ui/activity/ChangeMyPhoneActivity.java | 2 +- .../zhdcoa/ui/activity/ClcrzsqcxActivity.java | 2 +- .../ui/activity/ClcrzsqcxinfoActivity.java | 10 +- .../ui/activity/ClcrzsqcxxzActivity.java | 4 +- .../ui/activity/ConferenceAudioActivity.java | 8 +- .../ui/activity/ConferenceDateActivity.java | 4 +- .../ui/activity/DJActivity_ExamOnline.java | 4 +- .../ui/activity/DJActivity_PDFView.java | 2 +- .../ui/activity/DJActivityksinfodetail.java | 2 +- .../zhdcoa/ui/activity/DJKjInfoActivity.java | 4 +- .../zhdcoa/ui/activity/DJKsInfoActivity.java | 2 +- .../ui/activity/DJKslbListViewActivity.java | 2 +- .../ui/activity/DJPXOfficeViewActivity.java | 2 +- .../zhdcoa/ui/activity/DJPXinfoActivity.java | 2 +- .../ui/activity/DJPXinfoMoreActivity.java | 12 +- .../zhdcoa/ui/activity/DJPeixunActivity.java | 2 +- .../zhdcoa/ui/activity/DJPxKjglActivity.java | 2 +- .../ui/activity/DJPxVideoPlayActivity.java | 2 +- .../ui/activity/DJSylyListViewActivity.java | 2 +- .../zhdcoa/ui/activity/DJTimeActivity.java | 2 +- .../ui/activity/DJUploadKJInfoActivity.java | 8 +- .../zhdcoa/ui/activity/DJlocalActivity.java | 2 +- .../activity/DagerEnterApplyDetailActivity.kt | 2 +- .../ui/activity/DeparmentTreeActivity.java | 2 +- .../zhdcoa/ui/activity/DownloadActivity.java | 2 +- .../ui/activity/DydhinfoSaveDataActivity.java | 2 +- .../zhdcoa/ui/activity/DzzBmListActivity.java | 2 +- .../ui/activity/FunctionSelectActivity.java | 2 +- .../zhdcoa/ui/activity/GgnrActivity.java | 2 +- .../zhdcoa/ui/activity/GgzxActivity.java | 2 +- .../zhdcoa/ui/activity/GxrzActivity.java | 2 +- .../ui/activity/GzQySelectActivity.java | 2 +- .../zhdcoa/ui/activity/GzpActivity.java | 2 +- .../ui/activity/GzzCwSelectActivity.java | 2 +- .../zhdcoa/ui/activity/GzzSelectActivity.java | 2 +- .../ui/activity/GzzSelectGzbcyActivity.java | 2 +- .../zhdcoa/ui/activity/HeadPhotoActivity.java | 2 +- .../ui/activity/HmcheckboxActivity.java | 4 +- .../zhdcoa/ui/activity/HminfoActivity.java | 4 +- .../ui/activity/HminfoXzScActivity.java | 4 +- .../zhdcoa/ui/activity/IPConfigActivity.java | 2 +- .../zhdcoa/ui/activity/JcyrsqActivity.java | 2 +- .../zhdcoa/ui/activity/JcyrsqAddActivity.java | 20 +-- .../zhdcoa/ui/activity/KjInfoActivity.java | 4 +- .../zhdcoa/ui/activity/KsInfoActivity.java | 4 +- .../ui/activity/KslbListViewActivity.java | 2 +- .../zhdcoa/ui/activity/LocalWordActivity.java | 2 +- .../zhdcoa/ui/activity/LrgzpActivity.java | 4 +- .../zhdcoa/ui/activity/LrqylsryActivity.java | 2 +- .../ui/activity/LrqylsryinfoActivity.java | 6 +- .../zhdcoa/ui/activity/LrqyryActivity.java | 2 +- .../zhdcoa/ui/activity/LrzdqyryActivity.java | 2 +- .../zhdcoa/ui/activity/LsgkActivity.java | 2 +- .../zhdcoa/ui/activity/LsgkinfoActivity.java | 8 +- .../activity/MakerecommendationsActivity.java | 4 +- .../zhdcoa/ui/activity/MyOrderActivity.java | 6 +- .../ui/activity/MyTaskDetailActivity.java | 4 +- .../activity/OrdinaryVisitAuditActivity.java | 2 +- .../ui/activity/OtherCountMeActivity.java | 2 +- .../ui/activity/OthersTaskDetailActivity.java | 2 +- .../ui/activity/PXOfficeViewActivity.java | 2 +- .../zhdcoa/ui/activity/PXinfoActivity.java | 2 +- .../activity/PartDeparmentTreeActivity.java | 2 +- .../ui/activity/PeiXunVideoPlayActivity.java | 2 +- .../zhdcoa/ui/activity/PeixunActivity.java | 2 +- .../activity/ProduceStudyInfoMoreActivity.kt | 10 +- .../ProduceStudyLocalDocActivity.java | 4 +- .../ProduceStudyPlayVideoActivity.java | 4 +- .../zhdcoa/ui/activity/PxKjglActivity.java | 2 +- .../zhdcoa/ui/activity/SeleCpActivity.java | 2 +- .../ui/activity/SelectConferenceActivity.java | 2 +- .../ui/activity/SelectItem1Activity.java | 4 +- .../ui/activity/SelectItem2Activity.java | 2 +- .../ui/activity/SelectItem3Activity.java | 2 +- .../ui/activity/SelectItem4Activity.java | 2 +- .../ui/activity/SelectItem5Activity.java | 2 +- .../ui/activity/SelectItem6Activity.java | 2 +- .../ui/activity/Selectzzsj2Activity.java | 2 +- .../rehome/zhdcoa/ui/activity/SqActivity.java | 4 +- .../ui/activity/SylyListViewActivity.java | 2 +- .../zhdcoa/ui/activity/TaskCountActivity.java | 2 +- .../zhdcoa/ui/activity/TaskDateActivity.java | 4 +- .../ui/activity/TrainInfoMoreActivity.kt | 10 +- .../zhdcoa/ui/activity/UpdatePwdActivity.java | 2 +- .../ui/activity/UploadKJInfoActivity.java | 8 +- .../ui/activity/UploadVideoTestActiviy.java | 2 +- .../rehome/zhdcoa/ui/activity/WjmmActivity.kt | 2 +- .../WjmmGetVerificationCodeActivity.kt | 4 +- .../ui/activity/WorkRiskListActivity.kt | 2 + .../activity/WorkRiskListHuiBaoActivity.java | 7 +- .../activity/WzccCbsSelectItemActivity.java | 2 +- .../ui/activity/WzccDwSelectItemActivity.java | 2 +- .../activity/WzccFhqSelectItemActivity.java | 2 +- .../zhdcoa/ui/activity/WzcccxActivity.java | 2 +- .../zhdcoa/ui/activity/WzccinfoActivity.java | 14 +- .../zhdcoa/ui/activity/WzccxzActivity.java | 6 +- .../zhdcoa/ui/activity/WztpScActivity.java | 6 +- .../ui/activity/WztpblScDetailActivity.java | 6 +- .../zhdcoa/ui/activity/XfsinfoActivity.java | 16 +-- .../zhdcoa/ui/activity/XfssqActivity.java | 2 +- .../zhdcoa/ui/activity/XfsxzActivity.java | 8 +- .../zhdcoa/ui/activity/XzLsgkActivity.java | 2 +- .../zhdcoa/ui/activity/YXCZCWActivity.java | 2 +- .../ui/activity/YXCZCWHistoryActivity.java | 2 +- .../ui/activity/YXCZCWInfoActivity.java | 2 +- .../zhdcoa/ui/activity/YXSBSSSJActivity.java | 2 +- .../ui/activity/YXSBSSSJHisActivity.java | 2 +- .../ui/activity/YXSBSSSJHisInfoActivity.java | 2 +- .../ui/activity/YcrySelectActivity.java | 2 +- .../zhdcoa/ui/activity/YcryglActivity.java | 2 +- .../zhdcoa/ui/activity/YjyaAFragment.java | 2 +- .../zhdcoa/ui/activity/YjyaBFragment.java | 2 +- .../zhdcoa/ui/activity/YjyaInfoActivity.java | 10 +- .../zhdcoa/ui/activity/ZddbActivity.java | 2 +- .../zhdcoa/ui/activity/ZddbgzActivity.java | 2 +- .../ui/activity/ZddbgzinfoActivity.java | 4 +- .../zhdcoa/ui/activity/ZddbinfoActivity.java | 10 +- .../zhdcoa/ui/activity/ZdqyActivity.java | 2 +- .../zhdcoa/ui/activity/ZdqycwActivity.java | 2 +- .../zhdcoa/ui/activity/ZdqylsActivity.java | 2 +- .../ui/activity/ZdqyryinfoActivity.java | 6 +- .../zhdcoa/ui/activity/ZxDjtpActivity.java | 2 +- .../zhdcoa/ui/activity/ZxtpActivity.java | 2 +- .../zhdcoa/ui/fragment/ContactFragment.kt | 2 +- .../rehome/zhdcoa/ui/fragment/ExamFragment.kt | 6 +- .../rehome/zhdcoa/ui/fragment/HomeFragment.kt | 2 +- .../zhdcoa/ui/fragment/MineFragment.java | 8 +- .../zhdcoa/ui/fragment/TrainFragment.kt | 2 +- .../zhdcoa/ui/fragment/YjyacFragment.kt | 2 +- .../zhdcoa/ui/fragment/YjyadFragment.kt | 2 +- .../rehome/zhdcoa/utils/ApplyListUtils.java | 6 +- .../com/rehome/zhdcoa/utils/DownloadUtil.java | 72 +++++++++- .../zhdcoa/utils/GetAuditPermissionUtils.java | 6 +- .../com/rehome/zhdcoa/utils/HttpUtils.java | 125 +++++++++++++++--- .../com/rehome/zhdcoa/utils/NohttpUtils.java | 77 +++++++++++ .../rehome/zhdcoa/utils/SaveApplyUtils.java | 6 +- .../rehome/zhdcoa/utils/SetAuditUtils.java | 6 +- .../rehome/zhdcoa/utils/SetBfAuditUtils.java | 6 +- app/src/main/res/raw/domain_zhdc.crt | 22 +++ 180 files changed, 586 insertions(+), 337 deletions(-) create mode 100644 app/src/main/res/raw/domain_zhdc.crt diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityCreatQRCode.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityCreatQRCode.java index 62e8f4e..e5773e6 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityCreatQRCode.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityCreatQRCode.java @@ -119,7 +119,7 @@ public class ActivityCreatQRCode extends BaseActivity { private void UploadQD(String scanResult) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(scanResult)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityMZDH.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityMZDH.java index a1b9a2f..18faf6b 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityMZDH.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityMZDH.java @@ -96,7 +96,7 @@ public class ActivityMZDH extends BaseActivity { } private void getListDatas() { - HttpUtils.getApi().MZDHList("SHYK").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).MZDHList("SHYK").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -225,7 +225,7 @@ public class ActivityMZDH extends BaseActivity { private void UploadQD(String scanResult) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(scanResult)); @@ -260,7 +260,7 @@ public class ActivityMZDH extends BaseActivity { private void UploadQD_Bycreater(String hyid) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson_ByCreater(hyid)); 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 f0b7957..86ea4c9 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 @@ -134,7 +134,7 @@ public class ActivitySHYK extends BaseActivity { } private void getListDatas() { - HttpUtils.getApi().SHYKList("SHYK", App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).SHYKList("SHYK", App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { QDListBean bean = response.body(); @@ -294,7 +294,7 @@ public class ActivitySHYK extends BaseActivity { } private void UploadQD(String scanResult) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(scanResult)); api.uploadqd(body).enqueue(new BaseCallBack(context) { @Override @@ -318,7 +318,7 @@ public class ActivitySHYK extends BaseActivity { } private void UploadQD_Bycreater(String hyid) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson_ByCreater(hyid)); api.uploadqd(body).enqueue(new BaseCallBack(context) { @Override 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 8c65518..3f1cfca 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 @@ -60,7 +60,7 @@ public class ActivitySavedhxx extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().DydhList(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).DydhList(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityWdhy.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityWdhy.java index 8c9c051..6fd570a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityWdhy.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityWdhy.java @@ -68,7 +68,7 @@ public class ActivityWdhy extends BaseActivity { } private void getListDatas() { - HttpUtils.getApi().WdhyList(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).WdhyList(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -143,7 +143,7 @@ public class ActivityWdhy extends BaseActivity { private void UploadQD(String scanResult) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(scanResult)); @@ -178,7 +178,7 @@ public class ActivityWdhy extends BaseActivity { private void UploadQD_Bycreater(String hyid) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson_ByCreater(hyid)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_ExamOnline.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_ExamOnline.java index adc45bb..013ca1b 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_ExamOnline.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_ExamOnline.java @@ -168,7 +168,7 @@ public class Activity_ExamOnline extends BaseActivity { } } public void changestate() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson2()); api.changedbstate(body).enqueue(new BaseCallBack(context) { @Override @@ -211,7 +211,7 @@ public class Activity_ExamOnline extends BaseActivity { } private void UploadExamDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), creatJson()); @@ -328,7 +328,7 @@ public class Activity_ExamOnline extends BaseActivity { } }; private void getListDatas() { - HttpUtils.getApi().getexaminfo(id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getexaminfo(id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { EaxmBean bean = response.body(); @@ -351,7 +351,7 @@ public class Activity_ExamOnline extends BaseActivity { } private void updateExamStatus() { - HttpUtils.getApi().canexam(id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).canexam(id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { canexamBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_PDFView.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_PDFView.java index 1ad7edd..3861b9d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_PDFView.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_PDFView.java @@ -191,7 +191,7 @@ public class Activity_PDFView extends BaseActivity { private void SaveXueXiXinDe(String skrrid, String ysssc, String ysssc_s, String sssd) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(skrrid, ysssc, ysssc_s, sssd)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Yjyajx_Action.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Yjyajx_Action.java index c6cf7d9..6dba3e3 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Yjyajx_Action.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Yjyajx_Action.java @@ -181,7 +181,7 @@ public class Activity_Yjyajx_Action extends BaseActivity { String state=intent.getStringExtra("state"); this.type = intent.getStringExtra("type"); - HttpUtils.getCompanyServerApi(token).GetyjyaActionListData(jlid,zstype,state).enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).GetyjyaActionListData(jlid,zstype,state).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { YjyaActionBaseBean bean = response.body(); @@ -230,7 +230,7 @@ public class Activity_Yjyajx_Action extends BaseActivity { } private void executeFlow(YjyaActionBean item,String token){ - HttpUtils.getCompanyServerApi(token).UpBZSXOKData(item.getXXID()).enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).UpBZSXOKData(item.getXXID()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { BaseBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Zxdjtp.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Zxdjtp.java index e5d8639..56e4f58 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Zxdjtp.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Zxdjtp.java @@ -172,7 +172,7 @@ public class Activity_Zxdjtp extends BaseActivity { private void UploadExamDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), creatJson()); @@ -293,7 +293,7 @@ public class Activity_Zxdjtp extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getdjtpindo(id, App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getdjtpindo(id, App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Zxtp.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Zxtp.java index 495a43f..5a8ba55 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Zxtp.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Zxtp.java @@ -177,7 +177,7 @@ public class Activity_Zxtp extends BaseActivity { private void UploadExamDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), creatJson()); @@ -317,7 +317,7 @@ public class Activity_Zxtp extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().gettpindo(id, App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).gettpindo(id, App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt index 2c6c9d5..2c79e50 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt @@ -280,7 +280,7 @@ class AddDagerEnterApplyActivity : //获取一条危化品数据 private fun getHWPSQByID() { - HttpUtils.getApi().getHWPSQByID(id!!) + HttpUtils.getApi(this).getHWPSQByID(id!!) .enqueue(object : BaseCallBack(context) { override fun onSuccess( call: Call?, @@ -314,7 +314,7 @@ class AddDagerEnterApplyActivity : //获取危化品清单数据 private fun getHwpListByID() { - HttpUtils.getApi().getHwpListByID(id!!) + HttpUtils.getApi(this).getHwpListByID(id!!) .enqueue(object : BaseCallBack(context) { override fun onSuccess( call: Call?, diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt index cd1d57a..dfd523c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt @@ -732,7 +732,7 @@ class ApplyAboutMeActivity : BaseActivityOaToolbarViewBinding(context) { override fun onSuccess( call: Call?, @@ -763,7 +763,7 @@ class ApplyAboutMeActivity : BaseActivityOaToolbarViewBinding(context) { override fun onSuccess( 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 30c36da..8c9b369 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 @@ -58,7 +58,7 @@ public class ApplyChangeShiftActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getChangeShiftList("18", "", "", + HttpUtils.getApi(this).getChangeShiftList("18", "", "", userInfo.getManid(), userInfo.getBzbh()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShiftDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShiftDetailActivity.java index 9ccd47b..f5b7d78 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShiftDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShiftDetailActivity.java @@ -120,7 +120,7 @@ public class ApplyChangeShiftDetailActivity extends BaseActivity { RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(Flow_state)); - HttpUtils.getApi().saveChangeShift(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).saveChangeShift(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShitfAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShitfAuditActivity.java index 4eb18b6..f168c11 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShitfAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyChangeShitfAuditActivity.java @@ -158,7 +158,7 @@ public class ApplyChangeShitfAuditActivity extends BaseActivity { private void getAuditpermission() { - HttpUtils.getApi().getReplaceClassAudit(ListId + HttpUtils.getApi(this).getReplaceClassAudit(ListId , Contans.LISTCODE.REPLACECLASS, userInfo.getManid(), "ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -228,7 +228,7 @@ public class ApplyChangeShitfAuditActivity extends BaseActivity { RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), createJson()); - HttpUtils.getApi().setChangeShitfAudit(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).setChangeShitfAudit(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { 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 8e03ce3..86da6a6 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 @@ -233,7 +233,7 @@ public class ApplyConferenceAuditActivity extends BaseActivity implements View.O private void getDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getConference(listcode, ListId, Suplistid).enqueue(new BaseCallBack(context) { @@ -332,7 +332,7 @@ public class ApplyConferenceAuditActivity extends BaseActivity implements View.O */ private void getConferenceUpdate() { - HttpUtils.getApi().getConferenceUpdate(userInfo.getManid(), Contans.LISTCODE.APPLYCONFERENCE).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getConferenceUpdate(userInfo.getManid(), Contans.LISTCODE.APPLYCONFERENCE).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceDetailActivity.java index 51442c3..86c122e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceDetailActivity.java @@ -140,7 +140,7 @@ public class ApplyConferenceDetailActivity extends BaseActivity implements Confe private void getDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getConference(listcode, ListId, Suplistid).enqueue(new BaseCallBack(context) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerAuditActivity.java index b7baabe..d37de80 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerAuditActivity.java @@ -172,7 +172,7 @@ public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnCli private void getDatas() { - Api api = HttpUtils.getApi(Contans.BASE_URL); + Api api = HttpUtils.getApi(context); api.getDinner(listcode, ListId).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerDetailActivity.java index f4b9ff9..d502262 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerDetailActivity.java @@ -290,7 +290,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply private void getDatas() { Log.i("app", "getDatas"); - Api api = HttpUtils.getApi(Contans.BASE_URL); + Api api = HttpUtils.getApi(this); api.getDinner(listcode, ListId).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -315,7 +315,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply private void getListDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getDepartMentList(Contans.MODUETYPE.DEPARTMENT, "ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveActivity.java index 22a66d6..7c2d0b2 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveActivity.java @@ -103,7 +103,7 @@ public class ApplyLeaveActivity extends BaseActivity { }, true, true, "数据加载中..."); -// HttpUtils.getApi().getLeaveList("", "", "", "QJSQ", userInfo.getManid(), userInfo.getBzbh(), "1").enqueue(new BaseCallBack(context) { +// HttpUtils.getApi(this).getLeaveList("", "", "", "QJSQ", userInfo.getManid(), userInfo.getBzbh(), "1").enqueue(new BaseCallBack(context) { // @Override // public void onSuccess(Call call, Response response) { // diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveAuditActivity.java index 06225f0..80f7408 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveAuditActivity.java @@ -175,7 +175,7 @@ public class ApplyLeaveAuditActivity extends BaseActivity implements View.OnClic } - HttpUtils.getApi().getLeaveHintData("WSHZTS", changeShift.getKind_code(), manid, year, changeShift.getStart_date(), changeShift.getEnd_date()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getLeaveHintData("WSHZTS", changeShift.getKind_code(), manid, year, changeShift.getStart_date(), changeShift.getEnd_date()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -302,7 +302,7 @@ public class ApplyLeaveAuditActivity extends BaseActivity implements View.OnClic //Log.i("app", gson); RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), gson); - HttpUtils.getApi().getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -344,7 +344,7 @@ public class ApplyLeaveAuditActivity extends BaseActivity implements View.OnClic RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), createJson()); - HttpUtils.getApi().setChangeShitfAudit(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).setChangeShitfAudit(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveDetailActivity.java index 668f1a8..a3561e6 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveDetailActivity.java @@ -377,7 +377,7 @@ public class ApplyLeaveDetailActivity extends BaseActivity { private void getLeaveHintData(String year) { - HttpUtils.getApi().getLeaveHintData("WSHZTS", typeBean.getValue(), userInfo.getManid(), year, ilStartTime.getContent(), ilEndTime.getContent()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getLeaveHintData("WSHZTS", typeBean.getValue(), userInfo.getManid(), year, ilStartTime.getContent(), ilEndTime.getContent()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -436,7 +436,7 @@ public class ApplyLeaveDetailActivity extends BaseActivity { String json = createJson(Flow_state); showLog(json); RequestBody body = RequestBody.create(MediaType.parse("applocation/json"),json); - HttpUtils.getApi().saveLeave(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).saveLeave(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean resultBean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddAuditActivity.java index 385c0fb..c6a6b03 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddAuditActivity.java @@ -194,7 +194,7 @@ public class ApplyOfficeAddAuditActivity extends BaseActivity implements View.On private void getOfficeAddDetail() { - HttpUtils.getApi().getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddDetailActivity.java index e90b7ec..2e7f997 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddDetailActivity.java @@ -206,7 +206,7 @@ public class ApplyOfficeAddDetailActivity extends BaseActivity { private void getOfficeAddDetail() { - HttpUtils.getApi().getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveAuditActivity.java index c23c08b..a3a7d00 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveAuditActivity.java @@ -232,7 +232,7 @@ public class ApplyReceiveAuditActivity extends BaseActivity implements View.OnCl private void getDatas() { - HttpUtils.getApi().getReceiveVisit(ListId).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getReceiveVisit(ListId).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveDetailActivity.java index 6e8666b..89d9e46 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveDetailActivity.java @@ -238,7 +238,7 @@ public class ApplyReceiveDetailActivity extends BaseActivity implements VehicleL private void saveJDLFApply(String istj) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(istj)); @@ -448,7 +448,7 @@ public class ApplyReceiveDetailActivity extends BaseActivity implements VehicleL private void getDatas() { - HttpUtils.getApi().getReceiveVisit(ListId).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getReceiveVisit(ListId).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -1132,7 +1132,7 @@ public class ApplyReceiveDetailActivity extends BaseActivity implements VehicleL public void getAnterRoom() {//获取接待室 - HttpUtils.getApi().getAnterRoom("Set_AnterRoom", "ZH").enqueue(new BaseCallBack(ApplyReceiveDetailActivity.this) { + HttpUtils.getApi(this).getAnterRoom("Set_AnterRoom", "ZH").enqueue(new BaseCallBack(ApplyReceiveDetailActivity.this) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesAuditActivity.java index fd4a712..cd5f330 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesAuditActivity.java @@ -191,7 +191,7 @@ public class ApplySuppliesAuditActivity extends BaseActivity implements View.OnC private void getDetailData() { - HttpUtils.getApi().getSuppliesDetail(ListId, listcode) + HttpUtils.getApi(this).getSuppliesDetail(ListId, listcode) .enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesDetailActivity.java index 0cf9713..0da4664 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesDetailActivity.java @@ -138,7 +138,7 @@ public class ApplySuppliesDetailActivity extends BaseActivity implements ApplySu private void getDetailData() { - HttpUtils.getApi().getSuppliesDetail(ListId, listcode) + HttpUtils.getApi(this).getSuppliesDetail(ListId, listcode) .enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutAuditActivity.java index bff5b8b..1deaf59 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutAuditActivity.java @@ -232,7 +232,7 @@ public class ApplyTakeOutAuditActivity extends BaseActivity implements GetAudit private void getdatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getTakeOut(listcode, ListId, Suplistid).enqueue(new BaseCallBack(context) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutDetailActivity.java index a672657..019935a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutDetailActivity.java @@ -228,7 +228,7 @@ public class ApplyTakeOutDetailActivity extends BaseActivity implements SaveAppl private void getDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getTakeOut(applyList.getListcode(), applyList.getListid(), applyList.getSuplistid()).enqueue(new BaseCallBack(context) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelAuditActivity.java index 00759ae..376ebff 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelAuditActivity.java @@ -173,7 +173,7 @@ public class ApplyTravelAuditActivity extends BaseActivity implements View.OnCli private void getTravelDetail() { - HttpUtils.getApi().getTravelDetail(ListId).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getTravelDetail(ListId).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -224,7 +224,7 @@ public class ApplyTravelAuditActivity extends BaseActivity implements View.OnCli private void getAuditpermission() { - HttpUtils.getApi().getTravelAudit(ListId + HttpUtils.getApi(this).getTravelAudit(ListId , Contans.LISTCODE.APPLYTRAVEL, "ZH", userInfo.getManid(), userInfo.getBzbh(), Proposernameid, @@ -270,7 +270,7 @@ public class ApplyTravelAuditActivity extends BaseActivity implements View.OnCli RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), createJson()); - HttpUtils.getApi().setChangeShitfAudit(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).setChangeShitfAudit(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { 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 1192412..123f2cc 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 @@ -455,7 +455,7 @@ public class ApplyTravelDetailActivity extends BaseActivity { RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(istj)); - HttpUtils.getApi().saveTravel(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).saveTravel(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -487,7 +487,7 @@ public class ApplyTravelDetailActivity extends BaseActivity { private void getTravelDetail() { - HttpUtils.getApi().getTravelDetail(applyList.getListid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getTravelDetail(applyList.getListid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleActivity.java index e33159d..e08e4e8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleActivity.java @@ -67,7 +67,7 @@ public class ApplyVehicleActivity extends BaseActivity implements ApplyListUtil } private void JSYC() { - HttpUtils.getApi().JSYCSQ(vehiclech, listid, userInfo.getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).JSYCSQ(vehiclech, listid, userInfo.getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleAuditActivity.java index 6062651..07f66a1 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleAuditActivity.java @@ -144,7 +144,7 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl btnDx.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Api api = HttpUtils.getApi(Contans.BASE_URL); + Api api = HttpUtils.getApi(context); api.DX(ListId, "李耿").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -299,7 +299,7 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl private void getDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getVehicle(listcode, ListId, "").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -466,7 +466,7 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl private void UPSJCP() { RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), sjcpjson()); - HttpUtils.getApi().UpSJCP(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).UpSJCP(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean resultBean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleDetailActivity.java index 388e907..294a7fe 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleDetailActivity.java @@ -200,7 +200,7 @@ public class ApplyVehicleDetailActivity extends BaseActivity implements VehicleL private void getDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getVehicle(listcode, ListId, "").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AttendanceCheckActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AttendanceCheckActivity.java index 48059c5..b669496 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AttendanceCheckActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AttendanceCheckActivity.java @@ -86,7 +86,7 @@ public class AttendanceCheckActivity extends BaseActivity { private void getAttendanceCheck(String manid, String times, String timee) { - HttpUtils.getApi().getAttendanceCheck(manid, times, timee).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getAttendanceCheck(manid, times, timee).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/BfwwActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/BfwwActivity.java index 9124595..2038242 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/BfwwActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/BfwwActivity.java @@ -53,7 +53,7 @@ public class BfwwActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getBfwwList("", userInfo.getUsernames()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getBfwwList("", userInfo.getUsernames()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/BfwwinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/BfwwinfoActivity.java index 2eb8f3e..2841714 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/BfwwinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/BfwwinfoActivity.java @@ -140,7 +140,7 @@ public class BfwwinfoActivity extends BaseActivity implements View.OnClickListen private void getDetailData() { - HttpUtils.getApi().getbfshlc(listid, "KNBZSQSP", "ZH", userInfo.getManid(), dzzid) + HttpUtils.getApi(this).getbfshlc(listid, "KNBZSQSP", "ZH", userInfo.getManid(), dzzid) .enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/BmListActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/BmListActivity.java index 6461a15..091d994 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/BmListActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/BmListActivity.java @@ -79,7 +79,7 @@ public class BmListActivity extends BaseActivity { */ private void getkslb() { - HttpUtils.getApi().getBm("ZH").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getBm("ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { BmBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/BzclmxActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/BzclmxActivity.java index a86cfb2..3289660 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/BzclmxActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/BzclmxActivity.java @@ -51,7 +51,7 @@ public class BzclmxActivity extends BaseActivity { public void getdata() { - HttpUtils.getApi().GetBzClMx(dwcode).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetBzClMx(dwcode).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/CbsMemberSelectActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/CbsMemberSelectActivity.java index 706fc89..9424dd3 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/CbsMemberSelectActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/CbsMemberSelectActivity.java @@ -182,7 +182,7 @@ public class CbsMemberSelectActivity extends BaseActivity implements CbsMemberSe Intent intent = getIntent(); String cbs = intent.getStringExtra("cbs"); tvDeptName.setText(cbs); - HttpUtils.getCompanyServerApi(token).getCbsMember(cbs).enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).getCbsMember(cbs).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ChangeMyPhoneActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ChangeMyPhoneActivity.java index 021655a..9f8a297 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ChangeMyPhoneActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ChangeMyPhoneActivity.java @@ -88,7 +88,7 @@ public class ChangeMyPhoneActivity extends BaseActivity { showLog(json); // RequestBody body = RequestBody.create(MediaType.parse("application/json"), json); -// HttpUtils.getApi().updataPwd(body).enqueue(new BaseCallBack(context) { +// HttpUtils.getApi(this).updataPwd(body).enqueue(new BaseCallBack(context) { // @Override // public void onSuccess(Call call, Response response) { // diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxActivity.java index c3c4bfb..9670d62 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxActivity.java @@ -76,7 +76,7 @@ public class ClcrzsqcxActivity extends BaseActivity { public void getdata() { - HttpUtils.getApi().GetClcrz(userInfo.getManid(),userInfo.getUsernames(),userInfo.getBzbh()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetClcrz(userInfo.getManid(),userInfo.getUsernames(),userInfo.getBzbh()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { 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 f19499d..ad0e4e6 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 @@ -184,7 +184,7 @@ public class ClcrzsqcxinfoActivity extends BaseActivity implements View.OnClickL } private void getdata(String id) { - HttpUtils.getApi().GetclsqForone(id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetclsqForone(id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ClcrzcxBean bean = response.body(); @@ -312,7 +312,7 @@ public class ClcrzsqcxinfoActivity extends BaseActivity implements View.OnClickL private void Savewzcc(String state) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), getXginfo(state)); - HttpUtils.getApi().saveclcrz(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).saveclcrz(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); @@ -379,7 +379,7 @@ public class ClcrzsqcxinfoActivity extends BaseActivity implements View.OnClickL RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), gson); - HttpUtils.getApi().getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { bean = response.body(); @@ -412,7 +412,7 @@ public class ClcrzsqcxinfoActivity extends BaseActivity implements View.OnClickL private void setAudit() { RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), createJson()); - HttpUtils.getApi().setAudit(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).setAudit(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -459,7 +459,7 @@ public class ClcrzsqcxinfoActivity extends BaseActivity implements View.OnClickL } private void GetYjgj() { - HttpUtils.getApi().GetYzgjclcrDatas("clcrz").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetYzgjclcrDatas("clcrz").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxxzActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxxzActivity.java index aa50ea5..5041513 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxxzActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ClcrzsqcxxzActivity.java @@ -143,7 +143,7 @@ public class ClcrzsqcxxzActivity extends BaseActivity { } private void GetYjgj() { - HttpUtils.getApi().GetYzgjclcrDatas("clcrz").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetYzgjclcrDatas("clcrz").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -201,7 +201,7 @@ public class ClcrzsqcxxzActivity extends BaseActivity { toastviewbymyself.makeText(context, "请填写好必填项", Toast.LENGTH_LONG).show(); } else { RequestBody body = RequestBody.create(MediaType.parse("application/json"), getXginfo(state)); - HttpUtils.getApi().saveclcrz(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).saveclcrz(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); 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 ecee4a7..f86e9b5 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 @@ -740,7 +740,7 @@ public class ConferenceAudioActivity extends BaseActivity { RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file); builder.addFormDataPart("file", file.getName(), imageBody); //.wav .amr .mp3 .pcm .m4a - HttpUtils.getApi().uploadRecord("wjsc_up", userInfo.getManid(), "record", "", ".wav", ilConference.getContent(), + HttpUtils.getApi(this).uploadRecord("wjsc_up", userInfo.getManid(), "record", "", ".wav", ilConference.getContent(), ilHylx.getContent(), bzmc, ilHysj.getContent(), builder.build()).enqueue(new BaseCallBack(context) { @Override @@ -813,7 +813,7 @@ public class ConferenceAudioActivity extends BaseActivity { public void getMeetTypeData() { - HttpUtils.getApi().getmeettype().enqueue(new BaseCallBack(ConferenceAudioActivity.this) { + HttpUtils.getApi(this).getmeettype().enqueue(new BaseCallBack(ConferenceAudioActivity.this) { @Override public void onSuccess(Call call, Response response) { @@ -851,7 +851,7 @@ public class ConferenceAudioActivity extends BaseActivity { public void getRadioListData() { - HttpUtils.getApi().getRadioList().enqueue(new BaseCallBack(ConferenceAudioActivity.this) { + HttpUtils.getApi(this).getRadioList().enqueue(new BaseCallBack(ConferenceAudioActivity.this) { @Override public void onSuccess(Call call, Response response) { @@ -881,7 +881,7 @@ public class ConferenceAudioActivity extends BaseActivity { getRadioListBean.getRows().get(position).getImagename(); showLog(theDownLoadRadioUrl); //Log.i("app", theDownLoadRadioUrl); - DownloadUtil.get(context).download(theDownLoadRadioUrl, "Radio", context, new DownloadUtil.OnDownloadListener() { + DownloadUtil.get(context,URL).download(theDownLoadRadioUrl, "Radio", context, new DownloadUtil.OnDownloadListener() { @Override public void onDownloadSuccess(final String savePath, String fileName) { ConferenceAudioActivity.this.runOnUiThread(() -> { 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 4bbaeae..f8d02d9 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 @@ -94,7 +94,7 @@ public class ConferenceDateActivity extends BaseActivity implements DateLayout. txtMettingRoom = bean.getText(); } - HttpUtils.getApi().getMonthCouference(nowMouth, txtMettingRoom).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getMonthCouference(nowMouth, txtMettingRoom).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -185,7 +185,7 @@ public class ConferenceDateActivity extends BaseActivity implements DateLayout. txtMettingRoom = bean.getText(); } - HttpUtils.getApi().getConferenceDateList(Contans.LISTCODE.APPLYCONFERENCE, + HttpUtils.getApi(this).getConferenceDateList(Contans.LISTCODE.APPLYCONFERENCE, date, "3", txtMettingRoom).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivity_ExamOnline.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivity_ExamOnline.java index 39a559f..cd2c778 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivity_ExamOnline.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivity_ExamOnline.java @@ -134,7 +134,7 @@ public class DJActivity_ExamOnline extends BaseActivity { private void UploadExamDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), creatJson()); @@ -344,7 +344,7 @@ public class DJActivity_ExamOnline extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getDJexaminfo(id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDJexaminfo(id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivity_PDFView.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivity_PDFView.java index 66ed541..dcf986c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivity_PDFView.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivity_PDFView.java @@ -185,7 +185,7 @@ public class DJActivity_PDFView extends BaseActivity { private void SaveXueXiXinDe(String skrrid, String ysssc, String ysssc_s, String sssd) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(skrrid, ysssc, ysssc_s, sssd)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivityksinfodetail.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivityksinfodetail.java index 588bb85..f2de3ad 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivityksinfodetail.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJActivityksinfodetail.java @@ -112,7 +112,7 @@ public class DJActivityksinfodetail extends BaseActivity { public void onClick(View v) { if (kstype.equals("1")) { - HttpUtils.getApi().canexam(id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(context).canexam(id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKjInfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKjInfoActivity.java index 33d3453..5aec065 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKjInfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKjInfoActivity.java @@ -85,7 +85,7 @@ public class DJKjInfoActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getDJKjInfo(kjid).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDJKjInfo(kjid).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -109,7 +109,7 @@ public class DJKjInfoActivity extends BaseActivity { private void DelKjData() { - HttpUtils.getApi().DeDlDJKJ(kjid).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).DeDlDJKJ(kjid).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKsInfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKsInfoActivity.java index 4f13a4d..d155b06 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKsInfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKsInfoActivity.java @@ -58,7 +58,7 @@ public class DJKsInfoActivity extends BaseActivity { public void savekjinfo() { - HttpUtils.getApi().GetDJKSLBList(App.getInstance().getUserInfo().getManid(), kstype, times, timee, kslb_id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetDJKSLBList(App.getInstance().getUserInfo().getManid(), kstype, times, timee, kslb_id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKslbListViewActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKslbListViewActivity.java index b28e672..e145c6e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKslbListViewActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJKslbListViewActivity.java @@ -61,7 +61,7 @@ public class DJKslbListViewActivity extends BaseActivity { private void getkslb() { - HttpUtils.getApi().getDJkslbinfo().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDJkslbinfo().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXOfficeViewActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXOfficeViewActivity.java index 600cc8d..c028d5f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXOfficeViewActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXOfficeViewActivity.java @@ -306,7 +306,7 @@ public class DJPXOfficeViewActivity extends BaseActivity { private void SaveXueXiXinDe(String skrrid, String ysssc, String ysssc_s, String sssd) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(skrrid, ysssc, ysssc_s, sssd)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoActivity.java index 9f34f4f..32b5626 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoActivity.java @@ -74,7 +74,7 @@ public class DJPXinfoActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getDJPXinfolist(App.getInstance().getUserInfo().getManid(), lbid, "").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDJPXinfolist(App.getInstance().getUserInfo().getManid(), lbid, "").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoMoreActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoMoreActivity.java index ebbfd69..dcb2c26 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoMoreActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoMoreActivity.java @@ -168,7 +168,7 @@ public class DJPXinfoMoreActivity extends BaseActivity { if (!file.exists() || !file.isFile()) { Log.i("app", "文件不存在"); Log.i("app", URL + filedataBeans.get(position).getFilepath()); - DownloadUtil.get(context).download(URL + filedataBeans.get(position).getFilepath(), "Radio",context, new DownloadUtil.OnDownloadListener() { + DownloadUtil.get(context,URL).download(URL + filedataBeans.get(position).getFilepath(), "Radio",context, new DownloadUtil.OnDownloadListener() { @Override public void onDownloadSuccess(final String savePath, final String fileName) { @@ -256,7 +256,7 @@ public class DJPXinfoMoreActivity extends BaseActivity { if (!file.exists() || !file.isFile()) { Log.i("app", "文件不存在"); Log.i("app", URL + filedataBeans.get(position).getFilepath()); - DownloadUtil.get(context).download(URL + filedataBeans.get(position).getFilepath(), "Radio",context, new DownloadUtil.OnDownloadListener() { + DownloadUtil.get(context,URL).download(URL + filedataBeans.get(position).getFilepath(), "Radio",context, new DownloadUtil.OnDownloadListener() { @Override public void onDownloadSuccess(final String savePath, final String fileName) { @@ -337,7 +337,7 @@ public class DJPXinfoMoreActivity extends BaseActivity { if (filedataBeans.get(position).getFiletype().equals(".pdf")) { - DownloadUtil.get(context).download(URL + filedataBeans.get(position).getFilepath(), "Radio",context, new DownloadUtil.OnDownloadListener() { + DownloadUtil.get(context,URL).download(URL + filedataBeans.get(position).getFilepath(), "Radio",context, new DownloadUtil.OnDownloadListener() { @Override public void onDownloadSuccess(final String savePath, final String fileName) { @@ -389,7 +389,7 @@ public class DJPXinfoMoreActivity extends BaseActivity { } else if (filedataBeans.get(position).getFiletype().equals(".mp4") || filedataBeans.get(position).getFiletype().equals(".flv")) { - DownloadUtil.get(context).download(URL + filedataBeans.get(position).getFilepath(), "Radio",context, new DownloadUtil.OnDownloadListener() { + DownloadUtil.get(context,URL).download(URL + filedataBeans.get(position).getFilepath(), "Radio",context, new DownloadUtil.OnDownloadListener() { @Override public void onDownloadSuccess(final String savePath, final String fileName) { @@ -453,7 +453,7 @@ public class DJPXinfoMoreActivity extends BaseActivity { filedataBeans.get(position).getFiletype().equals(".xlsx") || filedataBeans.get(position).getFiletype().equals(".ppt") || filedataBeans.get(position).getFiletype().equals(".pptx")) { - DownloadUtil.get(context).download(URL + filedataBeans.get(position).getFilepath(), "Radio",context, new DownloadUtil.OnDownloadListener() { + DownloadUtil.get(context,URL).download(URL + filedataBeans.get(position).getFilepath(), "Radio",context, new DownloadUtil.OnDownloadListener() { @Override public void onDownloadSuccess(final String savePath, final String fileName) { @@ -517,7 +517,7 @@ public class DJPXinfoMoreActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getDJPXinfomorelist(Skrrid).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDJPXinfomorelist(Skrrid).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPeixunActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPeixunActivity.java index 892e64f..20c6bef 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPeixunActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPeixunActivity.java @@ -52,7 +52,7 @@ public class DJPeixunActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getDJPXlist(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDJPXlist(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { PxListBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxKjglActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxKjglActivity.java index 6d78d79..0e9ceb8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxKjglActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxKjglActivity.java @@ -82,7 +82,7 @@ public class DJPxKjglActivity extends BaseActivity implements View.OnClickListen private void getListDatas() { - HttpUtils.getApi().getDJKjlbInfo(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDJKjlbInfo(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxVideoPlayActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxVideoPlayActivity.java index 56d0294..d334bd2 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxVideoPlayActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPxVideoPlayActivity.java @@ -291,7 +291,7 @@ public class DJPxVideoPlayActivity extends BaseActivity { private void SaveXueXiXinDe(String skrrid, String ysssc, String ysssc_s, String sssd) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(skrrid, ysssc, ysssc_s, sssd)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJSylyListViewActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJSylyListViewActivity.java index 9024fec..690970d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJSylyListViewActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJSylyListViewActivity.java @@ -66,7 +66,7 @@ public class DJSylyListViewActivity extends BaseActivity { private void getSYLY() { - HttpUtils.getApi().getDJsylyInfo().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDJsylyInfo().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJTimeActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJTimeActivity.java index f8cebb4..5b3a07d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJTimeActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJTimeActivity.java @@ -104,7 +104,7 @@ public class DJTimeActivity extends AutoLayoutActivity implements View.OnClickLi } private void getListDatas() { - HttpUtils.getApi().GetDataByDYWorkOld(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetDataByDYWorkOld(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @SuppressLint("SetTextI18n") @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJUploadKJInfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJUploadKJInfoActivity.java index 2a7baf1..9abbde7 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJUploadKJInfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJUploadKJInfoActivity.java @@ -259,7 +259,7 @@ public class DJUploadKJInfoActivity extends BaseActivity { private void getKJLX() { - HttpUtils.getApi().getDJKjlxInfo().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDJKjlxInfo().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -296,7 +296,7 @@ public class DJUploadKJInfoActivity extends BaseActivity { private void getZJR() { - HttpUtils.getApi().getDJzjrInfo().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDJzjrInfo().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -361,7 +361,7 @@ public class DJUploadKJInfoActivity extends BaseActivity { builder.addFormDataPart("file", file.getName(), RequestBody.create(MediaType.parse("*/*"), new File(filePath))); - HttpUtils.getApi().uploadkjinfo(uploadfiletypeid, uploadfiletype, builder.build()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).uploadkjinfo(uploadfiletypeid, uploadfiletype, builder.build()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -391,7 +391,7 @@ public class DJUploadKJInfoActivity extends BaseActivity { public void savekjinfo(String kjid, String kjname, String jsid, String lbid, String kjlxid, String kjintroduce, String kjsd, String man_id, String man_name, String lrr_dept) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(kjid, kjname, jsid, lbid, kjlxid, kjintroduce, kjsd, man_id, man_name, lrr_dept)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJlocalActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJlocalActivity.java index 6ec3fb3..08bc437 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJlocalActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJlocalActivity.java @@ -197,7 +197,7 @@ public class DJlocalActivity extends BaseActivity { private void SaveXueXiXinDe(String skrrid, String ysssc, String ysssc_s, String sssd) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(skrrid, ysssc, ysssc_s, sssd)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DagerEnterApplyDetailActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DagerEnterApplyDetailActivity.kt index cfce428..76bc9ec 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DagerEnterApplyDetailActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DagerEnterApplyDetailActivity.kt @@ -174,7 +174,7 @@ class DagerEnterApplyDetailActivity : Log.i("app", json) val body: RequestBody = RequestBody.create("applocation/json".toMediaTypeOrNull(), json) - HttpUtils.getApi().getLeaveAuditPost(body) + HttpUtils.getApi(this).getLeaveAuditPost(body) .enqueue(object : BaseCallBack(context) { override fun onSuccess( call: Call?, diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeparmentTreeActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeparmentTreeActivity.java index 7b985ab..ab20301 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeparmentTreeActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeparmentTreeActivity.java @@ -99,7 +99,7 @@ public class DeparmentTreeActivity extends BaseActivity implements SelectItemDep private void getListDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getDepartMentList(Contans.MODUETYPE.DEPARTMENT, "ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DownloadActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DownloadActivity.java index 6d5a953..b5a5847 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DownloadActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DownloadActivity.java @@ -16,7 +16,7 @@ public class DownloadActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_download); String URL="https://qd.myapp.com/myapp/qqteam/AndroidQQ/mobileqq_android.apk"; - DownloadUtil.get(DownloadActivity.this).download(URL, "pdf", DownloadActivity.this, new DownloadUtil.OnDownloadListener() { + DownloadUtil.get(DownloadActivity.this,URL).download(URL, "pdf", DownloadActivity.this, new DownloadUtil.OnDownloadListener() { @Override public void onDownloadSuccess(String savePath, String fileName) { Toast.makeText(DownloadActivity.this, "下载成功", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DydhinfoSaveDataActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DydhinfoSaveDataActivity.java index 75516c5..f42abff 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DydhinfoSaveDataActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DydhinfoSaveDataActivity.java @@ -152,7 +152,7 @@ public class DydhinfoSaveDataActivity extends BaseActivity { private void TJXZ() { RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetJson()); - HttpUtils.getApi().xzdydh(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).xzdydh(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DzzBmListActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DzzBmListActivity.java index 1f91664..0f4b190 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DzzBmListActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DzzBmListActivity.java @@ -80,7 +80,7 @@ public class DzzBmListActivity extends BaseActivity { */ private void getkslb() { - HttpUtils.getApi().getDzzBm().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDzzBm().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { DzzBmBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/FunctionSelectActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/FunctionSelectActivity.java index a521f18..1c791db 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/FunctionSelectActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/FunctionSelectActivity.java @@ -70,7 +70,7 @@ public class FunctionSelectActivity extends BaseActivity { RequestBody body = RequestBody.create(MediaType.parse("application/json"), ModuleDatas.shortcutMenuSaveJson(items1, userInfo.getManid())); - HttpUtils.getApi().saveShortcutMenu(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).saveShortcutMenu(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GgnrActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GgnrActivity.java index ea41e75..9cdb5c5 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GgnrActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GgnrActivity.java @@ -116,7 +116,7 @@ public class GgnrActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getggzxnr(ggzxid).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getggzxnr(ggzxid).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GgzxActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GgzxActivity.java index bc723cf..6a8efed 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GgzxActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GgzxActivity.java @@ -61,7 +61,7 @@ public class GgzxActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getGgzxlist("", "", "", "").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getGgzxlist("", "", "", "").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GxrzActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GxrzActivity.java index cb39433..774373e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GxrzActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GxrzActivity.java @@ -42,7 +42,7 @@ public class GxrzActivity extends BaseActivity { } private void getdata() { - HttpUtils.getApi().GetGxlistDatas("","android").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetGxlistDatas("","android").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { GxlistBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzQySelectActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzQySelectActivity.java index 0651ea1..fd972af 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzQySelectActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzQySelectActivity.java @@ -104,7 +104,7 @@ public class GzQySelectActivity extends BaseActivity implements GzqySelectAdapt private void getListDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getgzqy(userInfo.getBzbh()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzpActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzpActivity.java index b604528..05f3689 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzpActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzpActivity.java @@ -93,7 +93,7 @@ public class GzpActivity extends BaseActivity { public void getdata() { - HttpUtils.getApi().GetGzpList(App.getInstance().getUserInfo().getBzbh(), userInfo.getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetGzpList(App.getInstance().getUserInfo().getBzbh(), userInfo.getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzCwSelectActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzCwSelectActivity.java index 7f7dbf1..863db08 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzCwSelectActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzCwSelectActivity.java @@ -101,7 +101,7 @@ public class GzzCwSelectActivity extends BaseActivity implements GzzSelectAdapt } private void getListDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getGzzcy1().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzSelectActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzSelectActivity.java index b414c75..a66cc3e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzSelectActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzSelectActivity.java @@ -112,7 +112,7 @@ public class GzzSelectActivity extends BaseActivity implements GzzSelectAdapter private void getListDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getGzzcy1().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzSelectGzbcyActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzSelectGzbcyActivity.java index 17d99e5..0774b2d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzSelectGzbcyActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzzSelectGzbcyActivity.java @@ -117,7 +117,7 @@ public class GzzSelectGzbcyActivity extends BaseActivity implements GzzSelectAd private void getListDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getGzzcy1().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HeadPhotoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HeadPhotoActivity.java index 9cf9e4e..7b823ea 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HeadPhotoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HeadPhotoActivity.java @@ -37,7 +37,7 @@ public class HeadPhotoActivity extends BaseActivity { MultipartBody.Builder builder = new MultipartBody.Builder(); builder.setType(MultipartBody.FORM); builder.addFormDataPart("file", "headPhoto", RequestBody.create(MediaType.parse("image/*"), new File(imagePhth))); - HttpUtils.getApi().updateHeadPhoto("head_up", userInfo.getManid(), ".jpg", builder.build()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(HeadPhotoActivity.this).updateHeadPhoto("head_up", userInfo.getManid(), ".jpg", builder.build()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { HeadPhotoResultBean headPhotoResultBean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HmcheckboxActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HmcheckboxActivity.java index 6a70070..61e1a59 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HmcheckboxActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HmcheckboxActivity.java @@ -143,7 +143,7 @@ public class HmcheckboxActivity extends BaseActivity { private void GetData() { - HttpUtils.getApi().GetAbInfo(QYID, ST, ET).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetAbInfo(QYID, ST, ET).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { AbinfoBean bean = response.body(); @@ -209,7 +209,7 @@ public class HmcheckboxActivity extends BaseActivity { } private void BC(String remark, String id) { - HttpUtils.getApi().HMBC("SaveHMSZ", remark, userInfo.getUsernames(), id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).HMBC("SaveHMSZ", remark, userInfo.getUsernames(), id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HminfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HminfoActivity.java index 10d84aa..153ef40 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HminfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HminfoActivity.java @@ -77,7 +77,7 @@ public class HminfoActivity extends BaseActivity { } private void getdata() { - HttpUtils.getApi().GetHmInfo(QYID, ST, ET).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetHmInfo(QYID, ST, ET).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -100,7 +100,7 @@ public class HminfoActivity extends BaseActivity { } private void getqx() { - HttpUtils.getApi().GetHmQx("CheckHMSZ", userInfo.getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetHmQx("CheckHMSZ", userInfo.getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HminfoXzScActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HminfoXzScActivity.java index 18f9404..1e0ebb0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HminfoXzScActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HminfoXzScActivity.java @@ -88,7 +88,7 @@ public class HminfoXzScActivity extends BaseActivity { } private void SC() { - HttpUtils.getApi().HMSC("DelHMSZ", list.getId(), userInfo.getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).HMSC("DelHMSZ", list.getId(), userInfo.getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -110,7 +110,7 @@ public class HminfoXzScActivity extends BaseActivity { } private void getqx() { - HttpUtils.getApi().GetHmQx("CheckHMSZ", userInfo.getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetHmQx("CheckHMSZ", userInfo.getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/IPConfigActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/IPConfigActivity.java index 5c1ad76..e91a313 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/IPConfigActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/IPConfigActivity.java @@ -36,7 +36,7 @@ public class IPConfigActivity extends AppCompatActivity { btn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - HttpUtils.getApi("").downLoadApk("http://219.131.195.3:8081/apkFiles/release/PMMAPP.apk").enqueue(new BaseCallBack(IPConfigActivity.this) { + HttpUtils.getApi(IPConfigActivity.this).downLoadApk("http://219.131.195.3:8081/apkFiles/release/PMMAPP.apk").enqueue(new BaseCallBack(IPConfigActivity.this) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqActivity.java index 798e8b0..3ce848f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqActivity.java @@ -172,7 +172,7 @@ public class JcyrsqActivity extends BaseActivity { public void getdata(String token) { - HttpUtils.getCompanyServerApi(token).getJcyrsq(tvSt.getText().toString().trim(),tvEt.getText().toString().trim()).enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).getJcyrsq(tvSt.getText().toString().trim(),tvEt.getText().toString().trim()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { JcyrsqBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqAddActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqAddActivity.java index 4d89665..63fe2c0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqAddActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqAddActivity.java @@ -270,7 +270,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe } private void GetYjgj() { - HttpUtils.getApi().GetYzgjclcrDatas("clcrz").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetYzgjclcrDatas("clcrz").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -594,7 +594,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe String time = format.format(calendar.getTime()); param.put("lrsj", time); RequestBody body = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(param)); - HttpUtils.getCompanyServerApi(token).addJcrysq(body).enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).addJcrysq(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { JcrysqAddBean bean = response.body(); @@ -620,7 +620,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe private void updateJcyrsq(String token, String state) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), getXginfo(state)); - HttpUtils.getCompanyServerApi(token).jcryUpDate(body).enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).jcryUpDate(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { BaseBean bean = response.body(); @@ -655,7 +655,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe memberList.add(member); } RequestBody body = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(memberList)); - HttpUtils.getCompanyServerApi(token).addJcsqryMembers(body).enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).addJcsqryMembers(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { BaseBean bean = response.body(); @@ -680,7 +680,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe if (tsryOld != null && tsryOld.size() > 0) { for (int i = 0; i < tsryOld.size(); i++) { CbsMemberBean.CbsMember bean = tsryOld.get(i); - HttpUtils.getCompanyServerApi(token).delJcsqryMembers(bean.getID()).enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).delJcsqryMembers(bean.getID()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { BaseBean bean = response.body(); @@ -701,7 +701,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe } private void getDetail(String token) { - HttpUtils.getCompanyServerApi(token).getJcrysqDetail(id).enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).getJcrysqDetail(id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { JcyrsqDetailBaseBean detailBaseBean = response.body(); @@ -777,7 +777,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe } private void getMemberList(String token) { - HttpUtils.getCompanyServerApi(token).getDetailMemberList(id).enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).getDetailMemberList(id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { JcyrsqDetailMemberBaseBean bean = response.body(); @@ -818,7 +818,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe } private void getAuditRecord(String token) { - HttpUtils.getCompanyServerApi(token).getAuditRecord(id, "1001", "ZH").enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).getAuditRecord(id, "1001", "ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { StepFollowBaseBean bean = response.body(); @@ -839,7 +839,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe } private void getIsAuditItem(String token) { - HttpUtils.getCompanyServerApi(token).getJcIsAuditItem(id, "1001", "ZH").enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).getJcIsAuditItem(id, "1001", "ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { AuditItemBaseBean bean = response.body(); @@ -895,7 +895,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe // {"itemid":"1002","shyj":"同意申请","isshyj":"1","range":"1001","barcode":"f840e45b-8454-409e-b4af-f5cd8c70e508","dc":"ZH"} RequestBody body = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(param)); - HttpUtils.getCompanyServerApi(token).SetAudit(body).enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).SetAudit(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { BaseBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KjInfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KjInfoActivity.java index 5cc2a8c..a332bbf 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KjInfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KjInfoActivity.java @@ -86,7 +86,7 @@ public class KjInfoActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getKjInfo(kjid).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getKjInfo(kjid).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -110,7 +110,7 @@ public class KjInfoActivity extends BaseActivity { private void DelKjData() { - HttpUtils.getApi().DeDlKJ(kjid).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).DeDlKJ(kjid).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KsInfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KsInfoActivity.java index f19defc..53c3606 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KsInfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KsInfoActivity.java @@ -94,7 +94,7 @@ public class KsInfoActivity extends BaseActivity { public void getValidExamTrainList() { - HttpUtils.getApi().GetKSLBList(App.getInstance().getUserInfo().getManid(), kstype, times, timee, kslb_id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetKSLBList(App.getInstance().getUserInfo().getManid(), kstype, times, timee, kslb_id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -132,7 +132,7 @@ public class KsInfoActivity extends BaseActivity { public void getValidExamProduceList() { - HttpUtils.getApi().GetKSLBProduceList(App.getInstance().getUserInfo().getManid(), times, timee).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetKSLBProduceList(App.getInstance().getUserInfo().getManid(), times, timee).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KslbListViewActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KslbListViewActivity.java index a8b52d3..bb108e8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KslbListViewActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KslbListViewActivity.java @@ -54,7 +54,7 @@ public class KslbListViewActivity extends BaseActivity { } private void getkslb() { - HttpUtils.getApi().getkslbinfo().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getkslbinfo().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LocalWordActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LocalWordActivity.java index 0582d7d..a97187f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LocalWordActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LocalWordActivity.java @@ -262,7 +262,7 @@ public class LocalWordActivity extends BaseActivity { private void SaveStudyProgress(String skrrid, String sssd) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(skrrid, sssd)); if (isParty) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrgzpActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrgzpActivity.java index d963609..029e18b 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrgzpActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrgzpActivity.java @@ -239,7 +239,7 @@ public class LrgzpActivity extends BaseActivity { } private void uploaddata() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetInfo()); api.uploadgzp(body).enqueue(new BaseCallBack(context) { @Override @@ -262,7 +262,7 @@ public class LrgzpActivity extends BaseActivity { } private void ZJgzp() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), getinfo_gzp()); api.zjgzp(body).enqueue(new BaseCallBack(context) { @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqylsryActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqylsryActivity.java index 0da8eb9..897ee1c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqylsryActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqylsryActivity.java @@ -202,7 +202,7 @@ public class LrqylsryActivity extends BaseActivity { } private void uploaddata() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetInfo()); api.uploadls(body).enqueue(new BaseCallBack(context) { @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqylsryinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqylsryinfoActivity.java index a537567..9169933 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqylsryinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqylsryinfoActivity.java @@ -198,7 +198,7 @@ public class LrqylsryinfoActivity extends BaseActivity implements View.OnClickLi public void getdata(String id) { - HttpUtils.getApi().Getlsryforone(id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).Getlsryforone(id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ZdqylsBean bean = response.body(); @@ -256,7 +256,7 @@ public class LrqylsryinfoActivity extends BaseActivity implements View.OnClickLi RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), gson); - HttpUtils.getApi().getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -297,7 +297,7 @@ public class LrqylsryinfoActivity extends BaseActivity implements View.OnClickLi public void setAudit() { RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), createJson()); - HttpUtils.getApi().setChangeShitfAudit(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).setChangeShitfAudit(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqyryActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqyryActivity.java index 82832cf..6fef2a2 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqyryActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrqyryActivity.java @@ -142,7 +142,7 @@ public class LrqyryActivity extends BaseActivity { } private void uploaddata() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetInfo()); api.uploadcw(body).enqueue(new BaseCallBack(context) { @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrzdqyryActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrzdqyryActivity.java index d4b6597..e1c3f6a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrzdqyryActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LrzdqyryActivity.java @@ -203,7 +203,7 @@ public class LrzdqyryActivity extends BaseActivity { } private void uploaddata() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetInfo()); api.uploadzd(body).enqueue(new BaseCallBack(context) { @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LsgkActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LsgkActivity.java index dcc0e6a..b3a2d1a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LsgkActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LsgkActivity.java @@ -64,7 +64,7 @@ public class LsgkActivity extends BaseActivity implements View.OnClickListener { private void getListDatas() { - HttpUtils.getApi().getlsgkList().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getlsgkList().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LsgkinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LsgkinfoActivity.java index 50f53fb..f11e5aa 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LsgkinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LsgkinfoActivity.java @@ -192,7 +192,7 @@ public class LsgkinfoActivity extends BaseActivity implements View.OnClickListen private void getshbz() { - HttpUtils.getApi().getshbz(listid, "934", userInfo.getBzbh(), "ZH").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getshbz(listid, "934", userInfo.getBzbh(), "ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { Lsgkshbz lsgkshbz = response.body(); @@ -224,7 +224,7 @@ public class LsgkinfoActivity extends BaseActivity implements View.OnClickListen private void getAuditpermission() { - HttpUtils.getApi().getlsgkshlc(listid, "LSGKGL", "ZH", userInfo.getManid(), userInfo.getBzbh(), "934").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getlsgkshlc(listid, "LSGKGL", "ZH", userInfo.getManid(), userInfo.getBzbh(), "934").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -267,7 +267,7 @@ public class LsgkinfoActivity extends BaseActivity implements View.OnClickListen private void setAudit() { RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), createJson()); - HttpUtils.getApi().setlsgksh(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).setlsgksh(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -324,7 +324,7 @@ public class LsgkinfoActivity extends BaseActivity implements View.OnClickListen private void TS() { RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), TSJSON()); - HttpUtils.getApi().lsgkts(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).lsgkts(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MakerecommendationsActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MakerecommendationsActivity.java index 297245c..976853f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MakerecommendationsActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MakerecommendationsActivity.java @@ -194,7 +194,7 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp private void getDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getAdviceInfo(Contans.LISTCODE.APPLYSUGGESTION, listid).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -214,7 +214,7 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp private void getSHQX() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getshqx(userInfo.getManid(), Contans.LISTCODE.APPLYSUGGESTION).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyOrderActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyOrderActivity.java index e99d848..6e755c7 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyOrderActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyOrderActivity.java @@ -108,7 +108,7 @@ public class MyOrderActivity extends BaseActivity implements ApplyDriverAdapter. private void requestVehicleData() { - HttpUtils.getApi().getDriverVehicleList(Contans.LISTCODE.APPLYVEHICLE, "0", userInfo.getManid(), "3").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDriverVehicleList(Contans.LISTCODE.APPLYVEHICLE, "0", userInfo.getManid(), "3").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -134,7 +134,7 @@ public class MyOrderActivity extends BaseActivity implements ApplyDriverAdapter. private void requestTakeOutData() { - HttpUtils.getApi().getTakeOutList(Contans.LISTCODE.APPLYORDER, "0", userInfo.getManid(),"1").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getTakeOutList(Contans.LISTCODE.APPLYORDER, "0", userInfo.getManid(),"1").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ApplyListTakeOutBean baseResult = response.body(); @@ -226,7 +226,7 @@ public class MyOrderActivity extends BaseActivity implements ApplyDriverAdapter. RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(listid, sendcmdcode, listCode)); - HttpUtils.getApi().sendCmdTask(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).sendCmdTask(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskDetailActivity.java index 7f11c27..0a62d88 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskDetailActivity.java @@ -219,7 +219,7 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils private void getDatas() { - HttpUtils.getApi().getMyTask(ListId, ListCode).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getMyTask(ListId, ListCode).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -303,7 +303,7 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils private void delApply() { - HttpUtils.getApi().delApply(ListId).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).delApply(ListId).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OrdinaryVisitAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OrdinaryVisitAuditActivity.java index e9a12f3..6aa8819 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OrdinaryVisitAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OrdinaryVisitAuditActivity.java @@ -180,7 +180,7 @@ public class OrdinaryVisitAuditActivity extends BaseActivity implements View.OnC private void getDatas() { - Api api = HttpUtils.getApi(Contans.BASE_URL); + Api api = HttpUtils.getApi(this); api.getOrdinaryVisit(listcode, ListId, Suplistid).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OtherCountMeActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OtherCountMeActivity.java index 6ad78bb..a0f8003 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OtherCountMeActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OtherCountMeActivity.java @@ -53,7 +53,7 @@ public class OtherCountMeActivity extends BaseActivity { public void getOtherCount() { - HttpUtils.getApi().getOther(userInfo.getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getOther(userInfo.getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { QtdbBean bean = response.body(); 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 f72bccf..6a5bc43 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 @@ -216,7 +216,7 @@ public class OthersTaskDetailActivity extends BaseActivity implements SaveApplyU public void getDetails() { - HttpUtils.getApi().getOtherTaskDetails(ListCode, ListId).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getOtherTaskDetails(ListCode, ListId).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PXOfficeViewActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PXOfficeViewActivity.java index b733f7a..22d0d5a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PXOfficeViewActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PXOfficeViewActivity.java @@ -308,7 +308,7 @@ public class PXOfficeViewActivity extends BaseActivity { private void SaveXueXiXinDe(String skrrid, String ysssc, String ysssc_s, String sssd) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(skrrid, ysssc, ysssc_s, sssd)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PXinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PXinfoActivity.java index 5b50c29..64d039e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PXinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PXinfoActivity.java @@ -71,7 +71,7 @@ public class PXinfoActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getPXinfolist(App.getInstance().getUserInfo().getManid(), lbid, "").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getPXinfolist(App.getInstance().getUserInfo().getManid(), lbid, "").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PartDeparmentTreeActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PartDeparmentTreeActivity.java index a1ea56d..512d292 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PartDeparmentTreeActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PartDeparmentTreeActivity.java @@ -93,7 +93,7 @@ public class PartDeparmentTreeActivity extends BaseActivityOaToolbarViewBinding< private void getListDatas() { - HttpUtils.getApi().getDepartmentTreeList().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDepartmentTreeList().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PeiXunVideoPlayActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PeiXunVideoPlayActivity.java index b6185fd..3a8b305 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PeiXunVideoPlayActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PeiXunVideoPlayActivity.java @@ -185,7 +185,7 @@ public class PeiXunVideoPlayActivity extends BaseActivity { private void SaveStudyProgress(String skrrid, String sssd) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(skrrid, sssd)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PeixunActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PeixunActivity.java index 49a4f33..13a49bd 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PeixunActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PeixunActivity.java @@ -62,7 +62,7 @@ public class PeixunActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getPXlist(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getPXlist(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyInfoMoreActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyInfoMoreActivity.kt index 8c38508..637972a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyInfoMoreActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyInfoMoreActivity.kt @@ -126,7 +126,7 @@ class ProduceStudyInfoMoreActivity : if (!file.exists() || !file.isFile) { Log.i("print", "文件不存在") dialogFileLoading.show() - DownloadUtil.get(context).download( + DownloadUtil.get(context,URL).download( URL + filepath, "Radio", context, @@ -198,7 +198,7 @@ class ProduceStudyInfoMoreActivity : if (!file.exists() || !file.isFile) { dialogFileLoading.show() Log.i("app", "文件不存在") - DownloadUtil.get(context).download( + DownloadUtil.get(context,URL).download( URL + filepath, "Radio", context, @@ -267,7 +267,7 @@ class ProduceStudyInfoMoreActivity : } else { if (filetype == ".mp4" || filetype == ".flv") { dialog.show() - DownloadUtil.get(context).download( + DownloadUtil.get(context,URL).download( URL + filepath, "Radio", context, @@ -319,7 +319,7 @@ class ProduceStudyInfoMoreActivity : }) } else if (filetype == ".pdf" || filetype == ".doc" || filetype == ".docx" || filetype == ".xls" || filetype == ".xlsx" || filetype == ".ppt" || filetype == ".pptx") { dialog.show() - DownloadUtil.get(context).download( + DownloadUtil.get(context,URL).download( URL + filepath, "Radio", context, @@ -375,7 +375,7 @@ class ProduceStudyInfoMoreActivity : } private fun getListDatas() { - HttpUtils.getApi().getProduceStudyinfoMoreData(id, kjid, kjempid, kcid) + HttpUtils.getApi(this).getProduceStudyinfoMoreData(id, kjid, kjempid, kcid) .enqueue(object : BaseCallBack(context) { override fun onSuccess( call: Call?, diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyLocalDocActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyLocalDocActivity.java index 66cba25..6ab26f8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyLocalDocActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyLocalDocActivity.java @@ -298,7 +298,7 @@ public class ProduceStudyLocalDocActivity extends BaseActivity { private void SaveStudyProgress(String sssd) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(sssd)); - HttpUtils.getApi().updateProduceStudyProgressData(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).updateProduceStudyProgressData(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { xxResultBean bean = response.body(); @@ -326,7 +326,7 @@ public class ProduceStudyLocalDocActivity extends BaseActivity { RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJsonTodoStatus()); - HttpUtils.getApi().changeTodoTaskStatusData(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).changeTodoTaskStatusData(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { xxResultBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyPlayVideoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyPlayVideoActivity.java index d81ee0e..e352354 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyPlayVideoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ProduceStudyPlayVideoActivity.java @@ -265,7 +265,7 @@ public class ProduceStudyPlayVideoActivity extends BaseActivity { RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(sssd)); - HttpUtils.getApi().updateProduceStudyProgressData(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).updateProduceStudyProgressData(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { xxResultBean bean = response.body(); @@ -295,7 +295,7 @@ public class ProduceStudyPlayVideoActivity extends BaseActivity { RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJsonTodoStatus()); - HttpUtils.getApi().changeTodoTaskStatusData(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).changeTodoTaskStatusData(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { xxResultBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PxKjglActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PxKjglActivity.java index 36d8726..14baf3a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PxKjglActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PxKjglActivity.java @@ -73,7 +73,7 @@ public class PxKjglActivity extends BaseActivity implements View.OnClickListener private void getListDatas() { - HttpUtils.getApi().getKjlbInfo(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getKjlbInfo(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SeleCpActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SeleCpActivity.java index dd5ab9f..842455f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SeleCpActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SeleCpActivity.java @@ -71,7 +71,7 @@ public class SeleCpActivity extends BaseActivity implements SelectcpAdapter.Sele } private void getListDatas() { - HttpUtils.getApi().GetCpxx().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetCpxx().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { CpxxBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectConferenceActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectConferenceActivity.java index acbe0c9..0fc4a6c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectConferenceActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectConferenceActivity.java @@ -51,7 +51,7 @@ public class SelectConferenceActivity extends BaseActivity { private void requestData() { - HttpUtils.getApi().getApplyList(Contans.LISTCODE.APPLYCONFERENCE, userInfo.getManid(), "3").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getApplyList(Contans.LISTCODE.APPLYCONFERENCE, userInfo.getManid(), "3").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ApplyListBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem1Activity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem1Activity.java index a66e0c8..4d1ef61 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem1Activity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem1Activity.java @@ -121,7 +121,7 @@ public class SelectItem1Activity extends BaseActivity { private void getMettingRoomList() { - Api api = HttpUtils.getApi(Contans.BASE_URL); + Api api = HttpUtils.getApi(this); api.getJudgeData("usedboardroomlist", "", start_time, end_time).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -150,7 +150,7 @@ public class SelectItem1Activity extends BaseActivity { private void getListDatas() { - Api api = HttpUtils.getApi(Contans.BASE_URL); + Api api = HttpUtils.getApi(this); api.getDropDown(MODUETYPE, "ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem2Activity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem2Activity.java index 11b3115..5254e57 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem2Activity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem2Activity.java @@ -109,7 +109,7 @@ public class SelectItem2Activity extends BaseActivity implements SelectItem2Adap private void getListDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getUserInfo(Contans.MODUETYPE.USEROFDEPARTMENT, "ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem3Activity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem3Activity.java index a9491eb..e0b32be 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem3Activity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem3Activity.java @@ -103,7 +103,7 @@ public class SelectItem3Activity extends BaseActivity { private void getListDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getUserInfo(Contans.MODUETYPE.USEROFDEPARTMENT, "ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem4Activity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem4Activity.java index 486d7d4..c794860 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem4Activity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem4Activity.java @@ -69,7 +69,7 @@ public class SelectItem4Activity extends BaseActivity { private void getDatas() { - HttpUtils.getApi().getOfficeGroup().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getOfficeGroup().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem5Activity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem5Activity.java index 06e979b..ae443c0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem5Activity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem5Activity.java @@ -110,7 +110,7 @@ public class SelectItem5Activity extends BaseActivity implements SelectItem5Adap private void getListDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getBXJL("BXJLCX", userInfo.getManid(), ilStartTime, ilEndTime).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem6Activity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem6Activity.java index 7d62317..b7c7cd5 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem6Activity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem6Activity.java @@ -109,7 +109,7 @@ public class SelectItem6Activity extends BaseActivity implements SelectItem2Ada private void getListDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.getUserInfo(Contans.MODUETYPE.USEROFDEPARTMENT, "ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Selectzzsj2Activity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Selectzzsj2Activity.java index c6a457d..d21d3e7 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Selectzzsj2Activity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Selectzzsj2Activity.java @@ -101,7 +101,7 @@ public class Selectzzsj2Activity extends BaseActivity implements SjSelectAdapte } private void getListDatas() { - HttpUtils.getApi().GetZZSJDatas().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetZZSJDatas().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { datas.clear(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SqActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SqActivity.java index 8e93c33..9fe976d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SqActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SqActivity.java @@ -84,7 +84,7 @@ public class SqActivity extends BaseActivity { } private void SendSQdata(String username, String gh) { - HttpUtils.getApi().SendSq(username, gh).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).SendSq(username, gh).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); @@ -105,7 +105,7 @@ public class SqActivity extends BaseActivity { } private void GetData() { - HttpUtils.getApi().GetsqList().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetsqList().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { SqBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SylyListViewActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SylyListViewActivity.java index 7401ec5..973b2b7 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SylyListViewActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SylyListViewActivity.java @@ -66,7 +66,7 @@ public class SylyListViewActivity extends BaseActivity { private void getSYLY() { - HttpUtils.getApi().getsylyInfo().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getsylyInfo().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TaskCountActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TaskCountActivity.java index 5d7101e..b78850f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TaskCountActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TaskCountActivity.java @@ -71,7 +71,7 @@ public class TaskCountActivity extends BaseActivity { private void getDatas() { - HttpUtils.getApi().getRWTJ(userInfo.getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getRWTJ(userInfo.getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { TaskCountBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TaskDateActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TaskDateActivity.java index 8547db7..bea0cc2 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TaskDateActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TaskDateActivity.java @@ -108,7 +108,7 @@ public class TaskDateActivity extends BaseActivity implements DateLayout.DateLay */ private void getTaskDateCounts(String date) { - HttpUtils.getApi().getTaskDateCount(date).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getTaskDateCount(date).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -160,7 +160,7 @@ public class TaskDateActivity extends BaseActivity implements DateLayout.DateLay private void getListDatas(final String date) { - HttpUtils.getApi().getTaskDateList(date).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getTaskDateList(date).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt index bb070fe..f57010b 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt @@ -148,7 +148,7 @@ class TrainInfoMoreActivity : BaseActivityOaToolbarViewBinding(context) { +// HttpUtils.getApi(this).updataPwd(body).enqueue(new BaseCallBack(context) { // @Override // public void onSuccess(Call call, Response response) { // diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/UploadKJInfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/UploadKJInfoActivity.java index 1d16b7c..b6af979 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/UploadKJInfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/UploadKJInfoActivity.java @@ -237,7 +237,7 @@ public class UploadKJInfoActivity extends BaseActivity { private void getKJLX() { - HttpUtils.getApi().getKjlxInfo().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getKjlxInfo().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -274,7 +274,7 @@ public class UploadKJInfoActivity extends BaseActivity { private void getZJR() { - HttpUtils.getApi().getzjrInfo().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getzjrInfo().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -339,7 +339,7 @@ public class UploadKJInfoActivity extends BaseActivity { builder.addFormDataPart("file", file.getName(), RequestBody.create(MediaType.parse("*/*"), new File(filePath))); - HttpUtils.getApi().uploadkjinfo(uploadfiletypeid, uploadfiletype, builder.build()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).uploadkjinfo(uploadfiletypeid, uploadfiletype, builder.build()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -369,7 +369,7 @@ public class UploadKJInfoActivity extends BaseActivity { public void savekjinfo(String kjid, String kjname, String jsid, String lbid, String kjlxid, String kjintroduce, String kjsd, String man_id, String man_name, String lrr_dept) { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), createJson(kjid, kjname, jsid, lbid, kjlxid, kjintroduce, kjsd, man_id, man_name, lrr_dept)); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/UploadVideoTestActiviy.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/UploadVideoTestActiviy.java index 00ac3b3..12babdd 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/UploadVideoTestActiviy.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/UploadVideoTestActiviy.java @@ -222,7 +222,7 @@ public class UploadVideoTestActiviy extends BaseActivity { RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file); builder.addFormDataPart("file", file.getName(), imageBody); } - HttpUtils.getApi().uploadRecord("wjsc_up", userInfo.getManid(), "record", "000001", ".mp4", "test123123", "123123", bzmc, "2020-08-07 11:30", + HttpUtils.getApi(this).uploadRecord("wjsc_up", userInfo.getManid(), "record", "000001", ".mp4", "test123123", "123123", bzmc, "2020-08-07 11:30", builder.build()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmActivity.kt index 00b92d6..37511bc 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmActivity.kt @@ -144,7 +144,7 @@ class WjmmActivity : BaseActivityOaToolbarViewBinding() { // Objects.requireNonNull(binding.xmm.text).toString().trim() // ) // .build() -// HttpUtils.getApi().postNewPassword(body).enqueue(object : BaseCallBack(context) { +// HttpUtils.getApi(this).postNewPassword(body).enqueue(object : BaseCallBack(context) { // // override fun onSuccess(call: Call?, response: Response?) { // val bean = response?.body() diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmGetVerificationCodeActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmGetVerificationCodeActivity.kt index 8a72936..4fcda53 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmGetVerificationCodeActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmGetVerificationCodeActivity.kt @@ -146,7 +146,7 @@ class WjmmGetVerificationCodeActivity : } }, true, true, "请稍候...") -// HttpUtils.getApi().postYzm(body).enqueue(object : BaseCallBack(context) { +// HttpUtils.getApi(this).postYzm(body).enqueue(object : BaseCallBack(context) { // override fun onSuccess(call: Call?, response: Response?) { // val bean = response?.body() // if (bean != null && bean.rows != null && bean.rows.size > 0 && bean.rows[0].result == "1") { @@ -233,7 +233,7 @@ class WjmmGetVerificationCodeActivity : } }, true, true, "请稍候...") -// HttpUtils.getApi().postCheckVerificationCode(body) +// HttpUtils.getApi(this).postCheckVerificationCode(body) // .enqueue(object : BaseCallBack(context) { // // override fun onSuccess(call: Call?, response: Response?) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt index 6842893..5cb82eb 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt @@ -72,6 +72,8 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding val item = datas[position] + showLog("---------") + showLog(GsonUtils.GsonString(item)) //工作情况汇报 val intent = Intent(context, WorkRiskListHuiBaoActivity::class.java) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListHuiBaoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListHuiBaoActivity.java index 59aabd0..1e5074e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListHuiBaoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListHuiBaoActivity.java @@ -228,7 +228,8 @@ public class WorkRiskListHuiBaoActivity extends BaseActivity { username = App.getInstance().getUserInfo().getManid(); Intent intent = getIntent(); type = intent.getStringExtra("type"); - id = intent.getStringExtra("id"); + //id = intent.getStringExtra("id"); + id = String.valueOf(intent.getIntExtra("id",0)); findView(); @@ -311,6 +312,10 @@ public class WorkRiskListHuiBaoActivity extends BaseActivity { showLog(url); Request request = NoHttp.createStringRequest(url, RequestMethod.POST); + showLog("-----------"); + showLog(id); + showLog(username); + request.add("reporterNo", username); request.add("level", type); request.add("ticketId", id); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccCbsSelectItemActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccCbsSelectItemActivity.java index 074646a..9d607aa 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccCbsSelectItemActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccCbsSelectItemActivity.java @@ -141,7 +141,7 @@ public class WzccCbsSelectItemActivity extends BaseActivity { private void getListDatas(String token) { - HttpUtils.getCompanyServerApi(token).getCbsList().enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).getCbsList().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccDwSelectItemActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccDwSelectItemActivity.java index 1815f80..0d1bc07 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccDwSelectItemActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccDwSelectItemActivity.java @@ -69,7 +69,7 @@ public class WzccDwSelectItemActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getDw().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getDw().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccFhqSelectItemActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccFhqSelectItemActivity.java index b841124..c7ea45c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccFhqSelectItemActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccFhqSelectItemActivity.java @@ -146,7 +146,7 @@ public class WzccFhqSelectItemActivity extends BaseActivity { private void getListDatas(String token) { - HttpUtils.getCompanyServerApi(token).getFhqNameList().enqueue(new BaseCallBack(context) { + HttpUtils.getCompanyServerApi(token,this).getFhqNameList().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzcccxActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzcccxActivity.java index 7eadc08..f33130d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzcccxActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzcccxActivity.java @@ -75,7 +75,7 @@ public class WzcccxActivity extends BaseActivity { public void getdata() { - HttpUtils.getApi().GetWzccDatas(userInfo.getManid(), userInfo.getUsernames(), userInfo.getBzbh()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetWzccDatas(userInfo.getManid(), userInfo.getUsernames(), userInfo.getBzbh()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccinfoActivity.java index 2255ce6..9c8f689 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccinfoActivity.java @@ -191,7 +191,7 @@ public class WzccinfoActivity extends BaseActivity implements View.OnClickListen } private void getdata(String id) { - HttpUtils.getApi().GetWzccForone(id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetWzccForone(id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { WzccdataBean bean = response.body(); @@ -313,7 +313,7 @@ public class WzccinfoActivity extends BaseActivity implements View.OnClickListen RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), gson); - HttpUtils.getApi().getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { bean = response.body(); @@ -356,7 +356,7 @@ public class WzccinfoActivity extends BaseActivity implements View.OnClickListen private void GetYjgj() { - HttpUtils.getApi().GetYzgjDatas().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetYzgjDatas().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -393,7 +393,7 @@ public class WzccinfoActivity extends BaseActivity implements View.OnClickListen private void changeandsaveandaudit(String state) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), getXginfo(state)); - HttpUtils.getApi().savewzccdata(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).savewzccdata(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); @@ -414,7 +414,7 @@ public class WzccinfoActivity extends BaseActivity implements View.OnClickListen private void Savewzcc(String state) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), getXginfo(state)); - HttpUtils.getApi().savewzccdata(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).savewzccdata(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); @@ -470,7 +470,7 @@ public class WzccinfoActivity extends BaseActivity implements View.OnClickListen private void setAudit() { RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), createJson()); - HttpUtils.getApi().setAudit(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).setAudit(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -519,7 +519,7 @@ public class WzccinfoActivity extends BaseActivity implements View.OnClickListen } private void GetRcmgDatas() { - HttpUtils.getApi().GetRcmgDatas("RYCLJCSQ_RCMG").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetRcmgDatas("RYCLJCSQ_RCMG").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccxzActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccxzActivity.java index f2ded04..d4f6014 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccxzActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccxzActivity.java @@ -181,7 +181,7 @@ public class WzccxzActivity extends BaseActivity implements View.OnClickListener private void GetYjgj() { - HttpUtils.getApi().GetYzgjDatas().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetYzgjDatas().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -206,7 +206,7 @@ public class WzccxzActivity extends BaseActivity implements View.OnClickListener toastviewbymyself.makeText(context, "请填写好必填项", Toast.LENGTH_LONG).show(); } else { RequestBody body = RequestBody.create(MediaType.parse("application/json"), getXginfo(state)); - HttpUtils.getApi().savewzccdata(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).savewzccdata(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); @@ -256,7 +256,7 @@ public class WzccxzActivity extends BaseActivity implements View.OnClickListener } private void GetRcmgDatas() { - HttpUtils.getApi().GetRcmgDatas("RYCLJCSQ_RCMG").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetRcmgDatas("RYCLJCSQ_RCMG").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java index 3f3aed9..572e247 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java @@ -772,7 +772,7 @@ public class WztpScActivity extends BaseActivity2 { //showToast("filesize:" + String.valueOf(wztpuploadfile.length())); RequestBody requestFile = RequestBody.create(MediaType.parse("image/*"), wztpuploadfile); MultipartBody.Part body = MultipartBody.Part.createFormData("fileps", wztpuploadfile.getName(), requestFile); - HttpUtils.getYXApi().uploadwztp( + HttpUtils.getYXApi(this).uploadwztp( wztp.getItemnum(), wztp.getItemid(), username, @@ -811,7 +811,7 @@ public class WztpScActivity extends BaseActivity2 { //showToast("filesize:" + String.valueOf(wztpuploadfile.length())); RequestBody requestFile = RequestBody.create(MediaType.parse("image/*"), wztpuploadfile); MultipartBody.Part body = MultipartBody.Part.createFormData("fileps", wztpuploadfile.getName(), requestFile); - HttpUtils.getYXApi().uploadwztp( + HttpUtils.getYXApi(this).uploadwztp( wztp.getItemnum(), wztp.getItemid(), username, @@ -856,7 +856,7 @@ public class WztpScActivity extends BaseActivity2 { Log.i("app", wztp.getItemnum() + "." + extensionName); Log.i("app", String.valueOf(duration)); - HttpUtils.getYXApi().uploadwztpBody( + HttpUtils.getYXApi(this).uploadwztpBody( wztp.getItemnum(), wztp.getItemid(), username, diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java index 1b0d296..0fb4126 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java @@ -742,7 +742,7 @@ public class WztpblScDetailActivity extends BaseActivityOaToolbarViewBinding(context) { + HttpUtils.getApi(this).GetXfsqyDatas().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -158,7 +158,7 @@ public class XfsinfoActivity extends BaseActivity implements View.OnClickListene } private void GetBm() { - HttpUtils.getApi().GetXfsDbmDatas(userInfo.getBzbh()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetXfsDbmDatas(userInfo.getBzbh()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -180,7 +180,7 @@ public class XfsinfoActivity extends BaseActivity implements View.OnClickListene private void GetBz(String Dbmid) { if (Dbmid != null) { XfsbzdialogDatas.clear(); - HttpUtils.getApi().GetXfsBzDatas(Dbmid).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetXfsBzDatas(Dbmid).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -258,7 +258,7 @@ public class XfsinfoActivity extends BaseActivity implements View.OnClickListene } private void gdata(String id) { - HttpUtils.getApi().GetXfsInfo(id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetXfsInfo(id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { XfsInfoBean bean = response.body(); @@ -353,7 +353,7 @@ public class XfsinfoActivity extends BaseActivity implements View.OnClickListene RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), gson); - HttpUtils.getApi().getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { bean = response.body(); @@ -391,7 +391,7 @@ public class XfsinfoActivity extends BaseActivity implements View.OnClickListene toastviewbymyself.makeText(context, "请填写好必填项", Toast.LENGTH_LONG).show(); } else { RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetJoanInfo(state)); - HttpUtils.getApi().UploadXfsDatas(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).UploadXfsDatas(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); @@ -458,7 +458,7 @@ public class XfsinfoActivity extends BaseActivity implements View.OnClickListene private void changeableness(String state) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetJoanInfo(state)); - HttpUtils.getApi().UploadXfsDatas(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).UploadXfsDatas(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); @@ -478,7 +478,7 @@ public class XfsinfoActivity extends BaseActivity implements View.OnClickListene private void setAudit() { RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), createJson()); - HttpUtils.getApi().setAudit(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).setAudit(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfssqActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfssqActivity.java index 6d41386..ce07dee 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfssqActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfssqActivity.java @@ -84,7 +84,7 @@ public class XfssqActivity extends BaseActivity { } public void GetData() { - HttpUtils.getApi().GetXfqsDatas("", userInfo.getManid(), userInfo.getBzbh()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetXfqsDatas("", userInfo.getManid(), userInfo.getBzbh()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { XfscxBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfsxzActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfsxzActivity.java index 8dfd079..87664d9 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfsxzActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfsxzActivity.java @@ -157,7 +157,7 @@ public class XfsxzActivity extends BaseActivity implements View.OnClickListener } private void GetQy() { - HttpUtils.getApi().GetXfsqyDatas().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetXfsqyDatas().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -177,7 +177,7 @@ public class XfsxzActivity extends BaseActivity implements View.OnClickListener } private void GetBm() { - HttpUtils.getApi().GetXfsDbmDatas(userInfo.getBzbh()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetXfsDbmDatas(userInfo.getBzbh()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -199,7 +199,7 @@ public class XfsxzActivity extends BaseActivity implements View.OnClickListener private void GetBz(String Dbmid) { if (Dbmid != null) { XfsbzdialogDatas.clear(); - HttpUtils.getApi().GetXfsBzDatas(Dbmid).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetXfsBzDatas(Dbmid).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -243,7 +243,7 @@ public class XfsxzActivity extends BaseActivity implements View.OnClickListener } else { // RequestBody body = RequestBody.create(GetJosnInfo(state),MediaType.get("application/json")); RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetJosnInfo(state)); - HttpUtils.getApi().UploadXfsDatas(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).UploadXfsDatas(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); 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 200cbf7..2d262dd 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 @@ -81,7 +81,7 @@ public class XzLsgkActivity extends BaseActivity { RequestBody body = RequestBody.create(MediaType.parse("application/json"), getInfo()); - HttpUtils.getApi().lsgkAdd(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).lsgkAdd(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWActivity.java index c6b9b1f..932f23c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWActivity.java @@ -130,7 +130,7 @@ public class YXCZCWActivity extends BaseActivity { public void GetData() { RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetJson()); - HttpUtils.getYXApi().Getczcwdatas(body).enqueue(new BaseCallBack(context) { + HttpUtils.getYXApi(this).Getczcwdatas(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWHistoryActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWHistoryActivity.java index 0d5a7d5..80a569c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWHistoryActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWHistoryActivity.java @@ -134,7 +134,7 @@ public class YXCZCWHistoryActivity extends BaseActivity { //showToast(String.valueOf(GetJson())); RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetJson()); - HttpUtils.getYXApi().GetczcwMsgGl(body).enqueue(new BaseCallBack(context) { + HttpUtils.getYXApi(this).GetczcwMsgGl(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWInfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWInfoActivity.java index a3204d8..7f9fd24 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWInfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWInfoActivity.java @@ -79,7 +79,7 @@ public class YXCZCWInfoActivity extends BaseActivity { String json = GetJson(); showLog(json); RequestBody body = RequestBody.create(MediaType.parse("application/json"),json); - HttpUtils.getYXApi().Getczcwhisdatas(body).enqueue(new BaseCallBack(context) { + HttpUtils.getYXApi(this).Getczcwhisdatas(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { YxczcwindohisBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJActivity.java index 2257019..53d6dd3 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJActivity.java @@ -91,7 +91,7 @@ public class YXSBSSSJActivity extends BaseActivity { public void GetData() { RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetJson()); - HttpUtils.getYXApi().GetYxSbInfoData(body).enqueue(new BaseCallBack(context) { + HttpUtils.getYXApi(this).GetYxSbInfoData(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { YxSbInfoDataBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisActivity.java index 0c07455..de94bf9 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisActivity.java @@ -119,7 +119,7 @@ public class YXSBSSSJHisActivity extends BaseActivity { public void GetData() { RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetJson()); - HttpUtils.getYXApi().GetYxSbInfoData(body).enqueue(new BaseCallBack(context) { + HttpUtils.getYXApi(this).GetYxSbInfoData(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { YxSbInfoDataBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisInfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisInfoActivity.java index a84197b..ef506da 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisInfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisInfoActivity.java @@ -77,7 +77,7 @@ public class YXSBSSSJHisInfoActivity extends BaseActivity { public void GetData() { RequestBody body = RequestBody.create(MediaType.parse("application/json"), GetJson()); - HttpUtils.getYXApi().GetYxSbInfohisData(body).enqueue(new BaseCallBack(context) { + HttpUtils.getYXApi(this).GetYxSbInfohisData(body).enqueue(new BaseCallBack(context) { @SuppressLint("NewApi") @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcrySelectActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcrySelectActivity.java index 0c5ec79..07e4542 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcrySelectActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcrySelectActivity.java @@ -99,7 +99,7 @@ public class YcrySelectActivity extends BaseActivity implements YcrySelectAdapte private void getListDatas() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); api.GetYcry(userInfo.getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcryglActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcryglActivity.java index c73fb3b..3ac96d5 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcryglActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcryglActivity.java @@ -79,7 +79,7 @@ public class YcryglActivity extends BaseActivity implements View.OnClickListener } public void GetData() { - HttpUtils.getApi().GetYcryinfo().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetYcryinfo().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { XfscxBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaAFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaAFragment.java index fa94c23..e7d995d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaAFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaAFragment.java @@ -48,7 +48,7 @@ public class YjyaAFragment extends BaseFragment { private void getListDatas() { - HttpUtils.getApi().GetyjyaData("", "1").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(requireActivity()).GetyjyaData("", "1").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { YjyaBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaBFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaBFragment.java index 535b79d..3f7a151 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaBFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaBFragment.java @@ -43,7 +43,7 @@ public class YjyaBFragment extends BaseFragment { private void getListDatas() { - HttpUtils.getApi().GetyjyaData("", "").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(requireActivity()).GetyjyaData("", "").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaInfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaInfoActivity.java index b3eced7..60bd056 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaInfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YjyaInfoActivity.java @@ -130,7 +130,7 @@ public class YjyaInfoActivity extends BaseActivity implements View.OnClickListen } private void getListDatas() { - HttpUtils.getApi().GetYjyaRy(listid).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetYjyaRy(listid).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { YjyaRyBean bean = response.body(); @@ -162,7 +162,7 @@ public class YjyaInfoActivity extends BaseActivity implements View.OnClickListen } private void getQx() { - HttpUtils.getApi().GetYjyaQx(App.getInstance().getUserInfo().getManid(), "ZH").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetYjyaQx(App.getInstance().getUserInfo().getManid(), "ZH").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -183,7 +183,7 @@ public class YjyaInfoActivity extends BaseActivity implements View.OnClickListen } private void QR() { - HttpUtils.getApi().QrYjYa(datas.getListid(), App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).QrYjYa(datas.getListid(), App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -207,7 +207,7 @@ public class YjyaInfoActivity extends BaseActivity implements View.OnClickListen } private void FQ() { - Api api = HttpUtils.getApi(); + Api api = HttpUtils.getApi(this); RequestBody body = RequestBody.create(MediaType.parse("application/json"), creatJson()); api.QrYjFq(body).enqueue(new BaseCallBack(context) { @@ -243,7 +243,7 @@ public class YjyaInfoActivity extends BaseActivity implements View.OnClickListen private void GB() { - HttpUtils.getApi().QrYjGb(datas.getListid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).QrYjGb(datas.getListid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbActivity.java index 238116f..918f788 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbActivity.java @@ -65,7 +65,7 @@ public class ZddbActivity extends BaseActivity { private void getListDatas() { - HttpUtils.getApi().getZddbList(userInfo.getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getZddbList(userInfo.getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzActivity.java index 3d5b375..45b6f1a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzActivity.java @@ -76,7 +76,7 @@ public class ZddbgzActivity extends BaseActivity implements View.OnClickListener private void getListDatas() { - HttpUtils.getApi().getZddbgzList("", "", userInfo.getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getZddbgzList("", "", userInfo.getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzinfoActivity.java index df32af0..1d75403 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbgzinfoActivity.java @@ -216,7 +216,7 @@ public class ZddbgzinfoActivity extends BaseActivity implements View.OnClickList } private void uploadwcqk() { - HttpUtils.getApi().putzddbwcqk(list.getListid(), wcid, ilSjwcsj.getContent(), wcqk.getContent(), list.getZrr(), userInfo.getManid(), list.getAplx(), list.getDbldid(), userInfo.getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).putzddbwcqk(list.getListid(), wcid, ilSjwcsj.getContent(), wcqk.getContent(), list.getZrr(), userInfo.getManid(), list.getAplx(), list.getDbldid(), userInfo.getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -238,7 +238,7 @@ public class ZddbgzinfoActivity extends BaseActivity implements View.OnClickList } private void dbqr() { - HttpUtils.getApi().dbqr(list.getListid(), list.getSfqr(), list.getAplx(), list.getDbldid(), userInfo.getManid(), list.getWczt(), list.getLrr()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).dbqr(list.getListid(), list.getSfqr(), list.getAplx(), list.getDbldid(), userInfo.getManid(), list.getWczt(), list.getLrr()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbinfoActivity.java index df1b771..43bf272 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZddbinfoActivity.java @@ -370,7 +370,7 @@ public class ZddbinfoActivity extends BaseActivity implements View.OnClickListen private void gethylx() { - HttpUtils.getApi().gethylx("SCJD_GZDB").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).gethylx("SCJD_GZDB").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -391,7 +391,7 @@ public class ZddbinfoActivity extends BaseActivity implements View.OnClickListen private void gethaplx() { - HttpUtils.getApi().gethylx("SCJD_APLX").enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).gethylx("SCJD_APLX").enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -427,7 +427,7 @@ public class ZddbinfoActivity extends BaseActivity implements View.OnClickListen private void XZDB() { RequestBody body = RequestBody.create(MediaType.parse("application/json"), getXzinfo()); - HttpUtils.getApi().xzdb(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).xzdb(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); @@ -447,7 +447,7 @@ public class ZddbinfoActivity extends BaseActivity implements View.OnClickListen private void XGDB() { RequestBody body = RequestBody.create(MediaType.parse("application/json"), getXginfo()); - HttpUtils.getApi().xzdb(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).xzdb(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); @@ -466,7 +466,7 @@ public class ZddbinfoActivity extends BaseActivity implements View.OnClickListen private void dbxd() { - HttpUtils.getApi().dbxd(listid, ZddbBeanlist.getSfxd(), aplxid, dldid, userInfo.getManid(), ZddbBeanlist.getLrrid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).dbxd(listid, ZddbBeanlist.getSfxd(), aplxid, dldid, userInfo.getManid(), ZddbBeanlist.getLrrid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqyActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqyActivity.java index a1f4f5d..37276ba 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqyActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqyActivity.java @@ -81,7 +81,7 @@ public class ZdqyActivity extends BaseActivity { public void getdata() { - HttpUtils.getApi().Getzdlsry((String) SPUtils.get(context, Contans.BZBH, "")).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).Getzdlsry((String) SPUtils.get(context, Contans.BZBH, "")).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ZdqylsBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqycwActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqycwActivity.java index 3ba9f5b..9b91026 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqycwActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqycwActivity.java @@ -85,7 +85,7 @@ public class ZdqycwActivity extends BaseActivity { public void getdata() { - HttpUtils.getApi().GetCyry().enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetCyry().enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqylsActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqylsActivity.java index 66a67ee..7b86aed 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqylsActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqylsActivity.java @@ -91,7 +91,7 @@ public class ZdqylsActivity extends BaseActivity { public void getData() { - HttpUtils.getApi().Getlsry((String) SPUtils.get(context, Contans.BZBH, "")).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).Getlsry((String) SPUtils.get(context, Contans.BZBH, "")).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ZdqylsBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqyryinfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqyryinfoActivity.java index 821a295..e16db26 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqyryinfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqyryinfoActivity.java @@ -194,7 +194,7 @@ public class ZdqyryinfoActivity extends BaseActivity implements View.OnClickList public void getdata(String id) { - HttpUtils.getApi().GetZdforone(id).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetZdforone(id).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ZdqylsBean bean = response.body(); @@ -253,7 +253,7 @@ public class ZdqyryinfoActivity extends BaseActivity implements View.OnClickList RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), gson); - HttpUtils.getApi().getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).getLeaveAuditPost(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { @@ -294,7 +294,7 @@ public class ZdqyryinfoActivity extends BaseActivity implements View.OnClickList public void setAudit() { RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), createJson()); - HttpUtils.getApi().setChangeShitfAudit(body).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).setChangeShitfAudit(body).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { ResultBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZxDjtpActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZxDjtpActivity.java index 5e9b7fa..f36ab04 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZxDjtpActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZxDjtpActivity.java @@ -59,7 +59,7 @@ public class ZxDjtpActivity extends BaseActivity { public void savekjinfo() { - HttpUtils.getApi().GetZxdjtp("", "", "", "", App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetZxdjtp("", "", "", "", App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZxtpActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZxtpActivity.java index bebd4ea..a5c2953 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZxtpActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZxtpActivity.java @@ -58,7 +58,7 @@ public class ZxtpActivity extends BaseActivity { public void savekjinfo() { - HttpUtils.getApi().GetZxtp("", "", "", "", App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { + HttpUtils.getApi(this).GetZxtp("", "", "", "", App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/ContactFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/ContactFragment.kt index e991e41..fc73576 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/ContactFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/ContactFragment.kt @@ -144,7 +144,7 @@ class ContactFragment : BaseViewBindingKotlinFragment(){ // public void getData() { // - // HttpUtils.getApi().getContactList().enqueue(new BaseCallBackNoProgress(getContext()) { + // HttpUtils.getApi(this).getContactList().enqueue(new BaseCallBackNoProgress(getContext()) { // @Override // public void onSuccess(Call call, Response response) { // diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/ExamFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/ExamFragment.kt index 119f47e..edfbf33 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/ExamFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/ExamFragment.kt @@ -97,7 +97,7 @@ class ExamFragment : BaseViewBindingFragment() { } private fun getValidExamTrainList() { - HttpUtils.getApi().GetValidExamList(App.getInstance().userInfo.manid) + HttpUtils.getApi(requireActivity()).GetValidExamList(App.getInstance().userInfo.manid) .enqueue(object : BaseCallBack(context) { override fun onSuccess( @@ -130,7 +130,7 @@ class ExamFragment : BaseViewBindingFragment() { } private fun refreshExamTrainList(id: String) { - HttpUtils.getApi().GetValidExamList(App.getInstance().userInfo.manid) + HttpUtils.getApi(requireActivity()).GetValidExamList(App.getInstance().userInfo.manid) .enqueue(object : BaseCallBack(context) { override fun onSuccess( @@ -173,7 +173,7 @@ class ExamFragment : BaseViewBindingFragment() { } fun getValidExamProduceList() { - HttpUtils.getApi().GetValidExamProduceList(App.getInstance().userInfo.manid) + HttpUtils.getApi(requireActivity()).GetValidExamProduceList(App.getInstance().userInfo.manid) .enqueue(object : BaseCallBack(context) { override fun onSuccess( diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt index c06e59a..79a2869 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt @@ -620,7 +620,7 @@ class HomeFragment : BaseViewBindingFragment() { manid: String, apply_code: String ) { - HttpUtils.getApi().getLeaveListByMe(dept_code, kind_type, manid, apply_code) + HttpUtils.getApi(requireActivity()).getLeaveListByMe(dept_code, kind_type, manid, apply_code) .enqueue(object : BaseCallBack( context ) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java index 6d2ae92..7e2945b 100755 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java @@ -548,7 +548,7 @@ public class MineFragment extends BaseLazyFragment { } private void checkUpdate() { - HttpUtils.getApi().getCheckUpdataApk().enqueue(new BaseCallBack(getActivity()) { + HttpUtils.getApi(requireActivity()).getCheckUpdataApk().enqueue(new BaseCallBack(getActivity()) { @Override public void onSuccess(Call call, Response response) { ApkUpdateBean apkUpdateBean = response.body(); @@ -669,7 +669,7 @@ public class MineFragment extends BaseLazyFragment { builder.addFormDataPart("file", "headPhoto", RequestBody.create(MediaType.parse("image/*"), fos)); //builder.addFormDataPart("file", "headPhoto", RequestBody.create(MediaType.parse("image/*"), new File(HeadPhotoFilePath))); - HttpUtils.getApi().updateHeadPhoto("head_up", App.getInstance().getUserInfo().getManid(), ".jpg", builder.build()).enqueue(new BaseCallBack(getActivity()) { + HttpUtils.getApi(requireActivity()).updateHeadPhoto("head_up", App.getInstance().getUserInfo().getManid(), ".jpg", builder.build()).enqueue(new BaseCallBack(getActivity()) { @Override public void onSuccess(Call call, Response response) { HeadPhotoResultBean headPhotoResultBean = response.body(); @@ -690,7 +690,7 @@ public class MineFragment extends BaseLazyFragment { //获取我的待办(其他数据) public void getOtherCount() { - HttpUtils.getApi().getOther(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(getContext()) { + HttpUtils.getApi(requireActivity()).getOther(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack(getContext()) { @Override public void onSuccess(Call call, Response response) { QtdbBean bean = response.body(); @@ -708,7 +708,7 @@ public class MineFragment extends BaseLazyFragment { //获取关于我的数据总数量 public void getAboutMeData() { - HttpUtils.getApi().getAboutMe(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBackNoProgress(getActivity()) { + HttpUtils.getApi(requireActivity()).getAboutMe(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBackNoProgress(getActivity()) { @Override public void onSuccess(Call call, Response response) { AboutMeBean bean = response.body(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/TrainFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/TrainFragment.kt index 0d8e46e..bf9a156 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/TrainFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/TrainFragment.kt @@ -59,7 +59,7 @@ class TrainFragment : BaseViewBindingFragment() { } private fun getValidTrainList() { - HttpUtils.getApi().GetValidTrainList(App.getInstance().userInfo.manid) + HttpUtils.getApi(requireActivity()).GetValidTrainList(App.getInstance().userInfo.manid) .enqueue(object : BaseCallBack(context) { override fun onSuccess(call: Call?,response: Response? ) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyacFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyacFragment.kt index 74458a2..73934fb 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyacFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyacFragment.kt @@ -146,7 +146,7 @@ class YjyacFragment : BaseViewBindingKotlinFragment() { } private fun getListDatas(token: String) { - HttpUtils.getCompanyServerApi(token).GetyjyaListData( + HttpUtils.getCompanyServerApi(token,requireActivity()).GetyjyaListData( this.stime, this.etime, "1", "1" ).enqueue(object : BaseCallBack(context) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyadFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyadFragment.kt index eaf2c0f..6dc9d57 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyadFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyadFragment.kt @@ -147,7 +147,7 @@ class YjyadFragment : BaseViewBindingKotlinFragment() { private fun getListDatas(token: String) { showLog("getListDatas") showLog("YJYAJX/GetList") - HttpUtils.getCompanyServerApi(token).GetyjyaListData( + HttpUtils.getCompanyServerApi(token,requireActivity()).GetyjyaListData( this.stime, this.etime, "1", "2" ).enqueue(object : BaseCallBack(context) { diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java index 08ae39d..1e63454 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java @@ -80,8 +80,8 @@ public class ApplyListUtils { private MyadviceAdapter myadviceAdapter; - private ApplyListUtils() { - api = HttpUtils.getApi(Contans.BASE_URL); + private ApplyListUtils(Context context) { + api = HttpUtils.getApi(context); datas = new ArrayList<>(); receiveDatas = new ArrayList<>(); conferenceDatas = new ArrayList<>(); @@ -660,7 +660,7 @@ public class ApplyListUtils { public ApplyListUtils builder(Context context) { this.context = context; valida(); - return new ApplyListUtils(); + return new ApplyListUtils(context); } /** diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/DownloadUtil.java b/app/src/main/java/com/rehome/zhdcoa/utils/DownloadUtil.java index f3f2f64..ce26096 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/DownloadUtil.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/DownloadUtil.java @@ -10,14 +10,23 @@ import android.util.Log; import androidx.annotation.NonNull; import com.rehome.zhdcoa.App; +import com.rehome.zhdcoa.R; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.security.KeyStore; +import java.security.SecureRandom; +import java.security.cert.CertificateFactory; import java.util.Objects; import java.util.concurrent.TimeUnit; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSocketFactory; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.X509TrustManager; + import okhttp3.Call; import okhttp3.Callback; import okhttp3.Interceptor; @@ -36,26 +45,35 @@ public class DownloadUtil { private final OkHttpClient okHttpClient; private static Context contextM; - public static DownloadUtil get(Context context) { + public static DownloadUtil get(Context context,String url) { if (downloadUtil == null) { - downloadUtil = new DownloadUtil(context); + downloadUtil = new DownloadUtil(context,url); } return downloadUtil; } - private DownloadUtil(Context context) { + private DownloadUtil(Context context,String url) { contextM=context; - okHttpClient = getOkHttpClient(); + okHttpClient = getOkHttpClient(context,url); + //okHttpClient.ho //okHttpClient = new OkHttpClient(); } - private static OkHttpClient getOkHttpClient() { + private static OkHttpClient getOkHttpClient(Context context,String url) { OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder(); httpClientBuilder.addNetworkInterceptor(new TokenHeaderInterceptor()); httpClientBuilder.addInterceptor(new LoggingInterceptor()); httpClientBuilder.connectTimeout(6, TimeUnit.SECONDS); httpClientBuilder.writeTimeout(60, TimeUnit.SECONDS); httpClientBuilder.readTimeout(600, TimeUnit.SECONDS); + 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 = getSSLSocketFactory(context); + if (socketFactory != null) { + TrustManagerFactory trustManagerFactory = getTrustManagerFactory(context); + httpClientBuilder.sslSocketFactory(socketFactory, (X509TrustManager) trustManagerFactory.getTrustManagers()[0]); + httpClientBuilder.hostnameVerifier((hostname, session) -> true); // 信任所有主机名 + } + } return httpClientBuilder.build(); } @@ -74,6 +92,50 @@ public class DownloadUtil { } } + public static TrustManagerFactory getTrustManagerFactory(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.domain))); + SSLContext sslContext = SSLContext.getInstance("TLS"); + final TrustManagerFactory trustManagerFactory = + TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); + trustManagerFactory.init(keyStore); + + return trustManagerFactory; + } catch (Exception ex) { + ex.printStackTrace(); + } + return null; + } + 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.domain))); + 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; + } + public static void showLog(String logText,Context context) { if (isApkInDebug(context)) { if (TextUtils.isEmpty(logText)) { diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/GetAuditPermissionUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/GetAuditPermissionUtils.java index 79be1d8..c6bf313 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/GetAuditPermissionUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/GetAuditPermissionUtils.java @@ -25,8 +25,8 @@ public class GetAuditPermissionUtils { private static Builder builder; - private GetAuditPermissionUtils() { - api = HttpUtils.getApi(Contans.BASE_URL); + private GetAuditPermissionUtils(Context context) { + api = HttpUtils.getApi(context); init(); } @@ -87,7 +87,7 @@ public class GetAuditPermissionUtils { public GetAuditPermissionUtils builder(Context context) { this.context = context; - return new GetAuditPermissionUtils(); + return new GetAuditPermissionUtils(context); } } diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/HttpUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/HttpUtils.java index 2608bd6..b6cb292 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/HttpUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/HttpUtils.java @@ -8,9 +8,21 @@ import androidx.annotation.NonNull; import com.rehome.zhdcoa.Api; import com.rehome.zhdcoa.App; import com.rehome.zhdcoa.Contans; +import com.rehome.zhdcoa.R; + import java.io.IOException; +import java.security.KeyStore; +import java.security.SecureRandom; +import java.security.cert.CertificateFactory; import java.util.concurrent.TimeUnit; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.X509TrustManager; + import okhttp3.Authenticator; import okhttp3.Call; import okhttp3.Callback; @@ -45,56 +57,57 @@ public class HttpUtils { private HttpUtils(Context context, String url) { Retrofit mRetrofit = new Retrofit.Builder() .baseUrl(url) - .client(getOkHttpClient()) + .client(getOkHttpClient(url,context)) .addConverterFactory(GsonConverterFactory.create()) .build(); api = mRetrofit.create(Api.class); HttpUtils.context = context; } - public static Api getApi() { - return getApi(Contans.BASE_URL); + public static Api getApi(Context context) { + return getApi(Contans.BASE_URL,context); } - public static Api getCompanyServerApi() { - return getApi(Contans.BASE_URL_COMPANY_SERVER); + public static Api getCompanyServerApi(Context context) { + return getApi(Contans.BASE_URL_COMPANY_SERVER,context); } - public static Api getAIServerApi() { - return getApi(Contans.BASE_URL_AI_3D_SERVER); + public static Api getAIServerApi(Context context) { + return getApi(Contans.BASE_URL_AI_3D_SERVER,context); } - public static Api getCompanyServerApi(String token) { + public static Api getCompanyServerApi(String token,Context context) { showLog("url:"+Contans.BASE_URL_COMPANY_SERVER); - return getAuthenticatorApi(Contans.BASE_URL_COMPANY_SERVER, token); + return getAuthenticatorApi(Contans.BASE_URL_COMPANY_SERVER, token,context); } - public static Api getYXApi() { - return getApi(Contans.IP); + public static Api getYXApi(Context context) { + return getApi(Contans.IP,context); } - public static Api getApi(String url) { - Retrofit mRetrofit = new Retrofit.Builder().baseUrl(url).client(getOkHttpClient()).addConverterFactory(GsonConverterFactory.create()).build(); + public static Api getApi(String url,Context context) { + HttpUtils.context = context; + Retrofit mRetrofit = new Retrofit.Builder().baseUrl(url).client(getOkHttpClient(url,context)).addConverterFactory(GsonConverterFactory.create()).build(); Api api = mRetrofit.create(Api.class); return api; } - public static Api getAuthenticatorApi(String url, String token) { - Retrofit mRetrofit = new Retrofit.Builder().baseUrl(url).client(getAuthenticatorOkHttpClient(token)).addConverterFactory(GsonConverterFactory.create()).build(); + public static Api getAuthenticatorApi(String url, String token,Context context) { + Retrofit mRetrofit = new Retrofit.Builder().baseUrl(url).client(getAuthenticatorOkHttpClient(token,url,context)).addConverterFactory(GsonConverterFactory.create()).build(); Api api = mRetrofit.create(Api.class); return api; } - public static Api getGzipApi(String url) { - Retrofit mRetrofit = new Retrofit.Builder().baseUrl(url).client(getGzipOkHttpClient()).addConverterFactory(GsonConverterFactory.create()).build(); + public static Api getGzipApi(String url,Context context) { + Retrofit mRetrofit = new Retrofit.Builder().baseUrl(url).client(getGzipOkHttpClient(url,context)).addConverterFactory(GsonConverterFactory.create()).build(); Api api = mRetrofit.create(Api.class); return api; } - public static void getGzipDataApi(String url, Callback callback) { - OkHttpClient okHttpClient = getGzipOkHttpClient(); + public static void getGzipDataApi(String url,Context context, Callback callback) { + OkHttpClient okHttpClient = getGzipOkHttpClient(url,context); final Request request = new Request.Builder() .url(url) .header("Accept", "application/json") @@ -105,13 +118,21 @@ public class HttpUtils { } - private static OkHttpClient getOkHttpClient() { + private static OkHttpClient getOkHttpClient(String url,Context context) { OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder(); httpClientBuilder.addNetworkInterceptor(new TokenHeaderInterceptor()); httpClientBuilder.addInterceptor(new LoggingInterceptor()); httpClientBuilder.connectTimeout(6, TimeUnit.SECONDS); httpClientBuilder.writeTimeout(60, TimeUnit.SECONDS); httpClientBuilder.readTimeout(60, TimeUnit.SECONDS); + 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 = getSSLSocketFactory(context); + if (socketFactory != null) { + TrustManagerFactory trustManagerFactory = getTrustManagerFactory(context); + httpClientBuilder.sslSocketFactory(socketFactory, (X509TrustManager) trustManagerFactory.getTrustManagers()[0]); + httpClientBuilder.hostnameVerifier((hostname, session) -> true); // 信任所有主机名 + } + } return httpClientBuilder.build(); } @@ -148,17 +169,25 @@ public class HttpUtils { } } - private static OkHttpClient getGzipOkHttpClient() { + private static OkHttpClient getGzipOkHttpClient(String url,Context context) { OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder(); httpClientBuilder.addNetworkInterceptor(new TokenHeaderInterceptor()); httpClientBuilder.addInterceptor(new GzipRequestInterceptor1()); httpClientBuilder.connectTimeout(6, TimeUnit.SECONDS); httpClientBuilder.writeTimeout(60, TimeUnit.SECONDS); httpClientBuilder.readTimeout(60, TimeUnit.SECONDS); + 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 = getSSLSocketFactory(context); + if (socketFactory != null) { + TrustManagerFactory trustManagerFactory = getTrustManagerFactory(context); + httpClientBuilder.sslSocketFactory(socketFactory, (X509TrustManager) trustManagerFactory.getTrustManagers()[0]); + httpClientBuilder.hostnameVerifier((hostname, session) -> true); // 信任所有主机名 + } + } return httpClientBuilder.build(); } - private static OkHttpClient getAuthenticatorOkHttpClient(String token) { + private static OkHttpClient getAuthenticatorOkHttpClient(String token,String url,Context context) { OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder(); httpClientBuilder.addNetworkInterceptor(new TokenHeaderInterceptorAuthenticator(token)); httpClientBuilder.addInterceptor(new LoggingInterceptor()); @@ -180,6 +209,14 @@ public class HttpUtils { // return response.request().newBuilder().header("Authorization", credential).build(); // } // }); + 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 = getSSLSocketFactory(context); + if (socketFactory != null) { + TrustManagerFactory trustManagerFactory = getTrustManagerFactory(context); + httpClientBuilder.sslSocketFactory(socketFactory, (X509TrustManager) trustManagerFactory.getTrustManagers()[0]); + httpClientBuilder.hostnameVerifier((hostname, session) -> true); // 信任所有主机名 + } + } return httpClientBuilder.build(); } @@ -325,4 +362,48 @@ public class HttpUtils { return false; } } + + public static TrustManagerFactory getTrustManagerFactory(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.domain))); + SSLContext sslContext = SSLContext.getInstance("TLS"); + final TrustManagerFactory trustManagerFactory = + TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); + trustManagerFactory.init(keyStore); + + return trustManagerFactory; + } catch (Exception ex) { + ex.printStackTrace(); + } + return null; + } + 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.domain))); + 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; + } } diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java index 1612c3c..13c4c0f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java @@ -18,7 +18,9 @@ import java.security.KeyStore; import java.security.SecureRandom; import java.security.cert.CertificateFactory; +import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManagerFactory; @@ -85,6 +87,21 @@ public class NohttpUtils { showLog(credential,mActivity); showLog(new Gson().toJson(request.headers()),mActivity); } + 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; + } + }); + } + } + } mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, canCanel, isLoading, msg)); } @@ -106,6 +123,21 @@ public class NohttpUtils { request.addHeader("Authorization", credential); showLog(request.url(),mActivity); } + 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; + } + }); + } + } + } mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, canCanel, isLoading, msg)); } @@ -119,6 +151,21 @@ public class NohttpUtils { // 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; + } + }); + } + } + } mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, true, true, "加载中...")); } @@ -131,6 +178,21 @@ public class NohttpUtils { // 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; + } + }); + } + } + } mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, true, true, progressTitle)); } @@ -143,6 +205,21 @@ public class NohttpUtils { // 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(context); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } mQueue.add(what, request, new HttpResponseListenerNoProgress(request, callback)); } diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java index b4770a7..496348d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java @@ -27,8 +27,8 @@ public class SaveApplyUtils { private static Builder builder; - private SaveApplyUtils() { - api = HttpUtils.getApi(Contans.BASE_URL); + private SaveApplyUtils(Context context) { + api = HttpUtils.getApi(context); init(); } @@ -90,7 +90,7 @@ public class SaveApplyUtils { public SaveApplyUtils builder(Context context) { this.context = context; valida(); - return new SaveApplyUtils(); + return new SaveApplyUtils(context); } private void valida() { diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/SetAuditUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/SetAuditUtils.java index 0b85d93..6e11bba 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/SetAuditUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/SetAuditUtils.java @@ -29,8 +29,8 @@ public class SetAuditUtils { private static Builder builder; - private SetAuditUtils() { - api = HttpUtils.getApi(Contans.BASE_URL); + private SetAuditUtils(Context context) { + api = HttpUtils.getApi(context); init(); } @@ -114,7 +114,7 @@ public class SetAuditUtils { public SetAuditUtils builder(Context context) { this.context = context; - return new SetAuditUtils(); + return new SetAuditUtils(context); } } diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/SetBfAuditUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/SetBfAuditUtils.java index b4edc41..ad7b538 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/SetBfAuditUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/SetBfAuditUtils.java @@ -29,8 +29,8 @@ public class SetBfAuditUtils { private static Builder builder; - private SetBfAuditUtils() { - api = HttpUtils.getApi(Contans.BASE_URL); + private SetBfAuditUtils(Context context) { + api = HttpUtils.getApi(context); init(); } @@ -114,7 +114,7 @@ public class SetBfAuditUtils { public SetBfAuditUtils builder(Context context) { this.context = context; - return new SetBfAuditUtils(); + return new SetBfAuditUtils(context); } } diff --git a/app/src/main/res/raw/domain_zhdc.crt b/app/src/main/res/raw/domain_zhdc.crt new file mode 100644 index 0000000..cec75cb --- /dev/null +++ b/app/src/main/res/raw/domain_zhdc.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDoTCCAokCFAHlk18aDz970932pXrnPvZlgo7zMA0GCSqGSIb3DQEBCwUAMIGL +MQswCQYDVQQGEwJDTjESMBAGA1UECAwJR3Vhbmdkb25nMQ8wDQYDVQQHDAZaaHVo +YWkxDzANBgNVBAoMBnJlaG9tZTEPMA0GA1UECwwGcmVob21lMRYwFAYDVQQDDA0y +MTkuMTMxLjE5NS4zMR0wGwYJKoZIhvcNAQkBFg5od2Y0NTJAMTYzLmNvbTAgFw0y +MzEwMTcwNzE4MDJaGA8yMTIzMDkyMzA3MTgwMlowgYsxCzAJBgNVBAYTAkNOMRIw +EAYDVQQIDAlHdWFuZ2RvbmcxDzANBgNVBAcMBlpodWhhaTEPMA0GA1UECgwGcmVo +b21lMQ8wDQYDVQQLDAZyZWhvbWUxFjAUBgNVBAMMDTIxOS4xMzEuMTk1LjMxHTAb +BgkqhkiG9w0BCQEWDmh3ZjQ1MkAxNjMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEAsAVvGCn20YhXSNi2dlQ0Tjh+LIQRue24QaFTwctVrnpfaHX0 +GfDX9tGJyNMDAQWQFMJ88b4/sv/yAv6BLAFi4tEVdx9Sjlv+mYiy60GEuwxKg4aA +XANZx4xBm1QpKh45/3ow6BuBgsYArXm43lNM6V3xzbhmAHbDTGwTYO83OYssaPQX +TpY+iFaSeNvQ9XQ55Pp8FVZFWvtaLycINED9q4wbQEdY7FZ2tB6Z6rS+h1pnlBMi +eJBwtxn5i3RlnxohW/e/F74qctyaeZeVGp6JrJoy9wnQQARnxN9u2UTIZYj6/oF2 +M6UTOUvhPHgj84EfchmQOYY88D1srlC+SlvdNQIDAQABMA0GCSqGSIb3DQEBCwUA +A4IBAQAndC+qUaMdKUkVnzQ8Rawr5ST3KGFB+oYJEn0ARdKqM2SWoj3o2zbyKuMT +XGkx13Hen7evwv8Nqh9OS6bLOE7O/VLjQdotov+2+10Ccd+fHFBmDPg2XIMjfWhn +Y2nZluRDAILAcjbn4jKJy0cbLkLwU0NTTP/lBzOp2ZcNIwPahXSUF1Zc6Q2lKog9 +zpE0ghbF4Derr3gKjgj/vRwBygfUD4Mlml2ttAIZJR952SxE1URPpgXJS5md8EQn +9oa3Vn945MZJbfRr32NaCHVPPq5OJICSo6vlVrglAyCfJT8U4YzVUykQxaY6t2Cu +ma8zMVez+LPBToPXHG1FuqcAtFD2 +-----END CERTIFICATE-----