事件已办列表

baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java

@@ -315,8 +315,10 @@ public class PathConfig {
 
     public static final String PATH_MODULE_COMMON_ACTIVITY_SEL_DEPT = "/modulecommon/activity/chooseDept";//部门选择接口
     public static final String PATH_MODULE_COMMON_ACTIVITY_SEL_PERSON = "/modulecommon/activity/choosePerson";//人员选择
-    public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG = "/modulecommon/activity/incidentLog";//事件日志
 
+    public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG = "/modulecommon/activity/incidentLog";//事件日志
+    public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DONE = "/modulecommon/activity/incidentDone";//已办事件
+    public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DETAIL = "/modulecommon/activity/incidentDetail";//事件详情
     public static final String PATH_MODULE_COMMON_ACTIVITY_STATISTICS = "/modulecommon/activity/statistics";//统计分析
     //======================网格员==================================================
     //小区
@@ -493,7 +495,7 @@ public class PathConfig {
     public static final String PATH_MODULE_GRID_ACTIVITY_INCIDENT_SEL_COMPONENT = "/modulegrid/activity/incidentSelComponent";//部件选择
 
     public static final String PATH_MODULE_GRID_ACTIVITY_INCIDENT_MINE_LIST = "/modulegrid/activity/incidentMineList";//我上报的事件列表
-    public static final String PATH_MODULE_GRID_ACTIVITY_INCIDENT_DETAIL = "/modulegrid/activity/incidentDetail";//事件详情
+
 
     public static final String PATH_MODULE_GRID_ACTIVITY_INCIDENT_HANDLE_LIST = "/modulegrid/activity/incidentHandleList";//待处理事件列表
     public static final String PATH_MODULE_GRID_ACTIVITY_INCIDENT_HANDLE = "/modulegrid/activity/incidentHandle";//事件处理

commonmodule/src/main/AndroidManifest.xml

@@ -3,8 +3,12 @@
     package="com.tengshisoft.commonmodule">
 
     <application>
-        <activity android:name=".activitys.logs.StatisticsActivity"></activity>
+        <activity android:name=".activitys.cases.IncidentDoneListActivity" />
+        <activity android:name=".activitys.cases.IncidentDetailActivity" />
         <activity android:name=".activitys.logs.IncidentLogActivity" />
+
+
+        <activity android:name=".activitys.logs.StatisticsActivity" />
         <activity android:name=".activitys.department.ChoosePersonActivity" />
         <activity android:name=".activitys.department.ChooseDeptActivity" />
         <activity android:name=".activitys.usercenter.UserCenterActivity" />

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java

@@ -1,7 +1,6 @@
-package com.tengshisoft.gridmodule.incident.activitys.cases;
+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.TextUtils;
@@ -23,17 +22,13 @@ import com.baidu.mapapi.map.MapStatusUpdateFactory;
 import com.baidu.mapapi.map.MarkerOptions;
 import com.baidu.mapapi.map.TextureMapView;
 import com.baidu.mapapi.model.LatLng;
-import com.hjq.toast.ToastUtils;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
-import com.scwang.smart.refresh.layout.api.RefreshLayout;
+import com.tengshisoft.commonmodule.R;
-import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
+import com.tengshisoft.commonmodule.R2;
-import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 import com.tengshisoft.commonmodule.adapters.HandleRecordAdapter;
 import com.tengshisoft.commonmodule.beans.HandleListBean;
 import com.tengshisoft.commonmodule.beans.IncidentDetailBean;
 import com.tengshisoft.commonmodule.nets.Apis;
-import com.tengshisoft.gridmodule.R;
-import com.tengshisoft.gridmodule.R2;
 import com.tenlionsoft.baselib.constant.PathConfig;
 import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi;
 import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
@@ -41,11 +36,8 @@ import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
 import com.tenlionsoft.baselib.core.widget.base.BaseShowPhotoAdapter;
 import com.tenlionsoft.baselib.core.widget.videorecord.MediaManager;
 import com.tenlionsoft.baselib.utils.ExceptionHandler;
-import com.tenlionsoft.baselib.utils.UIUtil;
 import com.tenlionsoft.baselib.utils.UserLgUtils;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -70,7 +62,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
  * 邮箱: itgaojian@163.com
  * 描述: 事件详情
  */
-@Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_INCIDENT_DETAIL)
+@Route(path = PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DETAIL)
 public class IncidentDetailActivity extends BaseActivity {
 
 

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDoneListActivity.java

@@ -0,0 +1,262 @@
+package com.tengshisoft.commonmodule.activitys.cases;
+
+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.commonmodule.R;
+import com.tengshisoft.commonmodule.R2;
+import com.tengshisoft.commonmodule.adapters.IncidentListAdapter;
+import com.tengshisoft.commonmodule.beans.IncidentListBean;
+import com.tengshisoft.commonmodule.nets.Apis;
+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年10月30日15:26:16
+ * 邮箱: itgaojian@163.com
+ * 描述: 已办事件-所有处理过的事件
+ */
+@Route(path = PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DONE)
+public class IncidentDoneListActivity extends BaseActivity {
+
+
+    @BindView(R2.id.et_base_search_content)
+    EditText mEtBaseSearchContent;
+    @BindView(R2.id.iv_base_clear)
+    ImageView mIvBaseClear;
+    @BindView(R2.id.btn_base_search)
+    Button mBtnBaseSearch;
+    @BindView(R2.id.ll_base_search_content)
+    LinearLayout mLlBaseSearchContent;
+    @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<IncidentListBean.RowsBean> mDatas;
+    private IncidentListAdapter mAdapter;
+    private int mCurrentPage = 1;
+    private String mKeywords = "";
+
+
+    @Override
+    protected int setLayoutId() {
+        return R.layout.activity_incident_done_list;
+    }
+
+    @Override
+    public void initData() {
+        mBind = ButterKnife.bind(this);
+        mTvBaseTitle.setText("我的事件");
+        mEtBaseSearchContent.setHint("请输入事件编码(分类名称)");
+        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);
+        getIncidentList(mCurrentPage);
+        mBtnBaseSearch.setOnClickListener(v -> doSearch());
+        mIvBaseClear.setOnClickListener(v -> {
+            mKeywords = "";
+            mEtBaseSearchContent.setText("");
+            doRefresh();
+        });
+        mAdapter.addOnItemClickListener(v -> ARouter.getInstance()
+                .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DETAIL)
+                .withString("id", v.getReportId())
+                .navigation());
+    }
+
+    /**
+     * 获取我经手处理的案件
+     */
+    private void getIncidentList(int currentPage) {
+        mCurrentPage = currentPage;
+        RetrofitManager.getInstance()
+                .create(Apis.class)
+                .getIncidentMineDoneList(mKeywords, mCurrentPage + "", UserLgUtils.getToken())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<IncidentListBean>() {
+                    @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() {
+        getIncidentList(mCurrentPage);
+    }
+
+    //刷新
+    private void doRefresh() {
+        mDatas.clear();
+        mAdapter.setData(mDatas);
+        getIncidentList(1);
+    }
+
+    /**
+     *
+     */
+    private void doSearch() {
+        String searchContent = mEtBaseSearchContent.getText().toString().trim();
+        if (!TextUtils.isEmpty(searchContent)) {
+            hideSoftKeyboard();
+            setStateView(13);
+            mKeywords = searchContent;
+            mCurrentPage = 1;
+            getIncidentList(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;
+        }
+    }
+}

commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/Apis.java

@@ -1028,6 +1028,13 @@ public interface Apis {
     @GET("app/report/listpage-me")
     Observable<IncidentListBean> getIncidentMineList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token);
 
+    /**
+     * 我处理过的事件
+     */
+    @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"})
+    @GET("app/taskbase/listPage-had")
+    Observable<IncidentListBean> getIncidentMineDoneList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token);
+
     /**
      * 获取事件详情
      */

commonmodule/src/main/res/layout/activity_incident_done_list.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/gray_bg"
+    android:orientation="vertical">
+
+    <include layout="@layout/item_base_search" />
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="5dp">
+
+        <com.scwang.smart.refresh.layout.SmartRefreshLayout
+            android:id="@+id/srl_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rlv_components"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ProgressBar
+                android:id="@+id/pb_loading"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:indeterminateBehavior="repeat"
+                android:indeterminateDrawable="@drawable/anim_loading" />
+
+            <ImageView
+                android:id="@+id/iv_empty_data"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_centerInParent="true"
+                android:background="@drawable/ic_empty_data" />
+
+            <TextView
+                android:id="@+id/tv_error_hint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:clickable="true"
+                android:textColor="@color/black"
+                tools:text="加载数据失败" />
+        </LinearLayout>
+    </RelativeLayout>
+</LinearLayout>

commonmodule/src/main/res/layout/item_incident_list.xml

@@ -16,8 +16,8 @@
 
         <ImageView
             android:id="@+id/iv_pic"
-            android:layout_width="48dp"
+            android:layout_width="32dp"
-            android:layout_height="48dp"
+            android:layout_height="32dp"
             android:src="@drawable/ic_incident_default" />
 
         <LinearLayout
@@ -59,8 +59,10 @@
             android:layout_height="wrap_content"
             android:background="@drawable/shp_status_blue"
             android:gravity="center"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
             android:textColor="@color/text_blue"
-            tools:text="未受理" />
+            tools:text="受理阶段" />
 
     </LinearLayout>
 

gridmodule/src/main/AndroidManifest.xml

@@ -203,11 +203,6 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"
             tools:ignore="LockedOrientationActivity" />
-        <activity
-            android:name=".incident.activitys.cases.IncidentDetailActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan|stateHidden"
-            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".incident.activitys.cases.IncidentListActivity"
             android:screenOrientation="portrait"

gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cases/IncidentListActivity.java

@@ -100,7 +100,7 @@ public class IncidentListActivity extends BaseActivity {
             doRefresh();
         });
         mAdapter.addOnItemClickListener(v -> ARouter.getInstance()
-                .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_INCIDENT_DETAIL)
+                .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DETAIL)
                 .withString("id", v.getReportId())
                 .navigation());
     }

mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java

@@ -130,9 +130,9 @@ public class GridMainFragment extends BaseFragment {
 //        mLlNotify.setOnClickListener(v -> ARouter.getInstance()
 //                .build(PathConfig.PATH_MODULE_GRID_ISSUE_NOTICE)
 //                .navigation());
-//        mLlPlan.setOnClickListener(v -> ARouter.getInstance()
+        mLlPlan.setOnClickListener(v -> ARouter.getInstance()
-//                .build(PathConfig.PATH_MODULE_ENTERPRISE_MINE_ENTERPRISE_LIST)
+                .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DONE)
-//                .navigation());
+                .navigation());
         for (int i = 0; i < mBtnStrs.length; i++) {
             FuncBean bean = new FuncBean();
             bean.setText(mBtnStrs[i]);

mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/LeaderMainFragment.java

@@ -153,9 +153,9 @@ public class LeaderMainFragment extends BaseFragment {
 //        mLlNotify.setOnClickListener(v -> ARouter.getInstance()
 //                .build(PathConfig.PATH_MODULE_GRID_ISSUE_NOTICE)
 //                .navigation());
-//        mLlPlan.setOnClickListener(v -> ARouter.getInstance()
+        mLlPlan.setOnClickListener(v -> ARouter.getInstance()
-//                .build(PathConfig.PATH_MODULE_ENTERPRISE_MINE_ENTERPRISE_LIST)
+                .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DONE)
-//                .navigation());
+                .navigation());
         for (int i = 0; i < mBtnStrs.length; i++) {
             FuncBean bean = new FuncBean();
             bean.setText(mBtnStrs[i]);

mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/SupervisionMainFragment.java

@@ -151,9 +151,9 @@ public class SupervisionMainFragment extends BaseFragment {
 //        mLlNotify.setOnClickListener(v -> ARouter.getInstance()
 //                .build(PathConfig.PATH_MODULE_GRID_ISSUE_NOTICE)
 //                .navigation());
-//        mLlPlan.setOnClickListener(v -> ARouter.getInstance()
+        mLlPlan.setOnClickListener(v -> ARouter.getInstance()
-//                .build(PathConfig.PATH_MODULE_ENTERPRISE_MINE_ENTERPRISE_LIST)
+                .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DONE)
-//                .navigation());
+                .navigation());
         for (int i = 0; i < mBtnStrs.length; i++) {
             FuncBean bean = new FuncBean();
             bean.setText(mBtnStrs[i]);

mainmodule/src/main/res/layout/fragment_main_grid.xml

@@ -96,7 +96,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:gravity="center"
-                    android:text="事件记录"
+                    android:text="我的上报"
                     android:textColor="@color/white"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -130,7 +130,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:gravity="center"
-                    android:text="我的企业"
+                    android:text="已办事件"
                     android:textColor="@color/white"
                     android:textSize="12sp" />
             </LinearLayout>

mainmodule/src/main/res/layout/fragment_main_leader.xml

@@ -129,7 +129,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:gravity="center"
-                    android:text="我的企业"
+                    android:text="已办事件"
                     android:textColor="@color/white"
                     android:textSize="12sp" />
             </LinearLayout>