From 62266f9cb2231f1b2fde924376be9369c1150153 Mon Sep 17 00:00:00 2001 From: wenfei Date: Fri, 1 Aug 2025 18:46:49 +0800 Subject: [PATCH] 2.4.0 release --- app/build.gradle | 4 +- app/src/main/java/com/rehome/zhdcoa/Api.java | 24 +- .../main/java/com/rehome/zhdcoa/Contans.java | 8 +- .../ui/activity/ApplyAboutMeActivity.kt | 91 +- .../ui/activity/ApplyConferenceActivity.java | 4 +- .../ui/activity/ApplyDinnerActivity.java | 4 +- .../ui/activity/ApplyOfficeAddActivity.java | 4 +- .../ui/activity/ApplyReceiveActivity.java | 4 +- .../ui/activity/ApplySuppliesActivity.java | 4 +- .../ui/activity/ApplyTakeOutActivity.java | 4 +- .../ui/activity/ApplyTravelActivity.java | 4 +- .../ui/activity/ApplyVehicleActivity.java | 4 +- .../zhdcoa/ui/activity/LoginActivity.kt | 71 -- .../rehome/zhdcoa/ui/activity/MainActivity.kt | 63 +- .../zhdcoa/ui/activity/MyAdviceActivity.java | 4 +- .../zhdcoa/ui/activity/MyTaskActivity.java | 4 +- .../ui/activity/OrdinaryVisitActivity.java | 2 +- .../ui/activity/OthersTaskActivity.java | 2 +- .../ui/activity/TrainInfoMoreActivity.kt | 107 ++- .../rehome/zhdcoa/ui/fragment/HomeFragment.kt | 61 +- .../rehome/zhdcoa/utils/ApplyListUtils.java | 884 ++++++++++++------ .../com/rehome/zhdcoa/utils/NohttpUtils.java | 4 +- 22 files changed, 842 insertions(+), 519 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c60e73d..46b3e65 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.rehome.zhdcoa" minSdk 24 targetSdk 36 - versionCode 23 - versionName "2.3.9" + versionCode 24 + versionName "2.4.0" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 diff --git a/app/src/main/java/com/rehome/zhdcoa/Api.java b/app/src/main/java/com/rehome/zhdcoa/Api.java index dd77d68..1ad7133 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Api.java +++ b/app/src/main/java/com/rehome/zhdcoa/Api.java @@ -122,6 +122,10 @@ public interface Api { @Query("timee") String timee); + @GET("PubFile/Data/GetOrderListRsa.ashx") + Call getMyAdviceRsa(@Query("listcode") String listcode, + @Query("manid") String manid, + @Query("proposerid") String proposerid); @GET("PubFile/Data/GetOrderList.ashx") Call getMyAdvice(@Query("listcode") String listcode, @Query("manid") String manid, @@ -452,15 +456,15 @@ public interface Api { * @param departmentnameid * @return */ - @GET("PubFile/Data/GetOrderList.ashx") - Call getReceiveList(@Query("listcode") String listcode, - @Query("proposerid") String proposerid, - @Query("manid") String manid, - @Query("departmentnameid") String departmentnameid, - @Query("platform") String platform); +// @GET("PubFile/Data/GetOrderList.ashx") +// Call getReceiveList(@Query("listcode") String listcode, +// @Query("proposerid") String proposerid, +// @Query("manid") String manid, +// @Query("departmentnameid") String departmentnameid, +// @Query("platform") String platform); /** - * 获取接待来访详情列表 + * 获取订餐列表 * * @param listcode * @param proposerid @@ -985,9 +989,9 @@ public interface Api { * @param aboutme * @return */ - @GET("PubFile/Data/aboutme/aboutdetail.ashx") - Call getAboutMeList(@Query("manid") String manid, - @Query("aboutme") String aboutme); +// @GET("PubFile/Data/aboutme/aboutdetail.ashx") +// Call getAboutMeList(@Query("manid") String manid, +// @Query("aboutme") String aboutme); /** * 修改密码 diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index 9187031..0797777 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -223,10 +223,12 @@ public class Contans { public static String GETABOUTME_URL = "PubFile/Data/aboutme/aboutme.ashx?manid="; public static String GETABOUTMELIST_URL = "PubFile/Data/aboutme/aboutdetail.ashx?manid="; + public static String GET_ABOUTME_LIST_RSA_URL = "PubFile/Data/aboutme/aboutdetailRsa.ashx"; public static String GETATTENDANCECHECK_URL = "PubFile/Data/RGKQ/GetDataZZCX.ashx?manid="; public static String GETCHECKUPDATAAPK_URL = "ApkUpdate/GetDataRsa.aspx"; public static String GETYZMANDCHECKYZMANDMODIFYMIMA = "PubFile/Data/GetVerificationCode.ashx"; - public static String GET_LISTDATA_URL = "PubFile_DJXT/InterfaceApp/STUDY/WLKCGL/Get_KCGL_DetailData.ashx?skrrid="; + public static String GET_LISTDATA_URL = "PubFile_DJXT/InterfaceApp/STUDY/WLKCGL/Get_KCGL_DetailData.ashx"; + public static String GET_LISTDATA_RSA_URL = "PubFile_DJXT/InterfaceApp/STUDY/WLKCGL/Get_KCGL_DetailDataRsa.ashx"; @@ -573,6 +575,10 @@ public class Contans { * 我的审核 */ public static String ABOUT_ME_RSA_URL="PubFile/Data/aboutme/aboutmeRsa.ashx"; + //获取审批流程 + public static String GET_ORDER_LIST_RSA_URL="PubFile/Data/GetOrderListRsa.ashx"; + public static String GETAPPLYLIST2_RSA_URL="PubFile/Data/GetList.ashx"; + /** * 生产岗位技能平台 diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt index 0bc1a57..8437976 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyAboutMeActivity.kt @@ -1,11 +1,13 @@ package com.rehome.zhdcoa.ui.activity import android.content.Intent +import android.text.TextUtils import android.util.Log import android.view.View import android.widget.AdapterView import com.rehome.zhdcoa.App import com.rehome.zhdcoa.Contans +import com.rehome.zhdcoa.R import com.rehome.zhdcoa.adapter.AboutMeListAdapter import com.rehome.zhdcoa.base.BaseActivity import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding @@ -14,7 +16,13 @@ import com.rehome.zhdcoa.bean.AboutMeListBean import com.rehome.zhdcoa.bean.ChangeShiftBean import com.rehome.zhdcoa.databinding.ActivityApplyAboutMeBinding import com.rehome.zhdcoa.utils.GsonUtils +import com.rehome.zhdcoa.utils.HttpListener import com.rehome.zhdcoa.utils.HttpUtils +import com.rehome.zhdcoa.utils.NohttpUtils +import com.rehome.zhdcoa.utils.RSAUtils +import com.rehome.zhdcoa.utils.UiUtlis +import com.yolanda.nohttp.NoHttp +import com.yolanda.nohttp.RequestMethod import retrofit2.Call import retrofit2.Response @@ -733,31 +741,82 @@ class ApplyAboutMeActivity : BaseActivityOaToolbarViewBinding(context) { - override fun onSuccess( - call: Call?, - response: Response? + + //获取我的条数显示 + val url = Contans.BASE_URL + Contans.GET_ABOUTME_LIST_RSA_URL + val request = NoHttp.createStringRequest(url, RequestMethod.GET) + request.add("manid",App.getInstance().userInfo.manid) + request.add("aboutme","3") + NohttpUtils.getInstance() + .addNoProgress(this, 0, request, object : HttpListener { + + override fun onSucceed( + what: Int, + response: com.yolanda.nohttp.rest.Response? ) { - val bean = response?.body() - if (bean != null) { - if (bean.total != "0") { - datas.clear() - datas.addAll(bean.rows) - adapter.notifyDataSetChanged() - } else { - datas.clear() - adapter.notifyDataSetChanged() + showLog("<---------------->") + showLog(url) + val jsonResult = response?.get() + showLog(jsonResult ?: "jsonResult is null") + val jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult) + showLog(jsonDecode) + showLog( "--------getAboutMeData--------") + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)) + } else { + val bean = GsonUtils.GsonToBean( + jsonDecode, + AboutMeListBean::class.java + ) + if (bean != null) { + if (bean.total != "0") { + datas.clear() + datas.addAll(bean.rows) + adapter.notifyDataSetChanged() + } else { + datas.clear() + adapter.notifyDataSetChanged() + } } } } - override fun onError(call: Call?, t: Throwable?) { + override fun onFailed( + what: Int, + response: com.yolanda.nohttp.rest.Response? + ) { } + }) + + + +// HttpUtils.getApi(this).getAboutMeList(manid, aboutMeType.toString() + "") +// .enqueue(object : BaseCallBack(context) { +// override fun onSuccess( +// call: Call?, +// response: Response? +// ) { +// val bean = response?.body() +// if (bean != null) { +// if (bean.total != "0") { +// datas.clear() +// datas.addAll(bean.rows) +// adapter.notifyDataSetChanged() +// } else { +// datas.clear() +// adapter.notifyDataSetChanged() +// } +// } +// } +// +// override fun onError(call: Call?, t: Throwable?) { +// +// } +// }) } private fun getListDatas( diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceActivity.java index bfc518c..2d913c6 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyConferenceActivity.java @@ -51,7 +51,7 @@ public class ApplyConferenceActivity extends BaseActivity implements ApplyListUt .setListView(lv) .setParams(Contans.LISTCODE.APPLYCONFERENCE, userInfo.getManid()) .setListener(this) - .builder(context); + .builder(this); } @Override @@ -63,7 +63,7 @@ public class ApplyConferenceActivity extends BaseActivity implements ApplyListUt .setListView(lv) .setParams(Contans.LISTCODE.APPLYCONFERENCE, userInfo.getManid()) .setListener(this) - .builder(context); + .builder(ApplyConferenceActivity.this); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerActivity.java index 83e2fe2..38ac22f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerActivity.java @@ -47,7 +47,7 @@ public class ApplyDinnerActivity extends BaseActivity implements ApplyListUtils. .setListView(lv) .setParams(Contans.LISTCODE.APPLYDINNER, userInfo.getManid()) .setListener(this) - .builder(context); + .builder(this); } @Override @@ -59,7 +59,7 @@ public class ApplyDinnerActivity extends BaseActivity implements ApplyListUtils. .setListView(lv) .setParams(Contans.LISTCODE.APPLYDINNER, userInfo.getManid()) .setListener(this) - .builder(context); + .builder(ApplyDinnerActivity.this); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddActivity.java index cff3ae5..f96f925 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyOfficeAddActivity.java @@ -44,7 +44,7 @@ public class ApplyOfficeAddActivity extends BaseActivity implements ApplyListUti .setListener(this) .setParams(Contans.LISTCODE.APPLYFACILITIES, userInfo.getManid()) .setListView(lv) - .builder(context); + .builder(this); } @Override @@ -75,7 +75,7 @@ public class ApplyOfficeAddActivity extends BaseActivity implements ApplyListUti .setListener(this) .setParams(Contans.LISTCODE.APPLYFACILITIES, userInfo.getManid()) .setListView(lv) - .builder(context); + .builder(ApplyOfficeAddActivity.this); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveActivity.java index f6a8198..ef4043f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyReceiveActivity.java @@ -48,7 +48,7 @@ public class ApplyReceiveActivity extends BaseActivity implements ApplyListUtil .setParams(Contans.LISTCODE.RECEIVEVISIT,userInfo.getManid()) .setListView(lv) .setListener(this) - .builder(context); + .builder(this); } @Override @@ -80,7 +80,7 @@ public class ApplyReceiveActivity extends BaseActivity implements ApplyListUtil .setParams(Contans.LISTCODE.RECEIVEVISIT,userInfo.getManid()) .setListView(lv) .setListener(this) - .builder(context); + .builder(ApplyReceiveActivity.this); break; } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesActivity.java index ba403ae..61cfab2 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplySuppliesActivity.java @@ -42,7 +42,7 @@ public class ApplySuppliesActivity extends BaseActivity implements ApplyListUtil .setParams(Contans.LISTCODE.APPLYSUPPLIES, userInfo.getManid()) .setListView(lv) .setListener(this) - .builder(context); + .builder(this); } @Override @@ -76,7 +76,7 @@ public class ApplySuppliesActivity extends BaseActivity implements ApplyListUtil .setParams(Contans.LISTCODE.APPLYSUPPLIES, userInfo.getManid()) .setListView(lv) .setListener(this) - .builder(context); + .builder(ApplySuppliesActivity.this); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutActivity.java index a7eb955..83027af 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTakeOutActivity.java @@ -44,7 +44,7 @@ public class ApplyTakeOutActivity extends BaseActivity implements ApplyListUtils .setParams(Contans.LISTCODE.APPLYORDER,userInfo.getManid()) .setListView(lv) .setListener(this) - .builder(context); + .builder(this); } @Override @@ -58,7 +58,7 @@ public class ApplyTakeOutActivity extends BaseActivity implements ApplyListUtils .setParams(Contans.LISTCODE.APPLYORDER, userInfo.getManid()) .setListView(lv) .setListener(this) - .builder(context); + .builder(ApplyTakeOutActivity.this); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelActivity.java index 29e90be..29ba4a4 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelActivity.java @@ -38,7 +38,7 @@ public class ApplyTravelActivity extends BaseActivity implements ApplyListUtils. .setListView(lv) .setParams(Contans.LISTCODE.APPLYTRAVEL, userInfo.getManid()) .setListener(this) - .builder(context); + .builder(this); } @Override @@ -73,7 +73,7 @@ public class ApplyTravelActivity extends BaseActivity implements ApplyListUtils. .setListView(lv) .setParams(Contans.LISTCODE.APPLYTRAVEL, userInfo.getManid()) .setListener(this) - .builder(context); + .builder(ApplyTravelActivity.this); break; case 2: break; diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleActivity.java index e08e4e8..cb13010 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleActivity.java @@ -45,7 +45,7 @@ public class ApplyVehicleActivity extends BaseActivity implements ApplyListUtil .setListener(this) .setParams(Contans.LISTCODE.APPLYVEHICLE, userInfo.getManid()) .setListView(lv) - .builder(context); + .builder(this); } @Override @@ -100,7 +100,7 @@ public class ApplyVehicleActivity extends BaseActivity implements ApplyListUtil .setListener(this) .setParams(Contans.LISTCODE.APPLYVEHICLE, userInfo.getManid()) .setListView(lv) - .builder(context); + .builder(ApplyVehicleActivity.this); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index b16c0d8..c9d791e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -174,78 +174,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { // 管理员 - binding.etUsername.setText("ZHPS_Admin") - binding.etPassword.setText("Rehome.zhps@996") - //公司内网215管理员 -// binding.etUsername.setText("ZHPS_Admin") -// binding.etPassword.setText("Rehome.zhps@2020") - - - -// binding.etUsername.setText("310353") -// binding.etPassword.setText("Zhps1382.") - - -// binding.etUsername.setText("310691") -// binding.etPassword.setText("Abcd*1234") - -// binding.etUsername.setText("990001") -// binding.etPassword.setText("Bwfb@123") - -// binding.etUsername.setText("310295") -// binding.etPassword.setText("Whk363521!") - -// binding.etUsername.setText("310675") -// binding.etPassword.setText("Mj12345_") - - //吴云强 -// binding.etUsername.setText("310430") -// binding.etPassword.setText("Laq**201610") - - //马 -// binding.etUsername.setText("310482") -// binding.etPassword.setText("Maying2008!") - // 生产岗位 卢高波 可以进入巡视抄表 -// binding.etUsername.setText("310492") -// binding.etPassword.setText("Dudu520520@") - //李昕逸 可以进入巡视抄表 -// binding.etUsername.setText("310677") -// binding.etPassword.setText("LXY1997.qaz") - - //陈坚标 -// binding.etUsername.setText("310063") -// binding.etPassword.setText("ZHPs@040909") - - ////郑佩障 -// binding.etUsername.setText("310569") -// binding.etPassword.setText("sUnnY@0926") - - - - //谭添欢 -// binding.etUsername.setText("310273") -// binding.etPassword.setText("#Tth8680004") - //吴云强 -// binding.etUsername.setText("310430") -// binding.etPassword.setText("Laq@201610") - //欧建荣 -// binding.etUsername.setText("310285") -// binding.etPassword.setText("@Ojr310285") - - -// binding.etUsername.setText("310561") -// binding.etPassword.setText("Yangjing!0561") - -// binding.etUsername.setText("310534") -// binding.etPassword.setText("abCd*1234") - -// binding.etUsername.setText("310291") -// binding.etPassword.setText("sfd02910291Z+") -// binding.etUsername.setText("310465") -// binding.etPassword.setText("Liu524042*") -// binding.etUsername.setText("310291") -// binding.etPassword.setText("sfd02910291Z+") diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt index 3e665d2..bdb415f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt @@ -219,39 +219,48 @@ class MainActivity : BaseActivityOaToolbarViewBinding() { } //获取我的条数显示 - val url = Contans.BASE_URL + Contans.GETABOUTME_URL + App.getInstance().userInfo.manid + val url = Contans.BASE_URL + Contans.ABOUT_ME_RSA_URL val request = NoHttp.createStringRequest(url, RequestMethod.GET) + request.add("manid",App.getInstance().userInfo.manid) NohttpUtils.getInstance().addNoProgress(this, 0, request, object : HttpListener { override fun onSucceed(what: Int, response: Response?) { - showLog( "----------------") + showLog( "--------getAboutMeData--------") val jsonResult = response?.get() + showLog(url) showLog( jsonResult ?: "jsonResult is null") - val bean = GsonUtils.GsonToBean(jsonResult, AboutMeBean::class.java) - if (bean != null) { - if (bean.total != "0") { - val rowsBeanList = bean.rows - for (rowsBean in rowsBeanList) { - when (rowsBean.aboutme) { - "1" -> {} - "2" -> {} - "3" -> tvAuditNum = if (rowsBean.countnum != "0") { - Integer.valueOf(rowsBean.countnum) - } else { - 0 + val jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult) + showLog(jsonDecode) + showLog( "--------getAboutMeData--------") + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)) + } else { + val bean = GsonUtils.GsonToBean(jsonDecode, AboutMeBean::class.java) + if (bean != null) { + if (bean.total != "0") { + val rowsBeanList = bean.rows + for (rowsBean in rowsBeanList) { + when (rowsBean.aboutme) { + "1" -> {} + "2" -> {} + "3" -> tvAuditNum = if (rowsBean.countnum != "0") { + Integer.valueOf(rowsBean.countnum) + } else { + 0 + } } } } - } - //2020.10.20修改成 只显示我审批的 - AllNum = tvAuditNum - badgeView_me.badgeCount = AllNum - if (AllNum == 0) { - ShortcutBadger.removeCount(context) - } else { - if (SystemUtil.getDeviceBrand() == "vivo") { - setBadgeNumber(context, AllNum) + //2020.10.20修改成 只显示我审批的 + AllNum = tvAuditNum + badgeView_me.badgeCount = AllNum + if (AllNum == 0) { + ShortcutBadger.removeCount(context) } else { - ShortcutBadger.applyCount(context, AllNum) + if (SystemUtil.getDeviceBrand() == "vivo") { + setBadgeNumber(context, AllNum) + } else { + ShortcutBadger.applyCount(context, AllNum) + } } } } @@ -419,9 +428,9 @@ class MainActivity : BaseActivityOaToolbarViewBinding() { val appVersionName = rowsBean.versionname val androidVersionCode = rowsBean.android_versioncode val appDesc = rowsBean.appdesc - if (appURL != null && appURL.contains("http://")) { - if (appURL.length > 26) { - val baseApkUrl = appURL.substring(26) + if (appURL != null && appURL.contains("https://")) { + if (appURL.length > 27) { + val baseApkUrl = appURL.substring(27) appURL = Contans.BASE_URL + baseApkUrl } } else { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyAdviceActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyAdviceActivity.java index a55d2b1..cac5381 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyAdviceActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyAdviceActivity.java @@ -45,7 +45,7 @@ public class MyAdviceActivity extends BaseActivity implements View.OnClickListen .setListener(this) .setParams(Contans.LISTCODE.APPLYSUGGESTION,userInfo.getManid()) .setListView(lv) - .builder(context); + .builder(this); }else if (intent.getStringExtra("result_advice").equals("2")){ @@ -57,7 +57,7 @@ public class MyAdviceActivity extends BaseActivity implements View.OnClickListen .setListener(this) .setParams(Contans.LISTCODE.APPLYSUGGESTION, "") .setListView(lv) - .builder(context); + .builder(this); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskActivity.java index 50efb70..7a17dbe 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MyTaskActivity.java @@ -38,7 +38,7 @@ public class MyTaskActivity extends BaseActivity implements ApplyListUtils.OnIte .setParams(Contans.LISTCODE.MYTASK,userInfo.getManid()) .setListener(this) .setListView(lv) - .builder(context); + .builder(this); } @Override @@ -61,7 +61,7 @@ public class MyTaskActivity extends BaseActivity implements ApplyListUtils.OnIte .setParams(Contans.LISTCODE.MYTASK, userInfo.getManid()) .setListener(this) .setListView(lv) - .builder(context); + .builder(MyTaskActivity.this); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OrdinaryVisitActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OrdinaryVisitActivity.java index 5b84b79..d8c103a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OrdinaryVisitActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OrdinaryVisitActivity.java @@ -45,7 +45,7 @@ public class OrdinaryVisitActivity extends BaseActivity implements ApplyListUtil .setListener(this) .setListView(lv) .setParams(Contans.LISTCODE.ORDINARYVISIT, userInfo.getManid()) - .builder(context); + .builder(this); } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskActivity.java index f0cdac8..0c3ab05 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/OthersTaskActivity.java @@ -55,7 +55,7 @@ public class OthersTaskActivity extends BaseActivity implements ApplyListUtils. .setListView(lv) .setParams(Contans.LISTCODE.OTHERTASK, userInfo.getManid()) .setListener(this) - .builder(context); + .builder(this); } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt index f57010b..4cbb10d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt @@ -18,6 +18,7 @@ import com.rehome.zhdcoa.Contans import com.rehome.zhdcoa.R import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding import com.rehome.zhdcoa.base.BaseCallBack +import com.rehome.zhdcoa.bean.AboutMeBean import com.rehome.zhdcoa.bean.PxinfomoreBean import com.rehome.zhdcoa.bean.UserInfoBean import com.rehome.zhdcoa.databinding.ActivityTrainInfoMoreBinding @@ -423,9 +424,10 @@ class TrainInfoMoreActivity : BaseActivityOaToolbarViewBinding { override fun onSucceed( what: Int, @@ -435,57 +437,64 @@ class TrainInfoMoreActivity : BaseActivityOaToolbarViewBinding0){ - for (fileItem in resultsbean.files) { - showLog("学习文件服务器地址：") - showLog( URL + fileItem.filepath) + val jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult) + showLog(jsonDecode) + showLog("-----getListDatas 学习中心------") + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)) + } else { + val bean: PxinfomoreBean? = GsonUtils.GsonToBean(jsonDecode, PxinfomoreBean::class.java) + //val bean = GsonUtils.GsonToBean(jsonDecode, PxinfomoreBean::class.java) + if (bean != null) { + showLog(GsonUtils.GsonString(bean)) + if (bean.result == "success") { + val resultsBean = bean.results + if (resultsBean != null) { + filedataBeans.clear() + for (resultsbean in resultsBean) { + filedataBeans.addAll(resultsbean.files) + + if(resultsbean.files!=null&&resultsbean.files.size>0){ + for (fileItem in resultsbean.files) { + showLog("学习文件服务器地址：") + showLog( URL + fileItem.filepath) + } } - } + } + showLog(GsonUtils.GsonString(filedataBeans)) + initDHRDialogDatas() } - showLog(GsonUtils.GsonString(filedataBeans)) - initDHRDialogDatas() - } - binding.kcmcTx.text = bean.results[0].kcname - binding.tvFbr.text = - if (bean.results[0].fbr != null) bean.results[0].fbr else "" - binding.kcmcXf.text = bean.results[0].kcsf + "分" - binding.yxqTx.text = - bean.results[0].times + "至" + bean.results[0].timee - if (bean.results[0].ysssc == null || bean.results[0].ysssc == "") { - binding.yxxscTx.text = "00:00" - } else { - binding.yxxscTx.text = bean.results[0].ysssc - } - binding.yhdxfTx.text = bean.results[0].yhdkcsf + "分" - if (bean.results[0].isdb == "0") { - binding.tvStatus.text = "未学习" - } else if (bean.results[0].isdb == "1") { - binding.tvStatus.text = "未达标" - } else { - binding.tvStatus.text = "已达标" - } - if (bean.results[0].ssjd == null || bean.results[0].ssjd == "") { - binding.tvProgress.text = "0%" - } else { - binding.tvProgress.text = bean.results[0].ssjd + "%" + binding.kcmcTx.text = bean.results[0].kcname + binding.tvFbr.text = + if (bean.results[0].fbr != null) bean.results[0].fbr else "" + binding.kcmcXf.text = bean.results[0].kcsf + "分" + binding.yxqTx.text = + bean.results[0].times + "至" + bean.results[0].timee + if (bean.results[0].ysssc == null || bean.results[0].ysssc == "") { + binding.yxxscTx.text = "00:00" + } else { + binding.yxxscTx.text = bean.results[0].ysssc + } + binding.yhdxfTx.text = bean.results[0].yhdkcsf + "分" + if (bean.results[0].isdb == "0") { + binding.tvStatus.text = "未学习" + } else if (bean.results[0].isdb == "1") { + binding.tvStatus.text = "未达标" + } else { + binding.tvStatus.text = "已达标" + } + if (bean.results[0].ssjd == null || bean.results[0].ssjd == "") { + binding.tvProgress.text = "0%" + } else { + binding.tvProgress.text = bean.results[0].ssjd + "%" + } + binding.xxxdEdit.setText(bean.results[0].sssd) + binding.xxxdEdit.isFocusable = false + binding.xxxdEdit.isFocusableInTouchMode = false + ysssc = bean.results[0].ysssc + ysssc_s = bean.results[0].ysssc_s } - binding.xxxdEdit.setText(bean.results[0].sssd) - binding.xxxdEdit.isFocusable = false - binding.xxxdEdit.isFocusableInTouchMode = false - ysssc = bean.results[0].ysssc - ysssc_s = bean.results[0].ysssc_s } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt index 923f0be..0e00c35 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt @@ -4,6 +4,7 @@ import android.app.Activity import android.content.Intent import android.os.Handler import android.os.Looper +import android.text.TextUtils import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -78,6 +79,8 @@ import com.rehome.zhdcoa.utils.HttpListener import com.rehome.zhdcoa.utils.HttpUtils import com.rehome.zhdcoa.utils.ModuleDatas import com.rehome.zhdcoa.utils.NohttpUtils +import com.rehome.zhdcoa.utils.RSAUtils +import com.rehome.zhdcoa.utils.UiUtlis import com.rehome.zhdcoa.weiget.GridViewDialog import com.xuexiang.xui.widget.textview.supertextview.SuperTextView import com.xuexiang.xui.widget.textview.supertextview.SuperTextView.OnSuperTextViewClickListener @@ -742,9 +745,10 @@ class HomeFragment : BaseViewBindingFragment() { return } //获取我的条数显示 - val url = - Contans.BASE_URL + Contans.GETABOUTMELIST_URL + App.getInstance().userInfo.manid + "&aboutme=3" + val url = Contans.BASE_URL + Contans.GET_ABOUTME_LIST_RSA_URL val request = NoHttp.createStringRequest(url, RequestMethod.GET) + request.add("manid",App.getInstance().userInfo.manid) + request.add("aboutme","3") NohttpUtils.getInstance() .addNoProgress(requireActivity(), 0, request, object : HttpListener { @@ -756,29 +760,36 @@ class HomeFragment : BaseViewBindingFragment() { showLog(url) val jsonResult = response?.get() showLog(jsonResult ?: "jsonResult is null") - val bean = GsonUtils.GsonToBean( - jsonResult, - AboutMeListBean::class.java - ) - if (bean != null) { - if (bean.total == "0") { //无数据的时候 - binding.superMessageTv.setRightString("暂无待办") - if (AboutMeListdatas == null) { - AboutMeListdatas = java.util.ArrayList() - } else { - AboutMeListdatas.clear() - } - mineDataAdapter.refresh(AboutMeListdatas) - } else { //有数据的时候 - binding.superMessageTv.setRightString("更多> ") - binding.superMessageTv.setRightTextColor(resources.getColor(R.color.colorPrimary)) - AboutMeListdatas = bean.rows - if (AboutMeListdatas.size == 1) { //如果待办数据只有1条则显示一条 - val getTwoInfoList: MutableList = AboutMeListdatas.subList(0, 1) - mineDataAdapter.refresh(getTwoInfoList) - } else if (AboutMeListdatas.size >= 2) { //如果待办数据大于等于2条 则获取两条 - val getTwoInfoList: MutableList = AboutMeListdatas.subList(0, 2) - mineDataAdapter.refresh(getTwoInfoList) + val jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult) + showLog(jsonDecode) + showLog( "--------getAboutMeData--------") + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)) + } else { + val bean = GsonUtils.GsonToBean( + jsonDecode, + AboutMeListBean::class.java + ) + if (bean != null) { + if (bean.total == "0") { //无数据的时候 + binding.superMessageTv.setRightString("暂无待办") + if (AboutMeListdatas == null) { + AboutMeListdatas = java.util.ArrayList() + } else { + AboutMeListdatas.clear() + } + mineDataAdapter.refresh(AboutMeListdatas) + } else { //有数据的时候 + binding.superMessageTv.setRightString("更多> ") + binding.superMessageTv.setRightTextColor(resources.getColor(R.color.colorPrimary)) + AboutMeListdatas = bean.rows + if (AboutMeListdatas.size == 1) { //如果待办数据只有1条则显示一条 + val getTwoInfoList: MutableList = AboutMeListdatas.subList(0, 1) + mineDataAdapter.refresh(getTwoInfoList) + } else if (AboutMeListdatas.size >= 2) { //如果待办数据大于等于2条 则获取两条 + val getTwoInfoList: MutableList = AboutMeListdatas.subList(0, 2) + mineDataAdapter.refresh(getTwoInfoList) + } } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java index 2b9dc0a..a1e9a01 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java @@ -1,13 +1,19 @@ package com.rehome.zhdcoa.utils; +import android.app.Activity; import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; +import android.widget.Toast; import com.rehome.zhdcoa.Api; import com.rehome.zhdcoa.App; import com.rehome.zhdcoa.Contans; +import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.adapter.ApplyConferenceAdapter; import com.rehome.zhdcoa.adapter.ApplyDinnerListAdapter; import com.rehome.zhdcoa.adapter.ApplyListAdapter; @@ -20,6 +26,7 @@ import com.rehome.zhdcoa.adapter.ApplyVehicleAdapter; import com.rehome.zhdcoa.adapter.GetRadioListAdapter; import com.rehome.zhdcoa.adapter.MyadviceAdapter; import com.rehome.zhdcoa.base.BaseCallBack; +import com.rehome.zhdcoa.bean.AboutMeBean; import com.rehome.zhdcoa.bean.ApplyListBean; import com.rehome.zhdcoa.bean.ApplyListConferenceBean; import com.rehome.zhdcoa.bean.ApplyListOtherTaskBean; @@ -32,6 +39,9 @@ import com.rehome.zhdcoa.bean.BfwwBean; import com.rehome.zhdcoa.bean.GetRadioListBean; import com.rehome.zhdcoa.bean.MyadviceBean; import com.rehome.zhdcoa.bean.UserInfoBean; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; import java.util.ArrayList; import java.util.HashMap; @@ -79,8 +89,10 @@ public class ApplyListUtils { private GetRadioListAdapter getRadioListAdapter; private MyadviceAdapter myadviceAdapter; + private Activity context; - private ApplyListUtils(Context context) { + + private ApplyListUtils(Activity context) { api = HttpUtils.getApi(context); datas = new ArrayList<>(); receiveDatas = new ArrayList<>(); @@ -93,6 +105,7 @@ public class ApplyListUtils { getRadioDates = new ArrayList<>(); myadviceDatas = new ArrayList<>(); bfwwDatas= new ArrayList<>(); + this.context=context; init(); } @@ -111,310 +124,563 @@ public class ApplyListUtils { String manid = userInfo.getManid(); String departmentnameid = userInfo.getBzbh(); - if (listcode == Contans.LISTCODE.RECEIVEVISIT) { - - api.getReceiveList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { - @Override - public void onSuccess(Call call, Response response) { - ApplyListReceiveBean baseResult = response.body(); - if (baseResult != null) { - baseResult.getTotal(); - if (!baseResult.getTotal().equals("0")) { - receiveDatas.clear(); - receiveDatas.addAll(baseResult.getRows()); - setListAdapter(listcode); - } else { - receiveDatas.clear(); - } - } - } - - @Override - public void onError(Call call, Throwable t) { - - } - }); - - } else if (listcode == Contans.LISTCODE.APPLYCONFERENCE) { - - api.getConferenceList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { - @Override - public void onSuccess(Call call, Response response) { - ApplyListConferenceBean baseResult = response.body(); - if (baseResult != null) { - baseResult.getTotal(); - if (!baseResult.getTotal().equals("0")) { - conferenceDatas.clear(); - conferenceDatas.addAll(baseResult.getRows()); - setListAdapter(listcode); - } else { - conferenceDatas.clear(); - } - } - } - - @Override - public void onError(Call call, Throwable t) { - - } - }); - - - } else if (listcode == Contans.LISTCODE.ORDINARYVISIT) { - - api.getOrdinaryVisitList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { - @Override - public void onSuccess(Call call, Response response) { - - ApplyOrdinaryVisitBean baseResult = response.body(); - if (baseResult != null) { - baseResult.getTotal(); - if (!baseResult.getTotal().equals("0")) { - ordinaryVisiDatas.clear(); - ordinaryVisiDatas.addAll(baseResult.getRows()); - setListAdapter(listcode); - } else { - conferenceDatas.clear(); - } - } - } - - @Override - public void onError(Call call, Throwable t) { - - } - }); - } else if (listcode == Contans.LISTCODE.APPLYTRAVEL) { - - api.getApplyTraveList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { - @Override - public void onSuccess(Call call, Response response) { - ApplyTravelListBean baseResult = response.body(); - if (baseResult != null) { - baseResult.getTotal(); - if (!baseResult.getTotal().equals("0")) { - travelListDatas.clear(); - travelListDatas.addAll(baseResult.getRows()); - setListAdapter(listcode); - } else { - travelListDatas.clear(); - } - } - } - - @Override - public void onError(Call call, Throwable t) { - - } - }); - - - } else if (listcode == Contans.LISTCODE.APPLYVEHICLE) { - - api.getVehicleList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { - @Override - public void onSuccess(Call call, Response response) { - - ApplyListVehicleBean baseResult = response.body(); - if (baseResult != null) { - baseResult.getTotal(); - if (!baseResult.getTotal().equals("0")) { - vehicleDatas.clear(); - vehicleDatas.addAll(baseResult.getRows()); - setListAdapter(listcode); - } else { - vehicleDatas.clear(); - } - } - - } - - @Override - public void onError(Call call, Throwable t) { - - } - }); - - } else if (listcode == Contans.LISTCODE.OTHERTASK) { - api.getOtherTaskList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { - @Override - public void onSuccess(Call call, Response response) { - ApplyListOtherTaskBean baseResult = response.body(); - if (baseResult != null) { - baseResult.getTotal(); - if (!baseResult.getTotal().equals("0")) { - otherTaskDatas.clear(); - otherTaskDatas.addAll(baseResult.getRows()); - setListAdapter(listcode); - } else { - otherTaskDatas.clear(); - } - } - } - - @Override - public void onError(Call call, Throwable t) { - - } - }); - - } else if (listcode == Contans.LISTCODE.APPLYORDER) { - - api.getTakeOutList2(listcode, "0", manid,"", departmentnameid,"").enqueue(new BaseCallBack(builder.context) { - @Override - public void onSuccess(Call call, Response response) { - ApplyListTakeOutBean baseResult = response.body(); - if (baseResult != null) { - baseResult.getTotal(); - if (!baseResult.getTotal().equals("0")) { - takeOutDatas.clear(); - takeOutDatas.addAll(baseResult.getRows()); - setListAdapter(listcode); - } else { - takeOutDatas.clear(); - } - } - } - - @Override - public void onError(Call call, Throwable t) { - - } - }); - - - } else if (listcode == Contans.LISTCODE.APPLYDINNER) { - - api.getApplyList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { - - @Override - public void onSuccess(Call call, Response response) { - ApplyListBean baseResult = response.body(); - if (baseResult != null) { - baseResult.getTotal(); - if (!baseResult.getTotal().equals("0")) { - datas.clear(); - datas.addAll(baseResult.getRows()); - setListAdapter(listcode); - } else { - datas.clear(); - } - } - } - - @Override - public void onError(Call call, Throwable t) { - - } - }); - - - } else if (listcode == Contans.LISTCODE.APPLYSUPPLIES) { - - api.getApplyList2(listcode, proposerid, times, timee).enqueue(new BaseCallBack(builder.context) { - - @Override - public void onSuccess(Call call, Response response) { - ApplyListBean baseResult = response.body(); - if (baseResult != null) { - baseResult.getTotal(); - if (!baseResult.getTotal().equals("0")) { - datas.clear(); - datas.addAll(baseResult.getRows()); - setListAdapter(listcode); - } else { - datas.clear(); - } - } - } - - @Override - public void onError(Call call, Throwable t) { - - } - }); - - - } else if (listcode == Contans.LISTCODE.APPLYFACILITIES) { + String url = Contans.BASE_URL + Contans.GET_ORDER_LIST_RSA_URL; + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + request.add("listcode",listcode); + request.add("proposerid",proposerid); + request.add("manid",manid); + + request.add("departmentnameid",departmentnameid); + + + + if (listcode.equals(Contans.LISTCODE.RECEIVEVISIT)) { + //获取接待来访详情列表 + request.add("platform","0"); + } else if (listcode.equals(Contans.LISTCODE.APPLYCONFERENCE)) { + //获取会议室详情列表 + request.add("platform","0"); + } else if (listcode.equals(Contans.LISTCODE.ORDINARYVISIT)) { + //获取订餐列表 + request.add("platform","0"); + } else if (listcode.equals(Contans.LISTCODE.APPLYTRAVEL)) { + //获取出差申请列表 + request.add("platform","0"); + } else if (listcode.equals(Contans.LISTCODE.APPLYVEHICLE)) { + //获取用车申请详情列表 + request.add("platform","0"); + } else if (listcode.equals(Contans.LISTCODE.OTHERTASK)) { + //获取他人任务详情列表 + request.add("platform","0"); + } else if (listcode.equals(Contans.LISTCODE.APPLYORDER)) { + //获取送餐详情列表 + request.add("platform","0"); + request.add("login_userid",""); + request.add("istj",""); + } else if (listcode.equals(Contans.LISTCODE.APPLYDINNER)) { + //订餐申请 + request.add("platform","0"); + } else if (listcode.equals(Contans.LISTCODE.APPLYSUPPLIES)) { + //获取申请列表 + url = Contans.BASE_URL + Contans.GETAPPLYLIST2_RSA_URL; + request = NoHttp.createStringRequest(url, RequestMethod.GET); + request.add("listcode",listcode); + request.add("proposerid",proposerid); + request.add("manid",manid); + + request.add("times",times); + request.add("timee",timee); + } else if (listcode.equals(Contans.LISTCODE.APPLYFACILITIES)) { + //获取申请列表 + url = Contans.BASE_URL + Contans.GETAPPLYLIST2_RSA_URL; + request = NoHttp.createStringRequest(url, RequestMethod.GET); + request.add("listcode",listcode); + request.add("proposerid",proposerid); + request.add("manid",manid); + + request.add("times",times); + request.add("timee",timee); + } else if (listcode.equals(Contans.LISTCODE.APPLYSUGGESTION)) { + //建议汇总和我的建议 + request.add("listcode",listcode); + request.add("proposerid",proposerid); + request.add("manid",manid); + } else { + //没有就是else里面 + request.add("listcode",listcode); + request.add("proposerid",proposerid); + request.add("manid",manid); + request.add("times",times); + request.add("timee",timee); + } - api.getApplyList2(listcode, proposerid, times, timee).enqueue(new BaseCallBack(builder.context) { - @Override - public void onSuccess(Call call, Response response) { - ApplyListBean baseResult = response.body(); - if (baseResult != null) { - baseResult.getTotal(); - if (!baseResult.getTotal().equals("0")) { - datas.clear(); - datas.addAll(baseResult.getRows()); - setListAdapter(listcode); - } else { - datas.clear(); + NohttpUtils.getInstance().add(context, 0, request, new HttpListener() { + + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + + showLog("----------------"); + String result = response.get(); + if(listcode.equals(Contans.LISTCODE.APPLYSUPPLIES)||listcode.equals(Contans.LISTCODE.APPLYFACILITIES)){ + if (listcode.equals(Contans.LISTCODE.APPLYSUPPLIES)) { + ApplyListBean baseResult = GsonUtils.GsonToBean(result,ApplyListBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + datas.clear(); + datas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + datas.clear(); + } } } - } - - @Override - public void onError(Call call, Throwable t) { - - } - }); - - - } else if (listcode == Contans.LISTCODE.APPLYSUGGESTION) { - - api.getMyAdvice(listcode,manid, proposerid).enqueue(new BaseCallBack(builder.context) { - @Override - public void onSuccess(Call call, Response response) { - - MyadviceBean myadviceBean = response.body(); - if (myadviceBean != null) { - myadviceBean.getTotal(); - if (!myadviceBean.getTotal().equals("0")) { - myadviceDatas.clear(); - myadviceDatas.addAll(myadviceBean.getRows()); - setListAdapter(listcode); - } else { - myadviceDatas.clear(); + if (listcode.equals(Contans.LISTCODE.APPLYFACILITIES)) { + ApplyListBean baseResult = GsonUtils.GsonToBean(result,ApplyListBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + datas.clear(); + datas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + datas.clear(); + } } - } - - - } - - @Override - public void onError(Call call, Throwable t) { - - } - }); - - - } else { - //没有就是else里面 - api.getApplyList(listcode, proposerid,manid, times, timee).enqueue(new BaseCallBack(builder.context) { - - @Override - public void onSuccess(Call call, Response response) { - ApplyListBean baseResult = response.body(); - if (baseResult != null) { - baseResult.getTotal(); - if (!baseResult.getTotal().equals("0")) { - datas.clear(); - datas.addAll(baseResult.getRows()); - setListAdapter(listcode); + }else{ + String jsonDecode = RSAUtils.decryptBASE64StrClient(result); + showLog(result); + showLog(jsonDecode); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(context, R.string.data_error)); + } else { + if (listcode.equals(Contans.LISTCODE.RECEIVEVISIT)) { + ApplyListReceiveBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListReceiveBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + receiveDatas.clear(); + receiveDatas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + receiveDatas.clear(); + } + } + } else if (listcode.equals(Contans.LISTCODE.APPLYCONFERENCE)) { + ApplyListConferenceBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListConferenceBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + conferenceDatas.clear(); + conferenceDatas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + conferenceDatas.clear(); + } + } + } else if (listcode.equals(Contans.LISTCODE.ORDINARYVISIT)) { + ApplyOrdinaryVisitBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyOrdinaryVisitBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + ordinaryVisiDatas.clear(); + ordinaryVisiDatas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + conferenceDatas.clear(); + } + } + } else if (listcode.equals(Contans.LISTCODE.APPLYTRAVEL)) { + ApplyTravelListBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyTravelListBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + travelListDatas.clear(); + travelListDatas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + travelListDatas.clear(); + } + } + } else if (listcode.equals(Contans.LISTCODE.APPLYVEHICLE)) { + ApplyListVehicleBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListVehicleBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + vehicleDatas.clear(); + vehicleDatas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + vehicleDatas.clear(); + } + } + } else if (listcode.equals(Contans.LISTCODE.OTHERTASK)) { + ApplyListOtherTaskBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListOtherTaskBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + otherTaskDatas.clear(); + otherTaskDatas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + otherTaskDatas.clear(); + } + } + } else if (listcode.equals(Contans.LISTCODE.APPLYORDER)) { + ApplyListTakeOutBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListTakeOutBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + takeOutDatas.clear(); + takeOutDatas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + takeOutDatas.clear(); + } + } + } else if (listcode.equals(Contans.LISTCODE.APPLYDINNER)) { + ApplyListBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + datas.clear(); + datas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + datas.clear(); + } + } + } else if (listcode.equals(Contans.LISTCODE.APPLYSUPPLIES)) { + ApplyListBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + datas.clear(); + datas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + datas.clear(); + } + } + } else if (listcode.equals(Contans.LISTCODE.APPLYSUGGESTION)) { + MyadviceBean myadviceBean = GsonUtils.GsonToBean(jsonDecode,MyadviceBean.class); + if (myadviceBean != null) { + if (!myadviceBean.getTotal().equals("0")) { + myadviceDatas.clear(); + myadviceDatas.addAll(myadviceBean.getRows()); + setListAdapter(listcode); + } else { + myadviceDatas.clear(); + } + } } else { - datas.clear(); + //没有就是else里面 + ApplyListBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListBean.class); + if (baseResult != null) { + if (!baseResult.getTotal().equals("0")) { + datas.clear(); + datas.addAll(baseResult.getRows()); + setListAdapter(listcode); + } else { + datas.clear(); + } + } } } } + } - @Override - public void onError(Call call, Throwable t) { + @Override + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { - } - }); - } + } + }); + + + +// if (listcode == Contans.LISTCODE.RECEIVEVISIT) { +// +// api.getReceiveList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { +// @Override +// public void onSuccess(Call call, Response response) { +// ApplyListReceiveBean baseResult = response.body(); +// if (baseResult != null) { +// baseResult.getTotal(); +// if (!baseResult.getTotal().equals("0")) { +// receiveDatas.clear(); +// receiveDatas.addAll(baseResult.getRows()); +// setListAdapter(listcode); +// } else { +// receiveDatas.clear(); +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); +// +// } else if (listcode == Contans.LISTCODE.APPLYCONFERENCE) { +// +// api.getConferenceList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { +// @Override +// public void onSuccess(Call call, Response response) { +// ApplyListConferenceBean baseResult = response.body(); +// if (baseResult != null) { +// baseResult.getTotal(); +// if (!baseResult.getTotal().equals("0")) { +// conferenceDatas.clear(); +// conferenceDatas.addAll(baseResult.getRows()); +// setListAdapter(listcode); +// } else { +// conferenceDatas.clear(); +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); +// +// +// } else if (listcode == Contans.LISTCODE.ORDINARYVISIT) { +// +// api.getOrdinaryVisitList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// ApplyOrdinaryVisitBean baseResult = response.body(); +// if (baseResult != null) { +// baseResult.getTotal(); +// if (!baseResult.getTotal().equals("0")) { +// ordinaryVisiDatas.clear(); +// ordinaryVisiDatas.addAll(baseResult.getRows()); +// setListAdapter(listcode); +// } else { +// conferenceDatas.clear(); +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); +// } else if (listcode == Contans.LISTCODE.APPLYTRAVEL) { +// +// api.getApplyTraveList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { +// @Override +// public void onSuccess(Call call, Response response) { +// ApplyTravelListBean baseResult = response.body(); +// if (baseResult != null) { +// baseResult.getTotal(); +// if (!baseResult.getTotal().equals("0")) { +// travelListDatas.clear(); +// travelListDatas.addAll(baseResult.getRows()); +// setListAdapter(listcode); +// } else { +// travelListDatas.clear(); +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); +// +// +// } else if (listcode == Contans.LISTCODE.APPLYVEHICLE) { +// +// api.getVehicleList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// ApplyListVehicleBean baseResult = response.body(); +// if (baseResult != null) { +// baseResult.getTotal(); +// if (!baseResult.getTotal().equals("0")) { +// vehicleDatas.clear(); +// vehicleDatas.addAll(baseResult.getRows()); +// setListAdapter(listcode); +// } else { +// vehicleDatas.clear(); +// } +// } +// +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); +// +// } else if (listcode == Contans.LISTCODE.OTHERTASK) { +// api.getOtherTaskList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { +// @Override +// public void onSuccess(Call call, Response response) { +// ApplyListOtherTaskBean baseResult = response.body(); +// if (baseResult != null) { +// baseResult.getTotal(); +// if (!baseResult.getTotal().equals("0")) { +// otherTaskDatas.clear(); +// otherTaskDatas.addAll(baseResult.getRows()); +// setListAdapter(listcode); +// } else { +// otherTaskDatas.clear(); +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); +// +// } else if (listcode == Contans.LISTCODE.APPLYORDER) { +// +// api.getTakeOutList2(listcode, "0", manid,"", departmentnameid,"").enqueue(new BaseCallBack(builder.context) { +// @Override +// public void onSuccess(Call call, Response response) { +// ApplyListTakeOutBean baseResult = response.body(); +// if (baseResult != null) { +// baseResult.getTotal(); +// if (!baseResult.getTotal().equals("0")) { +// takeOutDatas.clear(); +// takeOutDatas.addAll(baseResult.getRows()); +// setListAdapter(listcode); +// } else { +// takeOutDatas.clear(); +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); +// +// +// } else if (listcode == Contans.LISTCODE.APPLYDINNER) { +// +// api.getApplyList(listcode, proposerid,manid, departmentnameid, "0").enqueue(new BaseCallBack(builder.context) { +// +// @Override +// public void onSuccess(Call call, Response response) { +// ApplyListBean baseResult = response.body(); +// if (baseResult != null) { +// baseResult.getTotal(); +// if (!baseResult.getTotal().equals("0")) { +// datas.clear(); +// datas.addAll(baseResult.getRows()); +// setListAdapter(listcode); +// } else { +// datas.clear(); +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); +// +// +// } else if (listcode == Contans.LISTCODE.APPLYSUPPLIES) { +// +// api.getApplyList2(listcode, proposerid, times, timee).enqueue(new BaseCallBack(builder.context) { +// +// @Override +// public void onSuccess(Call call, Response response) { +// ApplyListBean baseResult = response.body(); +// if (baseResult != null) { +// baseResult.getTotal(); +// if (!baseResult.getTotal().equals("0")) { +// datas.clear(); +// datas.addAll(baseResult.getRows()); +// setListAdapter(listcode); +// } else { +// datas.clear(); +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); +// +// +// } else if (listcode == Contans.LISTCODE.APPLYSUGGESTION) { +// +//// api.getMyAdvice(listcode,manid, proposerid).enqueue(new BaseCallBack(builder.context) { +//// @Override +//// public void onSuccess(Call call, Response response) { +//// +//// MyadviceBean myadviceBean = response.body(); +//// if (myadviceBean != null) { +//// myadviceBean.getTotal(); +//// if (!myadviceBean.getTotal().equals("0")) { +//// myadviceDatas.clear(); +//// myadviceDatas.addAll(myadviceBean.getRows()); +//// setListAdapter(listcode); +//// } else { +//// myadviceDatas.clear(); +//// } +//// +//// } +//// +//// +//// } +//// +//// @Override +//// public void onError(Call call, Throwable t) { +//// +//// } +//// }); +// +// api.getMyAdviceRsa(listcode,manid, proposerid).enqueue(new BaseCallBack(builder.context) { +// @Override +// public void onSuccess(Call call, Response response) { +// +// String result = response.body(); +// showLog("-----getMyAdviceRsa----"); +// showLog(result); +// +// String jsonDecode = RSAUtils.decryptBASE64StrClient(result); +// showLog(jsonDecode); +// if (TextUtils.isEmpty(jsonDecode)) { +// showToast(UiUtlis.getString(context, R.string.data_error)); +// } else { +// showToast(jsonDecode); +// MyadviceBean myadviceBean = GsonUtils.GsonToBean(jsonDecode,MyadviceBean.class); +// if (myadviceBean != null) { +// myadviceBean.getTotal(); +// if (!myadviceBean.getTotal().equals("0")) { +// myadviceDatas.clear(); +// myadviceDatas.addAll(myadviceBean.getRows()); +// setListAdapter(listcode); +// } else { +// myadviceDatas.clear(); +// } +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); +// +// +// } else { +// //没有就是else里面 +// api.getApplyList(listcode, proposerid,manid, times, timee).enqueue(new BaseCallBack(builder.context) { +// +// @Override +// public void onSuccess(Call call, Response response) { +// ApplyListBean baseResult = response.body(); +// if (baseResult != null) { +// baseResult.getTotal(); +// if (!baseResult.getTotal().equals("0")) { +// datas.clear(); +// datas.addAll(baseResult.getRows()); +// setListAdapter(listcode); +// } else { +// datas.clear(); +// } +// } +// } +// +// @Override +// public void onError(Call call, Throwable t) { +// +// } +// }); +// } } /** @@ -659,7 +925,7 @@ public class ApplyListUtils { return builder; } - public ApplyListUtils builder(Context context) { + public ApplyListUtils builder(Activity context) { this.context = context; valida(); return new ApplyListUtils(context); @@ -691,4 +957,34 @@ public class ApplyListUtils { public interface OnItemClickListener { void onItemClick(Object object); } + + public void showLog(String logText) { + if (isApkInDebug(context)) { + if(TextUtils.isEmpty(logText)){ + Log.i("app", "logText is null"); + }else{ + Log.i("app", logText); + } + } + } + + /** + * 判断当前应用是否是debug状态 + */ + + public static boolean isApkInDebug(Context context) { + try { + ApplicationInfo info = context.getApplicationInfo(); + return (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; + } catch (Exception e) { + return false; + } + } + public void showToast(String msg) { + Toast.makeText(context, msg, Toast.LENGTH_SHORT).show(); + } + + public void showToast(int strId) { + Toast.makeText(context, strId, Toast.LENGTH_SHORT).show(); + } } diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java index 13c4c0f..9e8a672 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java @@ -84,8 +84,8 @@ public class NohttpUtils { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url(),mActivity); - showLog(credential,mActivity); - showLog(new Gson().toJson(request.headers()),mActivity); +// showLog(credential,mActivity); +// showLog(new Gson().toJson(request.headers()),mActivity); } if(!TextUtils.isEmpty(request.url())){ String url =request.url();