diff --git a/app/src/main/java/com/rehome/zhdcoa/Api.java b/app/src/main/java/com/rehome/zhdcoa/Api.java index 1ad7133..e3e2e2d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Api.java +++ b/app/src/main/java/com/rehome/zhdcoa/Api.java @@ -122,20 +122,21 @@ public interface Api { @Query("timee") String timee); - @GET("PubFile/Data/GetOrderListRsa.ashx") - Call getMyAdviceRsa(@Query("listcode") String listcode, - @Query("manid") String manid, - @Query("proposerid") String proposerid); - @GET("PubFile/Data/GetOrderList.ashx") - Call getMyAdvice(@Query("listcode") String listcode, - @Query("manid") String manid, - @Query("proposerid") String proposerid); +// @GET("PubFile/Data/GetOrderListRsa.ashx") +// Call getMyAdviceRsa(@Query("listcode") String listcode, +// @Query("manid") String manid, +// @Query("proposerid") String proposerid); +// +// @GET("PubFile/Data/GetOrderList.ashx") +// Call getMyAdvice(@Query("listcode") String listcode, +// @Query("manid") String manid, +// @Query("proposerid") String proposerid); - @GET("PubFile/Data/GetOrderList.ashx") - Call getAdviceInfo(@Query("listcode") String listcode, - @Query("manid") String manid, - @Query("listid") String listid); +// @GET("PubFile/Data/GetOrderList.ashx") +// Call getAdviceInfo(@Query("listcode") String listcode, +// @Query("manid") String manid, +// @Query("listid") String listid); @GET("PubFile/Data/ConferenceUpdateJSY.ashx") @@ -143,12 +144,12 @@ public interface Api { @Query("listcode") String listcode); - @GET("PubFile/Data/GetOrderList.ashx") - Call getApplyList(@Query("listcode") String listcode, - @Query("proposerid") String proposerid, - @Query("manid") String manid, - @Query("departmentnameid") String departmentnameid, - @Query("platform") String platform); +// @GET("PubFile/Data/GetOrderList.ashx") +// Call getApplyList(@Query("listcode") String listcode, +// @Query("proposerid") String proposerid, +// @Query("manid") String manid, +// @Query("departmentnameid") String departmentnameid, +// @Query("platform") String platform); /** * 获取会议室等信息 @@ -230,49 +231,49 @@ public interface Api { * * @return */ - @GET("PubFile/Data/GetData.ashx") - Call getDinner(@Query("listcode") String listcode, - @Query("listid") String listid); +// @GET("PubFile/Data/GetData.ashx") +// Call getDinner(@Query("listcode") String listcode, +// @Query("listid") String listid,@Query("manid") String manid); /** * 获取用车申请数据 * * @return */ - @GET("PubFile/Data/GetData.ashx") - Call getVehicle(@Query("listcode") String listcode, - @Query("listid") String listid, - @Query("suplistid") String suplistid); +// @GET("PubFile/Data/GetData.ashx") +// Call getVehicle(@Query("listcode") String listcode, +// @Query("listid") String listid, +// @Query("suplistid") String suplistid); /** * 获取会议室申请数据 * * @return */ - @GET("PubFile/Data/GetData.ashx") - Call getConference(@Query("listcode") String listcode, - @Query("listid") String listid, - @Query("suplistid") String suplistid); +// @GET("PubFile/Data/GetData.ashx") +// Call getConference(@Query("listcode") String listcode, +// @Query("listid") String listid, +// @Query("suplistid") String suplistid); /** * 获取外卖申请数据 * * @return */ - @GET("PubFile/Data/GetData.ashx") - Call getTakeOut(@Query("listcode") String listcode, - @Query("listid") String listid, - @Query("suplistid") String suplistid); +// @GET("PubFile/Data/GetData.ashx") +// Call getTakeOut(@Query("listcode") String listcode, +// @Query("listid") String listid, +// @Query("suplistid") String suplistid); /** * 获取普通来访数据 * * @return */ - @GET("PubFile/Data/GetData.ashx") - Call getOrdinaryVisit(@Query("listcode") String listcode, - @Query("listid") String listid, - @Query("suplistid") String suplistid); +// @GET("PubFile/Data/GetData.ashx") +// Call getOrdinaryVisit(@Query("listcode") String listcode, +// @Query("listid") String listid, +// @Query("suplistid") String suplistid); /** * 获取接待来访详细信息 @@ -289,9 +290,9 @@ public interface Api { * @param listid * @return */ - @GET("PubFile/Data/GetData.ashx") - Call getMyTask(@Query("listid") String listid, - @Query("listcode") String listcode); +// @GET("PubFile/Data/GetData.ashx") +// Call getMyTask(@Query("listid") String listid, +// @Query("listcode") String listcode); /** * @param type boardroomisuse 会议室是否占用 @@ -343,13 +344,14 @@ public interface Api { * @param auditrange 审核类型编码 * @return */ - @GET("PubFile/Audit/GetIsAudit.ashx") - Call getAudit(@Query("listid") String listid, - @Query("listcode") String listcode, - @Query("dc") String dc, - @Query("shr") String shr, - @Query("shbm") String shbm, - @Query("auditrange") String auditrange); +// @GET("PubFile/Audit/GetIsAudit.ashx") +// Call getAudit(@Query("listid") String listid, +// @Query("listcode") String listcode, +// @Query("dc") String dc, +// @Query("shr") String shr, +// @Query("shbm") String shbm, +// @Query("auditrange") String auditrange, +// @Query("manid") String manid); /** * 任务统计 @@ -402,9 +404,9 @@ public interface Api { @GET("PubFile/Data/GetListDataRWRCTJ.ashx") Call getTaskDateCount(@Query("txtTimeS") String txtTimeS); - @GET("PubFile/Data/GetData.ashx") - Call getSuppliesDetail(@Query("listid") String listid, - @Query("listcode") String listcode); +// @GET("PubFile/Data/GetData.ashx") +// Call getSuppliesDetail(@Query("listid") String listid, +// @Query("listcode") String listcode); @GET("PubFile_TradeUnion/InterfaceApp/Audit/GetIsAudit.ashx") @@ -444,9 +446,9 @@ public interface Api { * * @return */ - @GET("PubFile/Data/GetData.ashx") - Call getOtherTaskDetails(@Query("listcode") String listcode, - @Query("listid") String listid); +// @GET("PubFile/Data/GetData.ashx") +// Call getOtherTaskDetails(@Query("listcode") String listcode, +// @Query("listid") String listid); /** * 获取接待来访详情列表 @@ -554,8 +556,8 @@ public interface Api { * * @return */ - @GET("PubFile/Data/GetData.ashx?listcode=BGYPSZ") - Call getOfficeGroup(); +// @GET("PubFile/Data/GetData.ashx?listcode=BGYPSZ") +// Call getOfficeGroup(); /** * 获取调班审核流程 @@ -927,9 +929,9 @@ public interface Api { * @param listid * @return */ - @GET("PubFile/Data/GetData.ashx") - Call getOfficeAddDetail(@Query("listcode") String listcode, - @Query("listid") String listid); +// @GET("PubFile/Data/GetData.ashx") +// Call getOfficeAddDetail(@Query("listcode") String listcode, +// @Query("listid") String listid); /** @@ -951,8 +953,8 @@ public interface Api { * @param manid * @return */ -// @GET("PubFile/Data/aboutme/aboutme.ashx") -// Call getAboutMe(@Query("manid") String manid); + @GET("PubFile/Data/aboutme/aboutme.ashx") + Call getAboutMe(@Query("manid") String manid); @GET("PubFile/Data/aboutme/aboutmeRsa.ashx") Call getAboutMeRsa(@Query("manid") String manid); diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index 0797777..aef08d0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -578,6 +578,12 @@ public class Contans { //获取审批流程 public static String GET_ORDER_LIST_RSA_URL="PubFile/Data/GetOrderListRsa.ashx"; public static String GETAPPLYLIST2_RSA_URL="PubFile/Data/GetList.ashx"; + //保存申请url + public static String APPLY_SAVE_URL="PubFile/Data/SaveRsa.ashx"; + //获取审批流程人员列表 + public static String GET_IS_AUDIT_RSA_URL="PubFile/Audit/GetIsAuditRsa.ashx"; + //获取审批详情数据 + public static String GET_AUDI_DATA_URL="PubFile/Data/GetDataRsa.ashx"; /** diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/ConferenceBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/ConferenceBean.java index 38c439c..b58b5c4 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/ConferenceBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/ConferenceBean.java @@ -22,6 +22,7 @@ public class ConferenceBean { private String Total = ""; private String DataTotal = ""; + private String manid; private List Rows; private List DataRows; @@ -57,6 +58,14 @@ public class ConferenceBean { this.DataRows = DataRows; } + public String getManid() { + return manid; + } + + public void setManid(String manid) { + this.manid = manid; + } + public static class DataRowsBean { /** * savetype : 1 diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/DinnerBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/DinnerBean.java index f00c77d..09db4bf 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/DinnerBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/DinnerBean.java @@ -19,6 +19,7 @@ public class DinnerBean { private String Total = "1"; private String DataTotal = "1"; + private String manid; private List Rows; private List DataRows; @@ -54,6 +55,14 @@ public class DinnerBean { this.DataRows = DataRows; } + public String getManid() { + return manid; + } + + public void setManid(String manid) { + this.manid = manid; + } + public static class DataRowsBean { private String savetype = ""; diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/MyTaskBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/MyTaskBean.java index 68a6f21..84610ff 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/MyTaskBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/MyTaskBean.java @@ -21,6 +21,7 @@ public class MyTaskBean { private String Total = "1"; private String DataTotal = "1"; + private String manid; private List Rows; private List DataRows; @@ -56,6 +57,14 @@ public class MyTaskBean { this.DataRows = DataRows; } + public String getManid() { + return manid; + } + + public void setManid(String manid) { + this.manid = manid; + } + public static class DataRowsBean { /** * savetype : 1 diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/OfficeAddBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/OfficeAddBean.java index 5a1c2f0..701aeec 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/OfficeAddBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/OfficeAddBean.java @@ -19,6 +19,7 @@ public class OfficeAddBean { */ private String Total = "1"; + private String manid; private String DataTotal; private List Rows; private List DataRows; @@ -55,6 +56,14 @@ public class OfficeAddBean { this.DataRows = DataRows; } + public String getManid() { + return manid; + } + + public void setManid(String manid) { + this.manid = manid; + } + public static class RowsBean { /** * listid : diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/OtherTaskBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/OtherTaskBean.java index fc34c11..2473e1a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/OtherTaskBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/OtherTaskBean.java @@ -21,6 +21,7 @@ public class OtherTaskBean { private String Total = "1"; private String DataTotal = "1"; + private String manid; private List Rows; private List DataRows; @@ -56,6 +57,14 @@ public class OtherTaskBean { this.DataRows = DataRows; } + public String getManid() { + return manid; + } + + public void setManid(String manid) { + this.manid = manid; + } + public static class DataRowsBean { /** * savetype : 1 diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/SubmitRecommendationsBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/SubmitRecommendationsBean.java index ffec59e..be898c1 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/SubmitRecommendationsBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/SubmitRecommendationsBean.java @@ -10,6 +10,7 @@ public class SubmitRecommendationsBean { private String Total = "1"; private String DataTotal = "1"; + private String manid; private List Rows; private List DataRows; @@ -47,6 +48,14 @@ public class SubmitRecommendationsBean { Rows = rows; } + public String getManid() { + return manid; + } + + public void setManid(String manid) { + this.manid = manid; + } + public static class DataRowsBean { private String savetype = ""; diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/SuppliesBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/SuppliesBean.java index 971f80d..1e11a69 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/SuppliesBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/SuppliesBean.java @@ -20,6 +20,7 @@ public class SuppliesBean { private String Total = "1"; private String DataTotal = "1"; + private String manid; private List Rows; private List DataRows; @@ -55,6 +56,14 @@ public class SuppliesBean { this.DataRows = DataRows; } + public String getManid() { + return manid; + } + + public void setManid(String manid) { + this.manid = manid; + } + public static class DataRowsBean { /** * savetype : 1 diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/TakeOutBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/TakeOutBean.java index 9f1d5e8..ff4b2c8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/TakeOutBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/TakeOutBean.java @@ -22,6 +22,7 @@ public class TakeOutBean { private String Total = "1"; private String DataTotal = "1"; + private String manid; private List Rows; private List DataRows; @@ -57,6 +58,14 @@ public class TakeOutBean { DataRows = dataRows; } + public String getManid() { + return manid; + } + + public void setManid(String manid) { + this.manid = manid; + } + public static class DataRowsBean { /** * savetype : 1 diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/VehicleBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/VehicleBean.java index e6b42b1..9d34e4e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/VehicleBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/VehicleBean.java @@ -21,6 +21,7 @@ public class VehicleBean { private String Total = "1"; private String DataTotal = "1"; + private String manid; private List Rows; private List DataRows; @@ -56,6 +57,14 @@ public class VehicleBean { DataRows = dataRows; } + public String getManid() { + return manid; + } + + public void setManid(String manid) { + this.manid = manid; + } + public static class DataRowsBean { /** * savetype : 1 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 715fce5..9e7abd2 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 @@ -2,10 +2,13 @@ package com.rehome.zhdcoa.ui.activity; import android.content.Intent; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; import android.widget.Toast; + +import com.google.gson.Gson; import com.rehome.zhdcoa.Api; import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.R; @@ -22,14 +25,22 @@ import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.DateUtils; import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SaveApplyUtils; import com.rehome.zhdcoa.utils.SetAuditUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.DateTimePickDialog; import com.rehome.zhdcoa.weiget.InputLayout; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.util.ArrayList; import java.util.List; import retrofit2.Call; @@ -142,7 +153,7 @@ public class ApplyConferenceAuditActivity extends BaseActivity implements View.O SaveApplyUtils.newBuilder() .setjson(createJson()) .setListener(ApplyConferenceAuditActivity.this) - .builder(context); + .builder(ApplyConferenceAuditActivity.this); } @Override @@ -232,25 +243,56 @@ public class ApplyConferenceAuditActivity extends BaseActivity implements View.O private void getDatas() { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); - Api api = HttpUtils.getApi(this); + request.add("listid",ListId); + request.add("listcode", listcode); + request.add("suplistid", Suplistid); + request.add("manid", userInfo.getManid()); + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { - api.getConference(listcode, ListId, Suplistid).enqueue(new BaseCallBack(context) { @Override - public void onSuccess(Call call, Response response) { - ConferenceBean bean = response.body(); - if (bean != null) { - conferenceBean = bean; - getAuditpermission(); + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + ConferenceBean bean = GsonUtils.GsonToBean(jsonDecode, ConferenceBean.class); + if (bean != null) { + conferenceBean = bean; + getAuditpermission(); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// Api api = HttpUtils.getApi(this); +// api.getConference(listcode, ListId, Suplistid).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// ConferenceBean bean = response.body(); +// if (bean != null) { +// conferenceBean = bean; +// getAuditpermission(); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } public void showView(ConferenceBean bean) { @@ -291,7 +333,7 @@ public class ApplyConferenceAuditActivity extends BaseActivity implements View.O paramBean.setShbm(DepartmentNameId); // paramBean.setShbm(userInfo.getBzbh()); - GetAuditPermissionUtils.newBuilder().setParams(paramBean).setListener(this).builder(context); + GetAuditPermissionUtils.newBuilder().setParams(paramBean).setListener(this).builder(this); } @Override @@ -437,6 +479,7 @@ public class ApplyConferenceAuditActivity extends BaseActivity implements View.O conferenceBean.getDataRows().get(0).setConferenceHyrs(ilConferenceHyrs.getContent()); conferenceBean.getDataRows().get(0).setSavetype("2"); + conferenceBean.setManid(userInfo.getManid()); String json = GsonUtils.GsonString(conferenceBean); return json; } 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 86c122e..a06972a 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 @@ -18,12 +18,19 @@ import com.rehome.zhdcoa.bean.RowsBean; import com.rehome.zhdcoa.bean.StaffInfoBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SaveApplyUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.ConferenceLayout; import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -97,7 +104,7 @@ public class ApplyConferenceDetailActivity extends BaseActivity implements Confe SaveApplyUtils.newBuilder() .setjson(createJson(istj)) .setListener(ApplyConferenceDetailActivity.this) - .builder(context); + .builder(ApplyConferenceDetailActivity.this); } @Override @@ -140,23 +147,56 @@ public class ApplyConferenceDetailActivity extends BaseActivity implements Confe private void getDatas() { - Api api = HttpUtils.getApi(this); - api.getConference(listcode, - ListId, - Suplistid).enqueue(new BaseCallBack(context) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listid",ListId); + request.add("listcode", listcode); + request.add("suplistid", Suplistid); + request.add("manid", userInfo.getManid()); + + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { + @Override - public void onSuccess(Call call, Response response) { - ConferenceBean bean = response.body(); - if (bean != null) { - showView(bean); + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + ConferenceBean bean = GsonUtils.GsonToBean(jsonDecode, ConferenceBean.class); + if (bean != null) { + showView(bean); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// Api api = HttpUtils.getApi(this); +// api.getConference(listcode, +// ListId, +// Suplistid).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// ConferenceBean bean = response.body(); +// if (bean != null) { +// showView(bean); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } public void showView(ConferenceBean bean) { @@ -249,6 +289,7 @@ public class ApplyConferenceDetailActivity extends BaseActivity implements Confe conferenceBean.getRows().get(0).setIstj(istj); conferenceBean.getRows().get(0).setModifiedby(userInfo.getManid()); + if (!TextUtils.isEmpty(conferenceBean.getDataRows().get(0).checkData())) { toastviewbymyself.makeText(context, conferenceBean.getDataRows().get(0).checkData(), Toast.LENGTH_LONG).show(); @@ -327,6 +368,8 @@ public class ApplyConferenceDetailActivity extends BaseActivity implements Confe conferenceBean.setRows(rowsBeanList); conferenceBean.setTotal("1"); conferenceBean.setDataTotal("1"); + + conferenceBean.setManid(userInfo.getManid()); json = GsonUtils.GsonString(conferenceBean); } return json; 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 d37de80..0f58e19 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 @@ -21,13 +21,21 @@ import com.rehome.zhdcoa.bean.SetAuditBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SetAuditUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.InputLayout; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.util.ArrayList; import java.util.List; import retrofit2.Call; @@ -171,27 +179,59 @@ public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnCli private void getDatas() { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); - Api api = HttpUtils.getApi(context); - api.getDinner(listcode, ListId).enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + request.add("listid",ListId); + request.add("listcode", listcode); + request.add("manid", userInfo.getManid()); - showLog("----------onSuccess---------"); + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { - DinnerBean bean = response.body(); - showLog(GsonUtils.GsonString(bean)); - if (bean != null) { - dinnerBean = bean; - getAuditpermission(); + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + DinnerBean bean = GsonUtils.GsonToBean(jsonDecode, DinnerBean.class); + if (bean != null) { + dinnerBean = bean; + getAuditpermission(); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// Api api = HttpUtils.getApi(context); +// api.getDinner(listcode, ListId, userInfo.getManid()).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// showLog("----------onSuccess---------"); +// +// DinnerBean bean = response.body(); +// showLog(GsonUtils.GsonString(bean)); +// if (bean != null) { +// dinnerBean = bean; +// getAuditpermission(); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } public void showView(DinnerBean bean) { @@ -230,7 +270,7 @@ public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnCli GetAuditPermissionUtils.newBuilder() .setParams(paramBean) .setListener(this) - .builder(context); + .builder(this); } @Override 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 d502262..7c92017 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 @@ -15,18 +15,27 @@ import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.ApplyListBean; +import com.rehome.zhdcoa.bean.ConferenceBean; import com.rehome.zhdcoa.bean.DeparmentTreeBean; import com.rehome.zhdcoa.bean.DinnerBean; import com.rehome.zhdcoa.bean.StaffInfoBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SaveApplyUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.DinnerLayout; import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.ListDialog; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; import com.rehome.zhdcoa.bean.RowsBean; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -85,7 +94,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply SaveApplyUtils.newBuilder() .setjson(createJson("1")) .setListener(ApplyDinnerDetailActivity.this) - .builder(context); + .builder(ApplyDinnerDetailActivity.this); } }); @@ -103,7 +112,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply SaveApplyUtils.newBuilder() .setjson(createJson("0")) .setListener(ApplyDinnerDetailActivity.this) - .builder(context); + .builder(ApplyDinnerDetailActivity.this); } @Override @@ -111,7 +120,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply SaveApplyUtils.newBuilder() .setjson(createJson("1")) .setListener(ApplyDinnerDetailActivity.this) - .builder(context); + .builder(ApplyDinnerDetailActivity.this); } }); dialog.show(); @@ -212,7 +221,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply SaveApplyUtils.newBuilder() .setjson(createJson("0")) .setListener(ApplyDinnerDetailActivity.this) - .builder(context); + .builder(ApplyDinnerDetailActivity.this); } @Override @@ -220,7 +229,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply SaveApplyUtils.newBuilder() .setjson(createJson("1")) .setListener(ApplyDinnerDetailActivity.this) - .builder(context); + .builder(ApplyDinnerDetailActivity.this); } }); dialog.show(); @@ -289,28 +298,63 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply } private void getDatas() { - Log.i("app", "getDatas"); - Api api = HttpUtils.getApi(this); - api.getDinner(listcode, ListId).enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { - DinnerBean dinnerBean = response.body(); - Log.i("app", new Gson().toJson(dinnerBean)); - if (dinnerBean != null) { - showView(dinnerBean); - getListDatas(); + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listid",ListId); + request.add("listcode", listcode); + request.add("manid", userInfo.getManid()); + + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { + + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); } else { - toastviewbymyself.makeText(context, "请求数据出错", Toast.LENGTH_LONG).show(); - finish(); + DinnerBean dinnerBean = GsonUtils.GsonToBean(jsonDecode, DinnerBean.class); + if (dinnerBean != null) { + showView(dinnerBean); + getListDatas(); + } else { + toastviewbymyself.makeText(context, "请求数据出错", Toast.LENGTH_LONG).show(); + finish(); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// Api api = HttpUtils.getApi(this); +// api.getDinner(listcode, ListId, userInfo.getManid()).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// DinnerBean dinnerBean = response.body(); +// if (dinnerBean != null) { +// showView(dinnerBean); +// getListDatas(); +// } else { +// toastviewbymyself.makeText(context, "请求数据出错", Toast.LENGTH_LONG).show(); +// finish(); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } private void getListDatas() { @@ -474,6 +518,9 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply dinnerBean.setRows(rowsBeanList); dinnerBean.setTotal("1"); dinnerBean.setDataTotal("1"); + + dinnerBean.setManid(userInfo.getManid()); + json = GsonUtils.GsonString(dinnerBean); Log.i("app", json); } 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 c6a6b03..19b8c06 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 @@ -19,13 +19,22 @@ import com.rehome.zhdcoa.bean.OfficeAddBean; import com.rehome.zhdcoa.bean.SetAuditBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; +import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SetAuditUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.InputLayout; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.util.ArrayList; import java.util.List; import retrofit2.Call; @@ -194,21 +203,53 @@ public class ApplyOfficeAddAuditActivity extends BaseActivity implements View.On private void getOfficeAddDetail() { - HttpUtils.getApi(this).getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listid",ListId); + request.add("listcode", Contans.LISTCODE.APPLYFACILITIES); + request.add("manid", userInfo.getManid()); + + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { - officeAddBean = response.body(); - if (officeAddBean != null) { - getAuditpermission(); + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + officeAddBean = GsonUtils.GsonToBean(jsonDecode, OfficeAddBean.class); + if (officeAddBean != null) { + getAuditpermission(); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// HttpUtils.getApi(this).getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// officeAddBean = response.body(); +// if (officeAddBean != null) { +// getAuditpermission(); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } private void showView() { @@ -267,7 +308,7 @@ public class ApplyOfficeAddAuditActivity extends BaseActivity implements View.On GetAuditPermissionUtils.newBuilder() .setParams(paramBean) .setListener(this) - .builder(context); + .builder(this); } @Override 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 2e7f997..1bc3157 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 @@ -11,14 +11,22 @@ import com.rehome.zhdcoa.adapter.OfficAddAdapter; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.ApplyListBean; +import com.rehome.zhdcoa.bean.ConferenceBean; import com.rehome.zhdcoa.bean.OfficeAddBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SaveApplyUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -100,7 +108,7 @@ public class ApplyOfficeAddDetailActivity extends BaseActivity { } }) - .builder(context); + .builder(ApplyOfficeAddDetailActivity.this); } @Override @@ -198,6 +206,7 @@ public class ApplyOfficeAddDetailActivity extends BaseActivity { bean.setDataTotal(datas.size() + ""); bean.setDataRows(datas); bean.setRows(rowsBeanList); + bean.setManid(userInfo.getManid()); json = GsonUtils.GsonString(bean); } @@ -206,21 +215,54 @@ public class ApplyOfficeAddDetailActivity extends BaseActivity { private void getOfficeAddDetail() { - HttpUtils.getApi(this).getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listid",ListId); + request.add("listcode", Contans.LISTCODE.APPLYFACILITIES); + request.add("manid", userInfo.getManid()); - officeAddBean = response.body(); - if (officeAddBean != null) { - showView(); + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { + + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + officeAddBean = GsonUtils.GsonToBean(jsonDecode, OfficeAddBean.class); + if (officeAddBean != null) { + showView(); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + + +// HttpUtils.getApi(this).getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// officeAddBean = response.body(); +// if (officeAddBean != null) { +// showView(); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } private void showView() { 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 a3a7d00..8d2d2e9 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 @@ -342,7 +342,7 @@ public class ApplyReceiveAuditActivity extends BaseActivity implements View.OnCl GetAuditPermissionUtils.newBuilder() .setParams(paramBean) .setListener(this) - .builder(context); + .builder(this); } @Override 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 cd5f330..26ba61a 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 @@ -13,19 +13,29 @@ import com.rehome.zhdcoa.adapter.ApplySuppliesAdapter1; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.ApplyListBean; +import com.rehome.zhdcoa.bean.ConferenceBean; import com.rehome.zhdcoa.bean.GetAuditBean; import com.rehome.zhdcoa.bean.GetAuditParamBean; import com.rehome.zhdcoa.bean.SetAuditBean; import com.rehome.zhdcoa.bean.SuppliesBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; +import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SetAuditUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.InputLayout; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.util.ArrayList; import java.util.List; import retrofit2.Call; @@ -191,23 +201,57 @@ public class ApplySuppliesAuditActivity extends BaseActivity implements View.OnC private void getDetailData() { - HttpUtils.getApi(this).getSuppliesDetail(ListId, listcode) - .enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); - SuppliesBean bean = response.body(); - if (bean != null) { - suppliesBean = bean; - getAuditpermission(); - } - } + request.add("listid",ListId); + request.add("listcode", listcode); + request.add("manid", userInfo.getManid()); +// request.add("suplistid", Suplistid); - @Override - public void onError(Call call, Throwable t) { + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + SuppliesBean bean = GsonUtils.GsonToBean(jsonDecode, SuppliesBean.class); + if (bean != null) { + suppliesBean = bean; + getAuditpermission(); } - }); + } + } + + @Override + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { + + } + }); + +// HttpUtils.getApi(this).getSuppliesDetail(ListId, listcode) +// .enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// SuppliesBean bean = response.body(); +// if (bean != null) { +// suppliesBean = bean; +// getAuditpermission(); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } public void getAuditpermission() { @@ -221,7 +265,7 @@ public class ApplySuppliesAuditActivity extends BaseActivity implements View.OnC GetAuditPermissionUtils.newBuilder() .setParams(paramBean) .setListener(this) - .builder(context); + .builder(this); } private void showView() { 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 0da4664..1e9e77b 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 @@ -11,17 +11,26 @@ import com.rehome.zhdcoa.adapter.ApplySuppliesAdapter; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.ApplyListBean; +import com.rehome.zhdcoa.bean.ConferenceBean; import com.rehome.zhdcoa.bean.OfficeGroupBean; import com.rehome.zhdcoa.bean.SuppliesBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.DataSaveUtils; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SaveApplyUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; import com.rehome.zhdcoa.bean.RowsBean; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -133,27 +142,60 @@ public class ApplySuppliesDetailActivity extends BaseActivity implements ApplySu SaveApplyUtils.newBuilder() .setListener(this) .setjson(createJson(istj)) - .builder(context); + .builder(ApplySuppliesDetailActivity.this); } private void getDetailData() { - HttpUtils.getApi(this).getSuppliesDetail(ListId, listcode) - .enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); - SuppliesBean bean = response.body(); - if (bean != null) { - showView(bean); - } - } + request.add("listid",ListId); + request.add("listcode", listcode); + request.add("manid", userInfo.getManid()); +// request.add("suplistid", Suplistid); - @Override - public void onError(Call call, Throwable t) { + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + SuppliesBean bean = GsonUtils.GsonToBean(jsonDecode, SuppliesBean.class); + if (bean != null) { + showView(bean); } - }); + } + } + + @Override + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { + + } + }); + +// HttpUtils.getApi(this).getSuppliesDetail(ListId, listcode) +// .enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// SuppliesBean bean = response.body(); +// if (bean != null) { +// showView(bean); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } private void showView(SuppliesBean bean) { @@ -304,6 +346,7 @@ public class ApplySuppliesDetailActivity extends BaseActivity implements ApplySu dataRowsBeanList.add(dataRowsBean); bean.setRows(rowsBeanList); bean.setDataRows(dataRowsBeanList); + bean.setManid(userInfo.getManid()); json = GsonUtils.GsonString(bean); } return json; 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 1deaf59..d244b49 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 @@ -14,19 +14,29 @@ import com.rehome.zhdcoa.adapter.TakeOutAdapter1; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.ApplyListTakeOutBean; +import com.rehome.zhdcoa.bean.ConferenceBean; import com.rehome.zhdcoa.bean.GetAuditBean; import com.rehome.zhdcoa.bean.GetAuditParamBean; import com.rehome.zhdcoa.bean.SetAuditBean; import com.rehome.zhdcoa.bean.TakeOutBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; +import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SetAuditUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.InputLayout; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.util.ArrayList; import java.util.List; import retrofit2.Call; @@ -232,26 +242,60 @@ public class ApplyTakeOutAuditActivity extends BaseActivity implements GetAudit private void getdatas() { - Api api = HttpUtils.getApi(this); - api.getTakeOut(listcode, - ListId, - Suplistid).enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listid",ListId); + request.add("listcode", listcode); + request.add("suplistid", Suplistid); + request.add("manid", userInfo.getManid()); - TakeOutBean bean = response.body(); - if (bean != null) { -// showView(bean); - takeOutBean = bean; - getAuditpermission(); + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { + + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + TakeOutBean bean = GsonUtils.GsonToBean(jsonDecode, TakeOutBean.class); + if (bean != null) { + takeOutBean = bean; + getAuditpermission(); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// Api api = HttpUtils.getApi(this); +// api.getTakeOut(listcode, +// ListId, +// Suplistid).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// TakeOutBean bean = response.body(); +// if (bean != null) { +//// showView(bean); +// takeOutBean = bean; +// getAuditpermission(); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } private void showView(TakeOutBean bean) { @@ -281,7 +325,7 @@ public class ApplyTakeOutAuditActivity extends BaseActivity implements GetAudit GetAuditPermissionUtils.newBuilder() .setParams(paramBean) .setListener(this) - .builder(context); + .builder(this); } @Override 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 019935a..2eb0b30 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 @@ -15,12 +15,17 @@ import com.rehome.zhdcoa.adapter.TakeOutAdapter1; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.ApplyListTakeOutBean; +import com.rehome.zhdcoa.bean.ConferenceBean; import com.rehome.zhdcoa.bean.DropDownBean; import com.rehome.zhdcoa.bean.TakeOutBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SaveApplyUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.CbRbLayout; @@ -29,6 +34,10 @@ import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.ListDialog; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; import com.rehome.zhdcoa.bean.RowsBean; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -78,7 +87,7 @@ public class ApplyTakeOutDetailActivity extends BaseActivity implements SaveAppl SaveApplyUtils.newBuilder() .setjson(createJson("1")) .setListener(ApplyTakeOutDetailActivity.this) - .builder(context); + .builder(ApplyTakeOutDetailActivity.this); } }); } @@ -181,7 +190,7 @@ public class ApplyTakeOutDetailActivity extends BaseActivity implements SaveAppl SaveApplyUtils.newBuilder() .setjson(createJson(istj)) .setListener(ApplyTakeOutDetailActivity.this) - .builder(context); + .builder(ApplyTakeOutDetailActivity.this); } @Override @@ -228,24 +237,56 @@ public class ApplyTakeOutDetailActivity extends BaseActivity implements SaveAppl private void getDatas() { - Api api = HttpUtils.getApi(this); - api.getTakeOut(applyList.getListcode(), - applyList.getListid(), - applyList.getSuplistid()).enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listid",applyList.getListid()); + request.add("listcode", applyList.getListcode()); + request.add("suplistid", applyList.getSuplistid()); + + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { - TakeOutBean bean = response.body(); - if (bean != null) { - showView(bean); + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + TakeOutBean bean = GsonUtils.GsonToBean(jsonDecode, TakeOutBean.class); + if (bean != null) { + showView(bean); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// Api api = HttpUtils.getApi(this); +// api.getTakeOut(applyList.getListcode(), +// applyList.getListid(), +// applyList.getSuplistid()).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// TakeOutBean bean = response.body(); +// if (bean != null) { +// showView(bean); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } private void showView(TakeOutBean bean) { @@ -388,6 +429,7 @@ public class ApplyTakeOutDetailActivity extends BaseActivity implements SaveAppl takeOutBean.setTotal("1"); takeOutBean.setDataTotal("1"); + takeOutBean.setManid(userInfo.getManid()); json = GsonUtils.GsonString(takeOutBean); } return json; 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 07f66a1..3ef0922 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 @@ -13,6 +13,7 @@ import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.ApplyListVehicleBean; +import com.rehome.zhdcoa.bean.ConferenceBean; import com.rehome.zhdcoa.bean.CpxxBean; import com.rehome.zhdcoa.bean.GetAuditBean; import com.rehome.zhdcoa.bean.GetAuditParamBean; @@ -26,13 +27,20 @@ import com.rehome.zhdcoa.bean.ZzsjDataBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SaveApplyUtils; import com.rehome.zhdcoa.utils.SetAuditUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.InputLayout; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; import java.util.ArrayList; import java.util.List; @@ -217,7 +225,7 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl } }) - .builder(context); + .builder(ApplyVehicleAuditActivity.this); } private void setAudit() { @@ -299,24 +307,59 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl private void getDatas() { - Api api = HttpUtils.getApi(this); - api.getVehicle(listcode, ListId, "").enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listid",ListId); + request.add("listcode", listcode); + request.add("suplistid", ""); + request.add("manid", userInfo.getManid()); + + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { - VehicleBean bean = response.body(); - if (bean != null) { - showView(bean); - vehicleBean = bean; - getAuditpermission(); + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + VehicleBean bean = GsonUtils.GsonToBean(jsonDecode, VehicleBean.class); + if (bean != null) { + showView(bean); + vehicleBean = bean; + getAuditpermission(); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// Api api = HttpUtils.getApi(this); +// api.getVehicle(listcode, ListId, "").enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// VehicleBean bean = response.body(); +// if (bean != null) { +// showView(bean); +// vehicleBean = bean; +// getAuditpermission(); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } public void showView(VehicleBean bean) { @@ -361,7 +404,7 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl GetAuditPermissionUtils.newBuilder() .setParams(paramBean) .setListener(this) - .builder(context); + .builder(this); } @Override @@ -460,6 +503,7 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl vehicleBean.getDataRows().get(0).setVehicleJsy(ZZSJID); } + vehicleBean.setManid(userInfo.getManid()); return GsonUtils.GsonString(vehicleBean); } 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 294a7fe..03198c5 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 @@ -18,14 +18,22 @@ import com.rehome.zhdcoa.bean.StaffInfoBean; import com.rehome.zhdcoa.bean.VehicleBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SaveApplyUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.ListDialog; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; import com.rehome.zhdcoa.weiget.VehicleLayout; import com.rehome.zhdcoa.bean.RowsBean; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -121,7 +129,7 @@ public class ApplyVehicleDetailActivity extends BaseActivity implements VehicleL SaveApplyUtils.newBuilder() .setjson(createJson(istj)) .setListener(ApplyVehicleDetailActivity.this) - .builder(context); + .builder(ApplyVehicleDetailActivity.this); } @Override @@ -200,22 +208,55 @@ public class ApplyVehicleDetailActivity extends BaseActivity implements VehicleL private void getDatas() { - Api api = HttpUtils.getApi(this); - api.getVehicle(listcode, ListId, "").enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listid",ListId); + request.add("listcode", listcode); + request.add("suplistid", ""); + request.add("manid", userInfo.getManid()); - VehicleBean bean = response.body(); - if (bean != null) { - showView(bean); + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { + + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + VehicleBean bean = GsonUtils.GsonToBean(jsonDecode, VehicleBean.class); + if (bean != null) { + showView(bean); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// Api api = HttpUtils.getApi(this); +// api.getVehicle(listcode, ListId, "").enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// VehicleBean bean = response.body(); +// if (bean != null) { +// showView(bean); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } public void showView(VehicleBean bean) { @@ -278,6 +319,8 @@ public class ApplyVehicleDetailActivity extends BaseActivity implements VehicleL VehicleBean bean = new VehicleBean(); + bean.setManid(userInfo.getManid()); + List rowsBeanList = new ArrayList<>(); RowsBean rowsBean = new RowsBean(); rowsBean.setListcode(Contans.LISTCODE.APPLYVEHICLE); @@ -313,6 +356,7 @@ public class ApplyVehicleDetailActivity extends BaseActivity implements VehicleL bean.setDataRows(dataRowsBeanList); bean.setTotal("1"); bean.setDataTotal("1"); + bean.setManid(userInfo.getManid()); json = GsonUtils.GsonString(bean); } return json; diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index c9d791e..4b79e9d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -175,9 +175,6 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { // 管理员 - - - } binding.textWjmm.setOnClickListener(View.OnClickListener { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt index bdb415f..e9418f0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt @@ -232,7 +232,8 @@ class MainActivity : BaseActivityOaToolbarViewBinding() { showLog(jsonDecode) showLog( "--------getAboutMeData--------") if (TextUtils.isEmpty(jsonDecode)) { - showToast(UiUtlis.getString(context, R.string.data_error)) + //showToast(UiUtlis.getString(context, R.string.data_error)) + showLog(UiUtlis.getString(context, R.string.data_error)) } else { val bean = GsonUtils.GsonToBean(jsonDecode, AboutMeBean::class.java) if (bean != null) { 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 cd84847..eb5c70d 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 @@ -2,27 +2,39 @@ package com.rehome.zhdcoa.ui.activity; import android.content.Intent; import android.text.InputType; +import android.text.TextUtils; import android.view.Gravity; import android.view.View; import android.widget.Button; import android.widget.EditText; + import com.rehome.zhdcoa.Api; import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.CKSHQXBean; +import com.rehome.zhdcoa.bean.ConferenceBean; import com.rehome.zhdcoa.bean.MyadviceBean; import com.rehome.zhdcoa.bean.SubmitRecommendationsBean; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SaveApplyUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditBHDialog; import com.rehome.zhdcoa.bean.RowsBean; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; + import retrofit2.Call; import retrofit2.Response; @@ -99,18 +111,13 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp btn_SAVE.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - - if (btn_SAVE.getText().equals("提交")) { - SaveApplyUtils.newBuilder() .setjson(createJson("", "1", "审批中")) .setListener(MakerecommendationsActivity.this) - .builder(context); + .builder(MakerecommendationsActivity.this); } else if (btn_SAVE.getText().equals("审核")) { - - AuditBHDialog dialog1 = new AuditBHDialog(context, "是否确认", new AuditBHDialog.AuditBHDialogListener() { @Override public void confirm() { @@ -118,20 +125,15 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp SaveApplyUtils.newBuilder() .setjson(createJson(listid, "2", "已确认")) .setListener(MakerecommendationsActivity.this) - .builder(context); - - + .builder(MakerecommendationsActivity.this); } @Override public void Bh() { - - SaveApplyUtils.newBuilder() .setjson(createJson(listid, "2", "已驳回")) .setListener(MakerecommendationsActivity.this) - .builder(context); - + .builder(MakerecommendationsActivity.this); } @Override @@ -140,15 +142,9 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp } }); dialog1.show(); - - } - - } }); - - } @Override @@ -182,34 +178,61 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp infoET.setFocusable(false); getDatas(); - getSHQX(); - - } - - } private void getDatas() { - Api api = HttpUtils.getApi(this); - api.getAdviceInfo(Contans.LISTCODE.APPLYSUGGESTION,userInfo.getManid(),listid).enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_ORDER_LIST_RSA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + request.add("listcode",Contans.LISTCODE.APPLYSUGGESTION); + request.add("listid",listid); + request.add("manid",userInfo.getManid()); - MyadviceBean bean = response.body(); - if (bean != null) { - showView(bean); + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { + + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + MyadviceBean bean = GsonUtils.GsonToBean(jsonDecode, MyadviceBean.class); + if (bean != null) { + showView(bean); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + + +// Api api = HttpUtils.getApi(this); +// api.getAdviceInfo(Contans.LISTCODE.APPLYSUGGESTION, userInfo.getManid(), listid).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// MyadviceBean bean = response.body(); +// if (bean != null) { +// showView(bean); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } private void getSHQX() { @@ -321,6 +344,8 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp dataRowsBeanList.add(dataRowsBean); submitRecommendationsBean.setDataRows(dataRowsBeanList); submitRecommendationsBean.setRows(rowsBeanList); + + submitRecommendationsBean.setManid(userInfo.getManid()); json = GsonUtils.GsonString(submitRecommendationsBean); return json; 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 0a62d88..20f88c0 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 @@ -10,17 +10,26 @@ import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.ApplyListBean; import com.rehome.zhdcoa.bean.MyTaskBean; +import com.rehome.zhdcoa.bean.OrdinaryVisitBean; import com.rehome.zhdcoa.bean.ResultBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SaveApplyUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.DateTimePickDialog; import com.rehome.zhdcoa.weiget.DelOrOkOrDissDialog; import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.ListDialog; import com.rehome.zhdcoa.bean.RowsBean; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -77,7 +86,7 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils SaveApplyUtils.newBuilder() .setjson(createJson(false)) .setListener(MyTaskDetailActivity.this) - .builder(context); + .builder(MyTaskDetailActivity.this); } @Override @@ -101,7 +110,7 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils SaveApplyUtils.newBuilder() .setjson(createJson(false)) .setListener(MyTaskDetailActivity.this) - .builder(context); + .builder(MyTaskDetailActivity.this); } @Override @@ -109,7 +118,7 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils SaveApplyUtils.newBuilder() .setjson(createJson(true)) .setListener(MyTaskDetailActivity.this) - .builder(context); + .builder(MyTaskDetailActivity.this); } @Override @@ -219,24 +228,60 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils private void getDatas() { - HttpUtils.getApi(this).getMyTask(ListId, ListCode).enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); - MyTaskBean bean = response.body(); - if (bean != null) { - if (bean.getDataTotal().equals("1")) { - showView(bean.getDataRows().get(0)); - myTaskBean = bean; + request.add("listid",ListId); + request.add("listcode", ListCode); + request.add("manid", userInfo.getManid()); +// request.add("suplistid", Suplistid); + + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { + + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + MyTaskBean bean = GsonUtils.GsonToBean(jsonDecode, MyTaskBean.class); + if (bean != null) { + if (bean.getDataTotal().equals("1")) { + showView(bean.getDataRows().get(0)); + myTaskBean = bean; + } } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// HttpUtils.getApi(this).getMyTask(ListId, ListCode).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// MyTaskBean bean = response.body(); +// if (bean != null) { +// if (bean.getDataTotal().equals("1")) { +// showView(bean.getDataRows().get(0)); +// myTaskBean = bean; +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } private void showView(MyTaskBean.DataRowsBean dataRowsBean) { @@ -295,6 +340,8 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils dataRowsBeanList.add(dataRowsBean); bean.setDataRows(dataRowsBeanList); bean.setRows(rowsBeanList); + + bean.setManid(userInfo.getManid()); json = GsonUtils.GsonString(bean); } return json; 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 6aa8819..73775c7 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 @@ -13,18 +13,28 @@ import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.ApplyOrdinaryVisitBean; +import com.rehome.zhdcoa.bean.ConferenceBean; import com.rehome.zhdcoa.bean.GetAuditBean; import com.rehome.zhdcoa.bean.GetAuditParamBean; import com.rehome.zhdcoa.bean.OrdinaryVisitBean; import com.rehome.zhdcoa.bean.SetAuditBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; +import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SetAuditUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.InputLayout; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.util.ArrayList; import java.util.List; import retrofit2.Call; @@ -180,23 +190,57 @@ public class OrdinaryVisitAuditActivity extends BaseActivity implements View.OnC private void getDatas() { - Api api = HttpUtils.getApi(this); - api.getOrdinaryVisit(listcode, ListId, Suplistid).enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listid",ListId); + request.add("listcode", listcode); + request.add("suplistid", Suplistid); + request.add("manid", userInfo.getManid()); + + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { - OrdinaryVisitBean bean = response.body(); - if (bean != null) { - ordinaryVisitBean = bean; - getAuditpermission(); + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + OrdinaryVisitBean bean = GsonUtils.GsonToBean(jsonDecode, OrdinaryVisitBean.class); + if (bean != null) { + ordinaryVisitBean = bean; + getAuditpermission(); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// Api api = HttpUtils.getApi(this); +// api.getOrdinaryVisit(listcode, ListId, Suplistid).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// OrdinaryVisitBean bean = response.body(); +// if (bean != null) { +// ordinaryVisitBean = bean; +// getAuditpermission(); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } public void showView(OrdinaryVisitBean bean) { @@ -225,7 +269,7 @@ public class OrdinaryVisitAuditActivity extends BaseActivity implements View.OnC GetAuditPermissionUtils.newBuilder() .setParams(paramBean) .setListener(this) - .builder(context); + .builder(this); } @Override 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 e33fb52..7e3b85f 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 @@ -10,19 +10,28 @@ import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.ApplyListOtherTaskBean; +import com.rehome.zhdcoa.bean.OrdinaryVisitBean; import com.rehome.zhdcoa.bean.OtherTaskBean; import com.rehome.zhdcoa.bean.StaffInfoBean; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.utils.DateUtils; import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; import com.rehome.zhdcoa.utils.SaveApplyUtils; +import com.rehome.zhdcoa.utils.UiUtlis; import com.rehome.zhdcoa.weiget.AuditBHDialog; import com.rehome.zhdcoa.weiget.DateTimePickDialog; import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.ListDialog; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; import com.rehome.zhdcoa.bean.RowsBean; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -195,7 +204,7 @@ public class OthersTaskDetailActivity extends BaseActivity implements SaveApplyU SaveApplyUtils.newBuilder() .setjson(json) .setListener(this) - .builder(context); + .builder(OthersTaskDetailActivity.this); } @@ -211,26 +220,59 @@ public class OthersTaskDetailActivity extends BaseActivity implements SaveApplyU SaveApplyUtils.newBuilder() .setjson(json2) .setListener(this) - .builder(context); + .builder(OthersTaskDetailActivity.this); } public void getDetails() { - HttpUtils.getApi(this).getOtherTaskDetails(ListCode, ListId).enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listid",ListId); + request.add("listcode", ListCode); + request.add("manid", userInfo.getManid()); +// request.add("suplistid", Suplistid); + + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { - OtherTaskBean bean = response.body(); - if (bean != null) { - showView(bean); + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + OtherTaskBean bean = GsonUtils.GsonToBean(jsonDecode, OtherTaskBean.class); + if (bean != null) { + showView(bean); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); + +// HttpUtils.getApi(this).getOtherTaskDetails(ListCode, ListId).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// OtherTaskBean bean = response.body(); +// if (bean != null) { +// showView(bean); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } private void showView(OtherTaskBean bean) { @@ -693,6 +735,7 @@ public class OthersTaskDetailActivity extends BaseActivity implements SaveApplyU bean.setRows(rowsBeanList); bean.setDataRows(dataRowsBeanList); + bean.setManid(userInfo.getManid()); json = GsonUtils.GsonString(bean); } 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 c794860..c7b770e 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 @@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity; import android.content.Intent; import android.text.Editable; +import android.text.TextUtils; import android.text.TextWatcher; import android.view.LayoutInflater; import android.view.View; @@ -11,12 +12,23 @@ import android.widget.EditText; import android.widget.ExpandableListView; import android.widget.ImageView; import android.widget.TextView; + +import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.OfficeGroupBean; +import com.rehome.zhdcoa.bean.VehicleBean; import com.rehome.zhdcoa.utils.DataSaveUtils; +import com.rehome.zhdcoa.utils.GsonUtils; +import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpUtils; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.RSAUtils; +import com.rehome.zhdcoa.utils.UiUtlis; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; import com.zhy.autolayout.utils.AutoUtils; import java.util.ArrayList; import java.util.List; @@ -69,24 +81,57 @@ public class SelectItem4Activity extends BaseActivity { private void getDatas() { - HttpUtils.getApi(this).getOfficeGroup().enqueue(new BaseCallBack(context) { - @Override - public void onSuccess(Call call, Response response) { + String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listcode", "BGYPSZ"); + request.add("manid", userInfo.getManid()); - OfficeGroupBean bean = response.body(); - if (bean != null) { - datas.clear(); - datas.addAll(bean.getRows()); - setAdatper(); + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { + + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + OfficeGroupBean bean = GsonUtils.GsonToBean(jsonDecode, OfficeGroupBean.class); + if (bean != null) { + datas.clear(); + datas.addAll(bean.getRows()); + setAdatper(); + } } } @Override - public void onError(Call call, Throwable t) { + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { } }); +// HttpUtils.getApi(this).getOfficeGroup().enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// OfficeGroupBean bean = response.body(); +// if (bean != null) { +// datas.clear(); +// datas.addAll(bean.getRows()); +// setAdatper(); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); + } private void setAdatper() { 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 fc73576..6a259a5 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 @@ -185,6 +185,7 @@ class ContactFragment : BaseViewBindingKotlinFragment(){ //showLog(jsonDecode); if (TextUtils.isEmpty(jsonDecode)) { showToast(UiUtlis.getString(context, R.string.data_error)) + showLog(UiUtlis.getString(context, R.string.data_error)) } else { val bean = GsonUtils.GsonToBean( jsonDecode, 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 0e00c35..137bbdf 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 @@ -764,7 +764,8 @@ class HomeFragment : BaseViewBindingFragment() { showLog(jsonDecode) showLog( "--------getAboutMeData--------") if (TextUtils.isEmpty(jsonDecode)) { - showToast(UiUtlis.getString(context, R.string.data_error)) + //showToast(UiUtlis.getString(context, R.string.data_error)) + showLog(UiUtlis.getString(context, R.string.data_error)) } else { val bean = GsonUtils.GsonToBean( jsonDecode, 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 29e1f26..29f4f48 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 @@ -837,7 +837,7 @@ public class MineFragment extends BaseLazyFragment { Request request = NoHttp.createStringRequest(url, RequestMethod.GET); String manid = App.getInstance().getUserInfo().getManid(); request.add("manid",manid); - NohttpUtils.getInstance().add(requireActivity(), 0, "正在提交数据...", request, new HttpListener() { + NohttpUtils.getInstance().addNoProgress(requireContext(), 0, request, new HttpListener() { @Override public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { @@ -848,7 +848,8 @@ public class MineFragment extends BaseLazyFragment { showLog(result); showLog(jsonDecode); if (TextUtils.isEmpty(jsonDecode)) { - showToast(UiUtlis.getString(context, R.string.data_error)); + //showToast(UiUtlis.getString(context, R.string.data_error)); + showLog(UiUtlis.getString(context, R.string.data_error)); } else { AboutMeBean bean = GsonUtils.GsonToBean(jsonDecode,AboutMeBean.class); if (bean != null) { 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 a1e9a01..1c406b7 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java @@ -63,7 +63,7 @@ import retrofit2.Response; public class ApplyListUtils { private static Builder builder; - private final Api api; + //private final Api api; public UserInfoBean.UserInfo userInfo; private final List datas; @@ -93,7 +93,7 @@ public class ApplyListUtils { private ApplyListUtils(Activity context) { - api = HttpUtils.getApi(context); + //api = HttpUtils.getApi(context); datas = new ArrayList<>(); receiveDatas = new ArrayList<>(); conferenceDatas = new ArrayList<>(); 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 c6bf313..707494a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/GetAuditPermissionUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/GetAuditPermissionUtils.java @@ -1,65 +1,127 @@ package com.rehome.zhdcoa.utils; +import android.app.Activity; import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.text.TextUtils; import android.util.Log; +import android.widget.Toast; import com.google.gson.Gson; import com.rehome.zhdcoa.Api; import com.rehome.zhdcoa.Contans; +import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.base.BaseCallBack; +import com.rehome.zhdcoa.bean.ApplyListBean; +import com.rehome.zhdcoa.bean.ApplyListConferenceBean; +import com.rehome.zhdcoa.bean.ApplyListOtherTaskBean; +import com.rehome.zhdcoa.bean.ApplyListReceiveBean; +import com.rehome.zhdcoa.bean.ApplyListTakeOutBean; +import com.rehome.zhdcoa.bean.ApplyListVehicleBean; +import com.rehome.zhdcoa.bean.ApplyOrdinaryVisitBean; +import com.rehome.zhdcoa.bean.ApplyTravelListBean; import com.rehome.zhdcoa.bean.GetAuditBean; import com.rehome.zhdcoa.bean.GetAuditParamBean; +import com.rehome.zhdcoa.bean.MyadviceBean; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; import retrofit2.Call; import retrofit2.Response; /** * Created by Rehome-rjb1 on 2017/5/31. - * + *

