社情民意功能完成

app/src/main/AndroidManifest.xml

@@ -96,17 +96,10 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".mvp.ui.activity.AddTjBRkbqActivity" />
-        <activity android:name=".mvp.ui.activity.RkbqActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-                <!-- &lt;!&ndash; <category android:name="android.intent.category.LAUNCHER" /> &ndash;&gt; -->
-            </intent-filter>
-        </activity>
+        <activity android:name=".mvp.ui.activity.RkbqActivity"></activity>
         <activity android:name=".mvp.ui.activity.NbdwJcActivity" />
         <activity android:name=".mvp.ui.activity.AddNbdwActivity" />
-        <activity android:name=".mvp.ui.activity.NbdwActivity"></activity>
+        <activity android:name=".mvp.ui.activity.NbdwActivity" />
         <activity android:name=".mvp.ui.activity.SwzdrLbActivity" />
         <activity android:name=".mvp.ui.activity.TdrkActivity" />
         <activity android:name=".mvp.ui.activity.JwzyActivity" />
@@ -119,14 +112,7 @@
         <activity android:name=".mvp.ui.activity.XzZatbActivity" />
         <activity android:name=".mvp.ui.activity.ZatblbActivity" />
         <activity android:name=".mvp.ui.activity.RhzfJlActivity" />
-        <activity android:name=".mvp.ui.activity.SqmyActivity">
-            <!--<intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>-->
-            -->
-        </activity>
+        <activity android:name=".mvp.ui.activity.SqmyActivity"></activity>
         <activity android:name=".mvp.ui.activity.SelectSydwFwActivity" />
         <activity android:name=".mvp.ui.activity.AqffxcActivity" />
         <activity android:name=".mvp.ui.activity.SqmyActivity" />
@@ -135,8 +121,9 @@
         <activity android:name=".mvp.ui.activity.LscyryActivity" />
         <activity android:name=".mvp.ui.activity.CyryhcActivity" />
         <activity android:name=".mvp.ui.activity.SydwlbActivity" />
-        <activity android:name=".mvp.ui.activity.XzSydwActivity"
-            android:windowSoftInputMode="adjustPan|stateHidden"/>
+        <activity
+            android:name=".mvp.ui.activity.XzSydwActivity"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity android:name=".mvp.ui.activity.SydwActivity" />
         <activity android:name=".mvp.ui.activity.SearchAppActivity" />
         <activity android:name=".mvp.ui.activity.RecordShowActivity" />
@@ -176,6 +163,7 @@
         <activity android:name=".mvp.ui.activity.BzdzMapActivity" />
         <activity android:name=".mvp.ui.activity.GdWzSsActivity" />
         <activity android:name=".mvp.ui.activity.XlfkActivity" />
+        <activity android:name=".mvp.ui.activity.AddChryActivity" />
         <activity android:name=".mvp.ui.activity.StHomeActivity">
 
             <!--
@@ -407,11 +395,11 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden">
-          <!--  <intent-filter>
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>-->
+            </intent-filter>
         </activity> <!-- 地图功能隐藏 -->
         <activity
             android:name="com.amap.api.navi.AmapRouteActivity"

app/src/main/java/com/zkjc/policedemo/di/component/AddChryComponent.java

@@ -0,0 +1,41 @@
+package com.zkjc.policedemo.di.component;
+
+import dagger.BindsInstance;
+import dagger.Component;
+
+import com.jess.arms.di.component.AppComponent;
+
+import com.zkjc.policedemo.di.module.AddChryModule;
+import com.zkjc.policedemo.mvp.contract.AddChryContract;
+
+import com.jess.arms.di.scope.ActivityScope;
+import com.zkjc.policedemo.mvp.ui.activity.AddChryActivity;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/25/2024 13:41
+ * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
+ * <a href="https://github.com/JessYanCoding">Follow me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
+ * ================================================
+ */
+@ActivityScope
+@Component(modules = AddChryModule.class, dependencies = AppComponent.class)
+public interface AddChryComponent {
+    void inject(AddChryActivity activity);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        AddChryComponent.Builder view(AddChryContract.View view);
+
+        AddChryComponent.Builder appComponent(AppComponent appComponent);
+
+        AddChryComponent build();
+    }
+}

app/src/main/java/com/zkjc/policedemo/di/module/AddChryModule.java

@@ -0,0 +1,30 @@
+package com.zkjc.policedemo.di.module;
+
+import com.jess.arms.di.scope.ActivityScope;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+
+import com.zkjc.policedemo.mvp.contract.AddChryContract;
+import com.zkjc.policedemo.mvp.model.AddChryModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/25/2024 13:41
+ * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
+ * <a href="https://github.com/JessYanCoding">Follow me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
+ * ================================================
+ */
+@Module
+public abstract class AddChryModule {
+
+    @Binds
+    abstract AddChryContract.Model bindAddChryModel(AddChryModel model);
+}

app/src/main/java/com/zkjc/policedemo/mvp/contract/AddChryContract.java

