From 1ce363ee40f1eaf1c9e9372850a0b8c2d857dc57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=81=A5?= Date: Tue, 14 Dec 2021 09:37:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baselib/constant/PathConfig.java | 9 +- .../baselib/core/retrofit_net/BaseUrlApi.java | 1 + .../core/widget/base/BaseActivity.java | 6 +- commandmodule/src/main/AndroidManifest.xml | 12 +- .../incident/IncidentAcceptListActivity.java | 3 +- .../IncidentDeferExamineListActivity.java | 266 -------------- .../activity_incident_defer_examine_list.xml | 57 --- commonmodule/src/main/AndroidManifest.xml | 12 +- .../cases/IncidentCheckDetailActivity.java | 345 +++++++++--------- .../IncidentDeferExamineDetailActivity.java | 103 +++++- .../IncidentDeferExamineListActivity.java | 124 +++++++ .../cases/IncidentDetailActivity.java | 89 ++++- .../cases/IncidentHandleActivity.java | 56 ++- .../cases/IncidentReportActivity.java | 28 +- .../adapters/HandleRecordAdapter.java | 9 +- .../adapters/IncidentDeferListAdapter.java | 43 +++ .../adapters/IncidentLogAdapter.java | 5 +- .../adapters/KeyPlaceAdapter.java | 2 +- .../adapters/TaskBusinessListAdapter.java | 2 +- .../adapters/TaskListAdapter.java | 17 + .../commonmodule/beans/DeferDetailBean.java | 18 + .../commonmodule/beans/HandleListBean.java | 10 + .../beans/IncidentDeferListBean.java | 160 ++++++++ .../commonmodule/beans/IncidentLogBean.java | 10 + .../beans/IncidentRebackBean.java | 20 +- .../beans/PatrolKeyPlaceDetailBean.java | 66 +++- .../beans/PatrolKeyPlaceListBean.java | 20 +- .../beans/SavePatrolKeyPlaceBean.java | 10 +- .../commonmodule/beans/SaveTaskStateBean.java | 28 ++ .../fragments/IncidentDeferFragment.java | 165 +++++++++ .../holders/HandleRecordHolder.java | 2 + .../holders/IncidentDeferListHolder.java | 34 ++ .../holders/IncidentLogHolder.java | 2 + .../commonmodule/holders/TaskHolder.java | 2 + .../commonmodule/nets/CenterApis.java | 7 +- .../commonmodule/nets/GridApis.java | 46 ++- ...activity_incident_defer_examine_detail.xml | 153 +++++++- .../activity_incident_defer_examine_list.xml | 22 ++ .../res/layout/activity_incident_detail.xml | 113 +++++- .../res/layout/activity_incident_handle.xml | 166 ++++++++- .../layout/activity_incident_special_dept.xml | 2 +- .../res/layout/activity_statistics_grid.xml | 18 + .../layout/fragment_incident_defer_list.xml | 7 + .../res/layout/item_incident_defer_list.xml | 86 +++++ .../main/res/layout/item_incident_handle.xml | 16 +- .../src/main/res/layout/item_incident_log.xml | 81 ++-- .../src/main/res/layout/item_task.xml | 27 +- gridmodule/src/main/AndroidManifest.xml | 185 ++++++++-- .../activitys/locus/WorkLocusActivity.java | 61 +++- .../patrols/KeyPlacePatrolAddActivity.java | 8 +- .../patrols/KeyPlacePatrolDetailActivity.java | 6 +- .../patrols/KeyPlacePatrolEditActivity.java | 36 +- .../patrols/KeyPlacePatrolListActivity.java | 103 +++--- .../CensusExpandableMainActivity.java | 2 +- .../security/KeyPlaceListActivity.java | 2 +- .../security/KeyRoadListActivity.java | 2 +- .../security/PenalDetailActivity.java | 57 ++- .../security/PenalSuspicionListActivity.java | 5 +- .../security/PenalVictimListActivity.java | 4 +- .../tasks/InspectionPatrolActivity.java | 134 +++++++ .../tasks/TaskBusinessListActivity.java | 32 +- .../activitys/tasks/TaskManageActivity.java | 28 +- .../tasks/fragments/TaskFragment.java | 47 +++ .../res/layout/activity_inspection_patrol.xml | 21 ++ .../res/layout/activity_key_place_detail.xml | 3 +- .../activity_key_place_patrol_detail.xml | 3 +- .../layout/activity_key_place_patrol_edit.xml | 3 +- .../layout/activity_key_place_patrol_list.xml | 57 +-- .../main/res/layout/activity_penal_detail.xml | 40 +- .../layout/activity_school_emphases_list.xml | 1 - .../layout/activity_school_manage_list.xml | 1 - .../main/res/layout/activity_work_locus.xml | 163 +++++---- .../fragments/GridMainFragment.java | 9 +- .../fragments/LeaderMainFragment.java | 21 +- .../fragments/SupervisionMainFragment.java | 10 +- .../IncidentAcceptDeptDetailActivity.java | 2 +- .../IncidentCheckDeptDetailActivity.java | 84 ++++- .../activity_incident_check_dept_detail.xml | 189 +++++++++- 78 files changed, 2843 insertions(+), 956 deletions(-) delete mode 100644 commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentDeferExamineListActivity.java delete mode 100644 commandmodule/src/main/res/layout/activity_incident_defer_examine_list.xml rename {commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident => commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases}/IncidentDeferExamineDetailActivity.java (86%) create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineListActivity.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/IncidentDeferListAdapter.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentDeferListBean.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveTaskStateBean.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentDeferFragment.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/IncidentDeferListHolder.java rename {commandmodule => commonmodule}/src/main/res/layout/activity_incident_defer_examine_detail.xml (76%) create mode 100644 commonmodule/src/main/res/layout/activity_incident_defer_examine_list.xml create mode 100644 commonmodule/src/main/res/layout/fragment_incident_defer_list.xml create mode 100644 commonmodule/src/main/res/layout/item_incident_defer_list.xml create mode 100644 gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/InspectionPatrolActivity.java create mode 100644 gridmodule/src/main/res/layout/activity_inspection_patrol.xml diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java index 22deae2..40a72d2 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -196,12 +196,17 @@ public class PathConfig { public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_LIST = "/modulecommon/activity/incidentCheckList";//事件核查 public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_DETAIL = "/modulecommon/activity/incidentCheckDetail";//事件核查详情 + public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEFER_EXAMINE = "/modulecommon/activity/incidentDeferExamine";//延期审核 + public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEFER_EXAMINE_DETAIL = "/modulecommon/activity/incidentDeferExamineDetail";//延期审核 + + public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEPT_SPECIAL = "/modulecommon/activity/incidentDeptSpecial";//部门端特殊事件 预警和超时 public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEPT_TIME_OUT = "/modulecommon/fragment/incidentDeptTimeOut";//部门端超时事件 public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEPT_EARLY_WARN = "/modulecommon/fragment/incidentDeptEarlyWarn";//部门端预警事件 public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CENTER_SPECIAL = "/modulecommon/activity/incidentCenterSpecial";//中心端特殊事件 预警和超时 public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_CENTER_TIME_OUT = "/modulecommon/fragment/incidentCenterTimeOut";//中心端超时事件 + public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEFER = "/modulecommon/fragment/incidentDefer";//事件延期列表 public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_CENTER_EARLY_WARN = "/modulecommon/fragment/incidentCenterEarlyWarn";//中心端预警事件 public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_OVERSEE = "/modulecommon/activity/incidentOversee";//事件督办 @@ -346,6 +351,7 @@ public class PathConfig { public static final String PATH_MODULE_GRID_ACTIVITY_TASK_DETAIL = "/modulegrid/activity/taskDetail";//任务详情 public static final String PATH_MODULE_GRID_ACTIVITY_TASK_REPORT = "/modulegrid/activity/taskReport";//任务详情 + public static final String PATH_MODULE_GRID_ACTIVITY_INSPECTION_PATROL = "/modulegrid/activity/inspectionPatrol";//巡查巡检 public static final String PATH_MODULE_GRID_ACTIVITY_TASK_BUSINESS_LIST = "/modulegrid/activity/taskBusinessList";//任务业务列表 @@ -487,8 +493,7 @@ public class PathConfig { public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_LIST = "/modulecommand/activity/incidentDispatchList";//事件派遣列表 public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_DETAIL = "/modulecommand/activity/incidentDispatchDetail";//事件派遣 public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_SEL_DEPT = "/modulecommand/activity/incidentDeptSel";//选择组织机构 - public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DEFER_EXAMINE = "/modulecommand/activity/incidentDeferExamine";//延期审核 - public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DEFER_EXAMINE_DETAIL = "/modulecommand/activity/incidentDeferExamineDetail";//延期审核 + /*=========================================部门端========================================*/ public static final String PATH_MODULE_SUPERVISION_INCIDENT_DISTRIBUTION_LIST_ACTIVITY = "/modulesupervision/activity/incidentDeptDistributionList";//事件分拨列表 diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java index a9a73f2..851f5cc 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java @@ -10,6 +10,7 @@ import com.tenlionsoft.baselib.constant.PathConfig; */ public class BaseUrlApi { +// public static final String IP = "http://192.168.0.103:7011/";/* 测试IP */ public static final String IP = "http://192.168.0.155:7011/";/* 测试IP */ public static final String SYS_USERCENTER = "usercenter/"; public static final String SYS_POPULATION = "population/";/*人口系统*/ diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java index 9700863..ed98f9c 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java @@ -261,8 +261,12 @@ public abstract class BaseActivity extends AppCompatActivity { clearSearch(); } - + /** + * 关闭标题搜索 + */ private void closeSearchContent() { + mEtAppSearchContent.setText(""); + clearSearch(); hideSoftKeyboard(); collapse(mLlAppSearchContent); } diff --git a/commandmodule/src/main/AndroidManifest.xml b/commandmodule/src/main/AndroidManifest.xml index e72466c..c236a2d 100644 --- a/commandmodule/src/main/AndroidManifest.xml +++ b/commandmodule/src/main/AndroidManifest.xml @@ -25,16 +25,8 @@ - - + + mDatas; private IncidentListAdapter mAdapter; private int mCurrentPage = 1; + private String mRows = "10"; private String mKeywords = ""; @Override @@ -124,7 +125,7 @@ public class IncidentAcceptListActivity extends BaseActivity { mCurrentPage = currentPage; RetrofitManager.getInstance() .create(CenterApis.class) - .getIncidentUnAcceptList(mKeywords, mCurrentPage + "", UserLgUtils.getToken()) + .getIncidentUnAcceptList(mKeywords, mCurrentPage + "", mRows, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { diff --git a/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentDeferExamineListActivity.java b/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentDeferExamineListActivity.java deleted file mode 100644 index c90e37d..0000000 --- a/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentDeferExamineListActivity.java +++ /dev/null @@ -1,266 +0,0 @@ -package com.tengshisoft.commandmodule.activitys.incident; - -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.Unbinder; -import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; -import io.reactivex.rxjava3.annotations.NonNull; -import io.reactivex.rxjava3.core.Observer; -import io.reactivex.rxjava3.disposables.Disposable; -import io.reactivex.rxjava3.schedulers.Schedulers; - -import android.content.Intent; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.ProgressBar; -import android.widget.TextView; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; -import com.scwang.smart.refresh.layout.SmartRefreshLayout; -import com.tengshisoft.commandmodule.R; -import com.tengshisoft.commandmodule.R2; -import com.tengshisoft.commonmodule.adapters.IncidentListAdapter; -import com.tengshisoft.commonmodule.beans.IncidentListBean; -import com.tengshisoft.commonmodule.nets.CenterApis; -import com.tenlionsoft.baselib.constant.PathConfig; -import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; -import com.tenlionsoft.baselib.core.widget.base.BaseActivity; -import com.tenlionsoft.baselib.utils.ExceptionHandler; -import com.tenlionsoft.baselib.utils.UserLgUtils; - -import java.util.ArrayList; -import java.util.List; - -/** - * 作者: Adam - * 日期: 2021年11月02日18:39:58 - * 邮箱: itgaojian@163.com - * 描述: 事件延期审核 - */ -@Route(path = PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DEFER_EXAMINE) -public class IncidentDeferExamineListActivity extends BaseActivity { - @BindView(R2.id.rlv_components) - RecyclerView mRlvComponents; - @BindView(R2.id.srl_content) - SmartRefreshLayout mSrlContent; - @BindView(R2.id.pb_loading) - ProgressBar mPbLoading; - @BindView(R2.id.iv_empty_data) - ImageView mIvEmptyData; - @BindView(R2.id.tv_error_hint) - TextView mTvErrorHint; - private Unbinder mBind; - private List mDatas; - private IncidentListAdapter mAdapter; - private int mCurrentPage = 1; - private String mKeywords = ""; - - @Override - protected int setLayoutId() { - return R.layout.activity_incident_defer_examine_list; - } - - - @Override - protected void doShowOptions() { - - } - - @Override - protected void clearSearch() { - mKeywords = ""; - doRefresh(); - } - - @Override - protected void doSearchByTitle() { - doSearch(); - } - - @Override - public void initData() { - mBind = ButterKnife.bind(this); - mTvBaseTitle.setText("延期审核"); - mEtAppSearchContent.setHint("请输入事件编码(分类名称)"); - mIvAppSearchIcon.setVisibility(View.VISIBLE); - refreshView(STATE_LOAD_SUCCESS); - mDatas = new ArrayList<>(); - mAdapter = new IncidentListAdapter(mActivity, mDatas); - mRlvComponents.setLayoutManager(new LinearLayoutManager(mActivity)); - mRlvComponents.setAdapter(mAdapter); - mSrlContent.setOnRefreshListener(v -> doRefresh()); - mSrlContent.setOnLoadMoreListener(v -> doLoadMore()); - setStateView(13); - getIncidentDispatchList(mCurrentPage); - mAdapter.addOnItemClickListener(v -> ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DEFER_EXAMINE_DETAIL) - .withString("reportId", v.getReportId()) - .withString("taskId", v.getTaskId()) - .withString("deferApplyId", v.getDelayApplyId()) - .navigation(mActivity, 12)); - } - - /** - * 获取待派遣的事件 - */ - private void getIncidentDispatchList(int currentPage) { - mCurrentPage = currentPage; - RetrofitManager.getInstance() - .create(CenterApis.class) - .getDeferIncidentList(mKeywords, mCurrentPage + "", UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { - - } - - @Override - public void onNext(@NonNull IncidentListBean communityListBean) { - if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) { - ++mCurrentPage; - if (currentPage == 1) { - mDatas.clear(); - mDatas.addAll(communityListBean.getRows()); - } else { - mDatas.addAll(communityListBean.getRows()); - } - setStateView(14); - mAdapter.notifyDataSetChanged(); - mSrlContent.finishRefresh(); - if (mDatas.size() >= communityListBean.getTotal()) { - mSrlContent.finishLoadMore(); - mSrlContent.setNoMoreData(true); - } else { - mSrlContent.finishLoadMore(); - mSrlContent.setNoMoreData(false); - } - } else { - if (currentPage > 1) { - mSrlContent.finishLoadMore(); - mSrlContent.setNoMoreData(true); - setStateView(14); - } else { - if (TextUtils.isEmpty(mKeywords)) { - //无数据 - setStateView(15); - } else { - setStateView(15); - ToastUtils.show("未查询到相关内容"); - } - } - } - } - - @Override - public void onError(@NonNull Throwable e) { - mSrlContent.finishLoadMore(); - mSrlContent.finishRefresh(); - ExceptionHandler.handleException(e); - setStateView(16); - } - - @Override - public void onComplete() { - - } - }); - - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable @org.jetbrains.annotations.Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (requestCode == 12) { - if (resultCode == 13) { - doRefresh(); - } - } - } - - //加载更多 - private void doLoadMore() { - getIncidentDispatchList(mCurrentPage); - } - - //刷新 - private void doRefresh() { - mDatas.clear(); - mAdapter.setData(mDatas); - getIncidentDispatchList(1); - } - - /** - * - */ - private void doSearch() { - String searchContent = mEtAppSearchContent.getText().toString().trim(); - if (!TextUtils.isEmpty(searchContent)) { - hideSoftKeyboard(); - setStateView(13); - mKeywords = searchContent; - mCurrentPage = 1; - getIncidentDispatchList(mCurrentPage); - - } else { - ToastUtils.show("请输入要查询的内容"); - } - } - - - /** - * 根据状态显示 - * 12 默认 - * 13 搜索中 - * 14 搜索完成有数据 - * 15 搜索完成没有数据 - * 16 搜索失败 - * - * @param state - */ - private void setStateView(int state) { - switch (state) { - case 12://默认 - case 15://默认 - mPbLoading.setVisibility(View.GONE); - mSrlContent.setVisibility(View.GONE); - mIvEmptyData.setVisibility(View.VISIBLE); - mTvErrorHint.setVisibility(View.VISIBLE); - mTvErrorHint.setText("暂无数据"); - break; - case 13://搜索中 - mPbLoading.setVisibility(View.VISIBLE); - mSrlContent.setVisibility(View.GONE); - mIvEmptyData.setVisibility(View.GONE); - mTvErrorHint.setVisibility(View.VISIBLE); - mTvErrorHint.setText("加载中..."); - break; - case 14://搜索完成有数据 - mPbLoading.setVisibility(View.GONE); - mSrlContent.setVisibility(View.VISIBLE); - mIvEmptyData.setVisibility(View.GONE); - mTvErrorHint.setVisibility(View.GONE); - break; - case 16://搜索失败 - mPbLoading.setVisibility(View.GONE); - mSrlContent.setVisibility(View.GONE); - mIvEmptyData.setVisibility(View.VISIBLE); - mTvErrorHint.setVisibility(View.VISIBLE); - mTvErrorHint.setText("加载失败,请稍后重试"); - break; - } - } - -} \ No newline at end of file diff --git a/commandmodule/src/main/res/layout/activity_incident_defer_examine_list.xml b/commandmodule/src/main/res/layout/activity_incident_defer_examine_list.xml deleted file mode 100644 index 4ebaad6..0000000 --- a/commandmodule/src/main/res/layout/activity_incident_defer_examine_list.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/commonmodule/src/main/AndroidManifest.xml b/commonmodule/src/main/AndroidManifest.xml index abeba66..564b241 100644 --- a/commonmodule/src/main/AndroidManifest.xml +++ b/commonmodule/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ package="com.tengshisoft.commonmodule"> - + @@ -12,6 +12,11 @@ + + ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG) - .withString("businessId", mDetailBean.getBusinessId()) - .navigation()); + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG) + .withString("businessId", mDetailBean.getBusinessId()) + .navigation()); initViews(); initMap(); getDetailData(); @@ -240,35 +240,35 @@ public class IncidentCheckDetailActivity extends BaseActivity { ProgressDialog dialog = UIUtil.initDialog(mActivity, "提交中..."); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .doSaveIncidentCheckUnPass(mId, body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .doSaveIncidentCheckUnPass(mId, body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("核查成功"); - setResult(13); - finish(); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("核查成功"); + setResult(13); + finish(); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } } @@ -282,35 +282,35 @@ public class IncidentCheckDetailActivity extends BaseActivity { ProgressDialog dialog = UIUtil.initDialog(mActivity, "提交中..."); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .doSaveIncidentCheckPass(mId, body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .doSaveIncidentCheckPass(mId, body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("核查成功"); - setResult(13); - finish(); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("核查成功"); + setResult(13); + finish(); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } } @@ -388,11 +388,11 @@ public class IncidentCheckDetailActivity extends BaseActivity { */ private void showSelectPhoto(AddPhotoBean bean) { ButtomDialogView buttomDialogView = new ButtomDialogView.DialogBuilder(mActivity) - .setIsBackCancelable(true) - .setIscancelable(true) - .setShowLocation(Gravity.BOTTOM) - .setIsShowFile(false) - .build(); + .setIsBackCancelable(true) + .setIscancelable(true) + .setShowLocation(Gravity.BOTTOM) + .setIsShowFile(false) + .build(); buttomDialogView.addOnChoseListener(new ButtomDialogView.OnChoseListener() { @Override public void choseFile() { @@ -403,7 +403,7 @@ public class IncidentCheckDetailActivity extends BaseActivity { mCurrentBean = bean; Intent intent = new Intent(Intent.ACTION_PICK, null); intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, - "image/*"); + "image/*"); startActivityForResult(intent, BaseUrlApi.PHOTO_REQUEST); buttomDialogView.dismiss(); } @@ -412,10 +412,10 @@ public class IncidentCheckDetailActivity extends BaseActivity { public void choseShoot() { mCurrentBean = bean; ARouter.getInstance() - .build(PathConfig.PATH_MODULE_BASELIB_TAKE_PHOTO) - .withString("path", getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getPath()) - .withString("type", "photo") - .navigation(mActivity, BaseUrlApi.CAMERA_REQUEST); + .build(PathConfig.PATH_MODULE_BASELIB_TAKE_PHOTO) + .withString("path", getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getPath()) + .withString("type", "photo") + .navigation(mActivity, BaseUrlApi.CAMERA_REQUEST); buttomDialogView.dismiss(); } @@ -475,45 +475,45 @@ public class IncidentCheckDetailActivity extends BaseActivity { RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file); MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(), requestFile); RetrofitManager.getInstance() - .create(BaseApiService.class) - .uploadImage(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + .create(BaseApiService.class) + .uploadImage(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + } + + @Override + public void onNext(BaseSuccessBean baseUserBean) { + if (progressDialog != null && progressDialog.isShowing()) { + progressDialog.dismiss(); } - - @Override - public void onNext(BaseSuccessBean baseUserBean) { - if (progressDialog != null && progressDialog.isShowing()) { - progressDialog.dismiss(); - } - ToastUtils.show("上传成功"); - mPhotoIds += (baseUserBean.getData() + ","); - mCurrentBean.setId(baseUserBean.getData()); - mCurrentBean.setPath(picPath); - if (mPhotos.size() < 4) { - mPhotos.add(new AddPhotoBean()); - } - mAddPhotoAdapter.notifyDataSetChanged(); - mCurrentBean = null; + ToastUtils.show("上传成功"); + mPhotoIds += (baseUserBean.getData() + ","); + mCurrentBean.setId(baseUserBean.getData()); + mCurrentBean.setPath(picPath); + if (mPhotos.size() < 4) { + mPhotos.add(new AddPhotoBean()); } + mAddPhotoAdapter.notifyDataSetChanged(); + mCurrentBean = null; + } - @Override - public void onError(Throwable e) { - if (progressDialog != null && progressDialog.isShowing()) { - progressDialog.dismiss(); - } - ExceptionHandler.handleException(e); + @Override + public void onError(Throwable e) { + if (progressDialog != null && progressDialog.isShowing()) { + progressDialog.dismiss(); } + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -521,32 +521,32 @@ public class IncidentCheckDetailActivity extends BaseActivity { */ private void getDetailData() { RetrofitManager.getInstance() - .create(GridApis.class) - .getIncidentDetailById(mId, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .getIncidentDetailById(mId, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull IncidentDetailBean incidentListBean) { - setDataToView(incidentListBean); - } + @Override + public void onNext(@NonNull IncidentDetailBean incidentListBean) { + setDataToView(incidentListBean); + } - @Override - public void onError(@NonNull Throwable e) { - ExceptionHandler.handleException(e); - refreshView(STATE_LOAD_ERROR); - } + @Override + public void onError(@NonNull Throwable e) { + ExceptionHandler.handleException(e); + refreshView(STATE_LOAD_ERROR); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -574,10 +574,10 @@ public class IncidentCheckDetailActivity extends BaseActivity { mBitMap = BitmapDescriptorFactory.fromResource(R.drawable.ic_map_location_marker); } MarkerOptions markerOptions = new MarkerOptions() - .position(new LatLng(lat, lng))//mark出现的位置 - .icon(mBitMap) //mark图标 - .draggable(false)//mark可拖拽 - .animateType(MarkerOptions.MarkerAnimateType.none); + .position(new LatLng(lat, lng))//mark出现的位置 + .icon(mBitMap) //mark图标 + .draggable(false)//mark可拖拽 + .animateType(MarkerOptions.MarkerAnimateType.none); mBaiduMap.addOverlay(markerOptions); if (!TextUtils.isEmpty(b.getReportPhotos())) { //有图片 @@ -592,10 +592,10 @@ public class IncidentCheckDetailActivity extends BaseActivity { mRlvPhotos.setLayoutManager(new GridLayoutManager(mActivity, 4)); mRlvPhotos.setAdapter(mAdapter); mAdapter.setOnItemClickListener((data, pos) -> ARouter.getInstance() - .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) - .withStringArrayList("imgUrls", paths) - .withInt("curItem", pos) - .navigation()); + .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) + .withStringArrayList("imgUrls", paths) + .withInt("curItem", pos) + .navigation()); for (String doorId : doorIds) { if (!TextUtils.isEmpty(doorId)) { paths.add(BaseUrlApi.BASE_IMG_URL + doorId); @@ -613,11 +613,11 @@ public class IncidentCheckDetailActivity extends BaseActivity { mLlVideo.setVisibility(View.VISIBLE); mTvVideoHint.setVisibility(View.GONE); mLlVideo.setOnClickListener(v -> //播放视频 - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO) - .withString("url", BaseUrlApi.BASE_IMG_URL + b.getReportVideo()) - .withString("title", "事件视频") - .navigation()); + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO) + .withString("url", BaseUrlApi.BASE_IMG_URL + b.getReportVideo()) + .withString("title", "事件视频") + .navigation()); } else { //没有视频 mLlVideo.setVisibility(View.GONE); @@ -632,11 +632,11 @@ public class IncidentCheckDetailActivity extends BaseActivity { AnimationDrawable animationDrawable = (AnimationDrawable) mTvVoiceAnim.getBackground(); animationDrawable.start(); MediaManager.playSound(path, - mp -> { - animationDrawable.selectDrawable(0);//显示动画第一帧 - animationDrawable.stop(); - MediaManager.destroy(); - }); + mp -> { + animationDrawable.selectDrawable(0);//显示动画第一帧 + animationDrawable.stop(); + MediaManager.destroy(); + }); } }); } else { @@ -651,59 +651,54 @@ public class IncidentCheckDetailActivity extends BaseActivity { private void getHandleList(int page) { mCurrentPage = page; RetrofitManager.getInstance() - .create(GridApis.class) - .getHandleListByReportId(mId, page + "", UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .getHandleLNewListByReportId(mId, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull HandleListBean handleListBean) { - if (handleListBean.getRows() != null && handleListBean.getRows().size() > 0) { - ++mCurrentPage; - mCvHandle.setVisibility(View.VISIBLE); - if (page == 1) { - mDatas.clear(); - mDatas.addAll(handleListBean.getRows()); - } else { - mDatas.addAll(handleListBean.getRows()); - } - mHandleRecordAdapter.notifyDataSetChanged(); - mSrlContent.finishRefresh(); - if (mDatas.size() >= handleListBean.getTotal()) { - mSrlContent.finishLoadMore(); - mSrlContent.setNoMoreData(true); - } else { - mSrlContent.finishLoadMore(); - mSrlContent.setNoMoreData(false); - } + @Override + public void onNext(@NonNull List handleListBean) { + if (handleListBean != null && handleListBean.size() > 0) { + ++mCurrentPage; + mCvHandle.setVisibility(View.VISIBLE); + if (page == 1) { + mDatas.clear(); + mDatas.addAll(handleListBean); + } else { + mDatas.addAll(handleListBean); + } + mHandleRecordAdapter.notifyDataSetChanged(); + mSrlContent.finishRefresh(); + mSrlContent.finishLoadMore(); + mSrlContent.setNoMoreData(true); + } else { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); + if (page > 1) { + mCvHandle.setVisibility(View.VISIBLE); + mSrlContent.setNoMoreData(true); } else { - mSrlContent.finishLoadMore(); - mSrlContent.finishRefresh(); - if (page > 1) { - mCvHandle.setVisibility(View.VISIBLE); - mSrlContent.setNoMoreData(true); - } else { - mCvHandle.setVisibility(View.GONE); - } + mCvHandle.setVisibility(View.GONE); } } + } - @Override - public void onError(@NonNull Throwable e) { + @Override + public void onError(@NonNull Throwable e) { - } + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** diff --git a/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentDeferExamineDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineDetailActivity.java similarity index 86% rename from commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentDeferExamineDetailActivity.java rename to commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineDetailActivity.java index e0fbee5..2347ad9 100644 --- a/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentDeferExamineDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineDetailActivity.java @@ -1,9 +1,10 @@ -package com.tengshisoft.commandmodule.activitys.incident; +package com.tengshisoft.commonmodule.activitys.cases; import android.annotation.SuppressLint; import android.app.ProgressDialog; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; +import android.text.Html; import android.text.TextUtils; import android.view.MotionEvent; import android.view.View; @@ -27,11 +28,12 @@ import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.google.gson.Gson; import com.hjq.toast.ToastUtils; -import com.tengshisoft.commandmodule.R; -import com.tengshisoft.commandmodule.R2; +import com.tengshisoft.commonmodule.R; +import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.adapters.IncidentTagListAdapter; import com.tengshisoft.commonmodule.beans.DeferDetailBean; import com.tengshisoft.commonmodule.beans.DelayApplyBean; +import com.tengshisoft.commonmodule.beans.DispatchDetailBean; import com.tengshisoft.commonmodule.beans.IncidentDetailBean; import com.tengshisoft.commonmodule.beans.SaveIncidentStateBean; import com.tengshisoft.commonmodule.beans.SuccessBean; @@ -42,6 +44,7 @@ import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.beans.OperateBean; import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; +import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.core.widget.base.BaseShowPhotoAdapter; import com.tenlionsoft.baselib.core.widget.videorecord.MediaManager; @@ -55,6 +58,7 @@ import java.util.Iterator; import java.util.List; import androidx.appcompat.widget.SwitchCompat; +import androidx.cardview.widget.CardView; import androidx.core.widget.NestedScrollView; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; @@ -76,7 +80,7 @@ import okhttp3.RequestBody; * 邮箱: itgaojian@163.com * 描述: 事件延期审核-详情 */ -@Route(path = PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DEFER_EXAMINE_DETAIL) +@Route(path = PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEFER_EXAMINE_DETAIL) public class IncidentDeferExamineDetailActivity extends BaseActivity { @BindView(R2.id.tv_grid) TextView mTvGrid; @@ -124,6 +128,24 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity { EditText mEtCheckSummary; @BindView(R2.id.btn_undefer) Button mBtnUndefer; + @BindView(R2.id.tv_dispatch_user) + TextView mTvDispatchUser; + @BindView(R2.id.tv_dispatch_username) + TextView mTvDispatchUsername; + @BindView(R2.id.tv_dispatch_dept) + TextView mTvDispatchDept; + @BindView(R2.id.tv_dispatch_end) + TextView mTvDispatchEnd; + @BindView(R2.id.tv_dispatch_content) + TextView mTvDispatchContent; + @BindView(R2.id.tv_dispatch_time) + TextView mTvDispatchTime; + @BindView(R2.id.cv_dispatch) + CardView mCvDispatch; + @BindView(R2.id.tv_apply_user) + TextView mTvApplyUser; + @BindView(R2.id.tv_apply_time) + TextView mTvApplyTime; private Unbinder mBind; private String mDeferApplyId; @@ -133,6 +155,7 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity { private String mReportId; private List mOperates; private IncidentDetailBean mDetailBean; + private DispatchDetailBean mDispatchDetailBean; @Override protected int setLayoutId() { @@ -179,25 +202,25 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity { OperateBean logBean = new OperateBean(); logBean.setId("LOG"); logBean.setName("事件日志"); - logBean.setResId(com.tengshisoft.commonmodule.R.drawable.ic_log_icon_gray); + logBean.setResId(R.drawable.ic_log_icon_gray); logBean.setSel(false); OperateBean flagBean = new OperateBean();////标杆案件 flagBean.setId("SAMPLE"); flagBean.setName("标杆事件"); - flagBean.setResId(com.tengshisoft.commonmodule.R.drawable.ic_flag_icon_gray); + flagBean.setResId(R.drawable.ic_flag_icon_gray); flagBean.setSel(false); OperateBean warnBean = new OperateBean(); warnBean.setName("预警事件"); warnBean.setId("WARNING"); - warnBean.setResId(com.tengshisoft.commonmodule.R.drawable.ic_warning_icon_gray); + warnBean.setResId(R.drawable.ic_warning_icon_gray); OperateBean collectBean = new OperateBean(); - collectBean.setResId(com.tengshisoft.commonmodule.R.drawable.ic_collect_icon_gray); + collectBean.setResId(R.drawable.ic_collect_icon_gray); collectBean.setId("COLLECT"); collectBean.setName("收藏事件"); OperateBean diffBean = new OperateBean(); diffBean.setName("疑难事件"); diffBean.setId("DIFFICULT"); - diffBean.setResId(com.tengshisoft.commonmodule.R.drawable.ic_difficult_icon_gray); + diffBean.setResId(R.drawable.ic_difficult_icon_gray); mOperates.add(logBean); mOperates.add(flagBean); mOperates.add(warnBean); @@ -449,6 +472,52 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity { getApplyDetail(); } + /** + * 获取派遣信息 + */ + private void getDispatchDetail(String id) { + RetrofitManager.getInstance() + .create(GridApis.class) + .getDispatchDetailByDispatchId(id, UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull DispatchDetailBean dispatchDetailBean) { + mDispatchDetailBean = dispatchDetailBean; + if (!TextUtils.isEmpty(mDispatchDetailBean.getDispatchUserId())) { + setDispatchToView(); + } else { + mCvDispatch.setVisibility(View.GONE); + } + } + + @Override + public void onError(@NonNull Throwable e) { + mCvDispatch.setVisibility(View.GONE); + } + + @Override + public void onComplete() { + + } + }); + } + + private void setDispatchToView() { + mCvDispatch.setVisibility(View.VISIBLE); + mTvDispatchContent.setText(Html.fromHtml(mDispatchDetailBean.getDispatchSummary())); + mTvDispatchUser.setText(mDispatchDetailBean.getCreatorName()); + mTvDispatchDept.setText(mDispatchDetailBean.getDispatchUserDeptName()); + mTvDispatchTime.setText(mDispatchDetailBean.getGmtCreate()); + mTvDispatchEnd.setText(mDispatchDetailBean.getDispatchHandleTime()); + mTvDispatchUsername.setText(mDispatchDetailBean.getDispatchUserName()); + } + /** * 获取延期申请详情 */ @@ -468,6 +537,14 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity { public void onNext(@NonNull DeferDetailBean deferDetailBean) { mTvDeferSummary.setText(deferDetailBean.getDelayApplyReason()); mTvDeferDate.setText(deferDetailBean.getDelayExpireTime()); + mTvApplyTime.setText(deferDetailBean.getGmtCreate()); + mTvApplyUser.setText(deferDetailBean.getCreatorName()); + if (!TextUtils.isEmpty(deferDetailBean.getDispatchId())) { + //获取派遣信息 + getDispatchDetail(deferDetailBean.getDispatchId()); + } else { + mCvDispatch.setVisibility(View.GONE); + } } @Override @@ -552,7 +629,7 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity { bean1.setSel(false); bean1.setId("SAMPLE"); bean1.setName("标杆事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_flag_icon_gray); + bean1.setResId(R.drawable.ic_flag_icon_gray); mOperates.remove(bean1); } @@ -595,7 +672,7 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity { bean1.setSel(false); bean1.setId("COLLECT"); bean1.setName("收藏事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_collect_icon_gray); + bean1.setResId(R.drawable.ic_collect_icon_gray); mOperates.remove(bean1); } @@ -638,7 +715,7 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity { bean1.setSel(false); bean1.setId("WARNING"); bean1.setName("预警事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_warning_icon_gray); + bean1.setResId(R.drawable.ic_warning_icon_gray); mOperates.remove(bean1); } @@ -681,7 +758,7 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity { bean1.setSel(false); bean1.setId("DIFFICULT"); bean1.setName("疑难事件"); - bean1.setResId(com.tengshisoft.commonmodule.R.drawable.ic_difficult_icon_gray); + bean1.setResId(R.drawable.ic_difficult_icon_gray); mOperates.remove(bean1); } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineListActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineListActivity.java new file mode 100644 index 0000000..5d527d5 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineListActivity.java @@ -0,0 +1,124 @@ +package com.tengshisoft.commonmodule.activitys.cases; + +import android.content.Intent; +import android.text.TextUtils; +import android.view.View; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.alibaba.android.arouter.launcher.ARouter; +import com.hjq.toast.ToastUtils; +import com.tengshisoft.commonmodule.R; +import com.tengshisoft.commonmodule.R2; +import com.tenlionsoft.baselib.constant.PathConfig; +import com.tenlionsoft.baselib.core.widget.base.BaseActivity; +import com.tenlionsoft.baselib.core.widget.base.BaseFragment; +import com.tenlionsoft.baselib.core.widget.base.BaseViewPage2Adapter; +import com.tenlionsoft.baselib.core.widget.base.ViewPageNavigatorAdapter; +import com.tenlionsoft.baselib.utils.UIUtil; + +import net.lucode.hackware.magicindicator.MagicIndicator; +import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import androidx.annotation.Nullable; +import androidx.viewpager2.widget.ViewPager2; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; + +/** + * 作者: Adam + * 日期: 2021年11月02日18:39:58 + * 邮箱: itgaojian@163.com + * 描述: 事件延期审核 + */ +@Route(path = PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEFER_EXAMINE) +public class IncidentDeferExamineListActivity extends BaseActivity { + @BindView(R2.id.mi_tabs) + MagicIndicator mMiTabs; + @BindView(R2.id.vp_content) + ViewPager2 mVpContent; + private Unbinder mBind; + private List mFragments; + private List mTitles = Arrays.asList("待审批", "审批历史"); + private String mSelCondition; + + @Override + protected int setLayoutId() { + return R.layout.activity_incident_defer_examine_list; + } + + + @Override + public void initData() { + mBind = ButterKnife.bind(this); + mTvBaseTitle.setText("延期审核"); + mEtAppSearchContent.setHint("请输入事件编码(分类名称)"); + mIvAppSearchIcon.setVisibility(View.VISIBLE); + refreshView(STATE_LOAD_SUCCESS); + initViews(); + + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == 12) { + if (resultCode == 13) { + mFragments.get(mVpContent.getCurrentItem()).refreshContentView("", ""); + } + } + } + + + private void initViews() { + mFragments = new ArrayList<>(); + BaseFragment timeOutFragment = (BaseFragment) ARouter.getInstance() + .build(PathConfig.PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEFER) + .withBoolean("isHistory", false) + .navigation(); + BaseFragment warnFragment = (BaseFragment) ARouter.getInstance() + .build(PathConfig.PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEFER) + .withBoolean("isHistory", true) + .navigation(); + mFragments.add(timeOutFragment); + mFragments.add(warnFragment); + mVpContent.setAdapter(new BaseViewPage2Adapter(this, mFragments)); + CommonNavigator commonNavigator = new CommonNavigator(this); + commonNavigator.setAdapter(new ViewPageNavigatorAdapter(this, mTitles, mVpContent)); + commonNavigator.setAdjustMode(true); + mMiTabs.setNavigator(commonNavigator); + UIUtil.bindViewPager2(mMiTabs, mVpContent, null); + } + + @Override + protected void doSearchByTitle() { + String searchContent = mEtAppSearchContent.getText().toString().trim(); + if (!TextUtils.isEmpty(searchContent)) { + hideSoftKeyboard(); + doSearch(); + } else { + ToastUtils.show("请输入要查询的内容"); + } + } + + private void doSearch() { + int currentItem = mVpContent.getCurrentItem(); + BaseFragment fragment = mFragments.get(currentItem); + fragment.refreshContentView(mSelCondition, mEtAppSearchContent.getText().toString().trim()); + } + + @Override + protected void clearSearch() { + mEtAppSearchContent.setText(""); + mSelCondition = ""; + int currentItem = mVpContent.getCurrentItem(); + BaseFragment baseFragment = mFragments.get(currentItem); + baseFragment.refreshContentView("", ""); + } + + +} \ No newline at end of file diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java index 7c6ca87..a5dd16a 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java @@ -12,7 +12,6 @@ import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RatingBar; import android.widget.TextView; import android.widget.ZoomControls; @@ -34,6 +33,7 @@ import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.adapters.HandleRecordAdapter; import com.tengshisoft.commonmodule.adapters.IncidentTagListAdapter; +import com.tengshisoft.commonmodule.beans.DeferDetailBean; import com.tengshisoft.commonmodule.beans.HandleListBean; import com.tengshisoft.commonmodule.beans.IncidentAppraiseDetailBean; import com.tengshisoft.commonmodule.beans.IncidentDetailBean; @@ -75,7 +75,6 @@ import butterknife.ButterKnife; import butterknife.Unbinder; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.annotations.NonNull; -import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.schedulers.Schedulers; @@ -148,6 +147,20 @@ public class IncidentDetailActivity extends BaseActivity { CardView mCvAppraise; @BindView(R2.id.btn_save) Button mBtnSave; + @BindView(R2.id.tv_apply_user) + TextView mTvApplyUser; + @BindView(R2.id.tv_apply_time) + TextView mTvApplyTime; + @BindView(R2.id.tv_defer_summary) + TextView mTvDeferSummary; + @BindView(R2.id.tv_defer_date) + TextView mTvDeferDate; + @BindView(R2.id.tv_defer_state) + TextView mTvDeferState; + @BindView(R2.id.tv_defer_content) + TextView mTvDeferContent; + @BindView(R2.id.cv_defer) + CardView mCvDefer; private Unbinder mBind; private String mId; private BaiduMap mBaiduMap; @@ -176,6 +189,15 @@ public class IncidentDetailActivity extends BaseActivity { mId = getIntent().getStringExtra("id"); mTaskId = getIntent().getStringExtra("taskId"); mCollectId = getIntent().getStringExtra("collectId"); + String type = getIntent().getStringExtra("type"); + if ("defer".equals(type)) { + mCvDefer.setVisibility(View.VISIBLE); + //延期页面跳转 + String deferApplyId = getIntent().getStringExtra("deferApplyId"); + getDeferDetail(deferApplyId); + } else { + mCvDefer.setVisibility(View.GONE); + } mIsCanAppraise = getIntent().getBooleanExtra("isCanAppraise", false); mTvPublish.setVisibility(View.VISIBLE); mTvPublish.setText("操作"); @@ -185,6 +207,48 @@ public class IncidentDetailActivity extends BaseActivity { getDetailData(); } + /** + * 获取延期信息 + */ + private void getDeferDetail(String deferApplyId) { + + RetrofitManager.getInstance() + .create(CenterApis.class) + .getDeferDetailById(deferApplyId, UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull DeferDetailBean deferDetailBean) { + if (TextUtils.isEmpty(deferDetailBean.getCreator())) { + mCvDefer.setVisibility(View.GONE); + } else { + mCvDefer.setVisibility(View.VISIBLE); + } + mTvDeferSummary.setText(deferDetailBean.getDelayApplyReason()); + mTvDeferDate.setText(deferDetailBean.getDelayExpireTime()); + mTvApplyTime.setText(deferDetailBean.getGmtCreate()); + mTvApplyUser.setText(deferDetailBean.getCreatorName()); + mTvDeferContent.setText(deferDetailBean.getDelayApplyExamineContent()); + mTvDeferState.setText(deferDetailBean.getDelayApplyExamineStatusText()); + } + + @Override + public void onError(@NonNull Throwable e) { + mCvDefer.setVisibility(View.GONE); + } + + @Override + public void onComplete() { + } + }); + + } + /** * 初始化列表 */ @@ -888,35 +952,30 @@ public class IncidentDetailActivity extends BaseActivity { mCurrentPage = page; RetrofitManager.getInstance() .create(GridApis.class) - .getHandleListByReportId(mId, page + "", UserLgUtils.getToken()) + .getHandleLNewListByReportId(mId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { + .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { } @Override - public void onNext(@NonNull HandleListBean handleListBean) { - if (handleListBean.getRows() != null && handleListBean.getRows().size() > 0) { + public void onNext(@NonNull List handleListBean) { + if (handleListBean != null && handleListBean.size() > 0) { ++mCurrentPage; mCvHandle.setVisibility(View.VISIBLE); if (page == 1) { mDatas.clear(); - mDatas.addAll(handleListBean.getRows()); + mDatas.addAll(handleListBean); } else { - mDatas.addAll(handleListBean.getRows()); + mDatas.addAll(handleListBean); } mHandleRecordAdapter.notifyDataSetChanged(); mSrlContent.finishRefresh(); - if (mDatas.size() >= handleListBean.getTotal()) { - mSrlContent.finishLoadMore(); - mSrlContent.setNoMoreData(true); - } else { - mSrlContent.finishLoadMore(); - mSrlContent.setNoMoreData(false); - } + mSrlContent.finishLoadMore(); + mSrlContent.setNoMoreData(true); } else { mSrlContent.finishLoadMore(); mSrlContent.finishRefresh(); diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentHandleActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentHandleActivity.java index c048639..32bec9e 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentHandleActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentHandleActivity.java @@ -9,6 +9,7 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Environment; import android.provider.MediaStore; +import android.text.Html; import android.text.TextUtils; import android.view.Gravity; import android.view.MotionEvent; @@ -50,6 +51,7 @@ import com.tenlionsoft.baselib.core.beans.BaseSuccessBean; import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; import com.tenlionsoft.baselib.core.retrofit_net.api.BaseApiService; +import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; import com.tenlionsoft.baselib.core.widget.PhotoActivity; import com.tenlionsoft.baselib.core.widget.base.AddPhotoAdapter; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; @@ -140,6 +142,26 @@ public class IncidentHandleActivity extends BaseActivity { CardView mCvDefer; @BindView(R2.id.rlv_applys) RecyclerView mRlvApplys; + @BindView(R2.id.tv_dispatch_user) + TextView mTvDispatchUser; + @BindView(R2.id.tv_dispatch_dept) + TextView mTvDispatchDept; + @BindView(R2.id.tv_dispatch_end) + TextView mTvDispatchEnd; + @BindView(R2.id.tv_dispatch_content) + TextView mTvDispatchContent; + @BindView(R2.id.tv_dispatch_time) + TextView mTvDispatchTime; + @BindView(R2.id.cv_dispatch) + CardView mCvDispatch; + @BindView(R2.id.tv_dispatch_username) + TextView mTvDispatchUsername; + @BindView(R2.id.tv_defer) + TextView mTvDefer; + @BindView(R2.id.tv_defer_time) + TextView mTvDeferTime; + @BindView(R2.id.ll_defer_time) + LinearLayout mLlDeferTime; private Unbinder mBind; private String mReportId; private IncidentDetailBean mIncidentDetailBean; @@ -213,9 +235,9 @@ public class IncidentHandleActivity extends BaseActivity { * @param content */ private void doRollBack(String content) { + hideSoftKeyboard(); IncidentRebackBean bean = new IncidentRebackBean(); - bean.setReportId(mReportId); - bean.setExplain(content); + bean.setSummary(content); bean.setTaskId(mTaskId); Gson gson = new Gson(); String obj = gson.toJson(bean); @@ -225,8 +247,7 @@ public class IncidentHandleActivity extends BaseActivity { RetrofitManager.getInstance() .create(GridApis.class) .doRollBack(mDispatchDetailBean.getDispatchId(), requestBody, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) + .compose(RxTransformer.getTransformer()) .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { @@ -654,7 +675,7 @@ public class IncidentHandleActivity extends BaseActivity { } /** - * 获取 + * 获取派遣信息 */ private void getDispatchDetail() { RetrofitManager.getInstance() @@ -671,11 +692,16 @@ public class IncidentHandleActivity extends BaseActivity { @Override public void onNext(@NonNull DispatchDetailBean dispatchDetailBean) { mDispatchDetailBean = dispatchDetailBean; + if (!TextUtils.isEmpty(mDispatchDetailBean.getDispatchUserId())) { + setDispatchToView(); + } else { + mCvDispatch.setVisibility(View.GONE); + } } @Override public void onError(@NonNull Throwable e) { - + mCvDispatch.setVisibility(View.GONE); } @Override @@ -685,6 +711,24 @@ public class IncidentHandleActivity extends BaseActivity { }); } + private void setDispatchToView() { + mCvDispatch.setVisibility(View.VISIBLE); + mTvDispatchContent.setText(Html.fromHtml(mDispatchDetailBean.getDispatchSummary())); + mTvDispatchUser.setText(mDispatchDetailBean.getCreatorName()); + mTvDispatchDept.setText(mDispatchDetailBean.getDispatchUserDeptName()); + mTvDispatchTime.setText(mDispatchDetailBean.getGmtCreate()); + mTvDispatchEnd.setText(mDispatchDetailBean.getDispatchHandleTime()); + mTvDispatchUsername.setText(mDispatchDetailBean.getDispatchUserName()); + if (1 == mDispatchDetailBean.getIsAllowDelay()) { + mTvDefer.setText("是"); + mLlDeferTime.setVisibility(View.VISIBLE); + mTvDeferTime.setText(mDispatchDetailBean.getDelayExpireTime()); + } else { + mTvDefer.setText("否"); + mLlDeferTime.setVisibility(View.GONE); + } + } + /** * 回显事件信息 diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java index 8c0a1a5..c3cfcec 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java @@ -45,6 +45,7 @@ import com.tengshisoft.commonmodule.beans.CaseTypeBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; import com.tenlionsoft.baselib.constant.PathConfig; +import com.tenlionsoft.baselib.constant.PermissionConstants; import com.tenlionsoft.baselib.core.beans.AddPhotoBean; import com.tenlionsoft.baselib.core.beans.BaseSuccessBean; import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; @@ -58,6 +59,7 @@ import com.tenlionsoft.baselib.core.widget.videorecord.MediaManager; import com.tenlionsoft.baselib.core.widget.views.AreaChooseDialog; import com.tenlionsoft.baselib.core.widget.views.ButtomDialogView; import com.tenlionsoft.baselib.utils.ExceptionHandler; +import com.tenlionsoft.baselib.utils.PermissionUtils; import com.tenlionsoft.baselib.utils.UIUtil; import com.tenlionsoft.baselib.utils.UserLgUtils; @@ -253,7 +255,7 @@ public class IncidentReportActivity extends BaseActivity { .navigation(mActivity, 16)); //录音 - mArbAudio.setHasRecordPromission(true); + mArbAudio.setAudioFinishRecorderListener((seconds, filePath) -> uploadVoice(filePath)); mLlVoice.setOnClickListener(v -> { if (!TextUtils.isEmpty(mAudioPath)) { @@ -305,6 +307,30 @@ public class IncidentReportActivity extends BaseActivity { } }); mBtnSubmit.setOnClickListener(v -> doSubmit()); + checkAuthority(); + } + + /** + * 校验权限 + */ + private void checkAuthority() { + PermissionUtils.permission(PermissionConstants.STORAGE, + PermissionConstants.LOCATION, + PermissionConstants.CAMERA, + PermissionConstants.MICROPHONE) + .callback(new PermissionUtils.SimpleCallback() { + @Override + public void onGranted() { + mArbAudio.setHasRecordPromission(true); + } + + @Override + public void onDenied() { + ToastUtils.show("App需要读取SD的权限,和定位的权限,请前往设置里授权."); + mArbAudio.setHasRecordPromission(false); + finish(); + } + }).request(); } /** diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/HandleRecordAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/HandleRecordAdapter.java index b21fc7f..70925e7 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/HandleRecordAdapter.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/HandleRecordAdapter.java @@ -57,11 +57,12 @@ public class HandleRecordAdapter extends BaseRecyclerAdapter ARouter.getInstance() - .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) - .withStringArrayList("imgUrls", paths) - .withInt("curItem", pos) - .navigation()); + .build(PathConfig.PATH_MODULE_BASELIB_SHOW_IMG) + .withStringArrayList("imgUrls", paths) + .withInt("curItem", pos) + .navigation()); } public void setCheckId(String id) { diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/IncidentDeferListAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/IncidentDeferListAdapter.java new file mode 100644 index 0000000..77e0a2a --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/IncidentDeferListAdapter.java @@ -0,0 +1,43 @@ +package com.tengshisoft.commonmodule.adapters; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.tengshisoft.commonmodule.R; +import com.tengshisoft.commonmodule.beans.IncidentDeferListBean; +import com.tengshisoft.commonmodule.beans.IncidentHandleListBean; +import com.tengshisoft.commonmodule.holders.IncidentDeferListHolder; +import com.tengshisoft.commonmodule.holders.IncidentHandleListHolder; +import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2020/11/17 - 1:22 PM + * 邮箱: itgaojian@163.com + * 描述: 延期列表 + */ +public class IncidentDeferListAdapter extends BaseRecyclerAdapter { + public IncidentDeferListAdapter(Context ctx, List list) { + super(ctx, list); + } + + @Override + public IncidentDeferListHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_incident_defer_list, parent, false); + return new IncidentDeferListHolder(itemView); + } + + @Override + public void bindHolder(IncidentDeferListHolder holder, int i) { + IncidentDeferListBean.RowsBean bean = mData.get(i); + holder.mTvSummary.setText(bean.getDelayApplyReason()); + holder.mTvDept.setText("申请人:" + bean.getCreatorName()); + holder.mTvDelayTime.setText("延期时间:" + bean.getDelayExpireTime()); + holder.mTvTime.setText("申请时间:" + bean.getGmtCreate()); + holder.mTvState.setText(bean.getDelayApplyExamineStatusText()); + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/IncidentLogAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/IncidentLogAdapter.java index d325179..276c3cd 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/IncidentLogAdapter.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/IncidentLogAdapter.java @@ -6,9 +6,7 @@ import android.view.View; import android.view.ViewGroup; import com.tengshisoft.commonmodule.R; -import com.tengshisoft.commonmodule.beans.FamilyMemberListBean; import com.tengshisoft.commonmodule.beans.IncidentLogBean; -import com.tengshisoft.commonmodule.holders.HireRecordMemberHolder; import com.tengshisoft.commonmodule.holders.IncidentLogHolder; import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; @@ -61,7 +59,6 @@ public class IncidentLogAdapter extends BaseRecyclerAdapter mPatrolListener.onPatrol(bean)); } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/TaskBusinessListAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/TaskBusinessListAdapter.java index f18faf5..5fb2b83 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/TaskBusinessListAdapter.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/TaskBusinessListAdapter.java @@ -38,7 +38,7 @@ public class TaskBusinessListAdapter extends BaseRecyclerAdapter mTaskListener.doSubmit(bean, i)); + } else { + holder.mBtnSubmit.setVisibility(View.GONE); + } } else { holder.mIvHint.setVisibility(View.GONE); + holder.mBtnSubmit.setVisibility(View.GONE); } } + private OnSubmitTaskListener mTaskListener; + + public void addOnSubmitTaskListener(OnSubmitTaskListener listener) { + this.mTaskListener = listener; + } + + public interface OnSubmitTaskListener { + void doSubmit(TaskListBean.RowsBean bean, int pos); + } + } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DeferDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DeferDetailBean.java index c86ed2b..70dd0d3 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DeferDetailBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DeferDetailBean.java @@ -12,12 +12,14 @@ public class DeferDetailBean { private String creatorName; private String delayApplyExamineContent; private String delayApplyExamineStatus; + private String delayApplyExamineStatusText; private String delayApplyId; private String delayApplyReason; private String delayApplyUserId; private String delayExpireTime; private String dispatchId; private String gmtCreate; + private String reportCode; private String reportId; public String getCreator() { @@ -52,6 +54,14 @@ public class DeferDetailBean { this.delayApplyExamineStatus = delayApplyExamineStatus; } + public String getDelayApplyExamineStatusText() { + return delayApplyExamineStatusText; + } + + public void setDelayApplyExamineStatusText(String delayApplyExamineStatusText) { + this.delayApplyExamineStatusText = delayApplyExamineStatusText; + } + public String getDelayApplyId() { return delayApplyId; } @@ -100,6 +110,14 @@ public class DeferDetailBean { this.gmtCreate = gmtCreate; } + public String getReportCode() { + return reportCode; + } + + public void setReportCode(String reportCode) { + this.reportCode = reportCode; + } + public String getReportId() { return reportId; } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/HandleListBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/HandleListBean.java index 256e348..35fdfe8 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/HandleListBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/HandleListBean.java @@ -47,6 +47,16 @@ public class HandleListBean { private String handleSummary; private String reportId; private String creatorName; + private String handleUnitName; + + + public String getHandleUnitName() { + return handleUnitName; + } + + public void setHandleUnitName(String handleUnitName) { + this.handleUnitName = handleUnitName; + } public String getCreatorName() { return creatorName; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentDeferListBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentDeferListBean.java new file mode 100644 index 0000000..77de486 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentDeferListBean.java @@ -0,0 +1,160 @@ +package com.tengshisoft.commonmodule.beans; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2021/12/10 - 11:37 上午 + * 邮箱: itgaojian@163.com + * 描述:延期审核列表 + */ +public class IncidentDeferListBean { + + private int page; + private int total; + private List rows; + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + private String creator; + private String creatorName; + private String delayApplyExamineContent; + private String delayApplyExamineStatus; + private String delayApplyExamineStatusText; + private String delayApplyId; + private String delayApplyReason; + private String delayApplyUserId; + private String delayExpireTime; + private String dispatchId; + private String gmtCreate; + private String reportCode; + private String reportId; + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getCreatorName() { + return creatorName; + } + + public void setCreatorName(String creatorName) { + this.creatorName = creatorName; + } + + public String getDelayApplyExamineContent() { + return delayApplyExamineContent; + } + + public void setDelayApplyExamineContent(String delayApplyExamineContent) { + this.delayApplyExamineContent = delayApplyExamineContent; + } + + public String getDelayApplyExamineStatus() { + return delayApplyExamineStatus; + } + + public void setDelayApplyExamineStatus(String delayApplyExamineStatus) { + this.delayApplyExamineStatus = delayApplyExamineStatus; + } + + public String getDelayApplyExamineStatusText() { + return delayApplyExamineStatusText; + } + + public void setDelayApplyExamineStatusText(String delayApplyExamineStatusText) { + this.delayApplyExamineStatusText = delayApplyExamineStatusText; + } + + public String getDelayApplyId() { + return delayApplyId; + } + + public void setDelayApplyId(String delayApplyId) { + this.delayApplyId = delayApplyId; + } + + public String getDelayApplyReason() { + return delayApplyReason; + } + + public void setDelayApplyReason(String delayApplyReason) { + this.delayApplyReason = delayApplyReason; + } + + public String getDelayApplyUserId() { + return delayApplyUserId; + } + + public void setDelayApplyUserId(String delayApplyUserId) { + this.delayApplyUserId = delayApplyUserId; + } + + public String getDelayExpireTime() { + return delayExpireTime; + } + + public void setDelayExpireTime(String delayExpireTime) { + this.delayExpireTime = delayExpireTime; + } + + public String getDispatchId() { + return dispatchId; + } + + public void setDispatchId(String dispatchId) { + this.dispatchId = dispatchId; + } + + public String getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getReportCode() { + return reportCode; + } + + public void setReportCode(String reportCode) { + this.reportCode = reportCode; + } + + public String getReportId() { + return reportId; + } + + public void setReportId(String reportId) { + this.reportId = reportId; + } + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentLogBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentLogBean.java index d39eac7..deadb9a 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentLogBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentLogBean.java @@ -16,6 +16,16 @@ public class IncidentLogBean { private String nodeSummary; private String nodeTimeConsuming; private String nodeUserName; + private String nodeUserDeptName; + + + public String getNodeUserDeptName() { + return nodeUserDeptName; + } + + public void setNodeUserDeptName(String nodeUserDeptName) { + this.nodeUserDeptName = nodeUserDeptName; + } public String getNodeEndTime() { return nodeEndTime; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentRebackBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentRebackBean.java index 545ef7d..611a237 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentRebackBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/IncidentRebackBean.java @@ -7,24 +7,16 @@ package com.tengshisoft.commonmodule.beans; * 描述: */ public class IncidentRebackBean { - private String reportId; - private String explain; + + private String summary; private String taskId; - public String getReportId() { - return reportId; + public String getSummary() { + return summary; } - public void setReportId(String reportId) { - this.reportId = reportId; - } - - public String getExplain() { - return explain; - } - - public void setExplain(String explain) { - this.explain = explain; + public void setSummary(String summary) { + this.summary = summary; } public String getTaskId() { diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/PatrolKeyPlaceDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/PatrolKeyPlaceDetailBean.java index e9cbcef..03979b6 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/PatrolKeyPlaceDetailBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/PatrolKeyPlaceDetailBean.java @@ -8,9 +8,13 @@ package com.tengshisoft.commonmodule.beans; */ public class PatrolKeyPlaceDetailBean { - - private String homicideId; - private String homicidePatrolId; + private String creator; + private String gmtCreate; + private String gmtModified; + private int isDelete; + private String keyPlaceId; + private String keyPlacePatrolId; + private String modifier; private String patrolContent; private String patrolPhoto; private String patrolResult; @@ -18,20 +22,60 @@ public class PatrolKeyPlaceDetailBean { private String patrolVideo; private String remake; - public String getHomicideId() { - return homicideId; + public String getCreator() { + return creator; } - public void setHomicideId(String homicideId) { - this.homicideId = homicideId; + public void setCreator(String creator) { + this.creator = creator; } - public String getHomicidePatrolId() { - return homicidePatrolId; + public String getGmtCreate() { + return gmtCreate; } - public void setHomicidePatrolId(String homicidePatrolId) { - this.homicidePatrolId = homicidePatrolId; + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getGmtModified() { + return gmtModified; + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public int getIsDelete() { + return isDelete; + } + + public void setIsDelete(int isDelete) { + this.isDelete = isDelete; + } + + public String getKeyPlaceId() { + return keyPlaceId; + } + + public void setKeyPlaceId(String keyPlaceId) { + this.keyPlaceId = keyPlaceId; + } + + public String getKeyPlacePatrolId() { + return keyPlacePatrolId; + } + + public void setKeyPlacePatrolId(String keyPlacePatrolId) { + this.keyPlacePatrolId = keyPlacePatrolId; + } + + public String getModifier() { + return modifier; + } + + public void setModifier(String modifier) { + this.modifier = modifier; } public String getPatrolContent() { diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/PatrolKeyPlaceListBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/PatrolKeyPlaceListBean.java index 17238e2..be654d2 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/PatrolKeyPlaceListBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/PatrolKeyPlaceListBean.java @@ -43,8 +43,8 @@ public class PatrolKeyPlaceListBean { private String gmtCreate; private String gmtModified; private int isDelete; - private String logisticsSafeId; - private String logisticsSafePatrolId; + private String keyPlaceId; + private String keyPlacePatrolId; private String modifier; private String patrolContent; private String patrolPhoto; @@ -85,20 +85,20 @@ public class PatrolKeyPlaceListBean { this.isDelete = isDelete; } - public String getLogisticsSafeId() { - return logisticsSafeId; + public String getKeyPlaceId() { + return keyPlaceId; } - public void setLogisticsSafeId(String logisticsSafeId) { - this.logisticsSafeId = logisticsSafeId; + public void setKeyPlaceId(String keyPlaceId) { + this.keyPlaceId = keyPlaceId; } - public String getLogisticsSafePatrolId() { - return logisticsSafePatrolId; + public String getKeyPlacePatrolId() { + return keyPlacePatrolId; } - public void setLogisticsSafePatrolId(String logisticsSafePatrolId) { - this.logisticsSafePatrolId = logisticsSafePatrolId; + public void setKeyPlacePatrolId(String keyPlacePatrolId) { + this.keyPlacePatrolId = keyPlacePatrolId; } public String getModifier() { diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SavePatrolKeyPlaceBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SavePatrolKeyPlaceBean.java index 8bca82e..416d0b8 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SavePatrolKeyPlaceBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SavePatrolKeyPlaceBean.java @@ -8,7 +8,7 @@ package com.tengshisoft.commonmodule.beans; */ public class SavePatrolKeyPlaceBean { - private String keyAreaCheckRenovationId; + private String keyPlaceId; private String patrolContent; private String patrolPhoto; private String patrolResult; @@ -16,12 +16,12 @@ public class SavePatrolKeyPlaceBean { private String patrolVideo; private String remake; - public String getKeyAreaCheckRenovationId() { - return keyAreaCheckRenovationId; + public String getKeyPlaceId() { + return keyPlaceId; } - public void setKeyAreaCheckRenovationId(String keyAreaCheckRenovationId) { - this.keyAreaCheckRenovationId = keyAreaCheckRenovationId; + public void setKeyPlaceId(String keyPlaceId) { + this.keyPlaceId = keyPlaceId; } public String getPatrolContent() { diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveTaskStateBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveTaskStateBean.java new file mode 100644 index 0000000..d7379cf --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveTaskStateBean.java @@ -0,0 +1,28 @@ +package com.tengshisoft.commonmodule.beans; + +/** + * 作者: adam + * 日期: 2021/12/13 - 10:35 上午 + * 邮箱: itgaojian@163.com + * 描述: + */ +public class SaveTaskStateBean { + private String executeStatus;//: '完成', + private String isReceive;//: 1 + + public String getExecuteStatus() { + return executeStatus; + } + + public void setExecuteStatus(String executeStatus) { + this.executeStatus = executeStatus; + } + + public String getIsReceive() { + return isReceive; + } + + public void setIsReceive(String isReceive) { + this.isReceive = isReceive; + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentDeferFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentDeferFragment.java new file mode 100644 index 0000000..cb91a21 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentDeferFragment.java @@ -0,0 +1,165 @@ +package com.tengshisoft.commonmodule.fragments; + +import android.view.View; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.alibaba.android.arouter.launcher.ARouter; +import com.tengshisoft.commonmodule.R; +import com.tengshisoft.commonmodule.R2; +import com.tengshisoft.commonmodule.adapters.IncidentDeferListAdapter; +import com.tengshisoft.commonmodule.beans.IncidentDeferListBean; +import com.tengshisoft.commonmodule.beans.IncidentListBean; +import com.tengshisoft.commonmodule.nets.CenterApis; +import com.tenlionsoft.baselib.constant.PathConfig; +import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; +import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; +import com.tenlionsoft.baselib.core.widget.base.BaseFragment; +import com.tenlionsoft.baselib.utils.ExceptionHandler; +import com.tenlionsoft.baselib.utils.UserLgUtils; + +import java.util.ArrayList; +import java.util.List; + +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; + +/** + * 作者: adam + * 日期: 2021/11/26 - 5:16 下午 + * 邮箱: itgaojian@163.com + * 描述: 延期列表 + */ +@Route(path = PathConfig.PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEFER) +public class IncidentDeferFragment extends BaseFragment { + + @BindView(R2.id.rlv_content) + RecyclerView mRlvContent; + private Unbinder mBind; + private String mType; + private List mDatas; + private IncidentDeferListAdapter mAdapter; + private int mCurrentPage = 1; + private String mKeywords = ""; + private boolean mIsHistory;// true 历史 false 待审核 + + @Override + protected void setDataToView(View dataView) { + mBind = ButterKnife.bind(this, dataView); + mIsHistory = getArguments().getBoolean("isHistory", false); + mDatas = new ArrayList<>(); + mAdapter = new IncidentDeferListAdapter(mActivity, mDatas); + mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity)); + mRlvContent.setAdapter(mAdapter); + mSrlView.setOnRefreshListener(v -> doRefresh()); + mSrlView.setOnLoadMoreListener(v -> loadMoreData()); + setStateView(13); + getIncidentDispatchList(mCurrentPage); + if (mIsHistory) { + mAdapter.addOnItemClickListener(v -> ARouter.getInstance() + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DETAIL) + .withString("id", v.getReportId()) + .withString("deferApplyId", v.getDelayApplyId()) + .withString("type", "defer") + .navigation()); + } else { + mAdapter.addOnItemClickListener(v -> ARouter.getInstance() + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEFER_EXAMINE_DETAIL) + .withString("reportId", v.getReportId()) + .withString("deferApplyId", v.getDelayApplyId()) + .navigation(mActivity, 12)); + } + } + + private void getIncidentDispatchList(int page) { + mCurrentPage = page; + RetrofitManager.getInstance() + .create(CenterApis.class) + .getDeferIncidentList(mIsHistory, mKeywords, page + "", UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull IncidentDeferListBean taskListBean) { + ++mCurrentPage; + mSrlView.finishRefresh(); + mSrlView.finishLoadMore(); + if (page == 1) { + if (taskListBean.getRows() != null && taskListBean.getRows().size() > 0) { + mDatas.clear(); + mDatas.addAll(taskListBean.getRows()); + setStateView(STATE_SUCCESS); + } else { + setStateView(STATE_EMPTY); + } + } else { + if (taskListBean.getRows() != null && taskListBean.getRows().size() > 0) { + mDatas.addAll(taskListBean.getRows()); + mSrlView.setNoMoreData(false); + } else { + mSrlView.setNoMoreData(true); + } + } + mAdapter.notifyDataSetChanged(); + } + + @Override + public void onError(@NonNull Throwable e) { + ExceptionHandler.handleException(e); + if (page == 1) { + //首次 + mSrlView.finishLoadMore(); + mSrlView.finishRefresh(); + setStateView(STATE_ERROR); + } else { + //首次 + mSrlView.finishLoadMore(); + mSrlView.finishRefresh(); + mSrlView.setNoMoreData(false); + } + } + + @Override + public void onComplete() { + + } + }); + + } + + @Override + public void refreshContentView(String... data) { + mKeywords = data[1]; + refreshView(); + } + + @Override + protected void refreshView() { + mCurrentPage = 1; + mDatas.clear(); + getIncidentDispatchList(mCurrentPage); + } + + @Override + protected void loadMoreData() { + getIncidentDispatchList(mCurrentPage); + } + + public void doRefresh() { + refreshView(); + } + + @Override + protected int getContentViewId() { + return R.layout.fragment_incident_center_time_out; + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/HandleRecordHolder.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/HandleRecordHolder.java index d883a77..d559310 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/HandleRecordHolder.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/HandleRecordHolder.java @@ -22,6 +22,7 @@ public class HandleRecordHolder extends RecyclerView.ViewHolder { public RecyclerView mRlvPhotos; public TextView mTvTime; public TextView mTvUser; + public TextView mTvDept; public HandleRecordHolder(@NonNull @NotNull View itemView) { super(itemView); @@ -29,5 +30,6 @@ public class HandleRecordHolder extends RecyclerView.ViewHolder { mRlvPhotos = itemView.findViewById(R.id.rlv_photos); mTvTime = itemView.findViewById(R.id.tv_time); mTvUser = itemView.findViewById(R.id.tv_user); + mTvDept = itemView.findViewById(R.id.tv_dept); } } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/IncidentDeferListHolder.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/IncidentDeferListHolder.java new file mode 100644 index 0000000..435603f --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/IncidentDeferListHolder.java @@ -0,0 +1,34 @@ +package com.tengshisoft.commonmodule.holders; + +import android.view.View; +import android.widget.TextView; + +import com.tengshisoft.commonmodule.R; + +import org.jetbrains.annotations.NotNull; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +/** + * 作者: adam + * 日期: 2021年10月18日14:19:22 + * 邮箱: itgaojian@163.com + * 描述: 延期列表 + */ +public class IncidentDeferListHolder extends RecyclerView.ViewHolder { + public TextView mTvState;//状态 + public TextView mTvSummary;//派遣描述 + public TextView mTvTime;//派遣时间 + public TextView mTvDelayTime;//延期到期时间 + public TextView mTvDept;//派遣部门 + + public IncidentDeferListHolder(@NonNull @NotNull View itemView) { + super(itemView); + mTvState = itemView.findViewById(R.id.tv_state); + mTvSummary = itemView.findViewById(R.id.tv_summary); + mTvTime = itemView.findViewById(R.id.tv_time); + mTvDelayTime = itemView.findViewById(R.id.tv_delay_time); + mTvDept = itemView.findViewById(R.id.tv_dept); + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/IncidentLogHolder.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/IncidentLogHolder.java index d79a281..786d30b 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/IncidentLogHolder.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/IncidentLogHolder.java @@ -31,6 +31,7 @@ public class IncidentLogHolder extends RecyclerView.ViewHolder { public LinearLayout mLlHandleTime; public LinearLayout mLlEndTime; public LinearLayout mLlSummary; + public TextView mTvHandleDept; public IncidentLogHolder(@NonNull @NotNull View itemView) { super(itemView); @@ -46,5 +47,6 @@ public class IncidentLogHolder extends RecyclerView.ViewHolder { mLlSummary = itemView.findViewById(R.id.ll_handle_summary); mLlHandleTime = itemView.findViewById(R.id.ll_handle_time); mLlEndTime = itemView.findViewById(R.id.ll_end_time); + mTvHandleDept = itemView.findViewById(R.id.tv_handle_dept); } } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/TaskHolder.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/TaskHolder.java index 3f9609b..ed04226 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/TaskHolder.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/TaskHolder.java @@ -26,6 +26,7 @@ public class TaskHolder extends RecyclerView.ViewHolder { public TextView mTvType; public TextView mTvState; public TextView mTvTaskType; + public TextView mBtnSubmit; public TaskHolder(@NonNull View itemView) { super(itemView); @@ -37,5 +38,6 @@ public class TaskHolder extends RecyclerView.ViewHolder { mTvType = itemView.findViewById(R.id.tv_type); mTvState = itemView.findViewById(R.id.tv_state); mTvTaskType = itemView.findViewById(R.id.tv_task_type); + mBtnSubmit = itemView.findViewById(R.id.btn_submit); } } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/CenterApis.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/CenterApis.java index 2a09661..9ec7c54 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/CenterApis.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/CenterApis.java @@ -9,6 +9,7 @@ import com.tengshisoft.commonmodule.beans.IncidentCenterEarlyWarnListBean; import com.tengshisoft.commonmodule.beans.IncidentCenterTimeOutCount; import com.tengshisoft.commonmodule.beans.IncidentCenterTimeOutListBean; import com.tengshisoft.commonmodule.beans.IncidentCountBean; +import com.tengshisoft.commonmodule.beans.IncidentDeferListBean; import com.tengshisoft.commonmodule.beans.IncidentListBean; import com.tengshisoft.commonmodule.beans.IncidentMineOverseeListBean; import com.tengshisoft.commonmodule.beans.IncidentOverseeDetailBean; @@ -100,7 +101,7 @@ public interface CenterApis { */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) @GET("app/taskbase/listpage-task-accept") - Observable getIncidentUnAcceptList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getIncidentUnAcceptList(@Query("keywords") String key, @Query("page") String page, @Query("rows") String rows, @Header("token") String token); /** * 事件受理-废除 @@ -148,8 +149,8 @@ public interface CenterApis { * 申请延期 */ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) - @GET("app/delayapply/listpage-auditme") - Observable getDeferIncidentList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + @GET("app/delayapply/listpage") + Observable getDeferIncidentList(@Query("historyData") boolean isHistroy, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); /** * 获取延期申请详情 diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java index faf7882..cf18cd9 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java @@ -1152,6 +1152,13 @@ public interface GridApis { @GET("app/dispatch/get-bytaskId/{taskId}") Observable getDispatchDetailById(@Path("taskId") String id, @Header("token") String token); + /** + * 获取事件派遣详情 + */ + @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) + @GET("app/dispatch/get/{dispatchId}") + Observable getDispatchDetailByDispatchId(@Path("dispatchId") String id, @Header("token") String token); + /** * 延期申请 */ @@ -1187,6 +1194,13 @@ public interface GridApis { @GET("app/handle/listpage-report/{reportId}") Observable getHandleListByReportId(@Path("reportId") String id, @Query("page") String page, @Header("token") String token); + /** + * 获取事件处理记录最新列表 + */ + @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"}) + @GET("app/handle/list-news/{reportId}") + Observable> getHandleLNewListByReportId(@Path("reportId") String id, @Header("token") String token); + /** * 获取事件处理详情 */ @@ -1382,11 +1396,19 @@ public interface GridApis { /** - * + * @Query("matterIdx") String idx, + * 获取任务详细列表 */ @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"}) @GET("app/distribute/listpagematter") - Observable getTaskBusinessList(@Query("distributeId") String taskId, @Query("matterIdx") String idx, @Query("business") String business, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getTaskBusinessList(@Query("distributeId") String taskId, @Query("business") String business, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + + /** + * 上报任务状态 + */ + @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"}) + @PUT("app/receiveruser/updatereceiveruser/{receiverUserId}") + Observable doSaveTaskState(@Path("receiverUserId") String id, @Body RequestBody body, @Header("token") String token); /*=========================================9+x=========================================*/ /*重点区域*/ @@ -1587,7 +1609,7 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/homicidesuspect/listpagehomicidesuspect") - Observable getPenalSuspicionList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getPenalSuspicionList(@Query("keywords") String key, @Query("homicideId") String caseId, @Query("page") String page, @Header("token") String token); /** * 新增命案基本信息 @@ -1623,7 +1645,7 @@ public interface GridApis { */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) @GET("app/homicidevictim/listpagehomicidevictim") - Observable getPenalVictimList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token); + Observable getPenalVictimList(@Query("keywords") String key, @Query("homicideId") String caseId, @Query("page") String page, @Header("token") String token); /** * 新增受害人信息 @@ -1809,36 +1831,36 @@ public interface GridApis { * 重点场所记录列表 */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) - @GET("app/logisticssafepatrol/listpagelogisticssafepatrol") - Observable getKeyPlacePatrolList(@Query("logisticsSafeId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); + @GET("app/keyplacepatrol/listpagekeyplacepatrol") + Observable getKeyPlacePatrolList(@Query("keyPlaceId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token); /** * 保存重点场所巡查记录 */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) - @POST("app/logisticssafepatrol/save") + @POST("app/keyplacepatrol/save") Observable doSaveKeyPlacePatrol(@Body RequestBody body, @Header("token") String token); /** * 编辑重点场所巡查记录 */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) - @PUT("app/logisticssafepatrol/updatelogisticssafepatrol/{logisticsSafePatrolId}") - Observable doEditKeyPlacePatrol(@Path("logisticsSafePatrolId") String id, @Body RequestBody body, @Header("token") String token); + @PUT("app/keyplacepatrol/updatekeyplacepatrol/{keyPlacePatrolId}") + Observable doEditKeyPlacePatrol(@Path("keyPlacePatrolId") String id, @Body RequestBody body, @Header("token") String token); /** * 删除重点场所巡查记录 */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) - @DELETE("app/logisticssafepatrol/remove/{ids}") + @DELETE("app/keyplacepatrol/remove/{ids}") Observable doDelKeyPlacePatrol(@Path("ids") String id, @Header("token") String token); /** * 获取重点场所巡查记录 */ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"}) - @GET("app/logisticssafepatrol/get/{logisticsSafePatrolId}") - Observable getKeyPlacePatrolDetailById(@Path("logisticsSafePatrolId") String id, @Header("token") String token); + @GET("app/keyplacepatrol/get/{keyPlacePatrolId}") + Observable getKeyPlacePatrolDetailById(@Path("keyPlacePatrolId") String id, @Header("token") String token); diff --git a/commandmodule/src/main/res/layout/activity_incident_defer_examine_detail.xml b/commonmodule/src/main/res/layout/activity_incident_defer_examine_detail.xml similarity index 76% rename from commandmodule/src/main/res/layout/activity_incident_defer_examine_detail.xml rename to commonmodule/src/main/res/layout/activity_incident_defer_examine_detail.xml index 7db1f88..300ccbd 100644 --- a/commandmodule/src/main/res/layout/activity_incident_defer_examine_detail.xml +++ b/commonmodule/src/main/res/layout/activity_incident_defer_examine_detail.xml @@ -26,7 +26,7 @@ app:cardCornerRadius="5dp" app:cardPreventCornerOverlap="true" app:cardUseCompatPadding="false" - tools:visibility="visible"> + tools:visibility="gone"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/commonmodule/src/main/res/layout/activity_incident_detail.xml b/commonmodule/src/main/res/layout/activity_incident_detail.xml index 623c007..22ea633 100644 --- a/commonmodule/src/main/res/layout/activity_incident_detail.xml +++ b/commonmodule/src/main/res/layout/activity_incident_detail.xml @@ -156,7 +156,7 @@ app:cardCornerRadius="5dp" app:cardPreventCornerOverlap="true" app:cardUseCompatPadding="false" - tools:visibility="visible"> + tools:visibility="gone"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:background="@color/gray_bg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_height="50dp" /> + + + + + + + \ No newline at end of file diff --git a/commonmodule/src/main/res/layout/item_incident_defer_list.xml b/commonmodule/src/main/res/layout/item_incident_defer_list.xml new file mode 100644 index 0000000..c3b5a4a --- /dev/null +++ b/commonmodule/src/main/res/layout/item_incident_defer_list.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/commonmodule/src/main/res/layout/item_incident_handle.xml b/commonmodule/src/main/res/layout/item_incident_handle.xml index bcc9d05..bbb2974 100644 --- a/commonmodule/src/main/res/layout/item_incident_handle.xml +++ b/commonmodule/src/main/res/layout/item_incident_handle.xml @@ -8,6 +8,13 @@ android:orientation="vertical" android:padding="5dp"> + + @@ -33,6 +40,7 @@ + + + \ No newline at end of file diff --git a/commonmodule/src/main/res/layout/item_incident_log.xml b/commonmodule/src/main/res/layout/item_incident_log.xml index ab49372..d37b4b9 100755 --- a/commonmodule/src/main/res/layout/item_incident_log.xml +++ b/commonmodule/src/main/res/layout/item_incident_log.xml @@ -53,9 +53,9 @@ @@ -73,17 +73,17 @@ @@ -103,16 +103,16 @@ android:id="@+id/ll_end_time" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" android:background="@drawable/shp_bottom_line" + android:orientation="horizontal" android:padding="3dp"> @@ -130,18 +130,18 @@ @@ -167,9 +167,9 @@ @@ -184,20 +184,47 @@ tools:text="处理人" /> - + + + + + + + @@ -217,16 +244,16 @@ android:id="@+id/ll_handle_summary" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" android:background="@drawable/shp_bottom_line" + android:orientation="horizontal" android:padding="3dp"> diff --git a/commonmodule/src/main/res/layout/item_task.xml b/commonmodule/src/main/res/layout/item_task.xml index ac86ddf..2c1ebbf 100644 --- a/commonmodule/src/main/res/layout/item_task.xml +++ b/commonmodule/src/main/res/layout/item_task.xml @@ -12,7 +12,8 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:src="@drawable/ic_nofify_point_red" - android:visibility="gone" /> + android:visibility="gone" + tools:visibility="visible" /> +