关于我的接口，增加aboutmeRsa

app/src/main/java/com/rehome/zhdcoa/Api.java

@@ -124,11 +124,13 @@ public interface Api {
 
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<MyadviceBean> getMyAdvice(@Query("listcode") String listcode,
+                                   @Query("manid") String manid,
                                    @Query("proposerid") String proposerid);
 
 
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<MyadviceBean> getAdviceInfo(@Query("listcode") String listcode,
+                                     @Query("manid") String manid,
                                      @Query("listid") String listid);
 
 
@@ -137,14 +139,10 @@ public interface Api {
                              @Query("listcode") String listcode);
 
 
-    //    @GET("PubFile/Data/GetOrderList.ashx")
-//    Call<ApplyListConferenceBean> getConferenceList(@Query("listcode") String listcode,
-//                                                    @Query("proposerid") String proposerid,
-//                                                    @Query("departmentnameid") String departmentnameid,
-//                                                    @Query("platform") String platform);
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<ApplyListBean> getApplyList(@Query("listcode") String listcode,
                                      @Query("proposerid") String proposerid,
+                                     @Query("manid") String manid,
                                      @Query("departmentnameid") String departmentnameid,
                                      @Query("platform") String platform);
 
@@ -424,6 +422,7 @@ public interface Api {
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<ConferenceDateListBean> getConferenceDateList(@Query("listcode") String listcode,
                                                        @Query("meettimes") String meettimes,
+                                                       @Query("manid") String manid,
                                                        @Query("shzt") String shzt,
                                                        @Query("txtMeetroom") String txtMeetroom);
 
@@ -456,6 +455,7 @@ public interface Api {
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<ApplyListReceiveBean> getReceiveList(@Query("listcode") String listcode,
                                               @Query("proposerid") String proposerid,
+                                              @Query("manid") String manid,
                                               @Query("departmentnameid") String departmentnameid,
                                               @Query("platform") String platform);
 
@@ -470,6 +470,7 @@ public interface Api {
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<ApplyOrdinaryVisitBean> getOrdinaryVisitList(@Query("listcode") String listcode,
                                                       @Query("proposerid") String proposerid,
+                                                      @Query("manid") String manid,
                                                       @Query("departmentnameid") String departmentnameid,
                                                       @Query("platform") String platform);
 
@@ -485,6 +486,7 @@ public interface Api {
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<ApplyListConferenceBean> getConferenceList(@Query("listcode") String listcode,
                                                     @Query("proposerid") String proposerid,
+                                                    @Query("manid") String manid,
                                                     @Query("departmentnameid") String departmentnameid,
                                                     @Query("platform") String platform);
 
@@ -500,6 +502,7 @@ public interface Api {
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<ApplyListVehicleBean> getVehicleList(@Query("listcode") String listcode,
                                               @Query("proposerid") String proposerid,
+                                              @Query("manid") String manid,
                                               @Query("departmentnameid") String departmentnameid,
                                               @Query("platform") String platform);
 
@@ -515,6 +518,7 @@ public interface Api {
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<ApplyListOtherTaskBean> getOtherTaskList(@Query("listcode") String listcode,
                                                   @Query("proposerid") String proposerid,
+                                                  @Query("manid") String manid,
                                                   @Query("departmentnameid") String departmentnameid,
                                                   @Query("platform") String platform);
 
@@ -529,6 +533,7 @@ public interface Api {
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<ApplyListTakeOutBean> getTakeOutList2(@Query("listcode") String listcode,
                                                @Query("platform") String platform,
+                                               @Query("manid") String manid,
                                                @Query("login_userid") String login_userid,
                                                @Query("departmentnameid") String departmentnameid,
                                                @Query("istj") String istj);
@@ -536,6 +541,7 @@ public interface Api {
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<ApplyListTakeOutBean> getTakeOutList(@Query("listcode") String listcode,
                                               @Query("platform") String platform,
+                                              @Query("manid") String manid,
                                               @Query("login_userid") String login_userid,
                                               @Query("istj") String istj);
 
@@ -856,6 +862,7 @@ public interface Api {
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<ApplyTravelListBean> getApplyTraveList(@Query("listcode") String listcode,
                                                 @Query("proposerid") String proposerid,
+                                                @Query("manid") String manid,
                                                 @Query("departmentnameid") String departmentnameid,
                                                 @Query("platform") String platform);
 
@@ -940,9 +947,10 @@ public interface Api {
      * @param manid
      * @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")
+    Call<String> getAboutMeRsa(@Query("manid") String manid);
 
     @GET("Pubfile/data/aboutme/thirdsysdb.ashx")
     Call<QtdbBean> getOther(@Query("manid") String manid);
@@ -1079,6 +1087,7 @@ public interface Api {
     @GET("PubFile/Data/GetOrderList.ashx")
     Call<ApplyListVehicleBean> getDriverVehicleList(@Query("listcode") String listcode,
                                                     @Query("platform") String platform,
+                                                    @Query("manid") String manid,
                                                     @Query("login_userid") String login_userid,
                                                     @Query("shzt") String shzt);
 

app/src/main/java/com/rehome/zhdcoa/Contans.java

@@ -566,6 +566,14 @@ public class Contans {
     //修改手机号或者密码
     public static String UPLOAD_PHONE_OR_PWD_URL="PubFile/Data/aboutme/UpdateUserPwd.ashx";
 
+    /**
+     * 获取关于我的数据，总数量。
+     * 提到我的
+     * 我发起的
+     * 我的审核
+     */
+    public static String ABOUT_ME_RSA_URL="PubFile/Data/aboutme/aboutmeRsa.ashx";
+
     /**
      * 生产岗位技能平台
      */

app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt

@@ -4,6 +4,7 @@ import android.content.Intent
 import android.util.Log
 import android.view.View
 import android.widget.AdapterView
+import com.rehome.zhdcoa.App
 import com.rehome.zhdcoa.Contans
 import com.rehome.zhdcoa.adapter.AboutMeListAdapter
 import com.rehome.zhdcoa.base.BaseActivity
@@ -732,7 +733,9 @@ class ApplyAboutMeActivity : BaseActivityOaToolbarViewBinding<ActivityApplyAbout
     }
 
     private fun getDatas() {
-        HttpUtils.getApi(this).getAboutMeList(userInfo!!.manid, aboutMeType.toString() + "")
+        var manid = App.getInstance().userInfo.manid
+        //manid = "310430"
+        HttpUtils.getApi(this).getAboutMeList(manid, aboutMeType.toString() + "")
             .enqueue(object : BaseCallBack<AboutMeListBean?>(context) {
                 override fun onSuccess(
                     call: Call<AboutMeListBean?>?,

app/src/main/java/com/rehome/zhdcoa/ui/activity/ConferenceDateActivity.java

@@ -184,7 +184,7 @@ public class ConferenceDateActivity extends BaseActivity implements  DateLayout.
         }
 
         HttpUtils.getApi(this).getConferenceDateList(Contans.LISTCODE.APPLYCONFERENCE,
-                date, "3", txtMettingRoom).enqueue(new BaseCallBack<ConferenceDateListBean>(context) {
+                date, userInfo.getManid(),"3", txtMettingRoom).enqueue(new BaseCallBack<ConferenceDateListBean>(context) {
             @Override
             public void onSuccess(Call<ConferenceDateListBean> call, Response<ConferenceDateListBean> response) {
 

app/src/main/java/com/rehome/zhdcoa/ui/activity/MakerecommendationsActivity.java

@@ -195,7 +195,7 @@ public class MakerecommendationsActivity extends BaseActivity implements SaveApp
     private void getDatas() {
 
         Api api = HttpUtils.getApi(this);
-        api.getAdviceInfo(Contans.LISTCODE.APPLYSUGGESTION, listid).enqueue(new BaseCallBack<MyadviceBean>(context) {
+        api.getAdviceInfo(Contans.LISTCODE.APPLYSUGGESTION,userInfo.getManid(),listid).enqueue(new BaseCallBack<MyadviceBean>(context) {
             @Override
             public void onSuccess(Call<MyadviceBean> call, Response<MyadviceBean> response) {
 

app/src/main/java/com/rehome/zhdcoa/ui/activity/MyOrderActivity.java

@@ -108,7 +108,7 @@ public class MyOrderActivity extends BaseActivity implements ApplyDriverAdapter.
 
     private void requestVehicleData() {
 
-        HttpUtils.getApi(this).getDriverVehicleList(Contans.LISTCODE.APPLYVEHICLE, "0", userInfo.getManid(), "3").enqueue(new BaseCallBack<ApplyListVehicleBean>(context) {
+        HttpUtils.getApi(this).getDriverVehicleList(Contans.LISTCODE.APPLYVEHICLE, "0",userInfo.getManid(), userInfo.getManid(), "3").enqueue(new BaseCallBack<ApplyListVehicleBean>(context) {
             @Override
             public void onSuccess(Call<ApplyListVehicleBean> call, Response<ApplyListVehicleBean> response) {
 
@@ -133,8 +133,7 @@ public class MyOrderActivity extends BaseActivity implements ApplyDriverAdapter.
     }
 
     private void requestTakeOutData() {
-
+        HttpUtils.getApi(this).getTakeOutList(Contans.LISTCODE.APPLYORDER, "0",userInfo.getManid(), userInfo.getManid(),"1").enqueue(new BaseCallBack<ApplyListTakeOutBean>(context) {
-        HttpUtils.getApi(this).getTakeOutList(Contans.LISTCODE.APPLYORDER, "0", userInfo.getManid(),"1").enqueue(new BaseCallBack<ApplyListTakeOutBean>(context) {
             @Override
             public void onSuccess(Call<ApplyListTakeOutBean> call, Response<ApplyListTakeOutBean> response) {
                 ApplyListTakeOutBean baseResult = response.body();

app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java

@@ -58,6 +58,7 @@ import com.rehome.zhdcoa.bean.AboutMeBean;
 import com.rehome.zhdcoa.bean.ApkUpdateBean;
 import com.rehome.zhdcoa.bean.HeadPhotoResultBean;
 import com.rehome.zhdcoa.bean.QtdbBean;
+import com.rehome.zhdcoa.bean.ResultBean;
 import com.rehome.zhdcoa.ui.activity.AboutMeActivity;
 import com.rehome.zhdcoa.ui.activity.ActivityCreatQRCode;
 import com.rehome.zhdcoa.ui.activity.ApplyAboutMeActivity;
@@ -70,12 +71,19 @@ import com.rehome.zhdcoa.ui.activity.OtherCountMeActivity;
 import com.rehome.zhdcoa.ui.activity.QrCodeNewActivity;
 import com.rehome.zhdcoa.ui.activity.SqActivity;
 import com.rehome.zhdcoa.ui.activity.UpdatePwdActivity;
+import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
+import com.rehome.zhdcoa.utils.GsonUtils;
+import com.rehome.zhdcoa.utils.HttpListener;
 import com.rehome.zhdcoa.utils.HttpUtils;
 import com.rehome.zhdcoa.utils.NohttpUtils;
+import com.rehome.zhdcoa.utils.RSAUtils;
+import com.rehome.zhdcoa.utils.SPUtils;
+import com.rehome.zhdcoa.utils.UiUtlis;
 import com.rehome.zhdcoa.utils.XToastUtils;
 import com.rehome.zhdcoa.weiget.AuditDialog;
 import com.rehome.zhdcoa.weiget.ListDialog;
 import com.yolanda.nohttp.NoHttp;
+import com.yolanda.nohttp.RequestMethod;
 import com.yolanda.nohttp.rest.CacheMode;
 import com.yolanda.nohttp.rest.OnResponseListener;
 import com.yolanda.nohttp.rest.Request;
@@ -786,11 +794,63 @@ public class MineFragment extends BaseLazyFragment {
     }
 
     //获取关于我的数据总数量
+//    public void getAboutMeData() {
+//        String manid = App.getInstance().getUserInfo().getManid();
+//        //manid = "310430";
+//        HttpUtils.getApi(requireContext()).getAboutMe(manid).enqueue(new BaseCallBackNoProgress<AboutMeBean>(getActivity()) {
+//            @Override
+//            public void onSuccess(Call<AboutMeBean> call, Response<AboutMeBean> response) {
+//                AboutMeBean bean = response.body();
+//                if (bean != null) {
+//                    if (bean.getTotal() != null && (!bean.getTotal().equals("0"))) {
+//                        if (bean.getRows() != null && bean.getRows().size() > 0) {
+//                            List<AboutMeBean.RowsBean> rowsBeanList = bean.getRows();
+//                            for (AboutMeBean.RowsBean rowsBean : rowsBeanList) {
+//                                if (rowsBean.getAboutme() != null) {
+//                                    if ("3".equals(rowsBean.getAboutme())) {
+//                                        if (rowsBean.getCountnum() != null) {
+//                                            if (tvAuditNum != null) {
+//                                                if (!rowsBean.getCountnum().equals("0")) {
+//                                                    tvAuditNum.setVisibility(View.VISIBLE);
+//                                                    tvAuditNum.setText(rowsBean.getCountnum());
+//                                                } else {
+//                                                    tvAuditNum.setVisibility(View.GONE);
+//                                                }
+//                                            }
+//                                        }
+//                                    }
+//                                }
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//
+//            @Override
+//            public void onError(Call<AboutMeBean> call, Throwable t) {
+//
+//            }
+//        });
+//    }
     public void getAboutMeData() {
-        HttpUtils.getApi(requireContext()).getAboutMe(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBackNoProgress<AboutMeBean>(getActivity()) {
+        String url = Contans.BASE_URL + Contans.ABOUT_ME_RSA_URL;
+        Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
+        String manid = App.getInstance().getUserInfo().getManid();
+        request.add("manid",manid);
+        NohttpUtils.getInstance().add(requireActivity(), 0, "正在提交数据...", request, new HttpListener<String>() {
+
             @Override
-            public void onSuccess(Call<AboutMeBean> call, Response<AboutMeBean> response) {
+            public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
-                AboutMeBean bean = response.body();
+
+                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 {
+                    AboutMeBean bean = GsonUtils.GsonToBean(jsonDecode,AboutMeBean.class);
                     if (bean != null) {
                         if (bean.getTotal() != null && (!bean.getTotal().equals("0"))) {
                             if (bean.getRows() != null && bean.getRows().size() > 0) {
@@ -815,9 +875,10 @@ public class MineFragment extends BaseLazyFragment {
                         }
                     }
                 }
+            }
 
             @Override
-            public void onError(Call<AboutMeBean> call, Throwable t) {
+            public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
 
             }
         });

app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java

@@ -103,15 +103,17 @@ public class ApplyListUtils {
 
     private void init() {
 
+        userInfo = App.getInstance().getUserInfo();
         final String listcode = builder.params.get("listcode");
         String proposerid = builder.params.get("proposerid");
         String times = builder.params.get("times");
         String timee = builder.params.get("timee");
-        String departmentnameid = App.getInstance().getUserInfo().getBzbh();
+        String manid = userInfo.getManid();
+        String departmentnameid = userInfo.getBzbh();
 
         if (listcode == Contans.LISTCODE.RECEIVEVISIT) {
 
-            api.getReceiveList(listcode, proposerid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyListReceiveBean>(builder.context) {
+            api.getReceiveList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyListReceiveBean>(builder.context) {
                 @Override
                 public void onSuccess(Call<ApplyListReceiveBean> call, Response<ApplyListReceiveBean> response) {
                     ApplyListReceiveBean baseResult = response.body();
@@ -135,7 +137,7 @@ public class ApplyListUtils {
 
         } else if (listcode == Contans.LISTCODE.APPLYCONFERENCE) {
 
-            api.getConferenceList(listcode, proposerid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyListConferenceBean>(builder.context) {
+            api.getConferenceList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyListConferenceBean>(builder.context) {
                 @Override
                 public void onSuccess(Call<ApplyListConferenceBean> call, Response<ApplyListConferenceBean> response) {
                     ApplyListConferenceBean baseResult = response.body();
@@ -160,7 +162,7 @@ public class ApplyListUtils {
 
         } else if (listcode == Contans.LISTCODE.ORDINARYVISIT) {
 
-            api.getOrdinaryVisitList(listcode, proposerid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyOrdinaryVisitBean>(builder.context) {
+            api.getOrdinaryVisitList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyOrdinaryVisitBean>(builder.context) {
                 @Override
                 public void onSuccess(Call<ApplyOrdinaryVisitBean> call, Response<ApplyOrdinaryVisitBean> response) {
 
@@ -184,7 +186,7 @@ public class ApplyListUtils {
             });
         } else if (listcode == Contans.LISTCODE.APPLYTRAVEL) {
 
-            api.getApplyTraveList(listcode, proposerid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyTravelListBean>(builder.context) {
+            api.getApplyTraveList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyTravelListBean>(builder.context) {
                 @Override
                 public void onSuccess(Call<ApplyTravelListBean> call, Response<ApplyTravelListBean> response) {
                     ApplyTravelListBean baseResult = response.body();
@@ -209,7 +211,7 @@ public class ApplyListUtils {
 
         } else if (listcode == Contans.LISTCODE.APPLYVEHICLE) {
 
-            api.getVehicleList(listcode, proposerid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyListVehicleBean>(builder.context) {
+            api.getVehicleList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyListVehicleBean>(builder.context) {
                 @Override
                 public void onSuccess(Call<ApplyListVehicleBean> call, Response<ApplyListVehicleBean> response) {
 
@@ -234,7 +236,7 @@ public class ApplyListUtils {
             });
 
         } else if (listcode == Contans.LISTCODE.OTHERTASK) {
-            api.getOtherTaskList(listcode, proposerid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyListOtherTaskBean>(builder.context) {
+            api.getOtherTaskList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyListOtherTaskBean>(builder.context) {
                 @Override
                 public void onSuccess(Call<ApplyListOtherTaskBean> call, Response<ApplyListOtherTaskBean> response) {
                     ApplyListOtherTaskBean baseResult = response.body();
@@ -258,7 +260,7 @@ public class ApplyListUtils {
 
         } else if (listcode == Contans.LISTCODE.APPLYORDER) {
 
-            api.getTakeOutList2(listcode, "0", "", departmentnameid,"").enqueue(new BaseCallBack<ApplyListTakeOutBean>(builder.context) {
+            api.getTakeOutList2(listcode, "0", manid,"", departmentnameid,"").enqueue(new BaseCallBack<ApplyListTakeOutBean>(builder.context) {
                 @Override
                 public void onSuccess(Call<ApplyListTakeOutBean> call, Response<ApplyListTakeOutBean> response) {
                     ApplyListTakeOutBean baseResult = response.body();
@@ -283,7 +285,7 @@ public class ApplyListUtils {
 
         } else if (listcode == Contans.LISTCODE.APPLYDINNER) {
 
-            api.getApplyList(listcode, proposerid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyListBean>(builder.context) {
+            api.getApplyList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack<ApplyListBean>(builder.context) {
 
                 @Override
                 public void onSuccess(Call<ApplyListBean> call, Response<ApplyListBean> response) {
@@ -361,7 +363,7 @@ public class ApplyListUtils {
 
         } else if (listcode == Contans.LISTCODE.APPLYSUGGESTION) {
 
-            api.getMyAdvice(listcode, proposerid).enqueue(new BaseCallBack<MyadviceBean>(builder.context) {
+            api.getMyAdvice(listcode,manid, proposerid).enqueue(new BaseCallBack<MyadviceBean>(builder.context) {
                 @Override
                 public void onSuccess(Call<MyadviceBean> call, Response<MyadviceBean> response) {
 
@@ -390,7 +392,7 @@ public class ApplyListUtils {
 
         } else {
             //没有就是else里面
-            api.getApplyList(listcode, proposerid, times, timee).enqueue(new BaseCallBack<ApplyListBean>(builder.context) {
+            api.getApplyList(listcode, proposerid,manid, times, timee).enqueue(new BaseCallBack<ApplyListBean>(builder.context) {
 
                 @Override
                 public void onSuccess(Call<ApplyListBean> call, Response<ApplyListBean> response) {