hwf453
/
ZHDCOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

所有审批接口上下行数据全部加密

Browse Source
master
wenfei 4 months ago
parent 62266f9cb2
commit ef0c6dc1cb
39 changed files with 1332 additions and 338 deletions
Show Stats Download Patch File Download Diff File

122
app/src/main/java/com/rehome/zhdcoa/Api.java
Unescape Escape View File

@ -122,20 +122,21 @@ public interface Api {
@Query("timee") String timee); @Query("timee") String timee);
@GET("PubFile/Data/GetOrderListRsa.ashx") // @GET("PubFile/Data/GetOrderListRsa.ashx")
Call<String> getMyAdviceRsa(@Query("listcode") String listcode, // Call<String> getMyAdviceRsa(@Query("listcode") String listcode,
@Query("manid") String manid, // @Query("manid") String manid,
@Query("proposerid") String proposerid); // @Query("proposerid") String proposerid);
@GET("PubFile/Data/GetOrderList.ashx") //
Call<MyadviceBean> getMyAdvice(@Query("listcode") String listcode, // @GET("PubFile/Data/GetOrderList.ashx")
@Query("manid") String manid, // Call<MyadviceBean> getMyAdvice(@Query("listcode") String listcode,
@Query("proposerid") String proposerid); // @Query("manid") String manid,
// @Query("proposerid") String proposerid);
@GET("PubFile/Data/GetOrderList.ashx") // @GET("PubFile/Data/GetOrderList.ashx")
Call<MyadviceBean> getAdviceInfo(@Query("listcode") String listcode, // Call<MyadviceBean> getAdviceInfo(@Query("listcode") String listcode,
@Query("manid") String manid, // @Query("manid") String manid,
@Query("listid") String listid); // @Query("listid") String listid);
@GET("PubFile/Data/ConferenceUpdateJSY.ashx") @GET("PubFile/Data/ConferenceUpdateJSY.ashx")
@ -143,12 +144,12 @@ public interface Api {
@Query("listcode") String listcode); @Query("listcode") String listcode);
@GET("PubFile/Data/GetOrderList.ashx") // @GET("PubFile/Data/GetOrderList.ashx")
Call<ApplyListBean> getApplyList(@Query("listcode") String listcode, // Call<ApplyListBean> getApplyList(@Query("listcode") String listcode,
@Query("proposerid") String proposerid, // @Query("proposerid") String proposerid,
@Query("manid") String manid, // @Query("manid") String manid,
@Query("departmentnameid") String departmentnameid, // @Query("departmentnameid") String departmentnameid,
@Query("platform") String platform); // @Query("platform") String platform);
/** /**
* 获取会议室等信息 * 获取会议室等信息
@ -230,49 +231,49 @@ public interface Api {
* *
* @return * @return
*/ */
@GET("PubFile/Data/GetData.ashx") // @GET("PubFile/Data/GetData.ashx")
Call<DinnerBean> getDinner(@Query("listcode") String listcode, // Call<DinnerBean> getDinner(@Query("listcode") String listcode,
@Query("listid") String listid); // @Query("listid") String listid,@Query("manid") String manid);
/** /**
* 获取用车申请数据 * 获取用车申请数据
* *
* @return * @return
*/ */
@GET("PubFile/Data/GetData.ashx") // @GET("PubFile/Data/GetData.ashx")
Call<VehicleBean> getVehicle(@Query("listcode") String listcode, // Call<VehicleBean> getVehicle(@Query("listcode") String listcode,
@Query("listid") String listid, // @Query("listid") String listid,
@Query("suplistid") String suplistid); // @Query("suplistid") String suplistid);
/** /**
* 获取会议室申请数据 * 获取会议室申请数据
* *
* @return * @return
*/ */
@GET("PubFile/Data/GetData.ashx") // @GET("PubFile/Data/GetData.ashx")
Call<ConferenceBean> getConference(@Query("listcode") String listcode, // Call<ConferenceBean> getConference(@Query("listcode") String listcode,
@Query("listid") String listid, // @Query("listid") String listid,
@Query("suplistid") String suplistid); // @Query("suplistid") String suplistid);
/** /**
* 获取外卖申请数据 * 获取外卖申请数据
* *
* @return * @return
*/ */
@GET("PubFile/Data/GetData.ashx") // @GET("PubFile/Data/GetData.ashx")
Call<TakeOutBean> getTakeOut(@Query("listcode") String listcode, // Call<TakeOutBean> getTakeOut(@Query("listcode") String listcode,
@Query("listid") String listid, // @Query("listid") String listid,
@Query("suplistid") String suplistid); // @Query("suplistid") String suplistid);
/** /**
* 获取普通来访数据 * 获取普通来访数据
* *
* @return * @return
*/ */
@GET("PubFile/Data/GetData.ashx") // @GET("PubFile/Data/GetData.ashx")
Call<OrdinaryVisitBean> getOrdinaryVisit(@Query("listcode") String listcode, // Call<OrdinaryVisitBean> getOrdinaryVisit(@Query("listcode") String listcode,
@Query("listid") String listid, // @Query("listid") String listid,
@Query("suplistid") String suplistid); // @Query("suplistid") String suplistid);
/** /**
* 获取接待来访详细信息 * 获取接待来访详细信息
@ -289,9 +290,9 @@ public interface Api {
* @param listid * @param listid
* @return * @return
*/ */
@GET("PubFile/Data/GetData.ashx") // @GET("PubFile/Data/GetData.ashx")
Call<MyTaskBean> getMyTask(@Query("listid") String listid, // Call<MyTaskBean> getMyTask(@Query("listid") String listid,
@Query("listcode") String listcode); // @Query("listcode") String listcode);
/** /**
* @param type boardroomisuse 会议室是否占用 * @param type boardroomisuse 会议室是否占用
@ -343,13 +344,14 @@ public interface Api {
* @param auditrange 审核类型编码 * @param auditrange 审核类型编码
* @return * @return
*/ */
@GET("PubFile/Audit/GetIsAudit.ashx") // @GET("PubFile/Audit/GetIsAudit.ashx")
Call<GetAuditBean> getAudit(@Query("listid") String listid, // Call<GetAuditBean> getAudit(@Query("listid") String listid,
@Query("listcode") String listcode, // @Query("listcode") String listcode,
@Query("dc") String dc, // @Query("dc") String dc,
@Query("shr") String shr, // @Query("shr") String shr,
@Query("shbm") String shbm, // @Query("shbm") String shbm,
@Query("auditrange") String auditrange); // @Query("auditrange") String auditrange,
// @Query("manid") String manid);
/** /**
* 任务统计 * 任务统计
@ -402,9 +404,9 @@ public interface Api {
@GET("PubFile/Data/GetListDataRWRCTJ.ashx") @GET("PubFile/Data/GetListDataRWRCTJ.ashx")
Call<TaskDateCountBean> getTaskDateCount(@Query("txtTimeS") String txtTimeS); Call<TaskDateCountBean> getTaskDateCount(@Query("txtTimeS") String txtTimeS);
@GET("PubFile/Data/GetData.ashx") // @GET("PubFile/Data/GetData.ashx")
Call<SuppliesBean> getSuppliesDetail(@Query("listid") String listid, // Call<SuppliesBean> getSuppliesDetail(@Query("listid") String listid,
@Query("listcode") String listcode); // @Query("listcode") String listcode);
@GET("PubFile_TradeUnion/InterfaceApp/Audit/GetIsAudit.ashx") @GET("PubFile_TradeUnion/InterfaceApp/Audit/GetIsAudit.ashx")
@ -444,9 +446,9 @@ public interface Api {
* *
* @return * @return
*/ */
@GET("PubFile/Data/GetData.ashx") // @GET("PubFile/Data/GetData.ashx")
Call<OtherTaskBean> getOtherTaskDetails(@Query("listcode") String listcode, // Call<OtherTaskBean> getOtherTaskDetails(@Query("listcode") String listcode,
@Query("listid") String listid); // @Query("listid") String listid);
/** /**
* 获取接待来访详情列表 * 获取接待来访详情列表
@ -554,8 +556,8 @@ public interface Api {
* *
* @return * @return
*/ */
@GET("PubFile/Data/GetData.ashx?listcode=BGYPSZ") // @GET("PubFile/Data/GetData.ashx?listcode=BGYPSZ")
Call<OfficeGroupBean> getOfficeGroup(); // Call<OfficeGroupBean> getOfficeGroup();
/** /**
* 获取调班审核流程 * 获取调班审核流程
@ -927,9 +929,9 @@ public interface Api {
* @param listid * @param listid
* @return * @return
*/ */
@GET("PubFile/Data/GetData.ashx") // @GET("PubFile/Data/GetData.ashx")
Call<OfficeAddBean> getOfficeAddDetail(@Query("listcode") String listcode, // Call<OfficeAddBean> getOfficeAddDetail(@Query("listcode") String listcode,
@Query("listid") String listid); // @Query("listid") String listid);
/** /**
@ -951,8 +953,8 @@ public interface Api {
* @param manid * @param manid
* @return * @return
*/ */
// @GET("PubFile/Data/aboutme/aboutme.ashx") @GET("PubFile/Data/aboutme/aboutme.ashx")
// Call<AboutMeBean> getAboutMe(@Query("manid") String manid); Call<AboutMeBean> getAboutMe(@Query("manid") String manid);
@GET("PubFile/Data/aboutme/aboutmeRsa.ashx") @GET("PubFile/Data/aboutme/aboutmeRsa.ashx")
Call<String> getAboutMeRsa(@Query("manid") String manid); Call<String> getAboutMeRsa(@Query("manid") String manid);

6
app/src/main/java/com/rehome/zhdcoa/Contans.java
Unescape Escape View File