@@ -0,0 +1,29 @@
+package com.zkjc.policedemo.mvp.contract;
+
+import com.jess.arms.mvp.IView;
+import com.jess.arms.mvp.IModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/25/2024 13:41
+ * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
+ * <a href="https://github.com/JessYanCoding">Follow me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
+ * ================================================
+ */
+public interface AddChryContract {
+    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
+    interface View extends IView {
+
+    }
+
+    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
+    interface Model extends IModel {
+
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/contract/AddMyQahyContract.java

@@ -20,6 +20,9 @@ public interface AddMyQahyContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onSaveSuccess(String result);
+
+        void onUpdateSuccess(String result);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/AddMzjmhContract.java

@@ -2,6 +2,8 @@ package com.zkjc.policedemo.mvp.contract;
 
 import com.jess.arms.mvp.IView;
 import com.jess.arms.mvp.IModel;
+import com.zkjc.policedemo.mvp.model.entity.JmhEntity;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
 
 
 /**
@@ -20,6 +22,13 @@ public interface AddMzjmhContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onSaveSuccess(String result);
+
+        void onUpdateSuccess(String result);
+
+        void onDit(String result);
+
+        void onGetDetailSuccess(JmhEntity.Jmh data);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/AddSqmyContract.java

@@ -2,6 +2,8 @@ package com.zkjc.policedemo.mvp.contract;
 
 import com.jess.arms.mvp.IView;
 import com.jess.arms.mvp.IModel;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
+import com.zkjc.policedemo.mvp.model.entity.ZdAllEntity;
 
 
 /**
@@ -20,6 +22,13 @@ public interface AddSqmyContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onGetZdSuccess(ZdAllEntity.DataBean data);
+
+        void onSaveSuccess(String result);
+
+        void onGetDetailSuccess(SqmyEntity.Sqmy data);
+
+        void onUpdateSuccess(String result);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/SqmyContract.java

@@ -2,6 +2,7 @@ package com.zkjc.policedemo.mvp.contract;
 
 import com.jess.arms.mvp.IView;
 import com.jess.arms.mvp.IModel;
+import com.zkjc.policedemo.mvp.model.entity.SqmyMainDataEntity;
 
 
 /**
@@ -20,6 +21,7 @@ public interface SqmyContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onGetDataSuccess(SqmyMainDataEntity.SqmyMainData data);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/SqmyLbContract.java

@@ -20,6 +20,9 @@ public interface SqmyLbContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onSuccess(String result);
+
+        void onRemoveSuccess(String result, int position);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/SqmyMyAqhyContract.java

@@ -20,6 +20,9 @@ public interface SqmyMyAqhyContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onSuccess(String result);
+
+        void onRemoveSuccess(String result, int position);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/SqmyMzjmhContract.java

@@ -20,6 +20,9 @@ public interface SqmyMzjmhContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onSuccess(String result);
+
+        void onRemoveSuccess(String result, int position);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/XzZatbContract.java

@@ -20,6 +20,9 @@ public interface XzZatbContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onSaveSuccess(String result);
+
+        void onUpdateSuccess(String result);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/ZatblbContract.java

@@ -20,6 +20,9 @@ public interface ZatblbContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onRemoveSuccess(String result, int position);
+
+        void onSuccess(String result);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/model/AddChryModel.java

@@ -0,0 +1,46 @@
+package com.zkjc.policedemo.mvp.model;
+
+import android.app.Application;
+
+import com.google.gson.Gson;
+import com.jess.arms.integration.IRepositoryManager;
+import com.jess.arms.mvp.BaseModel;
+
+import com.jess.arms.di.scope.ActivityScope;
+
+import javax.inject.Inject;
+
+import com.zkjc.policedemo.mvp.contract.AddChryContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/25/2024 13:41
+ * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
+ * <a href="https://github.com/JessYanCoding">Follow me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
+ * ================================================
+ */
+@ActivityScope
+public class AddChryModel extends BaseModel implements AddChryContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public AddChryModel(IRepositoryManager repositoryManager) {
+        super(repositoryManager);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        this.mGson = null;
+        this.mApplication = null;
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/model/api/Api.java

@@ -16,6 +16,9 @@ public interface Api {
 
 //    String APP_DOMAIN = "http://118.195.196.59:6543";
 //    String url = "http://118.195.196.59:6543/common/zf3";
+//    142227200006022615
+//220102199605221616
+//220102196712104411
 //    String APP_DOMAIN = "http://61.138.188.180:6543";
 //    String url = "http://61.138.188.180:6543/common/zf3";208079
 //    String APP_DOMAIN = "http:// 192.168.224.205:6543";

app/src/main/java/com/zkjc/policedemo/mvp/model/entity/HyjlEntity.java

@@ -0,0 +1,188 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class HyjlEntity {
+
+    private int code;
+    private boolean success;
+    private Data data;
+    private String msg;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    public void setData(Data data) {
+        this.data = data;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public static class Data {
+        private int total;
+        private int size;
+        private int current;
+        private boolean optimizeCountSql;
+        private boolean searchCount;
+        private int maxLimit;
+        private String countId;
+        private int pages;
+        private List<Hyjl> records;
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public int getCurrent() {
+            return current;
+        }
+
+        public void setCurrent(int current) {
+            this.current = current;
+        }
+
+        public boolean isOptimizeCountSql() {
+            return optimizeCountSql;
+        }
+
+        public void setOptimizeCountSql(boolean optimizeCountSql) {
+            this.optimizeCountSql = optimizeCountSql;
+        }
+
+        public boolean isSearchCount() {
+            return searchCount;
+        }
+
+        public void setSearchCount(boolean searchCount) {
+            this.searchCount = searchCount;
+        }
+
+        public int getMaxLimit() {
+            return maxLimit;
+        }
+
+        public void setMaxLimit(int maxLimit) {
+            this.maxLimit = maxLimit;
+        }
+
+        public String getCountId() {
+            return countId;
+        }
+
+        public void setCountId(String countId) {
+            this.countId = countId;
+        }
+
+        public int getPages() {
+            return pages;
+        }
+
+        public void setPages(int pages) {
+            this.pages = pages;
+        }
+
+        public List<Hyjl> getRecords() {
+            return records;
+        }
+
+        public void setRecords(List<Hyjl> records) {
+            this.records = records;
+        }
+    }
+    public static class Hyjl implements Serializable {
+        //  "hyzt": "会议主题",
+        //  "hynr": "会议内容",
+        //  "fj": "附件"
+        // 会议时间 hysj
+        private long createTime;
+        private String id;
+        private String hyzt;
+        private String hynr;
+        private String hysj;
+        private String fj;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public long getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(long createTime) {
+            this.createTime = createTime;
+        }
+
+        public String getHyzt() {
+            return hyzt;
+        }
+
+        public void setHyzt(String hyzt) {
+            this.hyzt = hyzt;
+        }
+
+        public String getHynr() {
+            return hynr;
+        }
+
+        public void setHynr(String hynr) {
+            this.hynr = hynr;
+        }
+
+        public String getHysj() {
+            return hysj;
+        }
+
+        public void setHysj(String hysj) {
+            this.hysj = hysj;
+        }
+
+        public String getFj() {
+            return fj;
+        }
+
+        public void setFj(String fj) {
+            this.fj = fj;
+        }
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/model/entity/JmhDetailEntity.java

@@ -0,0 +1,41 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+public class JmhDetailEntity {
+
+    private int code;
+    private boolean success;
+    private JmhEntity.Jmh data;
+    private String msg;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public JmhEntity.Jmh getData() {
+        return data;
+    }
+
+    public void setData(JmhEntity.Jmh data) {
+        this.data = data;
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/model/entity/JmhEntity.java

@@ -0,0 +1,284 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class JmhEntity {
+
+    private int code;
+    private boolean success;
+    private Data data;
+    private String msg;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    public void setData(Data data) {
+        this.data = data;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public static class Data {
+        private int total;
+        private int size;
+        private int current;
+        private boolean optimizeCountSql;
+        private boolean searchCount;
+        private int maxLimit;
+        private String countId;
+        private int pages;
+        private List<Jmh> records;
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public int getCurrent() {
+            return current;
+        }
+
+        public void setCurrent(int current) {
+            this.current = current;
+        }
+
+        public boolean isOptimizeCountSql() {
+            return optimizeCountSql;
+        }
+
+        public void setOptimizeCountSql(boolean optimizeCountSql) {
+            this.optimizeCountSql = optimizeCountSql;
+        }
+
+        public boolean isSearchCount() {
+            return searchCount;
+        }
+
+        public void setSearchCount(boolean searchCount) {
+            this.searchCount = searchCount;
+        }
+
+        public int getMaxLimit() {
+            return maxLimit;
+        }
+
+        public void setMaxLimit(int maxLimit) {
+            this.maxLimit = maxLimit;
+        }
+
+        public String getCountId() {
+            return countId;
+        }
+
+        public void setCountId(String countId) {
+            this.countId = countId;
+        }
+
+        public int getPages() {
+            return pages;
+        }
+
+        public void setPages(int pages) {
+            this.pages = pages;
+        }
+
+        public List<Jmh> getRecords() {
+            return records;
+        }
+
+        public void setRecords(List<Jmh> records) {
+            this.records = records;
+        }
+    }
+    public static class Jmh implements Serializable {
+        //   "hyzt": "会议主题",
+        //    "hynr": "会议内容",
+        //    "fj": "附件",
+        //    "sssqBm": 220171003003,
+        //    "ryList": [
+        //        {
+        //            "xm": "姓名1",
+        //            "zw": "职务1",
+        //            "lxdh": "联系电话1"
+        //        },
+        //        {
+        //            "xm": "姓名2",
+        //            "zw": "职务2",
+        //            "lxdh": "联系电话2"
+        //        }
+        //    ]
+        private long createTime;
+        private String id;
+        private String hyzt;
+        private String hysj;
+        private String hynr;
+        private String sssqBm;
+        private String sssqName;
+        private String fj;
+        private String names;
+        private List<JmhRy> ryList;
+
+        public String getNames() {
+            return names;
+        }
+
+        public void setNames(String names) {
+            this.names = names;
+        }
+
+        public String getSssqName() {
+            return sssqName;
+        }
+
+        public void setSssqName(String sssqName) {
+            this.sssqName = sssqName;
+        }
+
+        public String getHysj() {
+            return hysj;
+        }
+
+        public void setHysj(String hysj) {
+            this.hysj = hysj;
+        }
+
+        public String getHyzt() {
+            return hyzt;
+        }
+
+        public void setHyzt(String hyzt) {
+            this.hyzt = hyzt;
+        }
+
+        public String getHynr() {
+            return hynr;
+        }
+
+        public void setHynr(String hynr) {
+            this.hynr = hynr;
+        }
+
+        public String getSssqBm() {
+            return sssqBm;
+        }
+
+        public void setSssqBm(String sssqBm) {
+            this.sssqBm = sssqBm;
+        }
+
+        public List<JmhRy> getRyList() {
+            return ryList;
+        }
+
+        public void setRyList(List<JmhRy> ryList) {
+            this.ryList = ryList;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public long getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(long createTime) {
+            this.createTime = createTime;
+        }
+
+        public String getFj() {
+            return fj;
+        }
+
+        public void setFj(String fj) {
+            this.fj = fj;
+        }
+    }
+    public static class JmhRy implements Serializable {
+
+        private String id;
+        private String xm;
+        private String zw;
+        private String lxdh;
+        private int isDeleted;
+
+        public int getIsDeleted() {
+            return isDeleted;
+        }
+
+        public void setIsDeleted(int isDeleted) {
+            this.isDeleted = isDeleted;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getZw() {
+            return zw;
+        }
+
+        public void setZw(String zw) {
+            this.zw = zw;
+        }
+
+        public String getLxdh() {
+            return lxdh;
+        }
+
+        public void setLxdh(String lxdh) {
+            this.lxdh = lxdh;
+        }
+
+        public String getXm() {
+            return xm;
+        }
+
+        public void setXm(String xm) {
+            this.xm = xm;
+        }
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/model/entity/SqmyDetailEntity.java

@@ -0,0 +1,44 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class SqmyDetailEntity {
+
+    private int code;
+    private boolean success;
+    private SqmyEntity.Sqmy data;
+    private String msg;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public SqmyEntity.Sqmy getData() {
+        return data;
+    }
+
+    public void setData(SqmyEntity.Sqmy data) {
+        this.data = data;
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/model/entity/SqmyEntity.java

@@ -0,0 +1,309 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class SqmyEntity {
+
+    private int code;
+    private boolean success;
+    private Data data;
+    private String msg;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    public void setData(Data data) {
+        this.data = data;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public static class Data {
+        private int total;
+        private int size;
+        private int current;
+        private boolean optimizeCountSql;
+        private boolean searchCount;
+        private int maxLimit;
+        private String countId;
+        private int pages;
+        private List<Sqmy> records;
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public int getCurrent() {
+            return current;
+        }
+
+        public void setCurrent(int current) {
+            this.current = current;
+        }
+
+        public boolean isOptimizeCountSql() {
+            return optimizeCountSql;
+        }
+
+        public void setOptimizeCountSql(boolean optimizeCountSql) {
+            this.optimizeCountSql = optimizeCountSql;
+        }
+
+        public boolean isSearchCount() {
+            return searchCount;
+        }
+
+        public void setSearchCount(boolean searchCount) {
+            this.searchCount = searchCount;
+        }
+
+        public int getMaxLimit() {
+            return maxLimit;
+        }
+
+        public void setMaxLimit(int maxLimit) {
+            this.maxLimit = maxLimit;
+        }
+
+        public String getCountId() {
+            return countId;
+        }
+
+        public void setCountId(String countId) {
+            this.countId = countId;
+        }
+
+        public int getPages() {
+            return pages;
+        }
+
+        public void setPages(int pages) {
+            this.pages = pages;
+        }
+
+        public List<Sqmy> getRecords() {
+            return records;
+        }
+
+        public void setRecords(List<Sqmy> records) {
+            this.records = records;
+        }
+    }
+    public static class Sqmy implements Serializable {
+        // "xslx": "线索类型",
+        //  "fxsj": "发现时间",
+        //  "fxdd": "发现地点",
+        //  "xsnr": "线索内容",
+        //  "fj": "附件",
+        //  "ryList": [
+        //    {
+        //      "xm": "姓名",
+        //      "gmsfhm": "公民身份号码",
+        //      "lxdh": "联系电话",
+        //      "xjzdxz": "现居住地详址"
+        //    }
+        //  ]
+        private long createTime;
+        private String id;
+        private String xslx;
+        private String fxsj;
+        private String fxdd;
+        private String xsnr;
+        private String fj;
+        private List<Xstgr> ryList;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public long getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(long createTime) {
+            this.createTime = createTime;
+        }
+
+        public String getXslx() {
+            return xslx;
+        }
+
+        public void setXslx(String xslx) {
+            this.xslx = xslx;
+        }
+
+        public String getFxsj() {
+            return fxsj;
+        }
+
+        public void setFxsj(String fxsj) {
+            this.fxsj = fxsj;
+        }
+
+        public String getFxdd() {
+            return fxdd;
+        }
+
+        public void setFxdd(String fxdd) {
+            this.fxdd = fxdd;
+        }
+
+        public String getXsnr() {
+            return xsnr;
+        }
+
+        public void setXsnr(String xsnr) {
+            this.xsnr = xsnr;
+        }
+
+        public String getFj() {
+            return fj;
+        }
+
+        public void setFj(String fj) {
+            this.fj = fj;
+        }
+
+        public List<Xstgr> getRyList() {
+            return ryList;
+        }
+
+        public void setRyList(List<Xstgr> ryList) {
+            this.ryList = ryList;
+        }
+    }
+    public static class Xstgr implements Serializable {
+        // dwdzbm  单位地址编码
+        //tyshxydm  统一社会信用代码
+        //xm  姓名
+        //gmsfhm  公民身份号码
+        //xb  性别
+        //zy  职业（手填）
+        //zylb  职业类别（汉字）
+        //zylbDm 职业类别（代码）
+        //lxdh  联系电话
+        //xz  现居住地
+        //mz  民族
+        private String id;
+        private String zp;
+        private String xm;
+        private String gmsfhm;
+        private String xb;
+        private String lxdh;
+        private String mz;
+        private String xjzdxz;
+        private int isDeleted;
+
+        public int getIsDeleted() {
+            return isDeleted;
+        }
+
+        public void setIsDeleted(int isDeleted) {
+            this.isDeleted = isDeleted;
+        }
+
+        public String getXjzdxz() {
+            return xjzdxz;
+        }
+
+        public void setXjzdxz(String xjzdxz) {
+            this.xjzdxz = xjzdxz;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getZp() {
+            return zp;
+        }
+
+        public void setZp(String zp) {
+            this.zp = zp;
+        }
+
+        public String getXm() {
+            return xm;
+        }
+
+        public void setXm(String xm) {
+            this.xm = xm;
+        }
+
+        public String getGmsfhm() {
+            return gmsfhm;
+        }
+
+        public void setGmsfhm(String gmsfhm) {
+            this.gmsfhm = gmsfhm;
+        }
+
+        public String getXb() {
+            return xb;
+        }
+
+        public void setXb(String xb) {
+            this.xb = xb;
+        }
+
+        public String getLxdh() {
+            return lxdh;
+        }
+
+        public void setLxdh(String lxdh) {
+            this.lxdh = lxdh;
+        }
+
+        public String getMz() {
+            return mz;
+        }
+
+        public void setMz(String mz) {
+            this.mz = mz;
+        }
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/model/entity/SqmyMainDataEntity.java

@@ -0,0 +1,137 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class SqmyMainDataEntity {
+
+    private int code;
+    private boolean success;
+    private SqmyMainData data;
+    private String msg;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public SqmyMainData getData() {
+        return data;
+    }
+
+    public void setData(SqmyMainData data) {
+        this.data = data;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public static class SqmyMainData {
+        private String brSqmy;
+        private String bzRhzf;
+        private String jdSqmy;
+        private String ndRhzf;
+        private String ndSqmy;
+        private String weekOfYear;
+        private String monthOfYear;
+        private ZaqktbEntity.Zaqktb zatb;
+        private HyjlEntity.Hyjl fzrhy;
+        private JmhEntity.Jmh jhm;
+
+        public String getBrSqmy() {
+            return brSqmy;
+        }
+
+        public void setBrSqmy(String brSqmy) {
+            this.brSqmy = brSqmy;
+        }
+
+        public String getBzRhzf() {
+            return bzRhzf;
+        }
+
+        public void setBzRhzf(String bzRhzf) {
+            this.bzRhzf = bzRhzf;
+        }
+
+        public String getJdSqmy() {
+            return jdSqmy;
+        }
+
+        public void setJdSqmy(String jdSqmy) {
+            this.jdSqmy = jdSqmy;
+        }
+
+        public String getNdRhzf() {
+            return ndRhzf;
+        }
+
+        public void setNdRhzf(String ndRhzf) {
+            this.ndRhzf = ndRhzf;
+        }
+
+        public String getNdSqmy() {
+            return ndSqmy;
+        }
+
+        public void setNdSqmy(String ndSqmy) {
+            this.ndSqmy = ndSqmy;
+        }
+
+        public String getWeekOfYear() {
+            return weekOfYear;
+        }
+
+        public void setWeekOfYear(String weekOfYear) {
+            this.weekOfYear = weekOfYear;
+        }
+
+        public String getMonthOfYear() {
+            return monthOfYear;
+        }
+
+        public void setMonthOfYear(String monthOfYear) {
+            this.monthOfYear = monthOfYear;
+        }
+
+        public ZaqktbEntity.Zaqktb getZatb() {
+            return zatb;
+        }
+
+        public void setZatb(ZaqktbEntity.Zaqktb zatb) {
+            this.zatb = zatb;
+        }
+
+        public HyjlEntity.Hyjl getFzrhy() {
+            return fzrhy;
+        }
+
+        public void setFzrhy(HyjlEntity.Hyjl fzrhy) {
+            this.fzrhy = fzrhy;
+        }
+
+        public JmhEntity.Jmh getJhm() {
+            return jhm;
+        }
+
+        public void setJhm(JmhEntity.Jmh jhm) {
+            this.jhm = jhm;
+        }
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/model/entity/SydwEntity.java

@@ -381,6 +381,15 @@ public class SydwEntity implements Serializable{
         private String zylbDm;
         private String lxdh;
         private String xz;
+        private String mz;
+
+        public String getMz() {
+            return mz;
+        }
+
+        public void setMz(String mz) {
+            this.mz = mz;
+        }
 
         public String getId() {
             return id;

app/src/main/java/com/zkjc/policedemo/mvp/model/entity/ZaqktbEntity.java

@@ -0,0 +1,188 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ZaqktbEntity {
+
+    private int code;
+    private boolean success;
+    private Data data;
+    private String msg;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    public void setData(Data data) {
+        this.data = data;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public static class Data {
+        private int total;
+        private int size;
+        private int current;
+        private boolean optimizeCountSql;
+        private boolean searchCount;
+        private int maxLimit;
+        private String countId;
+        private int pages;
+        private List<Zaqktb> records;
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public int getCurrent() {
+            return current;
+        }
+
+        public void setCurrent(int current) {
+            this.current = current;
+        }
+
+        public boolean isOptimizeCountSql() {
+            return optimizeCountSql;
+        }
+
+        public void setOptimizeCountSql(boolean optimizeCountSql) {
+            this.optimizeCountSql = optimizeCountSql;
+        }
+
+        public boolean isSearchCount() {
+            return searchCount;
+        }
+
+        public void setSearchCount(boolean searchCount) {
+            this.searchCount = searchCount;
+        }
+
+        public int getMaxLimit() {
+            return maxLimit;
+        }
+
+        public void setMaxLimit(int maxLimit) {
+            this.maxLimit = maxLimit;
+        }
+
+        public String getCountId() {
+            return countId;
+        }
+
+        public void setCountId(String countId) {
+            this.countId = countId;
+        }
+
+        public int getPages() {
+            return pages;
+        }
+
+        public void setPages(int pages) {
+            this.pages = pages;
+        }
+
+        public List<Zaqktb> getRecords() {
+            return records;
+        }
+
+        public void setRecords(List<Zaqktb> records) {
+            this.records = records;
+        }
+    }
+    public static class Zaqktb implements Serializable {
+        //   "tbbt": "通报标题",
+        //  "bgqk": "报告情况",
+        //  "jmyj": "居民意见",
+        //  "fj": "附件"
+        private long createTime;
+        private String id;
+        private String tbbt;
+        private String bgqk;
+        private String jmyj;
+        private String fj;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public long getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(long createTime) {
+            this.createTime = createTime;
+        }
+
+        public String getTbbt() {
+            return tbbt;
+        }
+
+        public void setTbbt(String tbbt) {
+            this.tbbt = tbbt;
+        }
+
+        public String getBgqk() {
+            return bgqk;
+        }
+
+        public void setBgqk(String bgqk) {
+            this.bgqk = bgqk;
+        }
+
+        public String getJmyj() {
+            return jmyj;
+        }
+
+        public void setJmyj(String jmyj) {
+            this.jmyj = jmyj;
+        }
+
+        public String getFj() {
+            return fj;
+        }
+
+        public void setFj(String fj) {
+            this.fj = fj;
+        }
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/model/entity/ZdAllEntity.java

@@ -86,7 +86,16 @@ public class ZdAllEntity implements Serializable {
         private List<Fwtd> yyfwlx; // 委托服务类型
         private List<Fwtd> jyfs; // 经营方式
         private List<Fwtd> hylx; // 行业类型
-        private List<Fwtd> zylb; // 行业类型
+        private List<Fwtd> zylb; // 职业类别
+        private List<Fwtd> xslx; // 线索类型
+
+        public List<Fwtd> getXslx() {
+            return xslx;
+        }
+
+        public void setXslx(List<Fwtd> xslx) {
+            this.xslx = xslx;
+        }
 
         public List<Fwtd> getZylb() {
             return zylb;

app/src/main/java/com/zkjc/policedemo/mvp/presenter/AddChryPresenter.java

@@ -0,0 +1,53 @@
+package com.zkjc.policedemo.mvp.presenter;
+
+import android.app.Application;
+
+import com.jess.arms.integration.AppManager;
+import com.jess.arms.di.scope.ActivityScope;
+import com.jess.arms.mvp.BasePresenter;
+import com.jess.arms.http.imageloader.ImageLoader;
+
+import me.jessyan.rxerrorhandler.core.RxErrorHandler;
+
+import javax.inject.Inject;
+
+import com.zkjc.policedemo.mvp.contract.AddChryContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/25/2024 13:41
+ * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
+ * <a href="https://github.com/JessYanCoding">Follow me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
+ * ================================================
+ */
+@ActivityScope
+public class AddChryPresenter extends BasePresenter<AddChryContract.Model, AddChryContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public AddChryPresenter(AddChryContract.Model model, AddChryContract.View rootView) {
+        super(model, rootView);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        this.mErrorHandler = null;
+        this.mAppManager = null;
+        this.mImageLoader = null;
+        this.mApplication = null;
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/presenter/AddJzrkPresenter.java

@@ -85,7 +85,7 @@ public class AddJzrkPresenter extends BasePresenter<AddJzrkContract.Model, AddJz
 
     public void getRyData(Map<String, String> map) {
         Map<String, Object> map1 = new HashMap<>();
-        map1.put("className", "fwInfoController");
+        map1.put("className", "userController");
         map1.put("methodName", "getRyxxBySfzh");
         map1.put("params", map);
         ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {

app/src/main/java/com/zkjc/policedemo/mvp/presenter/AddMyQahyPresenter.java

@@ -2,6 +2,8 @@ package com.zkjc.policedemo.mvp.presenter;
 
 import android.app.Application;
 
+import com.google.gson.Gson;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.mvp.BasePresenter;
@@ -11,7 +13,14 @@ import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 
 import javax.inject.Inject;
 
+import com.zkjc.common.utils.Utils;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.ReqToBus;
 import com.zkjc.policedemo.mvp.contract.AddMyQahyContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +59,72 @@ public class AddMyQahyPresenter extends BasePresenter<AddMyQahyContract.Model, A
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void save(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "fzrhyInfoController");
+        map1.put("methodName", "save");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onSaveSuccess(result);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
+
+    public void update(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "fzrhyInfoController");
+        map1.put("methodName", "update");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onUpdateSuccess(result);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/AddMzjmhPresenter.java

@@ -2,6 +2,8 @@ package com.zkjc.policedemo.mvp.presenter;
 
 import android.app.Application;
 
+import com.google.gson.Gson;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.mvp.BasePresenter;
@@ -11,7 +13,18 @@ import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 
 import javax.inject.Inject;
 
+import com.zkjc.common.utils.Utils;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.ReqToBus;
 import com.zkjc.policedemo.mvp.contract.AddMzjmhContract;
+import com.zkjc.policedemo.mvp.model.entity.JmhDetailEntity;
+import com.zkjc.policedemo.mvp.model.entity.JmhEntity;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+import com.zkjc.policedemo.mvp.model.entity.SqmyDetailEntity;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +63,133 @@ public class AddMzjmhPresenter extends BasePresenter<AddMzjmhContract.Model, Add
         this.mImageLoader = null;
         this.mApplication = null;
     }
+    public void getDetail(Map<String, String> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "jmhInfoController");
+        map1.put("methodName", "detail");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                JmhDetailEntity entity = new Gson().fromJson(result, JmhDetailEntity.class);
+                JmhEntity.Jmh data = entity.getData();
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (data != null) {
+                        if (mRootView != null) {
+                            mRootView.onGetDetailSuccess(data);
+                        }
+                    } else {
+                        ToastUtils.show("数据出错");
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
+    public void zd() {
+        Map<String, String> map = new HashMap<>();
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "appMenuController");
+        map1.put("methodName", "getDeptList");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                if (mRootView != null)
+                    mRootView.onDit(result);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
+
+    public void save(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "jmhInfoController");
+        map1.put("methodName", "save");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onSaveSuccess(result);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
+
+    public void update(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "jmhInfoController");
+        map1.put("methodName", "update");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onUpdateSuccess(result);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/AddSqmyPresenter.java

@@ -2,6 +2,8 @@ package com.zkjc.policedemo.mvp.presenter;
 
 import android.app.Application;
 
+import com.google.gson.Gson;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.mvp.BasePresenter;
@@ -11,7 +13,19 @@ import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 
 import javax.inject.Inject;
 
+import com.zkjc.common.utils.Utils;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.ReqToBus;
 import com.zkjc.policedemo.mvp.contract.AddSqmyContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+import com.zkjc.policedemo.mvp.model.entity.SqmyDetailEntity;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
+import com.zkjc.policedemo.mvp.model.entity.SydwDetailEntity;
+import com.zkjc.policedemo.mvp.model.entity.SydwEntity;
+import com.zkjc.policedemo.mvp.model.entity.ZdAllEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +64,144 @@ public class AddSqmyPresenter extends BasePresenter<AddSqmyContract.Model, AddSq
         this.mImageLoader = null;
         this.mApplication = null;
     }
+    public void getDetail(Map<String, String> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "sqmyInfoController");
+        map1.put("methodName", "detail");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                SqmyDetailEntity entity = new Gson().fromJson(result, SqmyDetailEntity.class);
+                SqmyEntity.Sqmy data = entity.getData();
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (data != null) {
+                        if (mRootView != null) {
+                            mRootView.onGetDetailSuccess(data);
+                        }
+                    } else {
+                        ToastUtils.show("数据出错");
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
+    public void getDictionary(Map<String, String> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "fwInfoController");
+        map1.put("methodName", "dictionary");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                ZdAllEntity entity = new Gson().fromJson(result, ZdAllEntity.class);
+                ZdAllEntity.DataBean data = entity.getData();
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (data != null) {
+                        if (mRootView != null) {
+                            mRootView.onGetZdSuccess(data);
+                        }
+                    } else {
+                        ToastUtils.show("数据出错");
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
+    public void save(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "sqmyInfoController");
+        map1.put("methodName", "save");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onSaveSuccess(result);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
+
+    public void update(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "sqmyInfoController");
+        map1.put("methodName", "update");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onUpdateSuccess(result);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/SqmyLbPresenter.java

@@ -2,6 +2,8 @@ package com.zkjc.policedemo.mvp.presenter;
 
 import android.app.Application;
 
+import com.google.gson.Gson;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.mvp.BasePresenter;
@@ -11,7 +13,14 @@ import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 
 import javax.inject.Inject;
 
+import com.zkjc.common.utils.Utils;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.ReqToBus;
 import com.zkjc.policedemo.mvp.contract.SqmyLbContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +59,66 @@ public class SqmyLbPresenter extends BasePresenter<SqmyLbContract.Model, SqmyLbC
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+
+    public void getList(Map<String, String> map) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("className", "sqmyInfoController");
+        param.put("methodName", "page");
+        param.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(param, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                if (mRootView != null) {
+                    mRootView.onSuccess(result);
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
+
+
+    public void remove(Map<String, String> map, int position) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "sqmyInfoController");
+        map1.put("methodName", "remove");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onRemoveSuccess(result, position);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/SqmyMyAqhyPresenter.java

@@ -2,6 +2,8 @@ package com.zkjc.policedemo.mvp.presenter;
 
 import android.app.Application;
 
+import com.google.gson.Gson;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.mvp.BasePresenter;
@@ -11,7 +13,14 @@ import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 
 import javax.inject.Inject;
 
+import com.zkjc.common.utils.Utils;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.ReqToBus;
 import com.zkjc.policedemo.mvp.contract.SqmyMyAqhyContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +59,64 @@ public class SqmyMyAqhyPresenter extends BasePresenter<SqmyMyAqhyContract.Model,
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void getList(Map<String, String> map) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("className", "fzrhyInfoController");
+        param.put("methodName", "page");
+        param.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(param, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                if (mRootView != null) {
+                    mRootView.onSuccess(result);
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
+
+    public void remove(Map<String, String> map, int position) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "fzrhyInfoController");
+        map1.put("methodName", "remove");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onRemoveSuccess(result, position);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/SqmyMzjmhPresenter.java

@@ -2,6 +2,8 @@ package com.zkjc.policedemo.mvp.presenter;
 
 import android.app.Application;
 
+import com.google.gson.Gson;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.mvp.BasePresenter;
@@ -11,7 +13,14 @@ import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 
 import javax.inject.Inject;
 
+import com.zkjc.common.utils.Utils;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.ReqToBus;
 import com.zkjc.policedemo.mvp.contract.SqmyMzjmhContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +59,66 @@ public class SqmyMzjmhPresenter extends BasePresenter<SqmyMzjmhContract.Model, S
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+
+    public void getList(Map<String, String> map) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("className", "jmhInfoController");
+        param.put("methodName", "page");
+        param.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(param, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                if (mRootView != null) {
+                    mRootView.onSuccess(result);
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
+
+
+    public void remove(Map<String, String> map, int position) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "jmhInfoController");
+        map1.put("methodName", "remove");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onRemoveSuccess(result, position);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/SqmyPresenter.java

@@ -2,6 +2,8 @@ package com.zkjc.policedemo.mvp.presenter;
 
 import android.app.Application;
 
+import com.google.gson.Gson;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.mvp.BasePresenter;
@@ -11,7 +13,16 @@ import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 
 import javax.inject.Inject;
 
+import com.zkjc.common.utils.Utils;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.ReqToBus;
 import com.zkjc.policedemo.mvp.contract.SqmyContract;
+import com.zkjc.policedemo.mvp.model.entity.SqmyDetailEntity;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
+import com.zkjc.policedemo.mvp.model.entity.SqmyMainDataEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +61,42 @@ public class SqmyPresenter extends BasePresenter<SqmyContract.Model, SqmyContrac
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void getData(Map<String, String> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "sqmyInfoController");
+        map1.put("methodName", "sjtj");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                SqmyMainDataEntity entity = new Gson().fromJson(result, SqmyMainDataEntity.class);
+                SqmyMainDataEntity.SqmyMainData data = entity.getData();
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (data != null) {
+                        if (mRootView != null) {
+                            mRootView.onGetDataSuccess(data);
+                        }
+                    } else {
+                        ToastUtils.show("数据出错");
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/XzZatbPresenter.java

@@ -2,6 +2,8 @@ package com.zkjc.policedemo.mvp.presenter;
 
 import android.app.Application;
 
+import com.google.gson.Gson;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.mvp.BasePresenter;
@@ -11,7 +13,14 @@ import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 
 import javax.inject.Inject;
 
+import com.zkjc.common.utils.Utils;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.ReqToBus;
 import com.zkjc.policedemo.mvp.contract.XzZatbContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +59,71 @@ public class XzZatbPresenter extends BasePresenter<XzZatbContract.Model, XzZatbC
         this.mImageLoader = null;
         this.mApplication = null;
     }
+    public void save(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "zatbInfoController");
+        map1.put("methodName", "save");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onSaveSuccess(result);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
+
+    public void update(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "zatbInfoController");
+        map1.put("methodName", "update");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onUpdateSuccess(result);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/ZatblbPresenter.java

@@ -2,6 +2,8 @@ package com.zkjc.policedemo.mvp.presenter;
 
 import android.app.Application;
 
+import com.google.gson.Gson;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.mvp.BasePresenter;
@@ -11,7 +13,14 @@ import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 
 import javax.inject.Inject;
 
+import com.zkjc.common.utils.Utils;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.ReqToBus;
 import com.zkjc.policedemo.mvp.contract.ZatblbContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +59,66 @@ public class ZatblbPresenter extends BasePresenter<ZatblbContract.Model, ZatblbC
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+
+    public void getList(Map<String, String> map) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("className", "zatbInfoController");
+        param.put("methodName", "page");
+        param.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(param, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                if (mRootView != null) {
+                    mRootView.onSuccess(result);
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
+
+
+    public void remove(Map<String, String> map, int position) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "zatbInfoController");
+        map1.put("methodName", "remove");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onRemoveSuccess(result, position);
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/AddChryActivity.java

@@ -0,0 +1,167 @@
+package com.zkjc.policedemo.mvp.ui.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.hjq.toast.ToastUtils;
+import com.jess.arms.base.BaseActivity;
+import com.jess.arms.di.component.AppComponent;
+import com.jess.arms.utils.ArmsUtils;
+
+import com.zkjc.common.base.ZkjcBaseActivity;
+import com.zkjc.common.view.CommonTitleBarV3;
+import com.zkjc.policedemo.di.component.DaggerAddChryComponent;
+import com.zkjc.policedemo.mvp.contract.AddChryContract;
+import com.zkjc.policedemo.mvp.model.entity.JmhEntity;
+import com.zkjc.policedemo.mvp.presenter.AddChryPresenter;
+
+import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.mvp.ui.adapter.StringAdapter;
+
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+
+import static com.jess.arms.utils.Preconditions.checkNotNull;
+import static com.zkjc.policedemo.mvp.ui.fragment.SydwLeftFragment.QXZ;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/25/2024 13:41
+ * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
+ * <a href="https://github.com/JessYanCoding">Follow me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
+ * ================================================
+ */
+public class AddChryActivity extends ZkjcBaseActivity<AddChryPresenter> implements AddChryContract.View {
+    @BindView(R.id.et_name)
+    EditText etName;
+    @BindView(R.id.et_phone)
+    EditText etPhone;
+    @BindView(R.id.sp_zw)
+    Spinner spZw;
+    @BindView(R.id.tv_confirm)
+    TextView tvSave;
+    @BindView(R.id.title_bar)
+    CommonTitleBarV3 titleBar;
+    private JmhEntity.JmhRy mData;
+    private String mSelectZw;
+
+    @Override
+    public void setupActivityComponent(@NonNull AppComponent appComponent) {
+        DaggerAddChryComponent //如找不到该类,请编译一下项目
+                .builder()
+                .appComponent(appComponent)
+                .view(this)
+                .build()
+                .inject(this);
+    }
+
+    @Override
+    public int initView(@Nullable Bundle savedInstanceState) {
+        return R.layout.activity_add_chry; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
+    }
+
+    @Override
+    public void initData(@Nullable Bundle savedInstanceState) {
+        mData = (JmhEntity.JmhRy) getIntent().getSerializableExtra("ry");
+        if (mData == null) {
+            titleBar.setTitle("新增见面会人员");
+        } else {
+            titleBar.setTitle("修改见面会人员");
+        }
+        List<String> list = new ArrayList<>();
+        list.add(QXZ);
+        list.add("社区书记");
+        list.add("治保会主任");
+        spZw.setAdapter(new StringAdapter(list, this));
+        spZw.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                mSelectZw = list.get(position);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+        if (mData != null) {
+            etName.setText(mData.getXm());
+            etPhone.setText(mData.getLxdh());
+            for (int i = 0; i < list.size(); i++) {
+                if (list.get(i).equals(mData.getZw())) {
+                    spZw.setSelection(i);
+                }
+            }
+        }
+        tvSave.setOnClickListener(v -> {
+            if (TextUtils.isEmpty(etName.getText().toString().trim())) {
+                ToastUtils.show("请填写人员姓名");
+                return;
+            }
+            if (TextUtils.isEmpty(etPhone.getText().toString().trim())) {
+                ToastUtils.show("请填写人员电话");
+                return;
+            }
+            if (TextUtils.isEmpty(mSelectZw) || QXZ.equals(mSelectZw)) {
+                ToastUtils.show("请选择人员职务");
+                return;
+            }
+            if (mData == null) {
+                mData = new JmhEntity.JmhRy();
+            }
+            mData.setLxdh(etPhone.getText().toString().trim());
+            mData.setXm(etName.getText().toString().trim());
+            mData.setZw(mSelectZw);
+            Intent intent = new Intent();
+            intent.putExtra("ry", mData);
+            setResult(RESULT_OK, intent);
+            finish();
+        });
+    }
+
+    @Override
+    public void showLoading() {
+
+    }
+
+    @Override
+    public void hideLoading() {
+
+    }
+
+    @Override
+    public void showMessage(@NonNull String message) {
+        checkNotNull(message);
+        ArmsUtils.snackbarText(message);
+    }
+
+    @Override
+    public void launchActivity(@NonNull Intent intent) {
+        checkNotNull(intent);
+        ArmsUtils.startActivity(intent);
+    }
+
+    @Override
+    public void killMyself() {
+        finish();
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/AddMyQahyActivity.java

@@ -1,8 +1,12 @@
 package com.zkjc.policedemo.mvp.ui.activity;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -14,6 +18,9 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.lzy.imagepicker.ImagePicker;
@@ -22,22 +29,32 @@ import com.lzy.imagepicker.ui.ImageGridActivity;
 import com.lzy.imagepicker.ui.ImagePreviewDelActivity;
 import com.lzy.imagepicker.view.CropImageView;
 import com.zkjc.common.base.ZkjcBaseActivity;
+import com.zkjc.common.utils.ScreenUtils;
+import com.zkjc.common.utils.Utils;
 import com.zkjc.common.view.CommonTitleBarV3;
 import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.DateTimePicker;
 import com.zkjc.policedemo.app.utils.GlideImageLoader;
+import com.zkjc.policedemo.app.utils.UploadUtil;
 import com.zkjc.policedemo.di.component.DaggerAddMyQahyComponent;
 import com.zkjc.policedemo.mvp.contract.AddMyQahyContract;
+import com.zkjc.policedemo.mvp.model.entity.HyjlEntity;
 import com.zkjc.policedemo.mvp.presenter.AddMyQahyPresenter;
+import com.zkjc.policedemo.mvp.ui.adapter.AddPicAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.ImagePickerAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.MzchryAdapter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 import static com.jess.arms.utils.Preconditions.checkNotNull;
+import static com.zkjc.policedemo.mvp.ui.fragment.SydwLeftFragment.QXZ;
 
 
 /**
@@ -52,7 +69,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
  * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
  * ================================================
  */
-public class AddMyQahyActivity extends ZkjcBaseActivity<AddMyQahyPresenter> implements AddMyQahyContract.View , ImagePickerAdapter.OnRecyclerViewItemClickListener {
+public class AddMyQahyActivity extends ZkjcBaseActivity<AddMyQahyPresenter> implements AddMyQahyContract.View, AddPicAdapter.OnRecyclerViewItemClickListener {
 
     @BindView(R.id.title_bar)
     CommonTitleBarV3 titleBar;
@@ -76,10 +93,13 @@ public class AddMyQahyActivity extends ZkjcBaseActivity<AddMyQahyPresenter> impl
     TextView tvConfirm;
     private int maxImgCount = 9;               //允许选择图片最大数
     private ArrayList<ImageItem> selImageList; //当前选择的所有图片
-    private ImagePickerAdapter adapter;
+    private AddPicAdapter adapter;
+    private Map<String, String> urlMap = new HashMap<>();
     public static final int IMAGE_ITEM_ADD = -1;
     public static final int REQUEST_CODE_SELECT = 100;
     public static final int REQUEST_CODE_PREVIEW = 101;
+    private HyjlEntity.Hyjl mNetData;
+
     @Override
     public void setupActivityComponent(@NonNull AppComponent appComponent) {
         DaggerAddMyQahyComponent //如找不到该类,请编译一下项目
@@ -97,16 +117,100 @@ public class AddMyQahyActivity extends ZkjcBaseActivity<AddMyQahyPresenter> impl
 
     @Override
     public void initData(@Nullable Bundle savedInstanceState) {
-        titleBar.setTitle("新增每月安全会议");
+        mNetData = (HyjlEntity.Hyjl) getIntent().getSerializableExtra("hyjl");
+        if (mNetData == null) {
+            titleBar.setTitle("新增每月安全会议");
+        } else {
+            titleBar.setTitle("修改每月安全会议");
+        }
         initfj();
+        initDatePicker();
+        tvConfirm.setOnClickListener(v -> {
+            save();
+        });
+        if (mNetData != null) {
+            setNetData();
+        }
+    }
 
+    private void setNetData() {
+        etHysz.setText(mNetData.getHyzt());
+        tvHysjx.setText(mNetData.getHysj());
+        etXsnr.setText(mNetData.getHynr());
+        String fj = mNetData.getFj();
+        if (!TextUtils.isEmpty(fj)) {
+            String[] split = fj.split(",");
+            for (String url: split) {
+                ImageItem item = new ImageItem();
+                item.path = url;
+                selImageList.add(item);
+                urlMap.put(url, url);
+            }
+            adapter.notifyDataSetChanged();
+            adapter = new AddPicAdapter(this, selImageList, maxImgCount);
+            adapter.setOnItemClickListener(this);
+//            adapter.showDelete(false);
+            recyclerView.setAdapter(adapter);
+        }
+    }
 
+    private void save() {
+        if (TextUtils.isEmpty(etHysz.getText().toString())) {
+            ToastUtils.show("请选择会议主题");
+            return;
+        }
+        if (TextUtils.isEmpty(tvHysjx.getText().toString())) {
+            ToastUtils.show("请选择会议时间");
+            return;
+        }
+        if (TextUtils.isEmpty(etXsnr.getText().toString())) {
+            ToastUtils.show("请填写会议内容");
+            return;
+        }
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("hyzt", etHysz.getText().toString());
+        map.put("hynr", etXsnr.getText().toString());
+        map.put("hysj", tvHysjx.getText().toString());
+        StringBuilder builder = new StringBuilder();
+        for (Map.Entry<String, String> entry : urlMap.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+            builder.append(value);
+            builder.append(",");
+        }
+        if (TextUtils.isEmpty(builder.toString())) {
+            ToastUtils.show("请选择照片");
+            return;
+        } else {
+            builder.delete(builder.lastIndexOf(","), builder.length());
+            map.put("fj", builder.toString());
+        }
+        Utils.getInstances().showDialog(this, "正在上传");
+        if (mNetData == null) {
+            mPresenter.save(map);
+        } else {
+            map.put("id", mNetData.getId());
+            mPresenter.update(map);
+        }
+    }
+
+    private void initDatePicker() {
+        DateTimePicker dateTimePicker = new DateTimePicker(this, "请选择会议时间",  true);
+        dateTimePicker.setOnDateSelectListener(new DateTimePicker.OnDateSelectListener() {
+            @Override
+            public void onDateSelect(String start) {
+                tvHysjx.setText(start);
+            }
+        });
+        tvHysjx.setFocusable(false);
+        tvHysjx.setOnClickListener(v -> dateTimePicker.show());
     }
     private void initfj() {
         initImagePicker();
         selImageList = new ArrayList<>();
         //普通照片
-        adapter = new ImagePickerAdapter(this, selImageList, maxImgCount);
+        adapter = new AddPicAdapter(this, selImageList, maxImgCount);
         adapter.setOnItemClickListener(this);
         recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
         recyclerView.setHasFixedSize(true);
@@ -129,39 +233,39 @@ public class AddMyQahyActivity extends ZkjcBaseActivity<AddMyQahyPresenter> impl
     }
 
     @Override
-    public void onItemClick(View view, int position) {
-        switch (position) {
-            case IMAGE_ITEM_ADD:
-                ImagePicker.getInstance().setSelectLimit(maxImgCount - selImageList.size());
-                Intent intent = new Intent(AddMyQahyActivity.this, ImageGridActivity.class);
-                //intent.putExtra(ImageGridActivity.EXTRAS_IMAGES,(ArrayList<ImageItem>) adapter.getImages());
-                // intent.putExtra(ImageGridActivity.EXTRAS_TAKE_PICKERS, true);
-                intent.putExtra(ImageGridActivity.EXTRAS_IMAGES, (ArrayList<ImageItem>) adapter.getImages());
-
-                startActivityForResult(intent, REQUEST_CODE_SELECT);
-                break;
-            default:
-                //打开预览
-                Intent intentPreview = new Intent(this, ImagePreviewDelActivity.class);
-                intentPreview.putExtra(ImagePicker.EXTRA_IMAGE_ITEMS, (ArrayList<ImageItem>) adapter.getImages());
-                intentPreview.putExtra(ImagePicker.EXTRA_SELECTED_IMAGE_POSITION, position);
-                intentPreview.putExtra(ImagePicker.EXTRA_FROM_ITEMS, true);
-                startActivityForResult(intentPreview, REQUEST_CODE_PREVIEW);
-                break;
-        }
-    }
-
-    @Override
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == ImagePicker.RESULT_CODE_ITEMS) {
             //添加图片返回
             if (data != null && requestCode == REQUEST_CODE_SELECT) {
                 ArrayList<ImageItem> images = (ArrayList<ImageItem>) data.getSerializableExtra(ImagePicker.EXTRA_RESULT_ITEMS);
-                if (images != null) {
-                    selImageList.addAll(images);
-                    adapter.setImages(selImageList);
+                if (images != null && !images.isEmpty()) {
+                    Utils.getInstances().showDialog(this, "正在上传数据");
+                    UploadUtil.getInstance().init(this).getRequest(images.get(0).path, new CommonInterFace() {
+                        @Override
+                        public void onSuccess(String result) {
+                            Utils.getInstances().dismissDialog();
+                            JsonObject jsonObject1 = new JsonParser().parse(result).getAsJsonObject();
+                            JsonObject jsonObject = jsonObject1.get("data").getAsJsonObject();
+                            if (jsonObject.has("link")) {
+                                String url = jsonObject.get("link").getAsString();
+                                urlMap.put(images.get(0).path, url);
+
+                                selImageList.add(images.get(0));
+                                adapter.setImages(selImageList);
+                            }
+                        }
+
+                        @Override
+                        public void onError(Throwable throwable) {
 
+                        }
+
+                        @Override
+                        public void onFinsh() {
+
+                        }
+                    });
                 }
             }
 
@@ -206,4 +310,61 @@ public class AddMyQahyActivity extends ZkjcBaseActivity<AddMyQahyPresenter> impl
     }
 
 
+    @Override
+    public void onSaveSuccess(String result) {
+        setResult(RESULT_OK);
+        finish();
+    }
+
+    @Override
+    public void onUpdateSuccess(String result) {
+        setResult(RESULT_OK);
+        finish();
+    }
+
+    @Override
+    public void onItemClickSn(View view, int position) {
+        switch (view.getId()) {
+            case R.id.item_add_pic_iv_delete:
+                android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(this)
+                        .setMessage("是否删除这张照片")
+                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                dialogInterface.dismiss();
+                                ImageItem item = selImageList.get(position);
+                                urlMap.remove(item.path);
+                                selImageList.remove(position);
+                                adapter.setImages(selImageList);
+                            }
+                        })
+                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                dialogInterface.dismiss();
+                            }
+                        });
+                AlertDialog dialog = builder.create();
+                dialog.show();
+                WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+                params.width = ScreenUtils.dip2px(this, 320);
+
+                params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                dialog.getWindow().setAttributes(params);
+                break;
+            default:
+                break;
+        }
+        switch (position) {
+            case AddPicAdapter.IMAGE_ITEM_ADD:
+                ImagePicker.getInstance().setSelectLimit(maxImgCount - selImageList.size());
+                Intent intent = new Intent(this, ImageGridActivity.class);
+//                intent.putExtra(ImageGridActivity.EXTRAS_IMAGES, (ArrayList<ImageItem>) snAdapter.getImages());
+                //  intent.putExtra(ImageGridActivity.EXTRAS_TAKE_PICKERS, true);
+                startActivityForResult(intent, REQUEST_CODE_SELECT);
+                break;
+            default:
+                break;
+        }
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/AddMzjmhActivity.java

@@ -1,12 +1,18 @@
 package com.zkjc.policedemo.mvp.ui.activity;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
+import android.view.WindowManager;
+import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.Spinner;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -15,31 +21,47 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.alibaba.fastjson.JSONPatch;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.lzy.imagepicker.ImagePicker;
 import com.lzy.imagepicker.bean.ImageItem;
 import com.lzy.imagepicker.ui.ImageGridActivity;
-import com.lzy.imagepicker.ui.ImagePreviewDelActivity;
 import com.lzy.imagepicker.view.CropImageView;
 import com.zkjc.common.base.ZkjcBaseActivity;
+import com.zkjc.common.utils.ScreenUtils;
+import com.zkjc.common.utils.Utils;
 import com.zkjc.common.view.CommonTitleBarV3;
 import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.DateTimePicker;
 import com.zkjc.policedemo.app.utils.GlideImageLoader;
+import com.zkjc.policedemo.app.utils.UploadUtil;
 import com.zkjc.policedemo.di.component.DaggerAddMzjmhComponent;
 import com.zkjc.policedemo.mvp.contract.AddMzjmhContract;
+import com.zkjc.policedemo.mvp.model.entity.JmhEntity;
+import com.zkjc.policedemo.mvp.model.entity.JwsJgEntity;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
 import com.zkjc.policedemo.mvp.presenter.AddMzjmhPresenter;
-import com.zkjc.policedemo.mvp.ui.adapter.ImagePickerAdapter;
+import com.zkjc.policedemo.mvp.ui.adapter.AddPicAdapter;
+import com.zkjc.policedemo.mvp.ui.adapter.BaseRecycleAdapter;
+import com.zkjc.policedemo.mvp.ui.adapter.JgAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.MzchryAdapter;
-import com.zkjc.policedemo.mvp.ui.adapter.XstgrAdapter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
+import static com.alibaba.fastjson.JSONPatch.OperationType.remove;
 import static com.jess.arms.utils.Preconditions.checkNotNull;
+import static com.zkjc.policedemo.mvp.ui.fragment.SydwLeftFragment.QXZ;
 
 
 /**
@@ -54,7 +76,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
  * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
  * ================================================
  */
-public class AddMzjmhActivity extends ZkjcBaseActivity<AddMzjmhPresenter> implements AddMzjmhContract.View, ImagePickerAdapter.OnRecyclerViewItemClickListener  {
+public class AddMzjmhActivity extends ZkjcBaseActivity<AddMzjmhPresenter> implements AddMzjmhContract.View, AddPicAdapter.OnRecyclerViewItemClickListener {
 
     @BindView(R.id.title_bar)
     CommonTitleBarV3 titleBar;
@@ -74,10 +96,8 @@ public class AddMzjmhActivity extends ZkjcBaseActivity<AddMzjmhPresenter> implem
     RelativeLayout rlHysj;
     @BindView(R.id.sssq)
     TextView sssq;
-    @BindView(R.id.tv_sssq)
-    TextView tvSssq;
-    @BindView(R.id.jt2)
-    ImageView jt2;
+    @BindView(R.id.sp_sssq)
+    Spinner spSssq;
     @BindView(R.id.rl_sssq)
     RelativeLayout rlSssq;
     @BindView(R.id.et_xsnr)
@@ -96,11 +116,17 @@ public class AddMzjmhActivity extends ZkjcBaseActivity<AddMzjmhPresenter> implem
     TextView tvConfirm;
     private int maxImgCount = 9;               //允许选择图片最大数
     private ArrayList<ImageItem> selImageList; //当前选择的所有图片
-    private ImagePickerAdapter adapter;
+    private AddPicAdapter adapter;
     public static final int IMAGE_ITEM_ADD = -1;
     public static final int REQUEST_CODE_SELECT = 100;
     public static final int REQUEST_CODE_PREVIEW = 101;
     private MzchryAdapter mzchryAdapter;
+    private Map<String, String> urlMap = new HashMap<>();
+    private String sqId;
+    private ArrayList<JmhEntity.JmhRy> list;
+    private ArrayList<JmhEntity.JmhRy> listRemove;
+    private String mId;
+    private List<JwsJgEntity.DataBean> sqList;
 
     @Override
     public void setupActivityComponent(@NonNull AppComponent appComponent) {
@@ -119,24 +145,178 @@ public class AddMzjmhActivity extends ZkjcBaseActivity<AddMzjmhPresenter> implem
 
     @Override
     public void initData(@Nullable Bundle savedInstanceState) {
-        titleBar.setTitle("新增见面会");
+        mId = getIntent().getStringExtra("id");
+        if (TextUtils.isEmpty(mId)) {
+            titleBar.setTitle("新增见面会");
+        } else {
+            titleBar.setTitle("修改见面会");
+        }
         initfj();
-        List<String> list = new ArrayList<>();
-        list.add("1");
-        list.add("2");
-        //线索关系人
+        initDatePicker();
+        list = new ArrayList<>();
+        listRemove = new ArrayList<>();
         mzchryAdapter = new MzchryAdapter(list);
+        mzchryAdapter.setListener(new BaseRecycleAdapter.OnRecyclerViewListenerV2() {
+            @Override
+            public void onItemClick(View view, int position) {
+                JmhEntity.JmhRy ry = list.get(position);
+                switch (view.getId()) {
+                    case R.id.iv_delete:
+                        AlertDialog.Builder builder = new AlertDialog.Builder(AddMzjmhActivity.this)
+                                .setTitle("温馨提示")
+                                .setMessage("是否确认删除？")
+                                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        dialogInterface.dismiss();
+                                        if (!TextUtils.isEmpty(mId)) {
+                                            JmhEntity.JmhRy remove = list.remove(position);
+                                            remove.setIsDeleted(1);
+                                            listRemove.add(remove);
+                                        }
+                                        mzchryAdapter.notifyDataSetChanged();
+                                    }
+                                })
+                                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        dialogInterface.dismiss();
+                                    }
+                                });
+                        AlertDialog dialog = builder.create();
+                        dialog.show();
+
+                        WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+                        params.width = ScreenUtils.dip2px(AddMzjmhActivity.this, 320);
+
+                        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                        dialog.getWindow().setAttributes(params);
+
+
+                        break;
+                    case R.id.item_root: {
+                        Intent intent = new Intent(AddMzjmhActivity.this, AddChryActivity.class);
+                        intent.putExtra("ry", ry);
+                        startActivityForResult(intent, position);
+                    }
+                    break;
+                    default:
+                        break;
+                }
+            }
+
+            @Override
+            public boolean onItemLongClick(View view, int position) {
+                return false;
+            }
+        });
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         recyclerView.setAdapter(mzchryAdapter);
         rlAddry.setOnClickListener(view -> {
-            //此出弹窗填写相关人员 职务 电话
+            Intent intent = new Intent(AddMzjmhActivity.this, AddChryActivity.class);
+            startActivityForResult(intent, 2000);
+        });
+        tvConfirm.setOnClickListener(v -> {
+            save();
         });
+        Utils.getInstances().showDialog(this, "正在获取数据");
+        mPresenter.zd();
     }
+
+    private void setNetData(JmhEntity.Jmh jmh) {
+        etHysz.setText(jmh.getHyzt());
+        tvHysjx.setText(jmh.getHysj());
+        etXsnr.setText(jmh.getHynr());
+        String fj = jmh.getFj();
+        if (!TextUtils.isEmpty(fj)) {
+            String[] split = fj.split(",");
+            for (String url: split) {
+                ImageItem item = new ImageItem();
+                item.path = url;
+                selImageList.add(item);
+                urlMap.put(url, url);
+            }
+            adapter.notifyDataSetChanged();
+            adapter = new AddPicAdapter(this, selImageList, maxImgCount);
+            adapter.setOnItemClickListener(this);
+//            adapter.showDelete(false);
+            recyclerViewHyzp.setAdapter(adapter);
+        }
+        list.addAll(jmh.getRyList());
+        mzchryAdapter.notifyDataSetChanged();
+    }
+
+    private void save() {
+        if (TextUtils.isEmpty(etHysz.getText().toString())) {
+            ToastUtils.show("请选择会议主题");
+            return;
+        }
+        if (TextUtils.isEmpty(tvHysjx.getText().toString())) {
+            ToastUtils.show("请选择会议时间");
+            return;
+        }
+        if (TextUtils.isEmpty(etXsnr.getText().toString())) {
+            ToastUtils.show("请填写会议内容");
+            return;
+        }
+        if (TextUtils.isEmpty(sqId) || QXZ.equals(sqId)) {
+            ToastUtils.show("请选择社区");
+            return;
+        }
+        if (list.isEmpty()) {
+            ToastUtils.show("请选择人员");
+            return;
+        }
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("hyzt", etHysz.getText().toString());
+        map.put("hynr", etXsnr.getText().toString());
+        map.put("hysj", tvHysjx.getText().toString());
+        map.put("sssqBm", sqId);
+        StringBuilder builder = new StringBuilder();
+        for (Map.Entry<String, String> entry : urlMap.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+            builder.append(value);
+            builder.append(",");
+        }
+        if (TextUtils.isEmpty(builder.toString())) {
+            ToastUtils.show("请选择照片");
+            return;
+        } else {
+            builder.delete(builder.lastIndexOf(","), builder.length());
+            map.put("fj", builder.toString());
+        }
+        if (!listRemove.isEmpty()) {
+            list.addAll(listRemove);
+        }
+        map.put("ryList", list);
+        Utils.getInstances().showDialog(this, "正在上传");
+        if (TextUtils.isEmpty(mId)) {
+            mPresenter.save(map);
+        } else {
+            map.put("id", mId);
+            mPresenter.update(map);
+        }
+    }
+
+    private void initDatePicker() {
+        DateTimePicker dateTimePicker = new DateTimePicker(this, "请选择会议时间",  true);
+        dateTimePicker.setOnDateSelectListener(new DateTimePicker.OnDateSelectListener() {
+            @Override
+            public void onDateSelect(String start) {
+                tvHysjx.setText(start);
+            }
+        });
+        tvHysjx.setFocusable(false);
+        tvHysjx.setOnClickListener(v -> dateTimePicker.show());
+    }
+
     private void initfj() {
         initImagePicker();
         selImageList = new ArrayList<>();
         //普通照片
-        adapter = new ImagePickerAdapter(this, selImageList, maxImgCount);
+        adapter = new AddPicAdapter(this, selImageList, maxImgCount);
         adapter.setOnItemClickListener(this);
         recyclerViewHyzp.setLayoutManager(new GridLayoutManager(this, 3));
         recyclerViewHyzp.setHasFixedSize(true);
@@ -159,39 +339,39 @@ public class AddMzjmhActivity extends ZkjcBaseActivity<AddMzjmhPresenter> implem
     }
 
     @Override
-    public void onItemClick(View view, int position) {
-        switch (position) {
-            case IMAGE_ITEM_ADD:
-                ImagePicker.getInstance().setSelectLimit(maxImgCount - selImageList.size());
-                Intent intent = new Intent(AddMzjmhActivity.this, ImageGridActivity.class);
-                //intent.putExtra(ImageGridActivity.EXTRAS_IMAGES,(ArrayList<ImageItem>) adapter.getImages());
-                // intent.putExtra(ImageGridActivity.EXTRAS_TAKE_PICKERS, true);
-                intent.putExtra(ImageGridActivity.EXTRAS_IMAGES, (ArrayList<ImageItem>) adapter.getImages());
-
-                startActivityForResult(intent, REQUEST_CODE_SELECT);
-                break;
-            default:
-                //打开预览
-                Intent intentPreview = new Intent(this, ImagePreviewDelActivity.class);
-                intentPreview.putExtra(ImagePicker.EXTRA_IMAGE_ITEMS, (ArrayList<ImageItem>) adapter.getImages());
-                intentPreview.putExtra(ImagePicker.EXTRA_SELECTED_IMAGE_POSITION, position);
-                intentPreview.putExtra(ImagePicker.EXTRA_FROM_ITEMS, true);
-                startActivityForResult(intentPreview, REQUEST_CODE_PREVIEW);
-                break;
-        }
-    }
-
-    @Override
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == ImagePicker.RESULT_CODE_ITEMS) {
             //添加图片返回
             if (data != null && requestCode == REQUEST_CODE_SELECT) {
                 ArrayList<ImageItem> images = (ArrayList<ImageItem>) data.getSerializableExtra(ImagePicker.EXTRA_RESULT_ITEMS);
-                if (images != null) {
-                    selImageList.addAll(images);
-                    adapter.setImages(selImageList);
+                if (images != null && !images.isEmpty()) {
+                    Utils.getInstances().showDialog(this, "正在上传数据");
+                    UploadUtil.getInstance().init(this).getRequest(images.get(0).path, new CommonInterFace() {
+                        @Override
+                        public void onSuccess(String result) {
+                            Utils.getInstances().dismissDialog();
+                            JsonObject jsonObject1 = new JsonParser().parse(result).getAsJsonObject();
+                            JsonObject jsonObject = jsonObject1.get("data").getAsJsonObject();
+                            if (jsonObject.has("link")) {
+                                String url = jsonObject.get("link").getAsString();
+                                urlMap.put(images.get(0).path, url);
+
+                                selImageList.add(images.get(0));
+                                adapter.setImages(selImageList);
+                            }
+                        }
+
+                        @Override
+                        public void onError(Throwable throwable) {
 
+                        }
+
+                        @Override
+                        public void onFinsh() {
+
+                        }
+                    });
                 }
             }
 
@@ -207,6 +387,15 @@ public class AddMzjmhActivity extends ZkjcBaseActivity<AddMzjmhPresenter> implem
             }
 
         }
+        if (resultCode == RESULT_OK) {
+            if (requestCode == 2000) {
+                list.add((JmhEntity.JmhRy) data.getSerializableExtra("ry"));
+                mzchryAdapter.notifyDataSetChanged();
+            } else {
+                list.set(requestCode, (JmhEntity.JmhRy) data.getSerializableExtra("ry"));
+                mzchryAdapter.notifyDataSetChanged();
+            }
+        }
     }
     @Override
     public void showLoading() {
@@ -236,4 +425,106 @@ public class AddMzjmhActivity extends ZkjcBaseActivity<AddMzjmhPresenter> implem
     }
 
 
+    @Override
+    public void onItemClickSn(View view, int position) {
+        switch (view.getId()) {
+            case R.id.item_add_pic_iv_delete:
+                android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(this)
+                        .setMessage("是否删除这张照片")
+                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                dialogInterface.dismiss();
+                                ImageItem item = selImageList.get(position);
+                                urlMap.remove(item.path);
+                                selImageList.remove(position);
+                                adapter.setImages(selImageList);
+                            }
+                        })
+                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                dialogInterface.dismiss();
+                            }
+                        });
+                AlertDialog dialog = builder.create();
+                dialog.show();
+                WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+                params.width = ScreenUtils.dip2px(this, 320);
+
+                params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                dialog.getWindow().setAttributes(params);
+                break;
+            default:
+                break;
+        }
+        switch (position) {
+            case AddPicAdapter.IMAGE_ITEM_ADD:
+                ImagePicker.getInstance().setSelectLimit(maxImgCount - selImageList.size());
+                Intent intent = new Intent(this, ImageGridActivity.class);
+//                intent.putExtra(ImageGridActivity.EXTRAS_IMAGES, (ArrayList<ImageItem>) snAdapter.getImages());
+                //  intent.putExtra(ImageGridActivity.EXTRAS_TAKE_PICKERS, true);
+                startActivityForResult(intent, REQUEST_CODE_SELECT);
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public void onSaveSuccess(String result) {
+        setResult(RESULT_OK);
+        finish();
+    }
+
+    @Override
+    public void onUpdateSuccess(String result) {
+        setResult(RESULT_OK);
+        finish();
+    }
+
+    @Override
+    public void onDit(String result) {
+        try {
+            JwsJgEntity entity = new Gson().fromJson(result, JwsJgEntity.class);
+            sqList = entity.getData();
+            JwsJgEntity.DataBean dataBean = new JwsJgEntity.DataBean();
+            dataBean.setDeptName(QXZ);
+            dataBean.setId(QXZ);
+            sqList.add(0, dataBean);
+            spSssq.setAdapter(new JgAdapter(sqList, this));
+            spSssq.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                    JwsJgEntity.DataBean dataBean = sqList.get(position);
+                    sqId = dataBean.getId();
+
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> parent) {
+
+                }
+            });
+            if (!TextUtils.isEmpty(mId)) {
+                Map<String, String> map = new HashMap<>();
+                map.put("id", mId);
+                mPresenter.getDetail(map);
+            } else {
+                Utils.getInstances().dismissDialog();
+            }
+        } catch (Exception e) {
+
+        }
+    }
+
+    @Override
+    public void onGetDetailSuccess(JmhEntity.Jmh data) {
+        setNetData(data);
+        for (int i = 0; i < sqList.size(); i++) {
+            if (sqList.get(i).getId().equals(data.getSssqBm())) {
+                spSssq.setSelection(i);
+            }
+        }
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/AddSqmyActivity.java

@@ -1,12 +1,18 @@
 package com.zkjc.policedemo.mvp.ui.activity;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
+import android.view.WindowManager;
+import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.Spinner;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -15,30 +21,43 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.lzy.imagepicker.ImagePicker;
 import com.lzy.imagepicker.bean.ImageItem;
 import com.lzy.imagepicker.ui.ImageGridActivity;
-import com.lzy.imagepicker.ui.ImagePreviewDelActivity;
 import com.lzy.imagepicker.view.CropImageView;
 import com.zkjc.common.base.ZkjcBaseActivity;
+import com.zkjc.common.utils.ScreenUtils;
+import com.zkjc.common.utils.Utils;
 import com.zkjc.common.view.CommonTitleBarV3;
 import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.DateTimePicker;
 import com.zkjc.policedemo.app.utils.GlideImageLoader;
+import com.zkjc.policedemo.app.utils.UploadUtil;
 import com.zkjc.policedemo.di.component.DaggerAddSqmyComponent;
 import com.zkjc.policedemo.mvp.contract.AddSqmyContract;
+import com.zkjc.policedemo.mvp.model.entity.Fwtd;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
+import com.zkjc.policedemo.mvp.model.entity.ZdAllEntity;
 import com.zkjc.policedemo.mvp.presenter.AddSqmyPresenter;
-import com.zkjc.policedemo.mvp.ui.adapter.ImagePickerAdapter;
+import com.zkjc.policedemo.mvp.ui.adapter.AddPicAdapter;
+import com.zkjc.policedemo.mvp.ui.adapter.BaseRecycleAdapter;
+import com.zkjc.policedemo.mvp.ui.adapter.SpFwtdAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.XstgrAdapter;
 
 import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 import static com.jess.arms.utils.Preconditions.checkNotNull;
+import static com.zkjc.policedemo.mvp.ui.fragment.SydwLeftFragment.QXZ;
 
 
 /**
@@ -53,7 +72,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
  * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
  * ================================================
  */
-public class AddSqmyActivity extends ZkjcBaseActivity<AddSqmyPresenter> implements AddSqmyContract.View, ImagePickerAdapter.OnRecyclerViewItemClickListener {
+public class AddSqmyActivity extends ZkjcBaseActivity<AddSqmyPresenter> implements AddSqmyContract.View, AddPicAdapter.OnRecyclerViewItemClickListener {
 
     @BindView(R.id.title_bar)
     CommonTitleBarV3 titleBar;
@@ -61,10 +80,8 @@ public class AddSqmyActivity extends ZkjcBaseActivity<AddSqmyPresenter> implemen
     TextView fxpcLeftTvName;
     @BindView(R.id.xslx)
     TextView xslx;
-    @BindView(R.id.tv_xslx)
-    TextView tvXslx;
-    @BindView(R.id.jt1)
-    ImageView jt1;
+    @BindView(R.id.sp_xslx)
+    Spinner spXslx;
     @BindView(R.id.rl_xslx)
     RelativeLayout rlXslx;
     @BindView(R.id.fxsj)
@@ -95,11 +112,17 @@ public class AddSqmyActivity extends ZkjcBaseActivity<AddSqmyPresenter> implemen
     TextView tvConfirm;
     private int maxImgCount = 9;               //允许选择图片最大数
     private ArrayList<ImageItem> selImageList; //当前选择的所有图片
-    private ImagePickerAdapter adapter;
+    private AddPicAdapter adapter;
     public static final int IMAGE_ITEM_ADD = -1;
     public static final int REQUEST_CODE_SELECT = 100;
     public static final int REQUEST_CODE_PREVIEW = 101;
     private XstgrAdapter xstgrAdapter;
+    private Fwtd mSelectXslx;
+    private Map<String, String> urlMap = new HashMap<>();
+    private ArrayList<SqmyEntity.Xstgr> list;
+    private ArrayList<SqmyEntity.Xstgr> listRemove;
+    private String mId;
+    private ArrayList<Fwtd> listXslx;
 
     @Override
     public void setupActivityComponent(@NonNull AppComponent appComponent) {
@@ -118,28 +141,172 @@ public class AddSqmyActivity extends ZkjcBaseActivity<AddSqmyPresenter> implemen
 
     @Override
     public void initData(@Nullable Bundle savedInstanceState) {
-        titleBar.setTitle("收集社情民意");
+        mId = getIntent().getStringExtra("id");
+        if (TextUtils.isEmpty(mId)) {
+            titleBar.setTitle("收集社情民意");
+        } else {
+            titleBar.setTitle("社情民意修改");
+        }
         initfj();
-        List<String> list = new ArrayList<>();
-        list.add("1");
-        list.add("2");
+        list = new ArrayList<>();
+        listRemove = new ArrayList<>();
         //线索关系人
         xstgrAdapter = new XstgrAdapter(list);
+        xstgrAdapter.setShowDelete(/*TextUtils.isEmpty(mId)*/true);
+        xstgrAdapter.setListener(new BaseRecycleAdapter.OnRecyclerViewListenerV2() {
+            @Override
+            public void onItemClick(View view, int position) {
+                if (view.getId() == R.id.iv_delete) {
+
+                    AlertDialog.Builder builder = new AlertDialog.Builder(AddSqmyActivity.this)
+                            .setTitle("温馨提示")
+                            .setMessage("是否确认删除？")
+                            .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialogInterface, int i) {
+                                    dialogInterface.dismiss();
+                                    SqmyEntity.Xstgr remove = list.remove(position);
+                                    if (!TextUtils.isEmpty(mId)) {
+                                        remove.setIsDeleted(1);
+                                        listRemove.add(remove);
+                                    }
+                                    xstgrAdapter.notifyDataSetChanged();
+                                }
+                            })
+                            .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialogInterface, int i) {
+                                    dialogInterface.dismiss();
+                                }
+                            });
+                    AlertDialog dialog = builder.create();
+                    dialog.show();
+
+                    WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+                    params.width = ScreenUtils.dip2px(AddSqmyActivity.this, 320);
+
+                    params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                    dialog.getWindow().setAttributes(params);
+
+
+                }
+            }
+
+            @Override
+            public boolean onItemLongClick(View view, int position) {
+                return false;
+            }
+        });
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         recyclerView.setAdapter(xstgrAdapter);
         rlAddry.setOnClickListener(view -> {
-            ArmsUtils.startActivity(CyryhcActivity.class);
             Intent intent = new Intent(AddSqmyActivity.this, CyryhcActivity.class);
             intent.putExtra("xstgr", "xstgr");
             startActivityForResult(intent, 1000);
         });
+        initDatePicker();
+
+        Utils.getInstances().showDialog(AddSqmyActivity.this, "正在获取数据");
+        mPresenter.getDictionary(new HashMap<>());
+        tvConfirm.setOnClickListener(v -> {
+            save();
+        });
+    }
+
+    private void setNetData(SqmyEntity.Sqmy data) {
+        tvFxsj.setText(data.getFxsj());
+        etFxdd.setText(data.getFxdd());
+        etXsnr.setText(data.getXsnr());
+        if (data.getRyList() != null) {
+            list.addAll(data.getRyList());
+        }
+        xstgrAdapter.notifyDataSetChanged();
+        String fj = data.getFj();
+        if (!TextUtils.isEmpty(fj)) {
+            String[] split = fj.split(",");
+            for (String url: split) {
+                ImageItem item = new ImageItem();
+                item.path = url;
+                selImageList.add(item);
+                urlMap.put(url, url);
+            }
+            adapter.notifyDataSetChanged();
+            adapter = new AddPicAdapter(this, selImageList, maxImgCount);
+            adapter.setOnItemClickListener(this);
+//            adapter.showDelete(false);
+            recyclerViewXszp.setAdapter(adapter);
+        }
+    }
+
+    private void save() {
+        if (mSelectXslx == null || QXZ.equals(mSelectXslx.getLabel())) {
+            ToastUtils.show("请选择线索类型");
+            return;
+        }
+        if (TextUtils.isEmpty(tvFxsj.getText().toString())) {
+            ToastUtils.show("请选择发现时间");
+            return;
+        } 
+        if (TextUtils.isEmpty(etFxdd.getText().toString())) {
+            ToastUtils.show("请填写发现地点");
+            return;
+        }
+        if (TextUtils.isEmpty(etXsnr.getText().toString())) {
+            ToastUtils.show("请填写线索内容");
+            return;
+        }
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("xslx", mSelectXslx.getLabel());
+        map.put("fxsj", tvFxsj.getText().toString());
+        map.put("fxdd", etFxdd.getText().toString());
+        map.put("xsnr", etXsnr.getText().toString());
+        StringBuilder builder = new StringBuilder();
+        for (Map.Entry<String, String> entry : urlMap.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+            builder.append(value);
+            builder.append(",");
+        }
+        if (TextUtils.isEmpty(builder.toString())) {
+            ToastUtils.show("请填写线索照片");
+            return;
+        } else {
+            builder.delete(builder.lastIndexOf(","), builder.length());
+            map.put("fj", builder.toString());
+        }
+        Utils.getInstances().showDialog(this, "正在上传");
+        if (TextUtils.isEmpty(mId)) {
+            map.put("ryList", list);
+            mPresenter.save(map);
+        } else {
+            if (listRemove != null && !listRemove.isEmpty()) {
+                list.addAll(listRemove);
+            }
+            map.put("ryList", list);
+            map.put("id", mId);
+            mPresenter.update(map);
+        }
+    }
+
+
+    private void initDatePicker() {
+        DateTimePicker dateTimePicker = new DateTimePicker(this, "请选择发现时间",  false);
+        dateTimePicker.setOnDateSelectListener(new DateTimePicker.OnDateSelectListener() {
+            @Override
+            public void onDateSelect(String start) {
+                tvFxsj.setText(start);
+            }
+        });
+        tvFxsj.setFocusable(false);
+        tvFxsj.setOnClickListener(v -> dateTimePicker.show());
     }
 
     private void initfj() {
         initImagePicker();
         selImageList = new ArrayList<>();
         //普通照片
-        adapter = new ImagePickerAdapter(this, selImageList, maxImgCount);
+        adapter = new AddPicAdapter(this, selImageList, maxImgCount);
         adapter.setOnItemClickListener(this);
         recyclerViewXszp.setLayoutManager(new GridLayoutManager(this, 3));
         recyclerViewXszp.setHasFixedSize(true);
@@ -162,38 +329,40 @@ public class AddSqmyActivity extends ZkjcBaseActivity<AddSqmyPresenter> implemen
     }
 
     @Override
-    public void onItemClick(View view, int position) {
-        switch (position) {
-            case IMAGE_ITEM_ADD:
-                ImagePicker.getInstance().setSelectLimit(maxImgCount - selImageList.size());
-                Intent intent = new Intent(AddSqmyActivity.this, ImageGridActivity.class);
-                //intent.putExtra(ImageGridActivity.EXTRAS_IMAGES,(ArrayList<ImageItem>) adapter.getImages());
-                // intent.putExtra(ImageGridActivity.EXTRAS_TAKE_PICKERS, true);
-                intent.putExtra(ImageGridActivity.EXTRAS_IMAGES, (ArrayList<ImageItem>) adapter.getImages());
-
-                startActivityForResult(intent, REQUEST_CODE_SELECT);
-                break;
-            default:
-                //打开预览
-                Intent intentPreview = new Intent(this, ImagePreviewDelActivity.class);
-                intentPreview.putExtra(ImagePicker.EXTRA_IMAGE_ITEMS, (ArrayList<ImageItem>) adapter.getImages());
-                intentPreview.putExtra(ImagePicker.EXTRA_SELECTED_IMAGE_POSITION, position);
-                intentPreview.putExtra(ImagePicker.EXTRA_FROM_ITEMS, true);
-                startActivityForResult(intentPreview, REQUEST_CODE_PREVIEW);
-                break;
-        }
-    }
-
-    @Override
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == ImagePicker.RESULT_CODE_ITEMS) {
             //添加图片返回
             if (data != null && requestCode == REQUEST_CODE_SELECT) {
                 ArrayList<ImageItem> images = (ArrayList<ImageItem>) data.getSerializableExtra(ImagePicker.EXTRA_RESULT_ITEMS);
-                if (images != null) {
-                    selImageList.addAll(images);
-                    adapter.setImages(selImageList);
+
+                if (images != null && !images.isEmpty()) {
+                    Utils.getInstances().showDialog(this, "正在上传数据");
+                    UploadUtil.getInstance().init(this).getRequest(images.get(0).path, new CommonInterFace() {
+                        @Override
+                        public void onSuccess(String result) {
+                            Utils.getInstances().dismissDialog();
+                            JsonObject jsonObject1 = new JsonParser().parse(result).getAsJsonObject();
+                            JsonObject jsonObject = jsonObject1.get("data").getAsJsonObject();
+                            if (jsonObject.has("link")) {
+                                String url = jsonObject.get("link").getAsString();
+                                urlMap.put(images.get(0).path, url);
+
+                                selImageList.add(images.get(0));
+                                adapter.setImages(selImageList);
+                            }
+                        }
+
+                        @Override
+                        public void onError(Throwable throwable) {
+
+                        }
+
+                        @Override
+                        public void onFinsh() {
+
+                        }
+                    });
 
                 }
             }
@@ -209,6 +378,10 @@ public class AddSqmyActivity extends ZkjcBaseActivity<AddSqmyPresenter> implemen
                 }
             }
 
+        } else if (requestCode == 1000 && resultCode == RESULT_OK) {
+            SqmyEntity.Xstgr xstgr = (SqmyEntity.Xstgr) data.getSerializableExtra("xstgr");
+            list.add(xstgr);
+            xstgrAdapter.notifyDataSetChanged();
         }
     }
 
@@ -239,4 +412,101 @@ public class AddSqmyActivity extends ZkjcBaseActivity<AddSqmyPresenter> implemen
         finish();
     }
 
+    @Override
+    public void onGetZdSuccess(ZdAllEntity.DataBean data) {
+        listXslx = new ArrayList<>();
+        Fwtd qxz = new Fwtd();
+        qxz.setLabel(QXZ);
+        qxz.setValue(QXZ);
+        qxz.setId(QXZ);
+        listXslx.add(qxz);
+        listXslx.addAll(data.getXslx());
+        spXslx.setAdapter(new SpFwtdAdapter(listXslx, this));
+        spXslx.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                mSelectXslx = listXslx.get(position);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+        if (TextUtils.isEmpty(mId)) {
+            Utils.getInstances().dismissDialog();
+        } else {
+            Map<String, String> map = new HashMap<>();
+            map.put("id", mId);
+            mPresenter.getDetail(map);
+        }
+    }
+
+    @Override
+    public void onSaveSuccess(String result) {
+        setResult(RESULT_OK);
+        finish();
+    }
+
+    @Override
+    public void onGetDetailSuccess(SqmyEntity.Sqmy data) {
+        for (int i = 0; i < listXslx.size(); i++) {
+            if (listXslx.get(i).getLabel().equals(data.getXslx())) {
+                spXslx.setSelection(i);
+            }
+        }
+        setNetData(data);
+    }
+
+    @Override
+    public void onUpdateSuccess(String result) {
+        setResult(RESULT_OK);
+        finish();
+    }
+
+    @Override
+    public void onItemClickSn(View view, int position) {
+        switch (view.getId()) {
+            case R.id.item_add_pic_iv_delete:
+                android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(this)
+                        .setMessage("是否删除这张照片")
+                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                dialogInterface.dismiss();
+                                ImageItem item = selImageList.get(position);
+                                urlMap.remove(item.path);
+                                selImageList.remove(position);
+                                adapter.setImages(selImageList);
+                            }
+                        })
+                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                dialogInterface.dismiss();
+                            }
+                        });
+                AlertDialog dialog = builder.create();
+                dialog.show();
+                WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+                params.width = ScreenUtils.dip2px(this, 320);
+
+                params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                dialog.getWindow().setAttributes(params);
+                break;
+            default:
+                break;
+        }
+        switch (position) {
+            case AddPicAdapter.IMAGE_ITEM_ADD:
+                ImagePicker.getInstance().setSelectLimit(maxImgCount - selImageList.size());
+                Intent intent = new Intent(this, ImageGridActivity.class);
+//                intent.putExtra(ImageGridActivity.EXTRAS_IMAGES, (ArrayList<ImageItem>) snAdapter.getImages());
+                //  intent.putExtra(ImageGridActivity.EXTRAS_TAKE_PICKERS, true);
+                startActivityForResult(intent, REQUEST_CODE_SELECT);
+                break;
+            default:
+                break;
+        }
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/CyryhcActivity.java

@@ -34,6 +34,7 @@ import com.zkjc.policedemo.di.component.DaggerCyryhcComponent;
 import com.zkjc.policedemo.mvp.contract.CyryhcContract;
 import com.zkjc.policedemo.mvp.model.entity.Fwtd;
 import com.zkjc.policedemo.mvp.model.entity.RkxxEntity;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
 import com.zkjc.policedemo.mvp.model.entity.SydwEntity;
 import com.zkjc.policedemo.mvp.presenter.CyryhcPresenter;
 import com.zkjc.policedemo.mvp.ui.adapter.RkLxAdapter;
@@ -298,7 +299,18 @@ public class CyryhcActivity extends ZkjcBaseActivity<CyryhcPresenter> implements
                 });
                 dialog.show(getSupportFragmentManager(), "zy");
             } else {
-
+                SqmyEntity.Xstgr item = new SqmyEntity.Xstgr();
+                item.setXm(mRyxx.getFzXm());
+                item.setZp(mRyxx.getFzZp());
+                item.setGmsfhm(mRyxx.getGmsfhm());
+                item.setXb(mRyxx.getRyxb());
+                item.setLxdh(mRyxx.getFzDh());
+                item.setMz(mRyxx.getRyMz());
+                item.setXjzdxz(mRyxx.getHjdz());
+                Intent intent = new Intent();
+                intent.putExtra("xstgr", item);
+                setResult(RESULT_OK, intent);
+                finish();
             }
         });
     }

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/JxcsCjActivity.java

@@ -969,7 +969,6 @@ public class JxcsCjActivity extends ZkjcBaseActivity<JxcsCjPresenter> implements
 
     @Override
     public void onJg(String result) {
-        System.out.println("警***" + result);
         try {
             JwsJgEntity entity = new Gson().fromJson(result, JwsJgEntity.class);
             List<JwsJgEntity.DataBean> data = entity.getData();

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/SmfwListActivity.java

@@ -94,7 +94,7 @@ public class SmfwListActivity extends ZkjcBaseActivity<SmfwListPresenter> implem
 
     @Override
     public void initData(@Nullable Bundle savedInstanceState) {
-        titleBar.setTitle("委托服务");
+        titleBar.setTitle("上门服务");
         //设置 Header
         smart_refresh.setRefreshHeader(new ClassicsHeader(this).setEnableLastTime(true));
         //设置 Footer

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/SqmyActivity.java

@@ -1,7 +1,10 @@
 package com.zkjc.policedemo.mvp.ui.activity;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -18,10 +21,15 @@ import com.zkjc.common.view.CommonTitleBarV3;
 import com.zkjc.policedemo.R;
 import com.zkjc.policedemo.di.component.DaggerSqmyComponent;
 import com.zkjc.policedemo.mvp.contract.SqmyContract;
+import com.zkjc.policedemo.mvp.model.entity.Data;
+import com.zkjc.policedemo.mvp.model.entity.SqmyMainDataEntity;
 import com.zkjc.policedemo.mvp.presenter.SqmyPresenter;
 import com.zkjc.policedemo.mvp.ui.adapter.ZatbAdapter;
 
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 import butterknife.BindView;
@@ -82,6 +90,8 @@ public class SqmyActivity extends ZkjcBaseActivity<SqmyPresenter> implements Sqm
     TextView tvDqyf;
     @BindView(R.id.tv_mybt)
     TextView tvMybt;
+    @BindView(R.id.tv_zaqktb)
+    TextView tvZaqktb;
     @BindView(R.id.rl_myhy)
     RelativeLayout rlMyhy;
     @BindView(R.id.tv_jdza)
@@ -132,6 +142,7 @@ public class SqmyActivity extends ZkjcBaseActivity<SqmyPresenter> implements Sqm
         rlBzjmh.setOnClickListener(view -> {
             ArmsUtils.startActivity(SqmyMzjmhActivity.class);
         });
+        mPresenter.getData(new HashMap<>());
     }
 
     @Override
@@ -162,4 +173,35 @@ public class SqmyActivity extends ZkjcBaseActivity<SqmyPresenter> implements Sqm
     }
 
 
+    @Override
+    public void onGetDataSuccess(SqmyMainDataEntity.SqmyMainData data) {
+        brcjsl.setText(data.getBrSqmy());
+        tvBjdsqmysl.setText(data.getJdSqmy());
+        tvBndsqmysl.setText(data.getNdSqmy());
+        tvBzrhzfsl.setText(data.getBzRhzf());
+        tvBndrhzfsl.setText(data.getNdRhzf());
+        tvDqrq.setText("第" + data.getWeekOfYear() + "周");
+        tvDqyf.setText(data.getMonthOfYear() + "月");
+        if (data.getJhm() == null || TextUtils.isEmpty(data.getJhm().getHyzt())) {
+            tvJmhbt.setTextColor(Color.parseColor("#999999"));
+            tvJmhbt.setText("本周暂无开展见面会");
+        } else {
+            tvJmhbt.setTextColor(Color.parseColor("#111111"));
+            tvJmhbt.setText(data.getJhm().getHyzt());
+        }
+        if (data.getFzrhy() == null || TextUtils.isEmpty(data.getFzrhy().getHyzt())) {
+            tvMybt.setTextColor(Color.parseColor("#999999"));
+            tvMybt.setText("本月暂无安全负责人会议");
+        } else {
+            tvMybt.setTextColor(Color.parseColor("#111111"));
+            tvMybt.setText(data.getFzrhy().getHyzt());
+        }
+        if (data.getZatb() == null || TextUtils.isEmpty(data.getZatb().getTbbt())) {
+            tvZaqktb.setTextColor(Color.parseColor("#999999"));
+            tvZaqktb.setText("本季度暂无治安情况通报");
+        } else {
+            tvZaqktb.setTextColor(Color.parseColor("#111111"));
+            tvZaqktb.setText(data.getZatb().getTbbt());
+        }
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/SqmyLbActivity.java

@@ -1,7 +1,12 @@
 package com.zkjc.policedemo.mvp.ui.activity;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -9,6 +14,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.base.BaseActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
@@ -19,16 +28,23 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.constant.SpinnerStyle;
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 import com.zkjc.common.base.ZkjcBaseActivity;
+import com.zkjc.common.utils.ScreenUtils;
+import com.zkjc.common.utils.Utils;
 import com.zkjc.common.view.CommonTitleBarV3;
 import com.zkjc.policedemo.R;
 import com.zkjc.policedemo.di.component.DaggerSqmyLbComponent;
 import com.zkjc.policedemo.mvp.contract.SqmyLbContract;
+import com.zkjc.policedemo.mvp.model.entity.JcCsEntity;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
 import com.zkjc.policedemo.mvp.presenter.SqmyLbPresenter;
+import com.zkjc.policedemo.mvp.ui.adapter.BaseRecycleAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.SqmyJlAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.ZatbJlAdapter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -59,7 +75,7 @@ public class SqmyLbActivity extends ZkjcBaseActivity<SqmyLbPresenter> implements
     @BindView(R.id.float_button)
     FloatingActionButton floatButton;
     private SqmyJlAdapter mAdapter;
-    private List<String> datas;
+    private List<SqmyEntity.Sqmy> datas;
     private int pageNo = 1;
     private int pageSize = 10;
     @Override
@@ -80,7 +96,8 @@ public class SqmyLbActivity extends ZkjcBaseActivity<SqmyLbPresenter> implements
     @Override
     public void initData(@Nullable Bundle savedInstanceState) {
         floatButton.setOnClickListener(view -> {
-            ArmsUtils.startActivity(AddSqmyActivity.class);
+            Intent intent = new Intent(SqmyLbActivity.this, AddSqmyActivity.class);
+            startActivityForResult(intent, 1);
         });
         titleBar.setTitle("收集社情民意列表");
         titleBar.setmRightImageView(R.drawable.btn_search_black);
@@ -94,6 +111,57 @@ public class SqmyLbActivity extends ZkjcBaseActivity<SqmyLbPresenter> implements
         smart_refresh.setOnRefreshListener(this);
         smart_refresh.setOnLoadMoreListener(this);
         mAdapter = new SqmyJlAdapter(datas);
+        mAdapter.setListener(new BaseRecycleAdapter.OnRecyclerViewListenerV2() {
+            @Override
+            public void onItemClick(View view, int position) {
+                SqmyEntity.Sqmy sqmy = datas.get(position);
+                switch (view.getId()) {
+                    case R.id.item_delete:
+                        AlertDialog.Builder builder = new AlertDialog.Builder(SqmyLbActivity.this)
+                                .setTitle("温馨提示")
+                                .setMessage("是否确认删除？")
+                                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        dialogInterface.dismiss();
+                                        Map<String, String> map = new HashMap<>();
+                                        map.put("id", sqmy.getId());
+                                        mPresenter.remove(map, position);
+                                    }
+                                })
+                                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        dialogInterface.dismiss();
+                                    }
+                                });
+                        AlertDialog dialog = builder.create();
+                        dialog.show();
+
+                        WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+                        params.width = ScreenUtils.dip2px(SqmyLbActivity.this, 320);
+
+                        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                        dialog.getWindow().setAttributes(params);
+
+                        break;
+                    case R.id.item_bj:
+                    case R.id.item_root:
+                        Intent intent = new Intent(SqmyLbActivity.this, AddSqmyActivity.class);
+                        intent.putExtra("sqmy", sqmy);
+                        intent.putExtra("id", sqmy.getId());
+                        startActivityForResult(intent, 10);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            @Override
+            public boolean onItemLongClick(View view, int position) {
+                return false;
+            }
+        });
         mAdapter.setHasStableIds(true);
         recyclerView.setAdapter(mAdapter);
         mAdapter.notifyDataSetChanged();
@@ -104,12 +172,10 @@ public class SqmyLbActivity extends ZkjcBaseActivity<SqmyLbPresenter> implements
     }
 
     private void requestData(int pageNo, int pageSize) {
-        smart_refresh.finishLoadMore();
-        smart_refresh.finishRefresh();
-        for (int i1 = 0; i1 < 10; i1++) {
-            datas.add(i1 + "");
-        }
-        mAdapter.notifyDataSetChanged();
+        Map<String, String> map = new HashMap<>();
+        map.put("current", pageNo + "");
+        map.put("size", pageSize + "");
+        mPresenter.getList(map);
     }
 
     @Override
@@ -120,6 +186,14 @@ public class SqmyLbActivity extends ZkjcBaseActivity<SqmyLbPresenter> implements
     }
 
     @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            smart_refresh.autoRefresh();
+        }
+    }
+
+    @Override
     public void showLoading() {
 
     }
@@ -147,4 +221,35 @@ public class SqmyLbActivity extends ZkjcBaseActivity<SqmyLbPresenter> implements
     }
 
 
+    @Override
+    public void onSuccess(String result) {
+        smart_refresh.finishLoadMore();
+        smart_refresh.finishRefresh();
+        try {
+            JsonObject obj = new JsonParser().parse(result).getAsJsonObject();
+            if (obj.has("code")) {
+                int code = obj.get("code").getAsInt();
+                if (code == 200) {
+                    SqmyEntity entity = new Gson().fromJson(result, SqmyEntity.class);
+                    List<SqmyEntity.Sqmy> records = entity.getData().getRecords();
+                    if (records.size() > 0 && records != null) {
+                        datas.addAll(records);
+                        mAdapter.notifyDataSetChanged();
+                        Utils.getInstances().dismissDialog();
+                    } else {
+                        ToastUtils.show("没有更多数据了");
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @Override
+    public void onRemoveSuccess(String result, int position) {
+        datas.remove(position);
+        mAdapter.notifyDataSetChanged();
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/SqmyMyAqhyActivity.java

@@ -1,7 +1,11 @@
 package com.zkjc.policedemo.mvp.ui.activity;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -9,6 +13,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.scwang.smart.refresh.footer.ClassicsFooter;
@@ -18,16 +26,23 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.constant.SpinnerStyle;
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 import com.zkjc.common.base.ZkjcBaseActivity;
+import com.zkjc.common.utils.ScreenUtils;
+import com.zkjc.common.utils.Utils;
 import com.zkjc.common.view.CommonTitleBarV3;
 import com.zkjc.policedemo.R;
 import com.zkjc.policedemo.di.component.DaggerSqmyMyAqhyComponent;
 import com.zkjc.policedemo.mvp.contract.SqmyMyAqhyContract;
+import com.zkjc.policedemo.mvp.model.entity.HyjlEntity;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
 import com.zkjc.policedemo.mvp.presenter.SqmyMyAqhyPresenter;
+import com.zkjc.policedemo.mvp.ui.adapter.BaseRecycleAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.MyAqhylAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.SqmyJlAdapter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -47,7 +62,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
  * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
  * ================================================
  */
-public class SqmyMyAqhyActivity extends ZkjcBaseActivity<SqmyMyAqhyPresenter> implements SqmyMyAqhyContract.View , OnRefreshLoadMoreListener {
+public class SqmyMyAqhyActivity extends ZkjcBaseActivity<SqmyMyAqhyPresenter> implements SqmyMyAqhyContract.View, OnRefreshLoadMoreListener {
 
     @BindView(R.id.title_bar)
     CommonTitleBarV3 titleBar;
@@ -58,9 +73,10 @@ public class SqmyMyAqhyActivity extends ZkjcBaseActivity<SqmyMyAqhyPresenter> im
     @BindView(R.id.float_button)
     FloatingActionButton floatButton;
     private MyAqhylAdapter mAdapter;
-    private List<String> datas;
+    private List<HyjlEntity.Hyjl> datas;
     private int pageNo = 1;
     private int pageSize = 10;
+
     @Override
     public void setupActivityComponent(@NonNull AppComponent appComponent) {
         DaggerSqmyMyAqhyComponent //如找不到该类,请编译一下项目
@@ -79,38 +95,89 @@ public class SqmyMyAqhyActivity extends ZkjcBaseActivity<SqmyMyAqhyPresenter> im
     @Override
     public void initData(@Nullable Bundle savedInstanceState) {
 
-            floatButton.setOnClickListener(view -> {
-                 ArmsUtils.startActivity(AddMyQahyActivity.class);
-            });
-            titleBar.setTitle("每月安全负责人会议记录");
-            titleBar.setmRightImageView(R.drawable.btn_search_black);
-            //设置 Header
-            smart_refresh.setRefreshHeader(new ClassicsHeader(this).setEnableLastTime(true));
-            //设置 Footer
-            smart_refresh.setRefreshFooter(new ClassicsFooter(this).setSpinnerStyle(SpinnerStyle.FixedBehind));
-            smart_refresh.autoRefresh();
-            datas = new ArrayList<>();
-            recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
-            smart_refresh.setOnRefreshListener(this);
-            smart_refresh.setOnLoadMoreListener(this);
-            mAdapter = new MyAqhylAdapter(datas);
-            mAdapter.setHasStableIds(true);
-            recyclerView.setAdapter(mAdapter);
-            mAdapter.notifyDataSetChanged();
+        floatButton.setOnClickListener(view -> {
+            Intent intent = new Intent(SqmyMyAqhyActivity.this, AddMyQahyActivity.class);
+            startActivityForResult(intent, 1);
+        });
+        titleBar.setTitle("每月安全负责人会议记录");
+        titleBar.setmRightImageView(R.drawable.btn_search_black);
+        //设置 Header
+        smart_refresh.setRefreshHeader(new ClassicsHeader(this).setEnableLastTime(true));
+        //设置 Footer
+        smart_refresh.setRefreshFooter(new ClassicsFooter(this).setSpinnerStyle(SpinnerStyle.FixedBehind));
+        smart_refresh.autoRefresh();
+        datas = new ArrayList<>();
+        recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
+        smart_refresh.setOnRefreshListener(this);
+        smart_refresh.setOnLoadMoreListener(this);
+        mAdapter = new MyAqhylAdapter(datas);
+        mAdapter.setListener(new BaseRecycleAdapter.OnRecyclerViewListenerV2() {
+            @Override
+            public void onItemClick(View view, int position) {
+                HyjlEntity.Hyjl hyjl = datas.get(position);
+                switch (view.getId()) {
+                    case R.id.item_delete:
+                        AlertDialog.Builder builder = new AlertDialog.Builder(SqmyMyAqhyActivity.this)
+                                .setTitle("温馨提示")
+                                .setMessage("是否确认删除？")
+                                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        dialogInterface.dismiss();
+
+                                        Map<String, String> map = new HashMap<>();
+                                        map.put("id", hyjl.getId());
+                                        mPresenter.remove(map, position);
+                                    }
+                                })
+                                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        dialogInterface.dismiss();
+                                    }
+                                });
+                        AlertDialog dialog = builder.create();
+                        dialog.show();
+
+                        WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+                        params.width = ScreenUtils.dip2px(SqmyMyAqhyActivity.this, 320);
+
+                        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                        dialog.getWindow().setAttributes(params);
+
+                        break;
+                    case R.id.item_bj:
+                    case R.id.item_root:
+                        Intent intent = new Intent(SqmyMyAqhyActivity.this, AddMyQahyActivity.class);
+                        intent.putExtra("hyjl", hyjl);
+                        startActivityForResult(intent, 10);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            @Override
+            public boolean onItemLongClick(View view, int position) {
+                return false;
+            }
+        });
+        mAdapter.setHasStableIds(true);
+        recyclerView.setAdapter(mAdapter);
+        mAdapter.notifyDataSetChanged();
 
     }
+
     @Override
     public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
         requestData(++pageNo, pageSize);
     }
 
     private void requestData(int pageNo, int pageSize) {
-        smart_refresh.finishLoadMore();
-        smart_refresh.finishRefresh();
-        for (int i1 = 0; i1 < 10; i1++) {
-            datas.add(i1 + "");
-        }
-        mAdapter.notifyDataSetChanged();
+        Map<String, String> map = new HashMap<>();
+        map.put("current", pageNo + "");
+        map.put("size", pageSize + "");
+        mPresenter.getList(map);
     }
 
     @Override
@@ -121,6 +188,14 @@ public class SqmyMyAqhyActivity extends ZkjcBaseActivity<SqmyMyAqhyPresenter> im
     }
 
     @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            smart_refresh.autoRefresh();
+        }
+    }
+
+    @Override
     public void showLoading() {
 
     }
@@ -148,4 +223,35 @@ public class SqmyMyAqhyActivity extends ZkjcBaseActivity<SqmyMyAqhyPresenter> im
     }
 
 
+    @Override
+    public void onSuccess(String result) {
+        smart_refresh.finishLoadMore();
+        smart_refresh.finishRefresh();
+        try {
+            JsonObject obj = new JsonParser().parse(result).getAsJsonObject();
+            if (obj.has("code")) {
+                int code = obj.get("code").getAsInt();
+                if (code == 200) {
+                    HyjlEntity entity = new Gson().fromJson(result, HyjlEntity.class);
+                    List<HyjlEntity.Hyjl> records = entity.getData().getRecords();
+                    if (records.size() > 0 && records != null) {
+                        datas.addAll(records);
+                        mAdapter.notifyDataSetChanged();
+                        Utils.getInstances().dismissDialog();
+                    } else {
+                        ToastUtils.show("没有更多数据了");
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @Override
+    public void onRemoveSuccess(String result, int position) {
+        datas.remove(position);
+        mAdapter.notifyDataSetChanged();
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/SqmyMzjmhActivity.java

@@ -1,7 +1,11 @@
 package com.zkjc.policedemo.mvp.ui.activity;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -9,6 +13,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.scwang.smart.refresh.footer.ClassicsFooter;
@@ -18,16 +26,23 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.constant.SpinnerStyle;
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 import com.zkjc.common.base.ZkjcBaseActivity;
+import com.zkjc.common.utils.ScreenUtils;
+import com.zkjc.common.utils.Utils;
 import com.zkjc.common.view.CommonTitleBarV3;
 import com.zkjc.policedemo.R;
 import com.zkjc.policedemo.di.component.DaggerSqmyMzjmhComponent;
 import com.zkjc.policedemo.mvp.contract.SqmyMzjmhContract;
+import com.zkjc.policedemo.mvp.model.entity.JmhEntity;
+import com.zkjc.policedemo.mvp.model.entity.ZaqktbEntity;
 import com.zkjc.policedemo.mvp.presenter.SqmyMzjmhPresenter;
+import com.zkjc.policedemo.mvp.ui.adapter.BaseRecycleAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.MyAqhylAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.MzjmhAdapter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -58,7 +73,7 @@ public class SqmyMzjmhActivity extends ZkjcBaseActivity<SqmyMzjmhPresenter> impl
     @BindView(R.id.float_button)
     FloatingActionButton floatButton;
     private MzjmhAdapter mAdapter;
-    private List<String> datas;
+    private List<JmhEntity.Jmh> datas;
     private int pageNo = 1;
     private int pageSize = 10;
     @Override
@@ -80,7 +95,8 @@ public class SqmyMzjmhActivity extends ZkjcBaseActivity<SqmyMzjmhPresenter> impl
     public void initData(@Nullable Bundle savedInstanceState) {
 
         floatButton.setOnClickListener(view -> {
-           ArmsUtils.startActivity(AddMzjmhActivity.class);
+            Intent intent = new Intent(SqmyMzjmhActivity.this, AddMzjmhActivity.class);
+            startActivityForResult(intent, 1);
         });
         titleBar.setTitle("每周见面会记录");
         titleBar.setmRightImageView(R.drawable.btn_search_black);
@@ -94,6 +110,57 @@ public class SqmyMzjmhActivity extends ZkjcBaseActivity<SqmyMzjmhPresenter> impl
         smart_refresh.setOnRefreshListener(this);
         smart_refresh.setOnLoadMoreListener(this);
         mAdapter = new MzjmhAdapter(datas);
+        mAdapter.setListener(new BaseRecycleAdapter.OnRecyclerViewListenerV2() {
+            @Override
+            public void onItemClick(View view, int position) {
+                JmhEntity.Jmh jmh = datas.get(position);
+                switch (view.getId()) {
+                    case R.id.item_delete:
+                        AlertDialog.Builder builder = new AlertDialog.Builder(SqmyMzjmhActivity.this)
+                                .setTitle("温馨提示")
+                                .setMessage("是否确认删除？")
+                                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        dialogInterface.dismiss();
+                                        Map<String, String> map = new HashMap<>();
+                                        map.put("ids", jmh.getId());
+                                        mPresenter.remove(map, position);
+                                    }
+                                })
+                                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        dialogInterface.dismiss();
+                                    }
+                                });
+                        AlertDialog dialog = builder.create();
+                        dialog.show();
+
+                        WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+                        params.width = ScreenUtils.dip2px(SqmyMzjmhActivity.this, 320);
+
+                        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                        dialog.getWindow().setAttributes(params);
+
+                        break;
+                    case R.id.item_bj:
+                    case R.id.item_root:
+                        Intent intent = new Intent(SqmyMzjmhActivity.this, AddMzjmhActivity.class);
+                        intent.putExtra("jmh", jmh);
+                        intent.putExtra("id", jmh.getId());
+                        startActivityForResult(intent, 10);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            @Override
+            public boolean onItemLongClick(View view, int position) {
+                return false;
+            }
+        });
         mAdapter.setHasStableIds(true);
         recyclerView.setAdapter(mAdapter);
         mAdapter.notifyDataSetChanged();
@@ -105,12 +172,10 @@ public class SqmyMzjmhActivity extends ZkjcBaseActivity<SqmyMzjmhPresenter> impl
     }
 
     private void requestData(int pageNo, int pageSize) {
-        smart_refresh.finishLoadMore();
-        smart_refresh.finishRefresh();
-        for (int i1 = 0; i1 < 10; i1++) {
-            datas.add(i1 + "");
-        }
-        mAdapter.notifyDataSetChanged();
+        Map<String, String> map = new HashMap<>();
+        map.put("current", pageNo + "");
+        map.put("size", pageSize + "");
+        mPresenter.getList(map);
     }
 
     @Override
@@ -119,6 +184,15 @@ public class SqmyMzjmhActivity extends ZkjcBaseActivity<SqmyMzjmhPresenter> impl
         mAdapter.notifyDataSetChanged();
         requestData(pageNo = 1, pageSize);
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            smart_refresh.autoRefresh();
+        }
+    }
+
     @Override
     public void showLoading() {
 
@@ -146,4 +220,34 @@ public class SqmyMzjmhActivity extends ZkjcBaseActivity<SqmyMzjmhPresenter> impl
         finish();
     }
 
+    @Override
+    public void onSuccess(String result) {
+        Utils.getInstances().dismissDialog();
+        smart_refresh.finishLoadMore();
+        smart_refresh.finishRefresh();
+        try {
+            JsonObject obj = new JsonParser().parse(result).getAsJsonObject();
+            if (obj.has("code")) {
+                int code = obj.get("code").getAsInt();
+                if (code == 200) {
+                    JmhEntity entity = new Gson().fromJson(result, JmhEntity.class);
+                    List<JmhEntity.Jmh> records = entity.getData().getRecords();
+                    if (records.size() > 0 && records != null) {
+                        datas.addAll(records);
+                        mAdapter.notifyDataSetChanged();
+                    } else {
+                        ToastUtils.show("没有更多数据了");
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void onRemoveSuccess(String result, int position) {
+        datas.remove(position);
+        mAdapter.notifyDataSetChanged();
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/XzZatbActivity.java

@@ -1,9 +1,12 @@
 package com.zkjc.policedemo.mvp.ui.activity;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -12,6 +15,9 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.luck.picture.lib.config.PictureConfig;
@@ -21,15 +27,24 @@ import com.lzy.imagepicker.ui.ImageGridActivity;
 import com.lzy.imagepicker.ui.ImagePreviewDelActivity;
 import com.lzy.imagepicker.view.CropImageView;
 import com.zkjc.common.base.ZkjcBaseActivity;
+import com.zkjc.common.utils.ScreenUtils;
+import com.zkjc.common.utils.Utils;
 import com.zkjc.common.view.CommonTitleBarV3;
 import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.app.utils.CommonInterFace;
 import com.zkjc.policedemo.app.utils.GlideImageLoader;
+import com.zkjc.policedemo.app.utils.UploadUtil;
 import com.zkjc.policedemo.di.component.DaggerXzZatbComponent;
 import com.zkjc.policedemo.mvp.contract.XzZatbContract;
+import com.zkjc.policedemo.mvp.model.entity.HyjlEntity;
+import com.zkjc.policedemo.mvp.model.entity.ZaqktbEntity;
 import com.zkjc.policedemo.mvp.presenter.XzZatbPresenter;
+import com.zkjc.policedemo.mvp.ui.adapter.AddPicAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.ImagePickerAdapter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -50,7 +65,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
  * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
  * ================================================
  */
-public class XzZatbActivity extends ZkjcBaseActivity<XzZatbPresenter> implements XzZatbContract.View, ImagePickerAdapter.OnRecyclerViewItemClickListener {
+public class XzZatbActivity extends ZkjcBaseActivity<XzZatbPresenter> implements XzZatbContract.View, ImagePickerAdapter.OnRecyclerViewItemClickListener, AddPicAdapter.OnRecyclerViewItemClickListener {
 
     @BindView(R.id.title_bar)
     CommonTitleBarV3 titleBar;
@@ -66,10 +81,12 @@ public class XzZatbActivity extends ZkjcBaseActivity<XzZatbPresenter> implements
     TextView tvConfirm;
     private int maxImgCount = 9;               //允许选择图片最大数
     private ArrayList<ImageItem> selImageList; //当前选择的所有图片
-    private ImagePickerAdapter adapter;
+    private AddPicAdapter adapter;
     public static final int IMAGE_ITEM_ADD = -1;
     public static final int REQUEST_CODE_SELECT = 100;
     public static final int REQUEST_CODE_PREVIEW = 101;
+    private ZaqktbEntity.Zaqktb mNetData;
+    private Map<String, String> urlMap = new HashMap<>();
 
     @Override
     public void setupActivityComponent(@NonNull AppComponent appComponent) {
@@ -88,16 +105,89 @@ public class XzZatbActivity extends ZkjcBaseActivity<XzZatbPresenter> implements
 
     @Override
     public void initData(@Nullable Bundle savedInstanceState) {
-        titleBar.setTitle("新增季度治安情况通报");
+        mNetData = (ZaqktbEntity.Zaqktb) getIntent().getSerializableExtra("zatb");
+        if (mNetData == null) {
+            titleBar.setTitle("新增季度治安情况通报");
+        } else {
+            titleBar.setTitle("修改季度治安情况通报");
+        }
         initfj();
+        tvConfirm.setOnClickListener(v -> {
+            save();
+        });
+        if (mNetData != null) {
+            setNetData();
+        }
+    }
+
+
+    private void setNetData() {
+        etTbbt.setText(mNetData.getTbbt());
+        etBgqk.setText(mNetData.getBgqk());
+        etJmyj.setText(mNetData.getJmyj());
+        String fj = mNetData.getFj();
+        if (!TextUtils.isEmpty(fj)) {
+            String[] split = fj.split(",");
+            for (String url: split) {
+                ImageItem item = new ImageItem();
+                item.path = url;
+                selImageList.add(item);
+                urlMap.put(url, url);
+            }
+            adapter.notifyDataSetChanged();
+            adapter = new AddPicAdapter(this, selImageList, maxImgCount);
+            adapter.setOnItemClickListener(this);
+//            adapter.showDelete(false);
+            recyclerView.setAdapter(adapter);
+        }
+    }
+
+    private void save() {
+        if (TextUtils.isEmpty(etTbbt.getText().toString().trim())) {
+            ToastUtils.show("请选择通报标题");
+            return;
+        }
+        if (TextUtils.isEmpty(etBgqk.getText().toString().trim())) {
+            ToastUtils.show("请选择报告情况");
+            return;
+        }
+        if (TextUtils.isEmpty(etJmyj.getText().toString().trim())) {
+            ToastUtils.show("请填写居民意见");
+            return;
+        }
 
+        Map<String, Object> map = new HashMap<>();
+        map.put("tbbt", etTbbt.getText().toString().trim());
+        map.put("bgqk", etBgqk.getText().toString().trim());
+        map.put("jmyj", etJmyj.getText().toString().trim());
+        StringBuilder builder = new StringBuilder();
+        for (Map.Entry<String, String> entry : urlMap.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+            builder.append(value);
+            builder.append(",");
+        }
+        if (TextUtils.isEmpty(builder.toString())) {
+            ToastUtils.show("请选择照片");
+            return;
+        } else {
+            builder.delete(builder.lastIndexOf(","), builder.length());
+            map.put("fj", builder.toString());
+        }
+        Utils.getInstances().showDialog(this, "正在上传");
+        if (mNetData == null) {
+            mPresenter.save(map);
+        } else {
+            map.put("id", mNetData.getId());
+            mPresenter.update(map);
+        }
     }
 
     private void initfj() {
         initImagePicker();
         selImageList = new ArrayList<>();
         //普通照片
-        adapter = new ImagePickerAdapter(this, selImageList, maxImgCount);
+        adapter = new AddPicAdapter(this, selImageList, maxImgCount);
         adapter.setOnItemClickListener(this);
         recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
         recyclerView.setHasFixedSize(true);
@@ -176,10 +266,33 @@ public class XzZatbActivity extends ZkjcBaseActivity<XzZatbPresenter> implements
             //添加图片返回
             if (data != null && requestCode == REQUEST_CODE_SELECT) {
                 ArrayList<ImageItem> images = (ArrayList<ImageItem>) data.getSerializableExtra(ImagePicker.EXTRA_RESULT_ITEMS);
-                if (images != null) {
-                    selImageList.addAll(images);
-                    adapter.setImages(selImageList);
+                if (images != null && !images.isEmpty()) {
+                    Utils.getInstances().showDialog(this, "正在上传数据");
+                    UploadUtil.getInstance().init(this).getRequest(images.get(0).path, new CommonInterFace() {
+                        @Override
+                        public void onSuccess(String result) {
+                            Utils.getInstances().dismissDialog();
+                            JsonObject jsonObject1 = new JsonParser().parse(result).getAsJsonObject();
+                            JsonObject jsonObject = jsonObject1.get("data").getAsJsonObject();
+                            if (jsonObject.has("link")) {
+                                String url = jsonObject.get("link").getAsString();
+                                urlMap.put(images.get(0).path, url);
+
+                                selImageList.add(images.get(0));
+                                adapter.setImages(selImageList);
+                            }
+                        }
+
+                        @Override
+                        public void onError(Throwable throwable) {
+
+                        }
+
+                        @Override
+                        public void onFinsh() {
 
+                        }
+                    });
                 }
             }
 
@@ -197,4 +310,61 @@ public class XzZatbActivity extends ZkjcBaseActivity<XzZatbPresenter> implements
         }
     }
 
+    @Override
+    public void onItemClickSn(View view, int position) {
+        switch (view.getId()) {
+            case R.id.item_add_pic_iv_delete:
+                android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(this)
+                        .setMessage("是否删除这张照片")
+                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                dialogInterface.dismiss();
+                                ImageItem item = selImageList.get(position);
+                                urlMap.remove(item.path);
+                                selImageList.remove(position);
+                                adapter.setImages(selImageList);
+                            }
+                        })
+                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                dialogInterface.dismiss();
+                            }
+                        });
+                AlertDialog dialog = builder.create();
+                dialog.show();
+                WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+                params.width = ScreenUtils.dip2px(this, 320);
+
+                params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                dialog.getWindow().setAttributes(params);
+                break;
+            default:
+                break;
+        }
+        switch (position) {
+            case AddPicAdapter.IMAGE_ITEM_ADD:
+                ImagePicker.getInstance().setSelectLimit(maxImgCount - selImageList.size());
+                Intent intent = new Intent(this, ImageGridActivity.class);
+//                intent.putExtra(ImageGridActivity.EXTRAS_IMAGES, (ArrayList<ImageItem>) snAdapter.getImages());
+                //  intent.putExtra(ImageGridActivity.EXTRAS_TAKE_PICKERS, true);
+                startActivityForResult(intent, REQUEST_CODE_SELECT);
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public void onSaveSuccess(String result) {
+        setResult(RESULT_OK);
+        finish();
+    }
+
+    @Override
+    public void onUpdateSuccess(String result) {
+        setResult(RESULT_OK);
+        finish();
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/activity/ZatblbActivity.java

@@ -1,7 +1,11 @@
 package com.zkjc.policedemo.mvp.ui.activity;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -9,6 +13,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.scwang.smart.refresh.footer.ClassicsFooter;
@@ -18,16 +26,23 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.constant.SpinnerStyle;
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 import com.zkjc.common.base.ZkjcBaseActivity;
+import com.zkjc.common.utils.ScreenUtils;
+import com.zkjc.common.utils.Utils;
 import com.zkjc.common.view.CommonTitleBarV3;
 import com.zkjc.policedemo.R;
 import com.zkjc.policedemo.di.component.DaggerZatblbComponent;
 import com.zkjc.policedemo.mvp.contract.ZatblbContract;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
+import com.zkjc.policedemo.mvp.model.entity.ZaqktbEntity;
 import com.zkjc.policedemo.mvp.presenter.ZatblbPresenter;
+import com.zkjc.policedemo.mvp.ui.adapter.BaseRecycleAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.RhzfJlAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.ZatbJlAdapter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -58,7 +73,7 @@ public class ZatblbActivity extends ZkjcBaseActivity<ZatblbPresenter> implements
     @BindView(R.id.float_button)
     FloatingActionButton floatButton;
     private ZatbJlAdapter mAdapter;
-    private List<String> datas;
+    private List<ZaqktbEntity.Zaqktb> datas;
     private int pageNo = 1;
     private int pageSize = 10;
 
@@ -80,7 +95,9 @@ public class ZatblbActivity extends ZkjcBaseActivity<ZatblbPresenter> implements
     @Override
     public void initData(@Nullable Bundle savedInstanceState) {
         floatButton.setOnClickListener(view -> {
-            ArmsUtils.startActivity(XzZatbActivity.class);
+
+            Intent intent = new Intent(ZatblbActivity.this, XzZatbActivity.class);
+            startActivityForResult(intent, 1);
         });
         titleBar.setTitle("季度治安情况通报列表");
         titleBar.setmRightImageView(R.drawable.btn_search_black);
@@ -95,6 +112,57 @@ public class ZatblbActivity extends ZkjcBaseActivity<ZatblbPresenter> implements
         smart_refresh.setOnLoadMoreListener(this);
         mAdapter = new ZatbJlAdapter(datas);
         mAdapter.setHasStableIds(true);
+        mAdapter.setListener(new BaseRecycleAdapter.OnRecyclerViewListenerV2() {
+            @Override
+            public void onItemClick(View view, int position) {
+                ZaqktbEntity.Zaqktb zatb = datas.get(position);
+                switch (view.getId()) {
+                    case R.id.item_delete:
+                        AlertDialog.Builder builder = new AlertDialog.Builder(ZatblbActivity.this)
+                                .setTitle("温馨提示")
+                                .setMessage("是否确认删除？")
+                                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        dialogInterface.dismiss();
+                                        Map<String, String> map = new HashMap<>();
+                                        map.put("ids", zatb.getId());
+                                        mPresenter.remove(map, position);
+                                    }
+                                })
+                                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        dialogInterface.dismiss();
+                                    }
+                                });
+                        AlertDialog dialog = builder.create();
+                        dialog.show();
+
+                        WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+                        params.width = ScreenUtils.dip2px(ZatblbActivity.this, 320);
+
+                        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                        dialog.getWindow().setAttributes(params);
+
+                        break;
+                    case R.id.item_bj:
+                    case R.id.item_root:
+                        Intent intent = new Intent(ZatblbActivity.this, XzZatbActivity.class);
+                        intent.putExtra("zatb", zatb);
+                        intent.putExtra("id", zatb.getId());
+                        startActivityForResult(intent, 10);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            @Override
+            public boolean onItemLongClick(View view, int position) {
+                return false;
+            }
+        });
         recyclerView.setAdapter(mAdapter);
         mAdapter.notifyDataSetChanged();
     }
@@ -105,12 +173,10 @@ public class ZatblbActivity extends ZkjcBaseActivity<ZatblbPresenter> implements
     }
 
     private void requestData(int pageNo, int pageSize) {
-        smart_refresh.finishLoadMore();
-        smart_refresh.finishRefresh();
-        for (int i1 = 0; i1 < 10; i1++) {
-            datas.add(i1 + "");
-        }
-        mAdapter.notifyDataSetChanged();
+        Map<String, String> map = new HashMap<>();
+        map.put("current", pageNo + "");
+        map.put("size", pageSize + "");
+        mPresenter.getList(map);
     }
 
     @Override
@@ -121,6 +187,14 @@ public class ZatblbActivity extends ZkjcBaseActivity<ZatblbPresenter> implements
     }
 
     @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            smart_refresh.autoRefresh();
+        }
+    }
+
+    @Override
     public void showLoading() {
 
     }
@@ -148,4 +222,34 @@ public class ZatblbActivity extends ZkjcBaseActivity<ZatblbPresenter> implements
     }
 
 