* 获取审核权限工具类 */ public class GetAuditPermissionUtils { - private final Api api; + //private final Api api; private static Builder builder; - private GetAuditPermissionUtils(Context context) { - api = HttpUtils.getApi(context); + private Activity context; + + private GetAuditPermissionUtils(Activity context) { + //api = HttpUtils.getApi(context); + this.context = context; init(); } private void init() { - builder.paramBean.setDc("ZH"); - - api.getAudit(builder.paramBean.getListid(), builder.paramBean.getListcode(), - builder.paramBean.getDc(), builder.paramBean.getShr(), - builder.paramBean.getShbm(), builder.paramBean.getAuditrange()) - - - - .enqueue(new BaseCallBack(builder.context) { - @Override - public void onSuccess(Call call, Response response) { - - GetAuditBean bean = response.body(); - if (bean != null) { - if (!bean.getTotal().equals("0")) { - Log.i("app",new Gson().toJson(bean)); - builder.listener.onSuccess(bean); - } - }else{ - Log.i("app","getAudit is null"); + String url = Contans.BASE_URL + Contans.GET_IS_AUDIT_RSA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + + request.add("listid", builder.paramBean.getListid()); + request.add("listcode", builder.paramBean.getListcode()); + request.add("dc", "ZH"); + + request.add("shr", builder.paramBean.getShr()); + request.add("shbm", builder.paramBean.getShbm()); + request.add("auditrange", builder.paramBean.getAuditrange()); + request.add("manid", builder.paramBean.getShr()); + + NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener() { + + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("----------------"); + String result = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + GetAuditBean bean = GsonUtils.GsonToBean(jsonDecode, GetAuditBean.class); + if (bean != null) { + if (!bean.getTotal().equals("0")) { + Log.i("app", new Gson().toJson(bean)); + builder.listener.onSuccess(bean); } + } else { + Log.i("app", "getAudit is null"); } - - @Override - public void onError(Call call, Throwable t) { - - } - }); + } + } + + @Override + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { + + } + }); + + +// builder.paramBean.setDc("ZH"); +// api.getAudit(builder.paramBean.getListid(), builder.paramBean.getListcode(), +// builder.paramBean.getDc(), builder.paramBean.getShr(), +// builder.paramBean.getShbm(), builder.paramBean.getAuditrange(), builder.paramBean.getShr()) +// +// +// +// .enqueue(new BaseCallBack(builder.context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// GetAuditBean bean = response.body(); +// if (bean != null) { +// if (!bean.getTotal().equals("0")) { +// Log.i("app",new Gson().toJson(bean)); +// builder.listener.onSuccess(bean); +// } +// }else{ +// Log.i("app","getAudit is null"); +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); } public static Builder newBuilder() { @@ -69,7 +131,7 @@ public class GetAuditPermissionUtils { public static class Builder { - private Context context; + private Activity context; private GetAuditParamBean paramBean; @@ -85,7 +147,7 @@ public class GetAuditPermissionUtils { return builder; } - public GetAuditPermissionUtils builder(Context context) { + public GetAuditPermissionUtils builder(Activity context) { this.context = context; return new GetAuditPermissionUtils(context); } @@ -94,4 +156,35 @@ public class GetAuditPermissionUtils { public interface GetAuditPermissionUtilsListener { void onSuccess(GetAuditBean bean); } + + public void showLog(String logText) { + if (isApkInDebug(context)) { + if (TextUtils.isEmpty(logText)) { + Log.i("app", "logText is null"); + } else { + Log.i("app", logText); + } + } + } + + /** + * 判断当前应用是否是debug状态 + */ + + public static boolean isApkInDebug(Context context) { + try { + ApplicationInfo info = context.getApplicationInfo(); + return (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; + } catch (Exception e) { + return false; + } + } + + public void showToast(String msg) { + Toast.makeText(context, msg, Toast.LENGTH_SHORT).show(); + } + + public void showToast(int strId) { + Toast.makeText(context, strId, Toast.LENGTH_SHORT).show(); + } } 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 9e8a672..640aabb 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java @@ -166,7 +166,7 @@ public class NohttpUtils { } } } - mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, true, true, "加载中...")); + mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, true, true, "数据加载中...")); } public void add(Activity mActivity, int what, String progressTitle, Request request, HttpListener 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 496348d..26ec3b8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java @@ -1,6 +1,8 @@ package com.rehome.zhdcoa.utils; +import android.app.Activity; import android.content.Context; +import android.content.pm.ApplicationInfo; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; @@ -8,8 +10,20 @@ import android.widget.Toast; import com.google.gson.Gson; import com.rehome.zhdcoa.Api; import com.rehome.zhdcoa.Contans; +import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.ResultBean; +import com.rehome.zhdcoa.bean.RowsBean; +import com.rehome.zhdcoa.bean.SubmitRecommendationsBean; +import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import okhttp3.MediaType; import okhttp3.RequestBody; @@ -23,47 +37,92 @@ import retrofit2.Response; public class SaveApplyUtils { - private final Api api; + //private final Api api; private static Builder builder; - private SaveApplyUtils(Context context) { - api = HttpUtils.getApi(context); + private Activity mContext; + + + private SaveApplyUtils(Activity context) { + //api = HttpUtils.getApi(context); + this.mContext=context; init(); } private void init() { - RequestBody body = RequestBody.create(MediaType.parse("application/json"), builder.json); + String url = Contans.BASE_URL + Contans.APPLY_SAVE_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.POST); + String jsonEncrypt = RSAUtils.encryptBASE64Str(builder.json); + request.setDefineRequestBodyForJson(jsonEncrypt); + NohttpUtils.getInstance().add(mContext, 0, "正在提交数据...", request, new HttpListener() { - api.saveApply(body).enqueue(new BaseCallBack(builder.context) { @Override - public void onSuccess(Call call, Response response) { - ResultBean bean = response.body(); - if (bean != null) { - String result = bean.getRows().get(0).getResult(); - String msg = bean.getRows().get(0).getMsg(); - Log.i("app",new Gson().toJson(bean)); - - - //1成功，0失败，2异常,3无权限 - if (result.equals("1")) { - Toast.makeText(builder.context, msg, Toast.LENGTH_SHORT).show(); - builder.listener.onSuccess(); - } else { - Toast.makeText(builder.context, msg, Toast.LENGTH_SHORT).show(); - builder.listener.onError(); + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + + showLog("----------------"); + String resultStr = response.get(); + String jsonDecode = RSAUtils.decryptBASE64StrClient(resultStr); + showLog(resultStr); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(mContext, R.string.data_error)); + } else { + ResultBean bean = GsonUtils.GsonToBean(jsonDecode, ResultBean.class); + if (bean != null) { + String result = bean.getRows().get(0).getResult(); + String msg = bean.getRows().get(0).getMsg(); + //1成功，0失败，2异常,3无权限 + if (result.equals("1")) { + Toast.makeText(builder.context, msg, Toast.LENGTH_SHORT).show(); + builder.listener.onSuccess(); + } else { + Toast.makeText(builder.context, msg, Toast.LENGTH_SHORT).show(); + builder.listener.onError(); + } } } } @Override - public void onError(Call call, Throwable t) { - builder.listener.onError(); + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { + } }); + + + +// RequestBody body = RequestBody.create(MediaType.parse("application/json"), builder.json); +// api.saveApply(body).enqueue(new BaseCallBack(builder.context) { +// @Override +// public void onSuccess(Call call, Response response) { +// ResultBean bean = response.body(); +// if (bean != null) { +// String result = bean.getRows().get(0).getResult(); +// String msg = bean.getRows().get(0).getMsg(); +// Log.i("app",new Gson().toJson(bean)); +// +// +// //1成功，0失败，2异常,3无权限 +// if (result.equals("1")) { +// Toast.makeText(builder.context, msg, Toast.LENGTH_SHORT).show(); +// builder.listener.onSuccess(); +// } else { +// Toast.makeText(builder.context, msg, Toast.LENGTH_SHORT).show(); +// builder.listener.onError(); +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// builder.listener.onError(); +// } +// }); } + public static Builder newBuilder() { builder = new SaveApplyUtils.Builder(); return builder; @@ -73,7 +132,7 @@ public class SaveApplyUtils { private String json; - private Context context; + private Activity context; private SaveApplyUtilsListener listener; @@ -87,7 +146,7 @@ public class SaveApplyUtils { return builder; } - public SaveApplyUtils builder(Context context) { + public SaveApplyUtils builder(Activity context) { this.context = context; valida(); return new SaveApplyUtils(context); @@ -113,4 +172,34 @@ public class SaveApplyUtils { void onError(); } + + public void showLog(String logText) { + if (isApkInDebug(mContext)) { + if(TextUtils.isEmpty(logText)){ + Log.i("app", "logText is null"); + }else{ + Log.i("app", logText); + } + } + } + + /** + * 判断当前应用是否是debug状态 + */ + + public static boolean isApkInDebug(Context context) { + try { + ApplicationInfo info = context.getApplicationInfo(); + return (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; + } catch (Exception e) { + return false; + } + } + public void showToast(String msg) { + Toast.makeText(mContext, msg, Toast.LENGTH_SHORT).show(); + } + + public void showToast(int strId) { + Toast.makeText(mContext, strId, Toast.LENGTH_SHORT).show(); + } } diff --git a/app/src/main/res/layout/activity_makerecommendations.xml b/app/src/main/res/layout/activity_makerecommendations.xml index 29609a6..20efba5 100644 --- a/app/src/main/res/layout/activity_makerecommendations.xml +++ b/app/src/main/res/layout/activity_makerecommendations.xml @@ -48,6 +48,7 @@ android:id="@+id/NNBtn" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textColor="#666666" android:background="@android:color/transparent" android:text="选择匿名">