@ -578,6 +578,12 @@ public class Contans {
//获取审批流程 //获取审批流程
public static String GET_ORDER_LIST_RSA_URL="PubFile/Data/GetOrderListRsa.ashx"; public static String GET_ORDER_LIST_RSA_URL="PubFile/Data/GetOrderListRsa.ashx";
public static String GETAPPLYLIST2_RSA_URL="PubFile/Data/GetList.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";
/** /**

9
app/src/main/java/com/rehome/zhdcoa/bean/ConferenceBean.java
Unescape Escape View File

@ -22,6 +22,7 @@ public class ConferenceBean {
private String Total = ""; private String Total = "";
private String DataTotal = ""; private String DataTotal = "";
private String manid;
private List<RowsBean> Rows; private List<RowsBean> Rows;
private List<DataRowsBean> DataRows; private List<DataRowsBean> DataRows;
@ -57,6 +58,14 @@ public class ConferenceBean {
this.DataRows = DataRows; this.DataRows = DataRows;
} }
public String getManid() {
return manid;
}
public void setManid(String manid) {
this.manid = manid;
}
public static class DataRowsBean { public static class DataRowsBean {
/** /**
* savetype : 1 * savetype : 1

9
app/src/main/java/com/rehome/zhdcoa/bean/DinnerBean.java
Unescape Escape View File

@ -19,6 +19,7 @@ public class DinnerBean {
private String Total = "1"; private String Total = "1";
private String DataTotal = "1"; private String DataTotal = "1";
private String manid;
private List<RowsBean> Rows; private List<RowsBean> Rows;
private List<DataRowsBean> DataRows; private List<DataRowsBean> DataRows;
@ -54,6 +55,14 @@ public class DinnerBean {
this.DataRows = DataRows; this.DataRows = DataRows;
} }
public String getManid() {
return manid;
}
public void setManid(String manid) {
this.manid = manid;
}
public static class DataRowsBean { public static class DataRowsBean {
private String savetype = ""; private String savetype = "";

9
app/src/main/java/com/rehome/zhdcoa/bean/MyTaskBean.java
Unescape Escape View File

@ -21,6 +21,7 @@ public class MyTaskBean {
private String Total = "1"; private String Total = "1";
private String DataTotal = "1"; private String DataTotal = "1";
private String manid;
private List<RowsBean> Rows; private List<RowsBean> Rows;
private List<DataRowsBean> DataRows; private List<DataRowsBean> DataRows;
@ -56,6 +57,14 @@ public class MyTaskBean {
this.DataRows = DataRows; this.DataRows = DataRows;
} }
public String getManid() {
return manid;
}
public void setManid(String manid) {
this.manid = manid;
}
public static class DataRowsBean { public static class DataRowsBean {
/** /**
* savetype : 1 * savetype : 1

9
app/src/main/java/com/rehome/zhdcoa/bean/OfficeAddBean.java
Unescape Escape View File

@ -19,6 +19,7 @@ public class OfficeAddBean {
*/ */
private String Total = "1"; private String Total = "1";
private String manid;
private String DataTotal; private String DataTotal;
private List<RowsBean> Rows; private List<RowsBean> Rows;
private List<DataRowsBean> DataRows; private List<DataRowsBean> DataRows;
@ -55,6 +56,14 @@ public class OfficeAddBean {
this.DataRows = DataRows; this.DataRows = DataRows;
} }
public String getManid() {
return manid;
}
public void setManid(String manid) {
this.manid = manid;
}
public static class RowsBean { public static class RowsBean {
/** /**
* listid : * listid :

9
app/src/main/java/com/rehome/zhdcoa/bean/OtherTaskBean.java
Unescape Escape View File

@ -21,6 +21,7 @@ public class OtherTaskBean {
private String Total = "1"; private String Total = "1";
private String DataTotal = "1"; private String DataTotal = "1";
private String manid;
private List<RowsBean> Rows; private List<RowsBean> Rows;
private List<DataRowsBean> DataRows; private List<DataRowsBean> DataRows;
@ -56,6 +57,14 @@ public class OtherTaskBean {
this.DataRows = DataRows; this.DataRows = DataRows;
} }
public String getManid() {
return manid;
}
public void setManid(String manid) {
this.manid = manid;
}
public static class DataRowsBean { public static class DataRowsBean {
/** /**
* savetype : 1 * savetype : 1

9
app/src/main/java/com/rehome/zhdcoa/bean/SubmitRecommendationsBean.java
Unescape Escape View File

@ -10,6 +10,7 @@ public class SubmitRecommendationsBean {
private String Total = "1"; private String Total = "1";
private String DataTotal = "1"; private String DataTotal = "1";
private String manid;
private List<RowsBean> Rows; private List<RowsBean> Rows;
private List<DataRowsBean> DataRows; private List<DataRowsBean> DataRows;
@ -47,6 +48,14 @@ public class SubmitRecommendationsBean {
Rows = rows; Rows = rows;
} }
public String getManid() {
return manid;
}
public void setManid(String manid) {
this.manid = manid;
}
public static class DataRowsBean { public static class DataRowsBean {
private String savetype = ""; private String savetype = "";

9
app/src/main/java/com/rehome/zhdcoa/bean/SuppliesBean.java
Unescape Escape View File

@ -20,6 +20,7 @@ public class SuppliesBean {
private String Total = "1"; private String Total = "1";
private String DataTotal = "1"; private String DataTotal = "1";
private String manid;
private List<RowsBean> Rows; private List<RowsBean> Rows;
private List<DataRowsBean> DataRows; private List<DataRowsBean> DataRows;
@ -55,6 +56,14 @@ public class SuppliesBean {
this.DataRows = DataRows; this.DataRows = DataRows;
} }
public String getManid() {
return manid;
}
public void setManid(String manid) {
this.manid = manid;
}
public static class DataRowsBean { public static class DataRowsBean {
/** /**
* savetype : 1 * savetype : 1

9
app/src/main/java/com/rehome/zhdcoa/bean/TakeOutBean.java
Unescape Escape View File

@ -22,6 +22,7 @@ public class TakeOutBean {
private String Total = "1"; private String Total = "1";
private String DataTotal = "1"; private String DataTotal = "1";
private String manid;
private List<RowsBean> Rows; private List<RowsBean> Rows;
private List<DataRowsBean> DataRows; private List<DataRowsBean> DataRows;
@ -57,6 +58,14 @@ public class TakeOutBean {
DataRows = dataRows; DataRows = dataRows;
} }
public String getManid() {
return manid;
}
public void setManid(String manid) {
this.manid = manid;
}
public static class DataRowsBean { public static class DataRowsBean {
/** /**
* savetype : 1 * savetype : 1

9
app/src/main/java/com/rehome/zhdcoa/bean/VehicleBean.java
Unescape Escape View File

@ -21,6 +21,7 @@ public class VehicleBean {
private String Total = "1"; private String Total = "1";
private String DataTotal = "1"; private String DataTotal = "1";
private String manid;
private List<RowsBean> Rows; private List<RowsBean> Rows;
private List<DataRowsBean> DataRows; private List<DataRowsBean> DataRows;
@ -56,6 +57,14 @@ public class VehicleBean {
DataRows = dataRows; DataRows = dataRows;
} }
public String getManid() {
return manid;
}
public void setManid(String manid) {
this.manid = manid;
}
public static class DataRowsBean { public static class DataRowsBean {
/** /**
* savetype : 1 * savetype : 1

63
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceAuditActivity.java
Unescape Escape View File

@ -2,10 +2,13 @@ package com.rehome.zhdcoa.ui.activity;
import android.content.Intent; import android.content.Intent;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.Toast; import android.widget.Toast;
import com.google.gson.Gson;
import com.rehome.zhdcoa.Api; import com.rehome.zhdcoa.Api;
import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.Contans;
import com.rehome.zhdcoa.R; 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.DateUtils;
import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; import com.rehome.zhdcoa.utils.GetAuditPermissionUtils;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SaveApplyUtils;
import com.rehome.zhdcoa.utils.SetAuditUtils; import com.rehome.zhdcoa.utils.SetAuditUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditDialog;
import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog;
import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.CbRbLayout;
import com.rehome.zhdcoa.weiget.DateTimePickDialog; import com.rehome.zhdcoa.weiget.DateTimePickDialog;
import com.rehome.zhdcoa.weiget.InputLayout; 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.ArrayList;
import java.util.List; import java.util.List;
import retrofit2.Call; import retrofit2.Call;
@ -142,7 +153,7 @@ public class ApplyConferenceAuditActivity extends BaseActivity implements View.O
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson()) .setjson(createJson())
.setListener(ApplyConferenceAuditActivity.this) .setListener(ApplyConferenceAuditActivity.this)
.builder(context); .builder(ApplyConferenceAuditActivity.this);
} }
@Override @Override
@ -232,25 +243,56 @@ public class ApplyConferenceAuditActivity extends BaseActivity implements View.O
private void getDatas() { private void getDatas() {
String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
Request<String> 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<String>() {
api.getConference(listcode, ListId, Suplistid).enqueue(new BaseCallBack<ConferenceBean>(context) {
@Override @Override
public void onSuccess(Call<ConferenceBean> call, Response<ConferenceBean> response) { public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
ConferenceBean bean = response.body(); showLog("----------------");
if (bean != null) { String result = response.get();
conferenceBean = bean; String jsonDecode = RSAUtils.decryptBASE64StrClient(result);
getAuditpermission(); 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 @Override
public void onError(Call<ConferenceBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// Api api = HttpUtils.getApi(this);
// api.getConference(listcode, ListId, Suplistid).enqueue(new BaseCallBack<ConferenceBean>(context) {
// @Override
// public void onSuccess(Call<ConferenceBean> call, Response<ConferenceBean> response) {
// ConferenceBean bean = response.body();
// if (bean != null) {
// conferenceBean = bean;
// getAuditpermission();
// }
// }
//
// @Override
// public void onError(Call<ConferenceBean> call, Throwable t) {
//
// }
// });
} }
public void showView(ConferenceBean bean) { public void showView(ConferenceBean bean) {
@ -291,7 +333,7 @@ public class ApplyConferenceAuditActivity extends BaseActivity implements View.O
paramBean.setShbm(DepartmentNameId); paramBean.setShbm(DepartmentNameId);
// paramBean.setShbm(userInfo.getBzbh()); // paramBean.setShbm(userInfo.getBzbh());
GetAuditPermissionUtils.newBuilder().setParams(paramBean).setListener(this).builder(context); GetAuditPermissionUtils.newBuilder().setParams(paramBean).setListener(this).builder(this);
} }
@Override @Override
@ -437,6 +479,7 @@ public class ApplyConferenceAuditActivity extends BaseActivity implements View.O
conferenceBean.getDataRows().get(0).setConferenceHyrs(ilConferenceHyrs.getContent()); conferenceBean.getDataRows().get(0).setConferenceHyrs(ilConferenceHyrs.getContent());
conferenceBean.getDataRows().get(0).setSavetype("2"); conferenceBean.getDataRows().get(0).setSavetype("2");
conferenceBean.setManid(userInfo.getManid());
String json = GsonUtils.GsonString(conferenceBean); String json = GsonUtils.GsonString(conferenceBean);
return json; return json;
} }

63
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceDetailActivity.java
Unescape Escape View File

@ -18,12 +18,19 @@ import com.rehome.zhdcoa.bean.RowsBean;
import com.rehome.zhdcoa.bean.StaffInfoBean; import com.rehome.zhdcoa.bean.StaffInfoBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SaveApplyUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditDialog;
import com.rehome.zhdcoa.weiget.ConferenceLayout; import com.rehome.zhdcoa.weiget.ConferenceLayout;
import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.InputLayout;
import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; 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.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -97,7 +104,7 @@ public class ApplyConferenceDetailActivity extends BaseActivity implements Confe
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson(istj)) .setjson(createJson(istj))
.setListener(ApplyConferenceDetailActivity.this) .setListener(ApplyConferenceDetailActivity.this)
.builder(context); .builder(ApplyConferenceDetailActivity.this);
} }
@Override @Override
@ -140,23 +147,56 @@ public class ApplyConferenceDetailActivity extends BaseActivity implements Confe
private void getDatas() { private void getDatas() {
Api api = HttpUtils.getApi(this); String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
api.getConference(listcode, Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
ListId,
Suplistid).enqueue(new BaseCallBack<ConferenceBean>(context) { 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<String>() {
@Override @Override
public void onSuccess(Call<ConferenceBean> call, Response<ConferenceBean> response) { public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
ConferenceBean bean = response.body(); showLog("----------------");
if (bean != null) { String result = response.get();
showView(bean); 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 @Override
public void onError(Call<ConferenceBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// Api api = HttpUtils.getApi(this);
// api.getConference(listcode,
// ListId,
// Suplistid).enqueue(new BaseCallBack<ConferenceBean>(context) {
// @Override
// public void onSuccess(Call<ConferenceBean> call, Response<ConferenceBean> response) {
// ConferenceBean bean = response.body();
// if (bean != null) {
// showView(bean);
// }
// }
//
// @Override
// public void onError(Call<ConferenceBean> call, Throwable t) {
//
// }
// });
} }
public void showView(ConferenceBean bean) { 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).setIstj(istj);
conferenceBean.getRows().get(0).setModifiedby(userInfo.getManid()); conferenceBean.getRows().get(0).setModifiedby(userInfo.getManid());
if (!TextUtils.isEmpty(conferenceBean.getDataRows().get(0).checkData())) { if (!TextUtils.isEmpty(conferenceBean.getDataRows().get(0).checkData())) {
toastviewbymyself.makeText(context, conferenceBean.getDataRows().get(0).checkData(), Toast.LENGTH_LONG).show(); 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.setRows(rowsBeanList);
conferenceBean.setTotal("1"); conferenceBean.setTotal("1");
conferenceBean.setDataTotal("1"); conferenceBean.setDataTotal("1");
conferenceBean.setManid(userInfo.getManid());
json = GsonUtils.GsonString(conferenceBean); json = GsonUtils.GsonString(conferenceBean);
} }
return json; return json;

64
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerAuditActivity.java
Unescape Escape View File

@ -21,13 +21,21 @@ import com.rehome.zhdcoa.bean.SetAuditBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; import com.rehome.zhdcoa.utils.GetAuditPermissionUtils;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SetAuditUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditDialog;
import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog;
import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.AutoListView;
import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.CbRbLayout;
import com.rehome.zhdcoa.weiget.InputLayout; 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.ArrayList;
import java.util.List; import java.util.List;
import retrofit2.Call; import retrofit2.Call;
@ -171,27 +179,59 @@ public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnCli
private void getDatas() { private void getDatas() {
String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
Api api = HttpUtils.getApi(context); request.add("listid",ListId);
api.getDinner(listcode, ListId).enqueue(new BaseCallBack<DinnerBean>(context) { request.add("listcode", listcode);
@Override request.add("manid", userInfo.getManid());
public void onSuccess(Call<DinnerBean> call, Response<DinnerBean> response) {
showLog("----------onSuccess---------"); NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
DinnerBean bean = response.body(); @Override
showLog(GsonUtils.GsonString(bean)); public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
if (bean != null) { showLog("----------------");
dinnerBean = bean; String result = response.get();
getAuditpermission(); 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 @Override
public void onError(Call<DinnerBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// Api api = HttpUtils.getApi(context);
// api.getDinner(listcode, ListId, userInfo.getManid()).enqueue(new BaseCallBack<DinnerBean>(context) {
// @Override
// public void onSuccess(Call<DinnerBean> call, Response<DinnerBean> response) {
//
// showLog("----------onSuccess---------");
//
// DinnerBean bean = response.body();
// showLog(GsonUtils.GsonString(bean));
// if (bean != null) {
// dinnerBean = bean;
// getAuditpermission();
// }
// }
//
// @Override
// public void onError(Call<DinnerBean> call, Throwable t) {
//
// }
// });
} }
public void showView(DinnerBean bean) { public void showView(DinnerBean bean) {
@ -230,7 +270,7 @@ public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnCli
GetAuditPermissionUtils.newBuilder() GetAuditPermissionUtils.newBuilder()
.setParams(paramBean) .setParams(paramBean)
.setListener(this) .setListener(this)
.builder(context); .builder(this);
} }
@Override @Override

83
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerDetailActivity.java
Unescape Escape View File

@ -15,18 +15,27 @@ import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.ApplyListBean; import com.rehome.zhdcoa.bean.ApplyListBean;
import com.rehome.zhdcoa.bean.ConferenceBean;
import com.rehome.zhdcoa.bean.DeparmentTreeBean; import com.rehome.zhdcoa.bean.DeparmentTreeBean;
import com.rehome.zhdcoa.bean.DinnerBean; import com.rehome.zhdcoa.bean.DinnerBean;
import com.rehome.zhdcoa.bean.StaffInfoBean; import com.rehome.zhdcoa.bean.StaffInfoBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SaveApplyUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.DinnerLayout; import com.rehome.zhdcoa.weiget.DinnerLayout;
import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.InputLayout;
import com.rehome.zhdcoa.weiget.ListDialog; import com.rehome.zhdcoa.weiget.ListDialog;
import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog;
import com.rehome.zhdcoa.bean.RowsBean; 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.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -85,7 +94,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson("1")) .setjson(createJson("1"))
.setListener(ApplyDinnerDetailActivity.this) .setListener(ApplyDinnerDetailActivity.this)
.builder(context); .builder(ApplyDinnerDetailActivity.this);
} }
}); });
@ -103,7 +112,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson("0")) .setjson(createJson("0"))
.setListener(ApplyDinnerDetailActivity.this) .setListener(ApplyDinnerDetailActivity.this)
.builder(context); .builder(ApplyDinnerDetailActivity.this);
} }
@Override @Override
@ -111,7 +120,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson("1")) .setjson(createJson("1"))
.setListener(ApplyDinnerDetailActivity.this) .setListener(ApplyDinnerDetailActivity.this)
.builder(context); .builder(ApplyDinnerDetailActivity.this);
} }
}); });
dialog.show(); dialog.show();
@ -212,7 +221,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson("0")) .setjson(createJson("0"))
.setListener(ApplyDinnerDetailActivity.this) .setListener(ApplyDinnerDetailActivity.this)
.builder(context); .builder(ApplyDinnerDetailActivity.this);
} }
@Override @Override
@ -220,7 +229,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson("1")) .setjson(createJson("1"))
.setListener(ApplyDinnerDetailActivity.this) .setListener(ApplyDinnerDetailActivity.this)
.builder(context); .builder(ApplyDinnerDetailActivity.this);
} }
}); });
dialog.show(); dialog.show();
@ -289,28 +298,63 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply
} }
private void getDatas() { private void getDatas() {
Log.i("app", "getDatas");
Api api = HttpUtils.getApi(this);
api.getDinner(listcode, ListId).enqueue(new BaseCallBack<DinnerBean>(context) {
@Override
public void onSuccess(Call<DinnerBean> call, Response<DinnerBean> response) {
DinnerBean dinnerBean = response.body(); String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
Log.i("app", new Gson().toJson(dinnerBean)); Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
if (dinnerBean != null) {
showView(dinnerBean); request.add("listid",ListId);
getListDatas(); request.add("listcode", listcode);
request.add("manid", userInfo.getManid());
NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
@Override
public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> 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 { } else {
toastviewbymyself.makeText(context, "请求数据出错", Toast.LENGTH_LONG).show(); DinnerBean dinnerBean = GsonUtils.GsonToBean(jsonDecode, DinnerBean.class);
finish(); if (dinnerBean != null) {
showView(dinnerBean);
getListDatas();
} else {
toastviewbymyself.makeText(context, "请求数据出错", Toast.LENGTH_LONG).show();
finish();
}
} }
} }
@Override @Override
public void onError(Call<DinnerBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// Api api = HttpUtils.getApi(this);
// api.getDinner(listcode, ListId, userInfo.getManid()).enqueue(new BaseCallBack<DinnerBean>(context) {
// @Override
// public void onSuccess(Call<DinnerBean> call, Response<DinnerBean> 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<DinnerBean> call, Throwable t) {
//
// }
// });
} }
private void getListDatas() { private void getListDatas() {
@ -474,6 +518,9 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply
dinnerBean.setRows(rowsBeanList); dinnerBean.setRows(rowsBeanList);
dinnerBean.setTotal("1"); dinnerBean.setTotal("1");
dinnerBean.setDataTotal("1"); dinnerBean.setDataTotal("1");
dinnerBean.setManid(userInfo.getManid());
json = GsonUtils.GsonString(dinnerBean); json = GsonUtils.GsonString(dinnerBean);
Log.i("app", json); Log.i("app", json);
} }

57
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddAuditActivity.java
Unescape Escape View File

@ -19,13 +19,22 @@ import com.rehome.zhdcoa.bean.OfficeAddBean;
import com.rehome.zhdcoa.bean.SetAuditBean; import com.rehome.zhdcoa.bean.SetAuditBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; 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.HttpUtils;
import com.rehome.zhdcoa.utils.NohttpUtils;
import com.rehome.zhdcoa.utils.RSAUtils;
import com.rehome.zhdcoa.utils.SetAuditUtils; import com.rehome.zhdcoa.utils.SetAuditUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditDialog;
import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog;
import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.AutoListView;
import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.CbRbLayout;
import com.rehome.zhdcoa.weiget.InputLayout; 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.ArrayList;
import java.util.List; import java.util.List;
import retrofit2.Call; import retrofit2.Call;
@ -194,21 +203,53 @@ public class ApplyOfficeAddAuditActivity extends BaseActivity implements View.On
private void getOfficeAddDetail() { private void getOfficeAddDetail() {
HttpUtils.getApi(this).getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack<OfficeAddBean>(context) { String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
@Override Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
public void onSuccess(Call<OfficeAddBean> call, Response<OfficeAddBean> response) {
request.add("listid",ListId);
request.add("listcode", Contans.LISTCODE.APPLYFACILITIES);
request.add("manid", userInfo.getManid());
NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
officeAddBean = response.body(); @Override
if (officeAddBean != null) { public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
getAuditpermission(); 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 @Override
public void onError(Call<OfficeAddBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// HttpUtils.getApi(this).getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack<OfficeAddBean>(context) {
// @Override
// public void onSuccess(Call<OfficeAddBean> call, Response<OfficeAddBean> response) {
//
// officeAddBean = response.body();
// if (officeAddBean != null) {
// getAuditpermission();
// }
// }
//
// @Override
// public void onError(Call<OfficeAddBean> call, Throwable t) {
//
// }
// });
} }
private void showView() { private void showView() {
@ -267,7 +308,7 @@ public class ApplyOfficeAddAuditActivity extends BaseActivity implements View.On
GetAuditPermissionUtils.newBuilder() GetAuditPermissionUtils.newBuilder()
.setParams(paramBean) .setParams(paramBean)
.setListener(this) .setListener(this)
.builder(context); .builder(this);
} }
@Override @Override

58
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddDetailActivity.java
Unescape Escape View File

@ -11,14 +11,22 @@ import com.rehome.zhdcoa.adapter.OfficAddAdapter;
import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.ApplyListBean; import com.rehome.zhdcoa.bean.ApplyListBean;
import com.rehome.zhdcoa.bean.ConferenceBean;
import com.rehome.zhdcoa.bean.OfficeAddBean; import com.rehome.zhdcoa.bean.OfficeAddBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SaveApplyUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.AutoListView;
import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.InputLayout;
import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; 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.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -100,7 +108,7 @@ public class ApplyOfficeAddDetailActivity extends BaseActivity {
} }
}) })
.builder(context); .builder(ApplyOfficeAddDetailActivity.this);
} }
@Override @Override
@ -198,6 +206,7 @@ public class ApplyOfficeAddDetailActivity extends BaseActivity {
bean.setDataTotal(datas.size() + ""); bean.setDataTotal(datas.size() + "");
bean.setDataRows(datas); bean.setDataRows(datas);
bean.setRows(rowsBeanList); bean.setRows(rowsBeanList);
bean.setManid(userInfo.getManid());
json = GsonUtils.GsonString(bean); json = GsonUtils.GsonString(bean);
} }
@ -206,21 +215,54 @@ public class ApplyOfficeAddDetailActivity extends BaseActivity {
private void getOfficeAddDetail() { private void getOfficeAddDetail() {
HttpUtils.getApi(this).getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack<OfficeAddBean>(context) { String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
@Override Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
public void onSuccess(Call<OfficeAddBean> call, Response<OfficeAddBean> response) {
request.add("listid",ListId);
request.add("listcode", Contans.LISTCODE.APPLYFACILITIES);
request.add("manid", userInfo.getManid());
officeAddBean = response.body(); NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
if (officeAddBean != null) {
showView(); @Override
public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> 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 @Override
public void onError(Call<OfficeAddBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// HttpUtils.getApi(this).getOfficeAddDetail(Contans.LISTCODE.APPLYFACILITIES, ListId).enqueue(new BaseCallBack<OfficeAddBean>(context) {
// @Override
// public void onSuccess(Call<OfficeAddBean> call, Response<OfficeAddBean> response) {
//
// officeAddBean = response.body();
// if (officeAddBean != null) {
// showView();
// }
// }
//
// @Override
// public void onError(Call<OfficeAddBean> call, Throwable t) {
//
// }
// });
} }
private void showView() { private void showView() {

2
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveAuditActivity.java
Unescape Escape View File

@ -342,7 +342,7 @@ public class ApplyReceiveAuditActivity extends BaseActivity implements View.OnCl
GetAuditPermissionUtils.newBuilder() GetAuditPermissionUtils.newBuilder()
.setParams(paramBean) .setParams(paramBean)
.setListener(this) .setListener(this)
.builder(context); .builder(this);
} }
@Override @Override

72
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesAuditActivity.java
Unescape Escape View File

@ -13,19 +13,29 @@ import com.rehome.zhdcoa.adapter.ApplySuppliesAdapter1;
import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.ApplyListBean; import com.rehome.zhdcoa.bean.ApplyListBean;
import com.rehome.zhdcoa.bean.ConferenceBean;
import com.rehome.zhdcoa.bean.GetAuditBean; import com.rehome.zhdcoa.bean.GetAuditBean;
import com.rehome.zhdcoa.bean.GetAuditParamBean; import com.rehome.zhdcoa.bean.GetAuditParamBean;
import com.rehome.zhdcoa.bean.SetAuditBean; import com.rehome.zhdcoa.bean.SetAuditBean;
import com.rehome.zhdcoa.bean.SuppliesBean; import com.rehome.zhdcoa.bean.SuppliesBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; 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.HttpUtils;
import com.rehome.zhdcoa.utils.NohttpUtils;
import com.rehome.zhdcoa.utils.RSAUtils;
import com.rehome.zhdcoa.utils.SetAuditUtils; import com.rehome.zhdcoa.utils.SetAuditUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditDialog;
import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog;
import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.AutoListView;
import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.CbRbLayout;
import com.rehome.zhdcoa.weiget.InputLayout; 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.ArrayList;
import java.util.List; import java.util.List;
import retrofit2.Call; import retrofit2.Call;
@ -191,23 +201,57 @@ public class ApplySuppliesAuditActivity extends BaseActivity implements View.OnC
private void getDetailData() { private void getDetailData() {
HttpUtils.getApi(this).getSuppliesDetail(ListId, listcode) String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
.enqueue(new BaseCallBack<SuppliesBean>(context) { Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
@Override
public void onSuccess(Call<SuppliesBean> call, Response<SuppliesBean> response) {
SuppliesBean bean = response.body(); request.add("listid",ListId);
if (bean != null) { request.add("listcode", listcode);
suppliesBean = bean; request.add("manid", userInfo.getManid());
getAuditpermission(); // request.add("suplistid", Suplistid);
}
}
@Override NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
public void onError(Call<SuppliesBean> call, Throwable t) {
@Override
public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> 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<String> response) {
}
});
// HttpUtils.getApi(this).getSuppliesDetail(ListId, listcode)
// .enqueue(new BaseCallBack<SuppliesBean>(context) {
// @Override
// public void onSuccess(Call<SuppliesBean> call, Response<SuppliesBean> response) {
//
// SuppliesBean bean = response.body();
// if (bean != null) {
// suppliesBean = bean;
// getAuditpermission();
// }
// }
//
// @Override
// public void onError(Call<SuppliesBean> call, Throwable t) {
//
// }
// });
} }
public void getAuditpermission() { public void getAuditpermission() {
@ -221,7 +265,7 @@ public class ApplySuppliesAuditActivity extends BaseActivity implements View.OnC
GetAuditPermissionUtils.newBuilder() GetAuditPermissionUtils.newBuilder()
.setParams(paramBean) .setParams(paramBean)
.setListener(this) .setListener(this)
.builder(context); .builder(this);
} }
private void showView() { private void showView() {

69
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesDetailActivity.java
Unescape Escape View File

@ -11,17 +11,26 @@ import com.rehome.zhdcoa.adapter.ApplySuppliesAdapter;
import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.ApplyListBean; import com.rehome.zhdcoa.bean.ApplyListBean;
import com.rehome.zhdcoa.bean.ConferenceBean;
import com.rehome.zhdcoa.bean.OfficeGroupBean; import com.rehome.zhdcoa.bean.OfficeGroupBean;
import com.rehome.zhdcoa.bean.SuppliesBean; import com.rehome.zhdcoa.bean.SuppliesBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.DataSaveUtils; import com.rehome.zhdcoa.utils.DataSaveUtils;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SaveApplyUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.AutoListView;
import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.InputLayout;
import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog;
import com.rehome.zhdcoa.bean.RowsBean; 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.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -133,27 +142,60 @@ public class ApplySuppliesDetailActivity extends BaseActivity implements ApplySu
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setListener(this) .setListener(this)
.setjson(createJson(istj)) .setjson(createJson(istj))
.builder(context); .builder(ApplySuppliesDetailActivity.this);
} }
private void getDetailData() { private void getDetailData() {
HttpUtils.getApi(this).getSuppliesDetail(ListId, listcode) String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
.enqueue(new BaseCallBack<SuppliesBean>(context) { Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
@Override
public void onSuccess(Call<SuppliesBean> call, Response<SuppliesBean> response) {
SuppliesBean bean = response.body(); request.add("listid",ListId);
if (bean != null) { request.add("listcode", listcode);
showView(bean); request.add("manid", userInfo.getManid());
} // request.add("suplistid", Suplistid);
}
@Override NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
public void onError(Call<SuppliesBean> call, Throwable t) {
@Override
public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> 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<String> response) {
}
});
// HttpUtils.getApi(this).getSuppliesDetail(ListId, listcode)
// .enqueue(new BaseCallBack<SuppliesBean>(context) {
// @Override
// public void onSuccess(Call<SuppliesBean> call, Response<SuppliesBean> response) {
//
// SuppliesBean bean = response.body();
// if (bean != null) {
// showView(bean);
// }
// }
//
// @Override
// public void onError(Call<SuppliesBean> call, Throwable t) {
//
// }
// });
} }
private void showView(SuppliesBean bean) { private void showView(SuppliesBean bean) {
@ -304,6 +346,7 @@ public class ApplySuppliesDetailActivity extends BaseActivity implements ApplySu
dataRowsBeanList.add(dataRowsBean); dataRowsBeanList.add(dataRowsBean);
bean.setRows(rowsBeanList); bean.setRows(rowsBeanList);
bean.setDataRows(dataRowsBeanList); bean.setDataRows(dataRowsBeanList);
bean.setManid(userInfo.getManid());
json = GsonUtils.GsonString(bean); json = GsonUtils.GsonString(bean);
} }
return json; return json;

70
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutAuditActivity.java
Unescape Escape View File

@ -14,19 +14,29 @@ import com.rehome.zhdcoa.adapter.TakeOutAdapter1;
import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.ApplyListTakeOutBean; import com.rehome.zhdcoa.bean.ApplyListTakeOutBean;
import com.rehome.zhdcoa.bean.ConferenceBean;
import com.rehome.zhdcoa.bean.GetAuditBean; import com.rehome.zhdcoa.bean.GetAuditBean;
import com.rehome.zhdcoa.bean.GetAuditParamBean; import com.rehome.zhdcoa.bean.GetAuditParamBean;
import com.rehome.zhdcoa.bean.SetAuditBean; import com.rehome.zhdcoa.bean.SetAuditBean;
import com.rehome.zhdcoa.bean.TakeOutBean; import com.rehome.zhdcoa.bean.TakeOutBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; 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.HttpUtils;
import com.rehome.zhdcoa.utils.NohttpUtils;
import com.rehome.zhdcoa.utils.RSAUtils;
import com.rehome.zhdcoa.utils.SetAuditUtils; import com.rehome.zhdcoa.utils.SetAuditUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditDialog;
import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog;
import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.AutoListView;
import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.CbRbLayout;
import com.rehome.zhdcoa.weiget.InputLayout; 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.ArrayList;
import java.util.List; import java.util.List;
import retrofit2.Call; import retrofit2.Call;
@ -232,26 +242,60 @@ public class ApplyTakeOutAuditActivity extends BaseActivity implements GetAudit
private void getdatas() { private void getdatas() {
Api api = HttpUtils.getApi(this); String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
api.getTakeOut(listcode, Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
ListId,
Suplistid).enqueue(new BaseCallBack<TakeOutBean>(context) { request.add("listid",ListId);
@Override request.add("listcode", listcode);
public void onSuccess(Call<TakeOutBean> call, Response<TakeOutBean> response) { request.add("suplistid", Suplistid);
request.add("manid", userInfo.getManid());
TakeOutBean bean = response.body(); NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
if (bean != null) {
// showView(bean); @Override
takeOutBean = bean; public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
getAuditpermission(); 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 @Override
public void onError(Call<TakeOutBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// Api api = HttpUtils.getApi(this);
// api.getTakeOut(listcode,
// ListId,
// Suplistid).enqueue(new BaseCallBack<TakeOutBean>(context) {
// @Override
// public void onSuccess(Call<TakeOutBean> call, Response<TakeOutBean> response) {
//
// TakeOutBean bean = response.body();
// if (bean != null) {
//// showView(bean);
// takeOutBean = bean;
// getAuditpermission();
// }
// }
//
// @Override
// public void onError(Call<TakeOutBean> call, Throwable t) {
//
// }
// });
} }
private void showView(TakeOutBean bean) { private void showView(TakeOutBean bean) {
@ -281,7 +325,7 @@ public class ApplyTakeOutAuditActivity extends BaseActivity implements GetAudit
GetAuditPermissionUtils.newBuilder() GetAuditPermissionUtils.newBuilder()
.setParams(paramBean) .setParams(paramBean)
.setListener(this) .setListener(this)
.builder(context); .builder(this);
} }
@Override @Override

66
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutDetailActivity.java
Unescape Escape View File

@ -15,12 +15,17 @@ import com.rehome.zhdcoa.adapter.TakeOutAdapter1;
import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.ApplyListTakeOutBean; import com.rehome.zhdcoa.bean.ApplyListTakeOutBean;
import com.rehome.zhdcoa.bean.ConferenceBean;
import com.rehome.zhdcoa.bean.DropDownBean; import com.rehome.zhdcoa.bean.DropDownBean;
import com.rehome.zhdcoa.bean.TakeOutBean; import com.rehome.zhdcoa.bean.TakeOutBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SaveApplyUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog;
import com.rehome.zhdcoa.weiget.AutoListView; import com.rehome.zhdcoa.weiget.AutoListView;
import com.rehome.zhdcoa.weiget.CbRbLayout; 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.ListDialog;
import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog;
import com.rehome.zhdcoa.bean.RowsBean; 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.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -78,7 +87,7 @@ public class ApplyTakeOutDetailActivity extends BaseActivity implements SaveAppl
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson("1")) .setjson(createJson("1"))
.setListener(ApplyTakeOutDetailActivity.this) .setListener(ApplyTakeOutDetailActivity.this)
.builder(context); .builder(ApplyTakeOutDetailActivity.this);
} }
}); });
} }
@ -181,7 +190,7 @@ public class ApplyTakeOutDetailActivity extends BaseActivity implements SaveAppl
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson(istj)) .setjson(createJson(istj))
.setListener(ApplyTakeOutDetailActivity.this) .setListener(ApplyTakeOutDetailActivity.this)
.builder(context); .builder(ApplyTakeOutDetailActivity.this);
} }
@Override @Override
@ -228,24 +237,56 @@ public class ApplyTakeOutDetailActivity extends BaseActivity implements SaveAppl
private void getDatas() { private void getDatas() {
Api api = HttpUtils.getApi(this); String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
api.getTakeOut(applyList.getListcode(), Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
applyList.getListid(),
applyList.getSuplistid()).enqueue(new BaseCallBack<TakeOutBean>(context) { request.add("listid",applyList.getListid());
@Override request.add("listcode", applyList.getListcode());
public void onSuccess(Call<TakeOutBean> call, Response<TakeOutBean> response) { request.add("suplistid", applyList.getSuplistid());
NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
TakeOutBean bean = response.body(); @Override
if (bean != null) { public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
showView(bean); 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 @Override
public void onError(Call<TakeOutBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// Api api = HttpUtils.getApi(this);
// api.getTakeOut(applyList.getListcode(),
// applyList.getListid(),
// applyList.getSuplistid()).enqueue(new BaseCallBack<TakeOutBean>(context) {
// @Override
// public void onSuccess(Call<TakeOutBean> call, Response<TakeOutBean> response) {
//
// TakeOutBean bean = response.body();
// if (bean != null) {
// showView(bean);
// }
// }
//
// @Override
// public void onError(Call<TakeOutBean> call, Throwable t) {
//
// }
// });
} }
private void showView(TakeOutBean bean) { private void showView(TakeOutBean bean) {
@ -388,6 +429,7 @@ public class ApplyTakeOutDetailActivity extends BaseActivity implements SaveAppl
takeOutBean.setTotal("1"); takeOutBean.setTotal("1");
takeOutBean.setDataTotal("1"); takeOutBean.setDataTotal("1");
takeOutBean.setManid(userInfo.getManid());
json = GsonUtils.GsonString(takeOutBean); json = GsonUtils.GsonString(takeOutBean);
} }
return json; return json;

68
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleAuditActivity.java
Unescape Escape View File

@ -13,6 +13,7 @@ import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.ApplyListVehicleBean; import com.rehome.zhdcoa.bean.ApplyListVehicleBean;
import com.rehome.zhdcoa.bean.ConferenceBean;
import com.rehome.zhdcoa.bean.CpxxBean; import com.rehome.zhdcoa.bean.CpxxBean;
import com.rehome.zhdcoa.bean.GetAuditBean; import com.rehome.zhdcoa.bean.GetAuditBean;
import com.rehome.zhdcoa.bean.GetAuditParamBean; 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.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; import com.rehome.zhdcoa.utils.GetAuditPermissionUtils;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SaveApplyUtils;
import com.rehome.zhdcoa.utils.SetAuditUtils; import com.rehome.zhdcoa.utils.SetAuditUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditDialog;
import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog;
import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.CbRbLayout;
import com.rehome.zhdcoa.weiget.InputLayout; 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.ArrayList;
import java.util.List; import java.util.List;
@ -217,7 +225,7 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl
} }
}) })
.builder(context); .builder(ApplyVehicleAuditActivity.this);
} }
private void setAudit() { private void setAudit() {
@ -299,24 +307,59 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl
private void getDatas() { private void getDatas() {
Api api = HttpUtils.getApi(this); String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
api.getVehicle(listcode, ListId, "").enqueue(new BaseCallBack<VehicleBean>(context) { Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
@Override
public void onSuccess(Call<VehicleBean> call, Response<VehicleBean> response) { request.add("listid",ListId);
request.add("listcode", listcode);
request.add("suplistid", "");
request.add("manid", userInfo.getManid());
NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
VehicleBean bean = response.body(); @Override
if (bean != null) { public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
showView(bean); showLog("----------------");
vehicleBean = bean; String result = response.get();
getAuditpermission(); 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 @Override
public void onError(Call<VehicleBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// Api api = HttpUtils.getApi(this);
// api.getVehicle(listcode, ListId, "").enqueue(new BaseCallBack<VehicleBean>(context) {
// @Override
// public void onSuccess(Call<VehicleBean> call, Response<VehicleBean> response) {
//
// VehicleBean bean = response.body();
// if (bean != null) {
// showView(bean);
// vehicleBean = bean;
// getAuditpermission();
// }
// }
//
// @Override
// public void onError(Call<VehicleBean> call, Throwable t) {
//
// }
// });
} }
public void showView(VehicleBean bean) { public void showView(VehicleBean bean) {
@ -361,7 +404,7 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl
GetAuditPermissionUtils.newBuilder() GetAuditPermissionUtils.newBuilder()
.setParams(paramBean) .setParams(paramBean)
.setListener(this) .setListener(this)
.builder(context); .builder(this);
} }
@Override @Override
@ -460,6 +503,7 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl
vehicleBean.getDataRows().get(0).setVehicleJsy(ZZSJID); vehicleBean.getDataRows().get(0).setVehicleJsy(ZZSJID);
} }
vehicleBean.setManid(userInfo.getManid());
return GsonUtils.GsonString(vehicleBean); return GsonUtils.GsonString(vehicleBean);
} }

62
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleDetailActivity.java
Unescape Escape View File

@ -18,14 +18,22 @@ import com.rehome.zhdcoa.bean.StaffInfoBean;
import com.rehome.zhdcoa.bean.VehicleBean; import com.rehome.zhdcoa.bean.VehicleBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SaveApplyUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.CbRbLayout;
import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.InputLayout;
import com.rehome.zhdcoa.weiget.ListDialog; import com.rehome.zhdcoa.weiget.ListDialog;
import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog;
import com.rehome.zhdcoa.weiget.VehicleLayout; import com.rehome.zhdcoa.weiget.VehicleLayout;
import com.rehome.zhdcoa.bean.RowsBean; 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.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -121,7 +129,7 @@ public class ApplyVehicleDetailActivity extends BaseActivity implements VehicleL
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson(istj)) .setjson(createJson(istj))
.setListener(ApplyVehicleDetailActivity.this) .setListener(ApplyVehicleDetailActivity.this)
.builder(context); .builder(ApplyVehicleDetailActivity.this);
} }
@Override @Override
@ -200,22 +208,55 @@ public class ApplyVehicleDetailActivity extends BaseActivity implements VehicleL
private void getDatas() { private void getDatas() {
Api api = HttpUtils.getApi(this); String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
api.getVehicle(listcode, ListId, "").enqueue(new BaseCallBack<VehicleBean>(context) { Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
@Override
public void onSuccess(Call<VehicleBean> call, Response<VehicleBean> response) { request.add("listid",ListId);
request.add("listcode", listcode);
request.add("suplistid", "");
request.add("manid", userInfo.getManid());
VehicleBean bean = response.body(); NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
if (bean != null) {
showView(bean); @Override
public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> 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 @Override
public void onError(Call<VehicleBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// Api api = HttpUtils.getApi(this);
// api.getVehicle(listcode, ListId, "").enqueue(new BaseCallBack<VehicleBean>(context) {
// @Override
// public void onSuccess(Call<VehicleBean> call, Response<VehicleBean> response) {
//
// VehicleBean bean = response.body();
// if (bean != null) {
// showView(bean);
// }
// }
//
// @Override
// public void onError(Call<VehicleBean> call, Throwable t) {
//
// }
// });
} }
public void showView(VehicleBean bean) { public void showView(VehicleBean bean) {
@ -278,6 +319,8 @@ public class ApplyVehicleDetailActivity extends BaseActivity implements VehicleL
VehicleBean bean = new VehicleBean(); VehicleBean bean = new VehicleBean();
bean.setManid(userInfo.getManid());
List<RowsBean> rowsBeanList = new ArrayList<>(); List<RowsBean> rowsBeanList = new ArrayList<>();
RowsBean rowsBean = new RowsBean(); RowsBean rowsBean = new RowsBean();
rowsBean.setListcode(Contans.LISTCODE.APPLYVEHICLE); rowsBean.setListcode(Contans.LISTCODE.APPLYVEHICLE);
@ -313,6 +356,7 @@ public class ApplyVehicleDetailActivity extends BaseActivity implements VehicleL
bean.setDataRows(dataRowsBeanList); bean.setDataRows(dataRowsBeanList);
bean.setTotal("1"); bean.setTotal("1");
bean.setDataTotal("1"); bean.setDataTotal("1");
bean.setManid(userInfo.getManid());
json = GsonUtils.GsonString(bean); json = GsonUtils.GsonString(bean);
} }
return json; return json;

3
app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
Unescape Escape View File

@ -175,9 +175,6 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
if (isApkInDebug(context)) { if (isApkInDebug(context)) {
// 管理员 // 管理员
} }
binding.textWjmm.setOnClickListener(View.OnClickListener { binding.textWjmm.setOnClickListener(View.OnClickListener {

3
app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt
Unescape Escape View File

@ -232,7 +232,8 @@ class MainActivity : BaseActivityOaToolbarViewBinding<ActivityMainBinding>() {
showLog(jsonDecode) showLog(jsonDecode)
showLog( "--------getAboutMeData--------") showLog( "--------getAboutMeData--------")
if (TextUtils.isEmpty(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 { } else {
val bean = GsonUtils.GsonToBean(jsonDecode, AboutMeBean::class.java) val bean = GsonUtils.GsonToBean(jsonDecode, AboutMeBean::class.java)
if (bean != null) { if (bean != null) {

89
app/src/main/java/com/rehome/zhdcoa/ui/activity/MakerecommendationsActivity.java
Unescape Escape View File

@ -2,27 +2,39 @@ package com.rehome.zhdcoa.ui.activity;
import android.content.Intent; import android.content.Intent;
import android.text.InputType; import android.text.InputType;
import android.text.TextUtils;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import com.rehome.zhdcoa.Api; import com.rehome.zhdcoa.Api;
import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.Contans;
import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.CKSHQXBean; import com.rehome.zhdcoa.bean.CKSHQXBean;
import com.rehome.zhdcoa.bean.ConferenceBean;
import com.rehome.zhdcoa.bean.MyadviceBean; import com.rehome.zhdcoa.bean.MyadviceBean;
import com.rehome.zhdcoa.bean.SubmitRecommendationsBean; import com.rehome.zhdcoa.bean.SubmitRecommendationsBean;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SaveApplyUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditBHDialog; import com.rehome.zhdcoa.weiget.AuditBHDialog;
import com.rehome.zhdcoa.bean.RowsBean; 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.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Response; import retrofit2.Response;
@ -99,18 +111,13 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp
btn_SAVE.setOnClickListener(new View.OnClickListener() { btn_SAVE.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (btn_SAVE.getText().equals("提交")) { if (btn_SAVE.getText().equals("提交")) {
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson("", "1", "审批中")) .setjson(createJson("", "1", "审批中"))
.setListener(MakerecommendationsActivity.this) .setListener(MakerecommendationsActivity.this)
.builder(context); .builder(MakerecommendationsActivity.this);
} else if (btn_SAVE.getText().equals("审核")) { } else if (btn_SAVE.getText().equals("审核")) {
AuditBHDialog dialog1 = new AuditBHDialog(context, "是否确认", new AuditBHDialog.AuditBHDialogListener() { AuditBHDialog dialog1 = new AuditBHDialog(context, "是否确认", new AuditBHDialog.AuditBHDialogListener() {
@Override @Override
public void confirm() { public void confirm() {
@ -118,20 +125,15 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson(listid, "2", "已确认")) .setjson(createJson(listid, "2", "已确认"))
.setListener(MakerecommendationsActivity.this) .setListener(MakerecommendationsActivity.this)
.builder(context); .builder(MakerecommendationsActivity.this);
} }
@Override @Override
public void Bh() { public void Bh() {
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson(listid, "2", "已驳回")) .setjson(createJson(listid, "2", "已驳回"))
.setListener(MakerecommendationsActivity.this) .setListener(MakerecommendationsActivity.this)
.builder(context); .builder(MakerecommendationsActivity.this);
} }
@Override @Override
@ -140,15 +142,9 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp
} }
}); });
dialog1.show(); dialog1.show();
} }
} }
}); });
} }
@Override @Override
@ -182,34 +178,61 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp
infoET.setFocusable(false); infoET.setFocusable(false);
getDatas(); getDatas();
getSHQX(); getSHQX();
} }
} }
private void getDatas() { private void getDatas() {
Api api = HttpUtils.getApi(this); String url = Contans.BASE_URL + Contans.GET_ORDER_LIST_RSA_URL;
api.getAdviceInfo(Contans.LISTCODE.APPLYSUGGESTION,userInfo.getManid(),listid).enqueue(new BaseCallBack<MyadviceBean>(context) { Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
@Override request.add("listcode",Contans.LISTCODE.APPLYSUGGESTION);
public void onSuccess(Call<MyadviceBean> call, Response<MyadviceBean> response) { request.add("listid",listid);
request.add("manid",userInfo.getManid());
MyadviceBean bean = response.body(); NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
if (bean != null) {
showView(bean); @Override
public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> 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 @Override
public void onError(Call<MyadviceBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// Api api = HttpUtils.getApi(this);
// api.getAdviceInfo(Contans.LISTCODE.APPLYSUGGESTION, userInfo.getManid(), listid).enqueue(new BaseCallBack<MyadviceBean>(context) {
// @Override
// public void onSuccess(Call<MyadviceBean> call, Response<MyadviceBean> response) {
//
// MyadviceBean bean = response.body();
// if (bean != null) {
// showView(bean);
// }
// }
//
// @Override
// public void onError(Call<MyadviceBean> call, Throwable t) {
//
// }
// });
} }
private void getSHQX() { private void getSHQX() {
@ -321,6 +344,8 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp
dataRowsBeanList.add(dataRowsBean); dataRowsBeanList.add(dataRowsBean);
submitRecommendationsBean.setDataRows(dataRowsBeanList); submitRecommendationsBean.setDataRows(dataRowsBeanList);
submitRecommendationsBean.setRows(rowsBeanList); submitRecommendationsBean.setRows(rowsBeanList);
submitRecommendationsBean.setManid(userInfo.getManid());
json = GsonUtils.GsonString(submitRecommendationsBean); json = GsonUtils.GsonString(submitRecommendationsBean);
return json; return json;

71
app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskDetailActivity.java
Unescape Escape View File

@ -10,17 +10,26 @@ import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.ApplyListBean; import com.rehome.zhdcoa.bean.ApplyListBean;
import com.rehome.zhdcoa.bean.MyTaskBean; import com.rehome.zhdcoa.bean.MyTaskBean;
import com.rehome.zhdcoa.bean.OrdinaryVisitBean;
import com.rehome.zhdcoa.bean.ResultBean; import com.rehome.zhdcoa.bean.ResultBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SaveApplyUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditDialog;
import com.rehome.zhdcoa.weiget.DateTimePickDialog; import com.rehome.zhdcoa.weiget.DateTimePickDialog;
import com.rehome.zhdcoa.weiget.DelOrOkOrDissDialog; import com.rehome.zhdcoa.weiget.DelOrOkOrDissDialog;
import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.InputLayout;
import com.rehome.zhdcoa.weiget.ListDialog; import com.rehome.zhdcoa.weiget.ListDialog;
import com.rehome.zhdcoa.bean.RowsBean; 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.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -77,7 +86,7 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson(false)) .setjson(createJson(false))
.setListener(MyTaskDetailActivity.this) .setListener(MyTaskDetailActivity.this)
.builder(context); .builder(MyTaskDetailActivity.this);
} }
@Override @Override
@ -101,7 +110,7 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson(false)) .setjson(createJson(false))
.setListener(MyTaskDetailActivity.this) .setListener(MyTaskDetailActivity.this)
.builder(context); .builder(MyTaskDetailActivity.this);
} }
@Override @Override
@ -109,7 +118,7 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(createJson(true)) .setjson(createJson(true))
.setListener(MyTaskDetailActivity.this) .setListener(MyTaskDetailActivity.this)
.builder(context); .builder(MyTaskDetailActivity.this);
} }
@Override @Override
@ -219,24 +228,60 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils
private void getDatas() { private void getDatas() {
HttpUtils.getApi(this).getMyTask(ListId, ListCode).enqueue(new BaseCallBack<MyTaskBean>(context) { String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
@Override Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
public void onSuccess(Call<MyTaskBean> call, Response<MyTaskBean> response) {
MyTaskBean bean = response.body(); request.add("listid",ListId);
if (bean != null) { request.add("listcode", ListCode);
if (bean.getDataTotal().equals("1")) { request.add("manid", userInfo.getManid());
showView(bean.getDataRows().get(0)); // request.add("suplistid", Suplistid);
myTaskBean = bean;
NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
@Override
public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> 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 @Override
public void onError(Call<MyTaskBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// HttpUtils.getApi(this).getMyTask(ListId, ListCode).enqueue(new BaseCallBack<MyTaskBean>(context) {
// @Override
// public void onSuccess(Call<MyTaskBean> call, Response<MyTaskBean> 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<MyTaskBean> call, Throwable t) {
//
// }
// });
} }
private void showView(MyTaskBean.DataRowsBean dataRowsBean) { private void showView(MyTaskBean.DataRowsBean dataRowsBean) {
@ -295,6 +340,8 @@ public class MyTaskDetailActivity extends BaseActivity implements SaveApplyUtils
dataRowsBeanList.add(dataRowsBean); dataRowsBeanList.add(dataRowsBean);
bean.setDataRows(dataRowsBeanList); bean.setDataRows(dataRowsBeanList);
bean.setRows(rowsBeanList); bean.setRows(rowsBeanList);
bean.setManid(userInfo.getManid());
json = GsonUtils.GsonString(bean); json = GsonUtils.GsonString(bean);
} }
return json; return json;

64
app/src/main/java/com/rehome/zhdcoa/ui/activity/OrdinaryVisitAuditActivity.java
Unescape Escape View File

@ -13,18 +13,28 @@ import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.ApplyOrdinaryVisitBean; import com.rehome.zhdcoa.bean.ApplyOrdinaryVisitBean;
import com.rehome.zhdcoa.bean.ConferenceBean;
import com.rehome.zhdcoa.bean.GetAuditBean; import com.rehome.zhdcoa.bean.GetAuditBean;
import com.rehome.zhdcoa.bean.GetAuditParamBean; import com.rehome.zhdcoa.bean.GetAuditParamBean;
import com.rehome.zhdcoa.bean.OrdinaryVisitBean; import com.rehome.zhdcoa.bean.OrdinaryVisitBean;
import com.rehome.zhdcoa.bean.SetAuditBean; import com.rehome.zhdcoa.bean.SetAuditBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GetAuditPermissionUtils; 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.HttpUtils;
import com.rehome.zhdcoa.utils.NohttpUtils;
import com.rehome.zhdcoa.utils.RSAUtils;
import com.rehome.zhdcoa.utils.SetAuditUtils; import com.rehome.zhdcoa.utils.SetAuditUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditDialog; import com.rehome.zhdcoa.weiget.AuditDialog;
import com.rehome.zhdcoa.weiget.AuditFlowDialog; import com.rehome.zhdcoa.weiget.AuditFlowDialog;
import com.rehome.zhdcoa.weiget.CbRbLayout; import com.rehome.zhdcoa.weiget.CbRbLayout;
import com.rehome.zhdcoa.weiget.InputLayout; 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.ArrayList;
import java.util.List; import java.util.List;
import retrofit2.Call; import retrofit2.Call;
@ -180,23 +190,57 @@ public class OrdinaryVisitAuditActivity extends BaseActivity implements View.OnC
private void getDatas() { private void getDatas() {
Api api = HttpUtils.getApi(this); String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
api.getOrdinaryVisit(listcode, ListId, Suplistid).enqueue(new BaseCallBack<OrdinaryVisitBean>(context) { Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
@Override
public void onSuccess(Call<OrdinaryVisitBean> call, Response<OrdinaryVisitBean> response) { 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<String>() {
OrdinaryVisitBean bean = response.body(); @Override
if (bean != null) { public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
ordinaryVisitBean = bean; showLog("----------------");
getAuditpermission(); 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 @Override
public void onError(Call<OrdinaryVisitBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// Api api = HttpUtils.getApi(this);
// api.getOrdinaryVisit(listcode, ListId, Suplistid).enqueue(new BaseCallBack<OrdinaryVisitBean>(context) {
// @Override
// public void onSuccess(Call<OrdinaryVisitBean> call, Response<OrdinaryVisitBean> response) {
//
// OrdinaryVisitBean bean = response.body();
// if (bean != null) {
// ordinaryVisitBean = bean;
// getAuditpermission();
// }
// }
//
// @Override
// public void onError(Call<OrdinaryVisitBean> call, Throwable t) {
//
// }
// });
} }
public void showView(OrdinaryVisitBean bean) { public void showView(OrdinaryVisitBean bean) {
@ -225,7 +269,7 @@ public class OrdinaryVisitAuditActivity extends BaseActivity implements View.OnC
GetAuditPermissionUtils.newBuilder() GetAuditPermissionUtils.newBuilder()
.setParams(paramBean) .setParams(paramBean)
.setListener(this) .setListener(this)
.builder(context); .builder(this);
} }
@Override @Override

61
app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskDetailActivity.java
Unescape Escape View File

@ -10,19 +10,28 @@ import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.ApplyListOtherTaskBean; import com.rehome.zhdcoa.bean.ApplyListOtherTaskBean;
import com.rehome.zhdcoa.bean.OrdinaryVisitBean;
import com.rehome.zhdcoa.bean.OtherTaskBean; import com.rehome.zhdcoa.bean.OtherTaskBean;
import com.rehome.zhdcoa.bean.StaffInfoBean; import com.rehome.zhdcoa.bean.StaffInfoBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself; import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.DateUtils; import com.rehome.zhdcoa.utils.DateUtils;
import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.HttpUtils; 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.SaveApplyUtils;
import com.rehome.zhdcoa.utils.UiUtlis;
import com.rehome.zhdcoa.weiget.AuditBHDialog; import com.rehome.zhdcoa.weiget.AuditBHDialog;
import com.rehome.zhdcoa.weiget.DateTimePickDialog; import com.rehome.zhdcoa.weiget.DateTimePickDialog;
import com.rehome.zhdcoa.weiget.InputLayout; import com.rehome.zhdcoa.weiget.InputLayout;
import com.rehome.zhdcoa.weiget.ListDialog; import com.rehome.zhdcoa.weiget.ListDialog;
import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; import com.rehome.zhdcoa.weiget.SaveOrCommitDialog;
import com.rehome.zhdcoa.bean.RowsBean; 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.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -195,7 +204,7 @@ public class OthersTaskDetailActivity extends BaseActivity implements SaveApplyU
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(json) .setjson(json)
.setListener(this) .setListener(this)
.builder(context); .builder(OthersTaskDetailActivity.this);
} }
@ -211,26 +220,59 @@ public class OthersTaskDetailActivity extends BaseActivity implements SaveApplyU
SaveApplyUtils.newBuilder() SaveApplyUtils.newBuilder()
.setjson(json2) .setjson(json2)
.setListener(this) .setListener(this)
.builder(context); .builder(OthersTaskDetailActivity.this);
} }
public void getDetails() { public void getDetails() {
HttpUtils.getApi(this).getOtherTaskDetails(ListCode, ListId).enqueue(new BaseCallBack<OtherTaskBean>(context) { String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
@Override Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
public void onSuccess(Call<OtherTaskBean> call, Response<OtherTaskBean> response) {
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<String>() {
OtherTaskBean bean = response.body(); @Override
if (bean != null) { public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
showView(bean); 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 @Override
public void onError(Call<OtherTaskBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// HttpUtils.getApi(this).getOtherTaskDetails(ListCode, ListId).enqueue(new BaseCallBack<OtherTaskBean>(context) {
// @Override
// public void onSuccess(Call<OtherTaskBean> call, Response<OtherTaskBean> response) {
//
// OtherTaskBean bean = response.body();
// if (bean != null) {
// showView(bean);
// }
// }
//
// @Override
// public void onError(Call<OtherTaskBean> call, Throwable t) {
//
// }
// });
} }
private void showView(OtherTaskBean bean) { private void showView(OtherTaskBean bean) {
@ -693,6 +735,7 @@ public class OthersTaskDetailActivity extends BaseActivity implements SaveApplyU
bean.setRows(rowsBeanList); bean.setRows(rowsBeanList);
bean.setDataRows(dataRowsBeanList); bean.setDataRows(dataRowsBeanList);
bean.setManid(userInfo.getManid());
json = GsonUtils.GsonString(bean); json = GsonUtils.GsonString(bean);
} }

63
app/src/main/java/com/rehome/zhdcoa/ui/activity/SelectItem4Activity.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity;
import android.content.Intent; import android.content.Intent;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -11,12 +12,23 @@ import android.widget.EditText;
import android.widget.ExpandableListView; import android.widget.ExpandableListView;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.rehome.zhdcoa.Contans;
import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.OfficeGroupBean; import com.rehome.zhdcoa.bean.OfficeGroupBean;
import com.rehome.zhdcoa.bean.VehicleBean;
import com.rehome.zhdcoa.utils.DataSaveUtils; 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.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 com.zhy.autolayout.utils.AutoUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -69,24 +81,57 @@ public class SelectItem4Activity extends BaseActivity {
private void getDatas() { private void getDatas() {
HttpUtils.getApi(this).getOfficeGroup().enqueue(new BaseCallBack<OfficeGroupBean>(context) { String url = Contans.BASE_URL + Contans.GET_AUDI_DATA_URL;
@Override Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
public void onSuccess(Call<OfficeGroupBean> call, Response<OfficeGroupBean> response) {
request.add("listcode", "BGYPSZ");
request.add("manid", userInfo.getManid());
OfficeGroupBean bean = response.body(); NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
if (bean != null) {
datas.clear(); @Override
datas.addAll(bean.getRows()); public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
setAdatper(); 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 @Override
public void onError(Call<OfficeGroupBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
} }
}); });
// HttpUtils.getApi(this).getOfficeGroup().enqueue(new BaseCallBack<OfficeGroupBean>(context) {
// @Override
// public void onSuccess(Call<OfficeGroupBean> call, Response<OfficeGroupBean> response) {
//
// OfficeGroupBean bean = response.body();
// if (bean != null) {
// datas.clear();
// datas.addAll(bean.getRows());
// setAdatper();
// }
// }
//
// @Override
// public void onError(Call<OfficeGroupBean> call, Throwable t) {
//
// }
// });
} }
private void setAdatper() { private void setAdatper() {

1
app/src/main/java/com/rehome/zhdcoa/ui/fragment/ContactFragment.kt
Unescape Escape View File

@ -185,6 +185,7 @@ class ContactFragment : BaseViewBindingKotlinFragment<FragmentContactBinding>(){
//showLog(jsonDecode); //showLog(jsonDecode);
if (TextUtils.isEmpty(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 { } else {
val bean = GsonUtils.GsonToBean( val bean = GsonUtils.GsonToBean(
jsonDecode, jsonDecode,

3
app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt
Unescape Escape View File

@ -764,7 +764,8 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>() {
showLog(jsonDecode) showLog(jsonDecode)
showLog( "--------getAboutMeData--------") showLog( "--------getAboutMeData--------")
if (TextUtils.isEmpty(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 { } else {
val bean = GsonUtils.GsonToBean( val bean = GsonUtils.GsonToBean(
jsonDecode, jsonDecode,

5
app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java
Unescape Escape View File

@ -837,7 +837,7 @@ public class MineFragment extends BaseLazyFragment {
Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET); Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
String manid = App.getInstance().getUserInfo().getManid(); String manid = App.getInstance().getUserInfo().getManid();
request.add("manid",manid); request.add("manid",manid);
NohttpUtils.getInstance().add(requireActivity(), 0, "正在提交数据...", request, new HttpListener<String>() { NohttpUtils.getInstance().addNoProgress(requireContext(), 0, request, new HttpListener<String>() {
@Override @Override
public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) { public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
@ -848,7 +848,8 @@ public class MineFragment extends BaseLazyFragment {
showLog(result); showLog(result);
showLog(jsonDecode); showLog(jsonDecode);
if (TextUtils.isEmpty(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 { } else {
AboutMeBean bean = GsonUtils.GsonToBean(jsonDecode,AboutMeBean.class); AboutMeBean bean = GsonUtils.GsonToBean(jsonDecode,AboutMeBean.class);
if (bean != null) { if (bean != null) {

4
app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java
Unescape Escape View File

@ -63,7 +63,7 @@ import retrofit2.Response;
public class ApplyListUtils { public class ApplyListUtils {
private static Builder builder; private static Builder builder;
private final Api api; //private final Api api;
public UserInfoBean.UserInfo userInfo; public UserInfoBean.UserInfo userInfo;
private final List<ApplyListBean.ApplyList> datas; private final List<ApplyListBean.ApplyList> datas;
@ -93,7 +93,7 @@ public class ApplyListUtils {
private ApplyListUtils(Activity context) { private ApplyListUtils(Activity context) {
api = HttpUtils.getApi(context); //api = HttpUtils.getApi(context);
datas = new ArrayList<>(); datas = new ArrayList<>();
receiveDatas = new ArrayList<>(); receiveDatas = new ArrayList<>();
conferenceDatas = new ArrayList<>(); conferenceDatas = new ArrayList<>();

157
app/src/main/java/com/rehome/zhdcoa/utils/GetAuditPermissionUtils.java
Unescape Escape View File

@ -1,65 +1,127 @@
package com.rehome.zhdcoa.utils; package com.rehome.zhdcoa.utils;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.widget.Toast;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.rehome.zhdcoa.Api; import com.rehome.zhdcoa.Api;
import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.Contans;
import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.base.BaseCallBack; 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.GetAuditBean;
import com.rehome.zhdcoa.bean.GetAuditParamBean; 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.Call;
import retrofit2.Response; import retrofit2.Response;
/** /**
* Created by Rehome-rjb1 on 2017/5/31. * Created by Rehome-rjb1 on 2017/5/31.
* * <p>
* 获取审核权限工具类 * 获取审核权限工具类
*/ */
public class GetAuditPermissionUtils { public class GetAuditPermissionUtils {
private final Api api; //private final Api api;
private static Builder builder; private static Builder builder;
private GetAuditPermissionUtils(Context context) { private Activity context;
api = HttpUtils.getApi(context);
private GetAuditPermissionUtils(Activity context) {
//api = HttpUtils.getApi(context);
this.context = context;
init(); init();
} }
private void init() { private void init() {
builder.paramBean.setDc("ZH"); String url = Contans.BASE_URL + Contans.GET_IS_AUDIT_RSA_URL;
Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
api.getAudit(builder.paramBean.getListid(), builder.paramBean.getListcode(),
builder.paramBean.getDc(), builder.paramBean.getShr(), request.add("listid", builder.paramBean.getListid());
builder.paramBean.getShbm(), builder.paramBean.getAuditrange()) request.add("listcode", builder.paramBean.getListcode());
request.add("dc", "ZH");
request.add("shr", builder.paramBean.getShr());
.enqueue(new BaseCallBack<GetAuditBean>(builder.context) { request.add("shbm", builder.paramBean.getShbm());
@Override request.add("auditrange", builder.paramBean.getAuditrange());
public void onSuccess(Call<GetAuditBean> call, Response<GetAuditBean> response) { request.add("manid", builder.paramBean.getShr());
GetAuditBean bean = response.body(); NohttpUtils.getInstance().addNoProgress(context, 0, request, new HttpListener<String>() {
if (bean != null) {
if (!bean.getTotal().equals("0")) { @Override
Log.i("app",new Gson().toJson(bean)); public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
builder.listener.onSuccess(bean); showLog("----------------");
} String result = response.get();
}else{ String jsonDecode = RSAUtils.decryptBASE64StrClient(result);
Log.i("app","getAudit is null"); 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<GetAuditBean> call, Throwable t) {
@Override
} public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> 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<GetAuditBean>(builder.context) {
// @Override
// public void onSuccess(Call<GetAuditBean> call, Response<GetAuditBean> 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<GetAuditBean> call, Throwable t) {
//
// }
// });
} }
public static Builder newBuilder() { public static Builder newBuilder() {
@ -69,7 +131,7 @@ public class GetAuditPermissionUtils {
public static class Builder { public static class Builder {
private Context context; private Activity context;
private GetAuditParamBean paramBean; private GetAuditParamBean paramBean;
@ -85,7 +147,7 @@ public class GetAuditPermissionUtils {
return builder; return builder;
} }
public GetAuditPermissionUtils builder(Context context) { public GetAuditPermissionUtils builder(Activity context) {
this.context = context; this.context = context;
return new GetAuditPermissionUtils(context); return new GetAuditPermissionUtils(context);
} }
@ -94,4 +156,35 @@ public class GetAuditPermissionUtils {
public interface GetAuditPermissionUtilsListener { public interface GetAuditPermissionUtilsListener {
void onSuccess(GetAuditBean bean); 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();
}
} }

2
app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java
Unescape Escape View File

@ -166,7 +166,7 @@ public class NohttpUtils {
} }
} }
} }
mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, true, true, "加载中...")); mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, true, true, "数据加载中..."));
} }
public <T> void add(Activity mActivity, int what, String progressTitle, Request<T> request, HttpListener<T> callback) { public <T> void add(Activity mActivity, int what, String progressTitle, Request<T> request, HttpListener<T> callback) {

137
app/src/main/java/com/rehome/zhdcoa/utils/SaveApplyUtils.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.rehome.zhdcoa.utils; package com.rehome.zhdcoa.utils;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
@ -8,8 +10,20 @@ import android.widget.Toast;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.rehome.zhdcoa.Api; import com.rehome.zhdcoa.Api;
import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.Contans;
import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.base.BaseCallBack;
import com.rehome.zhdcoa.bean.ResultBean; 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.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;
@ -23,47 +37,92 @@ import retrofit2.Response;
public class SaveApplyUtils { public class SaveApplyUtils {
private final Api api; //private final Api api;
private static Builder builder; private static Builder builder;
private SaveApplyUtils(Context context) { private Activity mContext;
api = HttpUtils.getApi(context);
private SaveApplyUtils(Activity context) {
//api = HttpUtils.getApi(context);
this.mContext=context;
init(); init();
} }
private void init() { private void init() {
RequestBody body = RequestBody.create(MediaType.parse("application/json"), builder.json); String url = Contans.BASE_URL + Contans.APPLY_SAVE_URL;
Request<String> request = NoHttp.createStringRequest(url, RequestMethod.POST);
String jsonEncrypt = RSAUtils.encryptBASE64Str(builder.json);
request.setDefineRequestBodyForJson(jsonEncrypt);
NohttpUtils.getInstance().add(mContext, 0, "正在提交数据...", request, new HttpListener<String>() {
api.saveApply(body).enqueue(new BaseCallBack<ResultBean>(builder.context) {
@Override @Override
public void onSuccess(Call<ResultBean> call, Response<ResultBean> response) { public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
ResultBean bean = response.body();
if (bean != null) { showLog("----------------");
String result = bean.getRows().get(0).getResult(); String resultStr = response.get();
String msg = bean.getRows().get(0).getMsg(); String jsonDecode = RSAUtils.decryptBASE64StrClient(resultStr);
Log.i("app",new Gson().toJson(bean)); showLog(resultStr);
showLog(jsonDecode);
if (TextUtils.isEmpty(jsonDecode)) {
//1成功，0失败，2异常,3无权限 showToast(UiUtlis.getString(mContext, R.string.data_error));
if (result.equals("1")) { } else {
Toast.makeText(builder.context, msg, Toast.LENGTH_SHORT).show(); ResultBean bean = GsonUtils.GsonToBean(jsonDecode, ResultBean.class);
builder.listener.onSuccess(); if (bean != null) {
} else { String result = bean.getRows().get(0).getResult();
Toast.makeText(builder.context, msg, Toast.LENGTH_SHORT).show(); String msg = bean.getRows().get(0).getMsg();
builder.listener.onError(); //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 @Override
public void onError(Call<ResultBean> call, Throwable t) { public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
builder.listener.onError();
} }
}); });
// RequestBody body = RequestBody.create(MediaType.parse("application/json"), builder.json);
// api.saveApply(body).enqueue(new BaseCallBack<ResultBean>(builder.context) {
// @Override
// public void onSuccess(Call<ResultBean> call, Response<ResultBean> 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<ResultBean> call, Throwable t) {
// builder.listener.onError();
// }
// });
} }
public static Builder newBuilder() { public static Builder newBuilder() {
builder = new SaveApplyUtils.Builder(); builder = new SaveApplyUtils.Builder();
return builder; return builder;
@ -73,7 +132,7 @@ public class SaveApplyUtils {
private String json; private String json;
private Context context; private Activity context;
private SaveApplyUtilsListener listener; private SaveApplyUtilsListener listener;
@ -87,7 +146,7 @@ public class SaveApplyUtils {
return builder; return builder;
} }
public SaveApplyUtils builder(Context context) { public SaveApplyUtils builder(Activity context) {
this.context = context; this.context = context;
valida(); valida();
return new SaveApplyUtils(context); return new SaveApplyUtils(context);
@ -113,4 +172,34 @@ public class SaveApplyUtils {
void onError(); 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();
}
} }

1
app/src/main/res/layout/activity_makerecommendations.xml
Unescape Escape View File

@ -48,6 +48,7 @@
android:id="@+id/NNBtn" android:id="@+id/NNBtn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#666666"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:text="选择匿名"></Button> android:text="选择匿名"></Button>
</LinearLayout> </LinearLayout>

Write Preview
Loading…
Cancel
Save