+    @Override
+    public void onRemoveSuccess(String result, int position) {
+        datas.remove(position);
+        mAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void onSuccess(String result) {
+        smart_refresh.finishLoadMore();
+        smart_refresh.finishRefresh();
+        try {
+            JsonObject obj = new JsonParser().parse(result).getAsJsonObject();
+            if (obj.has("code")) {
+                int code = obj.get("code").getAsInt();
+                if (code == 200) {
+                    ZaqktbEntity entity = new Gson().fromJson(result, ZaqktbEntity.class);
+                    List<ZaqktbEntity.Zaqktb> records = entity.getData().getRecords();
+                    if (records.size() > 0 && records != null) {
+                        datas.addAll(records);
+                        mAdapter.notifyDataSetChanged();
+                        Utils.getInstances().dismissDialog();
+                    } else {
+                        ToastUtils.show("没有更多数据了");
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/adapter/LscyAdapter.java

@@ -42,7 +42,6 @@ public class LscyAdapter extends BaseRecycleAdapter<SydwEntity.Cyry> {
             setItemText(holder.getView(R.id.item_sfzh), cyry.getGmsfhm());
             setItemText(holder.getView(R.id.item_lxdh), cyry.getLxdh());
             setItemText(holder.getView(R.id.item_xjzd), cyry.getXz());
-            setItemText(holder.getView(R.id.item_xjzd), cyry.getXz());
             holder.getView(R.id.ll_djsj).setVisibility(cyry.getCreateTime() <= 0 ? View.GONE : View.VISIBLE);
             holder.getView(R.id.layout_bottom).setVisibility(showBottom ? View.VISIBLE : View.GONE);
             if (listener != null) {

app/src/main/java/com/zkjc/policedemo/mvp/ui/adapter/MyAqhylAdapter.java

@@ -1,18 +1,33 @@
 package com.zkjc.policedemo.mvp.ui.adapter;
 
 import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.mvp.model.entity.HyjlEntity;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
-public class MyAqhylAdapter extends BaseRecycleAdapter<String> {
+public class MyAqhylAdapter extends BaseRecycleAdapter<HyjlEntity.Hyjl> {
 
-    public MyAqhylAdapter(List<String> datas) {
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.CHINA);
+    public MyAqhylAdapter(List<HyjlEntity.Hyjl> datas) {
         super(datas);
     }
 
     @Override
     protected void bindData(BaseViewHolder holder, int position) {
-        if (holder != null) {}
+        if (holder != null) {
+            HyjlEntity.Hyjl hyjl = datas.get(position);
+            setItemText(holder.getView(R.id.item_xslx), hyjl.getHyzt());
+            setItemText(holder.getView(R.id.item_xsnr), hyjl.getHynr());
+            setItemText(holder.getView(R.id.item_hysj), sdf.format(new Date(hyjl.getCreateTime())));
+            if (listener != null) {
+                holder.setOnItemClickListenerV2(R.id.item_delete, position, listener);
+                holder.setOnItemClickListenerV2(R.id.item_bj, position, listener);
+                holder.setOnItemClickListenerV2(R.id.item_root, position, listener);
+            }
+        }
     }
 
 
@@ -23,5 +38,11 @@ public class MyAqhylAdapter extends BaseRecycleAdapter<String> {
     }
 
 
+    private OnRecyclerViewListenerV2 listener;
+
+    public void setListener(OnRecyclerViewListenerV2 listener) {
+        this.listener = listener;
+    }
+
 
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/adapter/MzchryAdapter.java

@@ -1,18 +1,27 @@
 package com.zkjc.policedemo.mvp.ui.adapter;
 
 import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.mvp.model.entity.JmhEntity;
 
 import java.util.List;
 
-public class MzchryAdapter extends BaseRecycleAdapter<String> {
+public class MzchryAdapter extends BaseRecycleAdapter<JmhEntity.JmhRy> {
 
-    public MzchryAdapter(List<String> datas) {
+    public MzchryAdapter(List<JmhEntity.JmhRy> datas) {
         super(datas);
     }
 
     @Override
     protected void bindData(BaseViewHolder holder, int position) {
-        if (holder != null) {}
+        if (holder != null) {
+            JmhEntity.JmhRy ry = datas.get(position);
+            setItemText(holder.getView(R.id.item_name), ry.getXm());
+            setItemText(holder.getView(R.id.item_zw_dh), ry.getZw() + " | " + ry.getLxdh());
+            if (listener != null) {
+                holder.setOnItemClickListenerV2(R.id.iv_delete, position, listener);
+                holder.setOnItemClickListenerV2(R.id.item_root, position, listener);
+            }
+        }
     }
 
 
@@ -23,5 +32,10 @@ public class MzchryAdapter extends BaseRecycleAdapter<String> {
     }
 
 
+    private OnRecyclerViewListenerV2 listener;
+
+    public void setListener(OnRecyclerViewListenerV2 listener) {
+        this.listener = listener;
+    }
 
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/adapter/MzjmhAdapter.java

@@ -1,18 +1,35 @@
 package com.zkjc.policedemo.mvp.ui.adapter;
 
 import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.mvp.model.entity.JmhEntity;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
-public class MzjmhAdapter extends BaseRecycleAdapter<String> {
+public class MzjmhAdapter extends BaseRecycleAdapter<JmhEntity.Jmh> {
 
-    public MzjmhAdapter(List<String> datas) {
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.CHINA);
+    public MzjmhAdapter(List<JmhEntity.Jmh> datas) {
         super(datas);
     }
 
     @Override
     protected void bindData(BaseViewHolder holder, int position) {
-        if (holder != null) {}
+        if (holder != null) {
+            JmhEntity.Jmh jmh = datas.get(position);
+            setItemText(holder.getView(R.id.item_xslx), jmh.getHyzt());
+            setItemText(holder.getView(R.id.item_xsnr), jmh.getHynr());
+            setItemText(holder.getView(R.id.item_chry), jmh.getNames());
+            setItemText(holder.getView(R.id.item_sssq), jmh.getSssqName());
+            setItemText(holder.getView(R.id.item_djsj), sdf.format(new Date(jmh.getCreateTime())));
+            if (listener != null) {
+                holder.setOnItemClickListenerV2(R.id.item_delete, position, listener);
+                holder.setOnItemClickListenerV2(R.id.item_bj, position, listener);
+                holder.setOnItemClickListenerV2(R.id.item_root, position, listener);
+            }
+        }
     }
 
 
@@ -23,5 +40,10 @@ public class MzjmhAdapter extends BaseRecycleAdapter<String> {
     }
 
 
+    private OnRecyclerViewListenerV2 listener;
+
+    public void setListener(OnRecyclerViewListenerV2 listener) {
+        this.listener = listener;
+    }
 
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/adapter/SqmyJlAdapter.java

@@ -1,18 +1,33 @@
 package com.zkjc.policedemo.mvp.ui.adapter;
 
 import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
-public class SqmyJlAdapter extends BaseRecycleAdapter<String> {
+public class SqmyJlAdapter extends BaseRecycleAdapter<SqmyEntity.Sqmy> {
 
-    public SqmyJlAdapter(List<String> datas) {
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.CHINA);
+    public SqmyJlAdapter(List<SqmyEntity.Sqmy> datas) {
         super(datas);
     }
 
     @Override
     protected void bindData(BaseViewHolder holder, int position) {
-        if (holder != null) {}
+        if (holder != null) {
+            SqmyEntity.Sqmy sqmy = datas.get(position);
+            setItemText(holder.getView(R.id.item_xslx), sqmy.getXslx());
+            setItemText(holder.getView(R.id.item_xsnr), sqmy.getXsnr());
+            setItemText(holder.getView(R.id.item_hysj), sdf.format(new Date(sqmy.getCreateTime())));
+            if (listener != null) {
+                holder.setOnItemClickListenerV2(R.id.item_delete, position, listener);
+                holder.setOnItemClickListenerV2(R.id.item_bj, position, listener);
+                holder.setOnItemClickListenerV2(R.id.item_root, position, listener);
+            }
+        }
     }
 
 
@@ -23,5 +38,10 @@ public class SqmyJlAdapter extends BaseRecycleAdapter<String> {
     }
 
 
+    private OnRecyclerViewListenerV2 listener;
+
+    public void setListener(OnRecyclerViewListenerV2 listener) {
+        this.listener = listener;
+    }
 
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/adapter/XstgrAdapter.java

@@ -1,20 +1,54 @@
 package com.zkjc.policedemo.mvp.ui.adapter;
 
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.squareup.picasso.Picasso;
 import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
+import com.zkjc.policedemo.mvp.model.entity.SydwEntity;
 
+import java.util.Date;
 import java.util.List;
 
-public class XstgrAdapter extends BaseRecycleAdapter<String> {
+public class XstgrAdapter extends BaseRecycleAdapter<SqmyEntity.Xstgr> {
 
-    public XstgrAdapter(List<String> datas) {
+    private boolean showDelete = false;
+    public XstgrAdapter(List<SqmyEntity.Xstgr> datas) {
         super(datas);
     }
 
     @Override
     protected void bindData(BaseViewHolder holder, int position) {
-        if (holder != null) {}
+        if (holder != null) {
+            SqmyEntity.Xstgr cyry = datas.get(position);
+            ImageView ivHead = (ImageView) holder.getView(R.id.iv_head);
+            if (TextUtils.isEmpty(cyry.getZp())) {
+                ivHead.setImageBitmap(null);
+            } else {
+                Picasso.with(ivHead.getContext()).load(cyry.getZp()).into(ivHead);
+            }
+            setItemText(holder.getView(R.id.item_name), cyry.getXm());
+            ImageView ivSex = (ImageView) holder.getView(R.id.iv_sex);
+            if ("男".equals(cyry.getXb())) {
+                ivSex.setBackgroundResource(R.drawable.icon_boy);
+            } else {
+                ivSex.setBackgroundResource(R.drawable.icon_girl);
+            }
+            setItemText(holder.getView(R.id.item_sfzh_mz), cyry.getGmsfhm() + " | " + cyry.getMz());
+            setItemText(holder.getView(R.id.item_lxdh), cyry.getLxdh());
+            setItemText(holder.getView(R.id.item_dwxx), cyry.getXjzdxz());
+            if (listener != null) {
+                holder.setOnItemClickListenerV2(R.id.iv_delete, position, listener);
+            }
+            holder.getView(R.id.iv_delete).setVisibility(showDelete ? View.VISIBLE : View.GONE);
+        }
     }
 
+    public void setShowDelete(boolean showDelete) {
+        this.showDelete = showDelete;
+    }
 
 
     @Override
@@ -23,5 +57,10 @@ public class XstgrAdapter extends BaseRecycleAdapter<String> {
     }
 
 
+    private OnRecyclerViewListenerV2 listener;
+
+    public void setListener(OnRecyclerViewListenerV2 listener) {
+        this.listener = listener;
+    }
 
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/adapter/ZatbJlAdapter.java

@@ -1,18 +1,34 @@
 package com.zkjc.policedemo.mvp.ui.adapter;
 
 import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.mvp.model.entity.SqmyEntity;
+import com.zkjc.policedemo.mvp.model.entity.ZaqktbEntity;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
-public class ZatbJlAdapter extends BaseRecycleAdapter<String> {
+public class ZatbJlAdapter extends BaseRecycleAdapter<ZaqktbEntity.Zaqktb> {
 
-    public ZatbJlAdapter(List<String> datas) {
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.CHINA);
+    public ZatbJlAdapter(List<ZaqktbEntity.Zaqktb> datas) {
         super(datas);
     }
 
     @Override
     protected void bindData(BaseViewHolder holder, int position) {
-        if (holder != null) {}
+        if (holder != null) {
+            ZaqktbEntity.Zaqktb sqmy = datas.get(position);
+            setItemText(holder.getView(R.id.item_title), sqmy.getTbbt());
+            setItemText(holder.getView(R.id.item_hynr), sqmy.getBgqk());
+            setItemText(holder.getView(R.id.item_hysj), sdf.format(new Date(sqmy.getCreateTime())));
+            if (listener != null) {
+                holder.setOnItemClickListenerV2(R.id.item_delete, position, listener);
+                holder.setOnItemClickListenerV2(R.id.item_bj, position, listener);
+                holder.setOnItemClickListenerV2(R.id.item_root, position, listener);
+            }
+        }
     }
 
 
@@ -24,4 +40,10 @@ public class ZatbJlAdapter extends BaseRecycleAdapter<String> {
 
 
 
+    private OnRecyclerViewListenerV2 listener;
+
+    public void setListener(OnRecyclerViewListenerV2 listener) {
+        this.listener = listener;
+    }
+
 }

app/src/main/java/com/zkjc/policedemo/mvp/ui/fragment/HomeFragment.java

@@ -96,10 +96,12 @@ import com.zkjc.policedemo.mvp.ui.activity.FxpcListActivity;
 import com.zkjc.policedemo.mvp.ui.activity.JdjcJlActivity;
 import com.zkjc.policedemo.mvp.ui.activity.JwsLbActivity;
 import com.zkjc.policedemo.mvp.ui.activity.MdjfActivity;
+import com.zkjc.policedemo.mvp.ui.activity.NbdwActivity;
 import com.zkjc.policedemo.mvp.ui.activity.RcgzActivity;
 import com.zkjc.policedemo.mvp.ui.activity.RhzfActivity;
 import com.zkjc.policedemo.mvp.ui.activity.RhzfDjActivity;
 import com.zkjc.policedemo.mvp.ui.activity.RhzfMainNewActivity;
+import com.zkjc.policedemo.mvp.ui.activity.RkbqActivity;
 import com.zkjc.policedemo.mvp.ui.activity.RwhcActivity;
 import com.zkjc.policedemo.mvp.ui.activity.RwxfLbActivity;
 import com.zkjc.policedemo.mvp.ui.activity.SearchAppActivity;
@@ -349,7 +351,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements HomeCon
                         switch (bean.getSort()) {
                             case "1": // 入户走访
                                 ArmsUtils.startActivity(RhzfMainNewActivity.class);
-//                                ArmsUtils.startActivity(SydwActivity.class);
+//                                ArmsUtils.startActivity(RkbqActivity.class);
                                 break;
                             case "2": // 矛盾纠纷
                                 ArmsUtils.startActivity(MdjfActivity.class);
@@ -446,9 +448,16 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements HomeCon
                                 break;
                             case "205": // 实有单位
                                 ArmsUtils.startActivity(SydwActivity.class);
+                                break;
                             case "212": // 社情民意
                                 ArmsUtils.startActivity(SqmyActivity.class);
                                 break;
+                            case "213": // 标签
+                                ArmsUtils.startActivity(RkbqActivity.class);
+                                break;
+                            case "214": // 内保单位
+                                ArmsUtils.startActivity(NbdwActivity.class);
+                                break;
                             case "99": // 更多
 //                                ToastUtils.show("功能开发中");
 //                                openUnitApp("__UNI__0308C60");

app/src/main/res/layout/activity_add_chry.xml

@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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="#f8f8f8"
+    android:orientation="vertical">
+
+    <com.zkjc.common.view.CommonTitleBarV3
+        android:id="@+id/title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="25dp" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/title_bar">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginRight="12dp"
+                android:background="@drawable/white_bg"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="12dp">
+
+                    <TextView
+                        android:id="@+id/fxpc_left_tv_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:text="参会人员"
+                        android:textColor="#111"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_alignParentBottom="true"
+                        android:background="#e7e7e7" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:paddingLeft="12dp"
+                    android:layout_marginRight="12dp"
+                    android:paddingRight="12dp">
+
+                    <TextView
+
+                        android:id="@+id/name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:text="人员姓名"
+                        android:textColor="#666666"
+                        android:textSize="14sp" />
+
+                    <EditText
+                        android:id="@+id/et_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@id/name"
+                        android:background="@null"
+                        android:gravity="right|center_vertical"
+                        android:hint="请输入人员姓名"
+                        android:textColor="#111111"
+                        android:textColorHint="#999999"
+                        android:textSize="14sp" />
+
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/rl_xslx"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="12dp">
+
+                    <TextView
+                        android:id="@+id/xslx"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:text="人员职务"
+                        android:textColor="#666666"
+                        android:textSize="14sp" />
+
+                    <Spinner
+                        android:id="@+id/sp_zw"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="2dp"
+                        android:layout_toRightOf="@id/xslx"
+                        android:layout_marginBottom="2dp"
+                        android:background="@drawable/jx"
+                        android:textColor="#000"
+                        android:textSize="14sp" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_alignParentBottom="true"
+                        android:background="#e7e7e7" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:paddingLeft="12dp"
+                    android:layout_marginRight="12dp"
+                    android:paddingRight="12dp">
+
+                    <TextView
+                        android:id="@+id/phone"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:text="人员电话"
+                        android:textColor="#666666"
+                        android:textSize="14sp" />
+
+                    <EditText
+                        android:id="@+id/et_phone"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@id/phone"
+                        android:background="@null"
+                        android:inputType="phone"
+                        android:gravity="right|center_vertical"
+                        android:hint="请输入人员电话"
+                        android:textColor="#111111"
+                        android:textColorHint="#999999"
+                        android:textSize="14sp" />
+
+
+                </RelativeLayout>
+
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tv_confirm"
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_alignParentBottom="true"
+                android:layout_marginLeft="12dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="12dp"
+                android:layout_marginBottom="20dp"
+                android:background="@drawable/bg_selector_fxpc_next"
+                android:enabled="true"
+                android:gravity="center"
+                android:text="确定"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+        </LinearLayout>
+    </ScrollView>
+
+
+</RelativeLayout>

app/src/main/res/layout/activity_add_my_qahy.xml

@@ -54,13 +54,12 @@
                     <EditText
                         android:id="@+id/et_hysz"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_centerVertical="true"
                         android:layout_toRightOf="@id/fxpc_left_tv_phone"
                         android:background="@null"
-                        android:gravity="right"
+                        android:gravity="right|center_vertical"
                         android:hint="请输入会议主题"
-                        android:inputType="number"
                         android:textColor="#111111"
                         android:textColorHint="#999999"
                         android:textSize="14sp" />
@@ -91,13 +90,13 @@
                     <TextView
                         android:id="@+id/tv_hysjx"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_centerVertical="true"
                         android:layout_marginRight="8dp"
                         android:layout_toLeftOf="@id/jt1"
                         android:layout_toRightOf="@id/hysj"
                         android:background="@null"
-                        android:gravity="right"
+                        android:gravity="right|center_vertical"
                         android:hint="请选择会议时间"
                         android:textColor="#111111"
                         android:textColorHint="#999999"

app/src/main/res/layout/activity_add_mzjmh.xml

@@ -76,13 +76,12 @@
                     <EditText
                         android:id="@+id/et_hysz"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_centerVertical="true"
                         android:layout_toRightOf="@id/fxpc_left_tv_phone"
                         android:background="@null"
-                        android:gravity="right"
+                        android:gravity="right|center_vertical"
                         android:hint="请输入会议主题"
-                        android:inputType="number"
                         android:textColor="#111111"
                         android:textColorHint="#999999"
                         android:textSize="14sp" />
@@ -113,13 +112,13 @@
                     <TextView
                         android:id="@+id/tv_hysjx"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_centerVertical="true"
                         android:layout_marginRight="8dp"
                         android:layout_toLeftOf="@id/jt1"
                         android:layout_toRightOf="@id/hysj"
                         android:background="@null"
-                        android:gravity="right"
+                        android:gravity="right|center_vertical"
                         android:hint="请选择会议时间"
                         android:textColor="#111111"
                         android:textColorHint="#999999"
@@ -157,29 +156,18 @@
                         android:textColor="#666666"
                         android:textSize="14sp" />
 
-                    <TextView
-                        android:id="@+id/tv_sssq"
+                    <Spinner
+                        android:id="@+id/sp_sssq"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_marginRight="8dp"
-                        android:layout_toLeftOf="@id/jt2"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="2dp"
                         android:layout_toRightOf="@id/sssq"
-                        android:background="@null"
-                        android:gravity="right"
-                        android:hint="请选择所属社区"
-                        android:textColor="#111111"
-                        android:textColorHint="#999999"
+                        android:layout_marginBottom="2dp"
+                        android:background="@drawable/jx"
+                        android:textColor="#000"
                         android:textSize="14sp" />
 
-                    <ImageView
-                        android:id="@+id/jt2"
-                        android:layout_width="14dp"
-                        android:layout_height="14dp"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/right_jt" />
-
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"

app/src/main/res/layout/activity_add_sqmy.xml

@@ -73,29 +73,18 @@
                         android:textColor="#666666"
                         android:textSize="14sp" />
 
-                    <TextView
-                        android:id="@+id/tv_xslx"
+                    <Spinner
+                        android:id="@+id/sp_xslx"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_marginRight="8dp"
-                        android:layout_toLeftOf="@id/jt1"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="2dp"
                         android:layout_toRightOf="@id/xslx"
-                        android:background="@null"
-                        android:gravity="right"
-                        android:hint="请选择线索类型"
-                        android:textColor="#111111"
-                        android:textColorHint="#999999"
+                        android:layout_marginBottom="2dp"
+                        android:background="@drawable/jx"
+                        android:textColor="#000"
                         android:textSize="14sp" />
 
-                    <ImageView
-                        android:id="@+id/jt1"
-                        android:layout_width="14dp"
-                        android:layout_height="14dp"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/right_jt" />
-
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
@@ -123,13 +112,13 @@
                     <TextView
                         android:id="@+id/tv_fxsj"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_centerVertical="true"
                         android:layout_marginRight="8dp"
                         android:layout_toLeftOf="@id/jt2"
                         android:layout_toRightOf="@id/fxsj"
                         android:background="@null"
-                        android:gravity="right"
+                        android:gravity="right|center_vertical"
                         android:hint="请选择发现时间"
                         android:textColor="#111111"
                         android:textColorHint="#999999"
@@ -171,11 +160,11 @@
                     <EditText
                         android:id="@+id/et_fxdd"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_centerVertical="true"
                         android:layout_toRightOf="@id/fxpc_left_tv_phone"
                         android:background="@null"
-                        android:gravity="right"
+                        android:gravity="right|center_vertical"
                         android:hint="请输入发现地点"
                         android:textColor="#111111"
                         android:textColorHint="#999999"

app/src/main/res/layout/activity_sqmy.xml

@@ -392,10 +392,20 @@
                     android:background="@drawable/right_black" />
 
 
+                <TextView
+                    android:id="@+id/tv_zaqktb"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tv_jdza"
+                    android:layout_margin="12dp"
+                    android:text="清风社区2024年11月安全负责会议"
+                    android:textColor="#111111"
+                    android:textSize="14sp" />
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:visibility="gone"
                     android:layout_below="@id/tv_jdza"
                     android:layout_margin="12dp"
                     tools:listitem="@layout/item_jdzatb" />

app/src/main/res/layout/fragment_sydw_left.xml

@@ -124,7 +124,6 @@
                     android:layout_marginLeft="10dp"
                     android:layout_marginTop="2dp"
                     android:layout_marginBottom="2dp"
-                    android:background="@drawable/jx"
                     android:textColor="#000"
                     android:textSize="14sp" />
 
@@ -163,7 +162,6 @@
                     android:layout_marginLeft="10dp"
                     android:layout_marginTop="2dp"
                     android:layout_marginBottom="2dp"
-                    android:background="@drawable/jx"
                     android:textColor="#000"
                     android:textSize="14sp" />
 

app/src/main/res/layout/item_add_pic.xml

@@ -33,6 +33,7 @@
 
         <ImageView
             android:layout_width="match_parent"
+            android:scaleType="centerCrop"
             android:id="@+id/item_add_pic_iv_img"
             android:layout_height="match_parent"/>
 

app/src/main/res/layout/item_mzchry.xml

@@ -3,10 +3,17 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginLeft="12dp"
+    android:id="@+id/item_root"
     android:layout_marginTop="12dp"
     android:layout_marginRight="12dp"
     android:background="@color/white">
-
+    <ImageView
+        android:layout_width="50dp"
+        android:id="@+id/iv_delete"
+        android:layout_alignParentRight="true"
+        android:padding="15dp"
+        android:src="@drawable/icon_delete"
+        android:layout_height="50dp"/>
     <ImageView
         android:id="@+id/iv_head"
         android:layout_width="16dp"
@@ -27,6 +34,7 @@
         android:id="@+id/btn_edit"
         android:layout_width="16dp"
         android:layout_height="16dp"
+        android:visibility="gone"
         android:layout_alignParentRight="true"
         android:background="@drawable/btn_edit_blue" />
 

app/src/main/res/layout/item_mzjmhy.xml

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginLeft="12dp"
+    android:id="@+id/item_root"
     android:layout_marginTop="12dp"
     android:layout_marginRight="12dp"
     android:background="@drawable/white_bg">

app/src/main/res/layout/item_sqmy.xml

@@ -4,6 +4,7 @@
     android:layout_height="wrap_content"
     android:layout_marginLeft="12dp"
     android:layout_marginTop="12dp"
+    android:id="@+id/item_root"
     android:layout_marginRight="12dp"
     android:background="@drawable/white_bg"
     >

app/src/main/res/layout/item_xstgr.xml

@@ -6,7 +6,7 @@
     android:layout_marginTop="12dp"
     android:layout_marginRight="12dp"
     android:background="@drawable/white_bg"
-    android:minHeight="148dp">
+    android:minHeight="124dp">
 
     <ImageView
         android:id="@+id/iv_head"
@@ -24,6 +24,21 @@
         android:text="赵傲天"
         android:textColor="#ff111111"
         android:textSize="14sp" />
+    <ImageView
+        android:id="@+id/iv_sex"
+        android:layout_width="16dp"
+        android:layout_toRightOf="@id/item_name"
+        android:layout_height="16dp"
+        android:layout_margin="12dp"
+        android:src="@drawable/icon_boy" />
+
+    <ImageView
+        android:layout_width="50dp"
+        android:id="@+id/iv_delete"
+        android:layout_alignParentRight="true"
+        android:padding="15dp"
+        android:src="@drawable/icon_delete"
+        android:layout_height="50dp"/>
 
     <TextView
         android:id="@+id/item_sfzh_mz"
@@ -40,6 +55,7 @@
         android:id="@+id/tv_rklb"
         android:layout_width="64dp"
         android:layout_height="24dp"
+        android:visibility="gone"
         android:layout_below="@id/item_sfzh_mz"
         android:layout_marginTop="8dp"
         android:layout_toRightOf="@id/iv_head"

app/src/main/res/layout/item_zatb.xml

@@ -4,6 +4,7 @@
     android:layout_height="wrap_content"
     android:layout_marginLeft="12dp"
     android:layout_marginTop="12dp"
+    android:id="@+id/item_root"
     android:layout_marginRight="12dp"
     android:background="@drawable/white_bg"
   >
@@ -71,7 +72,7 @@
         android:background="@drawable/imaginary_line" />
 
     <TextView
-        android:id="@+id/item_xg"
+        android:id="@+id/item_delete"
         android:layout_width="80dp"
         android:layout_height="32dp"
         android:layout_below="@id/line"
@@ -80,7 +81,7 @@
         android:layout_toLeftOf="@id/item_bj"
         android:background="@drawable/btn_dwxg_shape"
         android:gravity="center"
-        android:text="修改"
+        android:text="删除"
         android:textColor="#ff666666"
         android:textSize="14sp" />