实有单位完成

app/src/main/AndroidManifest.xml

@@ -105,19 +105,22 @@
         <activity android:name=".mvp.ui.activity.ZatblbActivity" />
         <activity android:name=".mvp.ui.activity.RhzfJlActivity" />
         <activity android:name=".mvp.ui.activity.SqmyActivity">
-            <intent-filter>
+            <!--<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>
+            </intent-filter>-->
+            -->
         </activity>
+        <activity android:name=".mvp.ui.activity.SelectSydwFwActivity" />
+        <activity android:name=".mvp.ui.activity.AqffxcActivity" />
         <activity android:name=".mvp.ui.activity.RydaActivity" />
         <activity android:name=".mvp.ui.activity.RhzfDetailActivity" />
         <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" />
+        <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" />
@@ -388,15 +391,11 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden">
-
-            <!--
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
-                &lt;!&ndash; &lt;!&ndash; <category android:name="android.intent.category.LAUNCHER" /> &ndash;&gt; &ndash;&gt;
             </intent-filter>
-            -->
         </activity> <!-- 地图功能隐藏 -->
         <activity
             android:name="com.amap.api.navi.AmapRouteActivity"

app/src/main/java/com/zkjc/policedemo/app/utils/ReqToBus.java

@@ -155,7 +155,9 @@ public class ReqToBus {
                                     if (object.has("msg")) {
                                         String msg = object.get("msg").getAsString();
                                         if (!TextUtils.isEmpty(msg) && msg.contains("重新登录")) {
-                                            ToastUtils.show("登录已过期，请重新登录");
+                                            if (!ApkUtils.isSqjw(context)) {
+                                                ToastUtils.show("登录已过期，请重新登录");
+                                            }
                                             EventBus.getDefault().post(1);
                                             sp.edit().putBoolean("isFirst", true).commit();
                                             ArmsUtils.startActivity(SqjwLoginActivity.class);

app/src/main/java/com/zkjc/policedemo/di/component/AqffxcComponent.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.AqffxcModule;
+import com.zkjc.policedemo.mvp.contract.AqffxcContract;
+
+import com.jess.arms.di.scope.ActivityScope;
+import com.zkjc.policedemo.mvp.ui.activity.AqffxcActivity;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 14:52
+ * <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 = AqffxcModule.class, dependencies = AppComponent.class)
+public interface AqffxcComponent {
+    void inject(AqffxcActivity activity);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        AqffxcComponent.Builder view(AqffxcContract.View view);
+
+        AqffxcComponent.Builder appComponent(AppComponent appComponent);
+
+        AqffxcComponent build();
+    }
+}

app/src/main/java/com/zkjc/policedemo/di/component/RhzfAqffxcComponent.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.RhzfAqffxcModule;
+import com.zkjc.policedemo.mvp.contract.RhzfAqffxcContract;
+
+import com.jess.arms.di.scope.FragmentScope;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfAqffxcFragment;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 14:53
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+@Component(modules = RhzfAqffxcModule.class, dependencies = AppComponent.class)
+public interface RhzfAqffxcComponent {
+    void inject(RhzfAqffxcFragment fragment);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        RhzfAqffxcComponent.Builder view(RhzfAqffxcContract.View view);
+
+        RhzfAqffxcComponent.Builder appComponent(AppComponent appComponent);
+
+        RhzfAqffxcComponent build();
+    }
+}

app/src/main/java/com/zkjc/policedemo/di/component/RhzfSmfwComponent.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.RhzfSmfwModule;
+import com.zkjc.policedemo.mvp.contract.RhzfSmfwContract;
+
+import com.jess.arms.di.scope.FragmentScope;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfSmfwFragment;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:56
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+@Component(modules = RhzfSmfwModule.class, dependencies = AppComponent.class)
+public interface RhzfSmfwComponent {
+    void inject(RhzfSmfwFragment fragment);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        RhzfSmfwComponent.Builder view(RhzfSmfwContract.View view);
+
+        RhzfSmfwComponent.Builder appComponent(AppComponent appComponent);
+
+        RhzfSmfwComponent build();
+    }
+}

app/src/main/java/com/zkjc/policedemo/di/component/RhzfSydwComponent.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.RhzfSydwModule;
+import com.zkjc.policedemo.mvp.contract.RhzfSydwContract;
+
+import com.jess.arms.di.scope.FragmentScope;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfSydwFragment;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 09:31
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+@Component(modules = RhzfSydwModule.class, dependencies = AppComponent.class)
+public interface RhzfSydwComponent {
+    void inject(RhzfSydwFragment fragment);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        RhzfSydwComponent.Builder view(RhzfSydwContract.View view);
+
+        RhzfSydwComponent.Builder appComponent(AppComponent appComponent);
+
+        RhzfSydwComponent build();
+    }
+}

app/src/main/java/com/zkjc/policedemo/di/component/RhzfTdrkgkComponent.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.RhzfTdrkgkModule;
+import com.zkjc.policedemo.mvp.contract.RhzfTdrkgkContract;
+
+import com.jess.arms.di.scope.FragmentScope;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfTdrkgkFragment;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 09:19
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+@Component(modules = RhzfTdrkgkModule.class, dependencies = AppComponent.class)
+public interface RhzfTdrkgkComponent {
+    void inject(RhzfTdrkgkFragment fragment);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        RhzfTdrkgkComponent.Builder view(RhzfTdrkgkContract.View view);
+
+        RhzfTdrkgkComponent.Builder appComponent(AppComponent appComponent);
+
+        RhzfTdrkgkComponent build();
+    }
+}

app/src/main/java/com/zkjc/policedemo/di/component/RhzfWtfwComponent.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.RhzfWtfwModule;
+import com.zkjc.policedemo.mvp.contract.RhzfWtfwContract;
+
+import com.jess.arms.di.scope.FragmentScope;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfWtfwFragment;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:57
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+@Component(modules = RhzfWtfwModule.class, dependencies = AppComponent.class)
+public interface RhzfWtfwComponent {
+    void inject(RhzfWtfwFragment fragment);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        RhzfWtfwComponent.Builder view(RhzfWtfwContract.View view);
+
+        RhzfWtfwComponent.Builder appComponent(AppComponent appComponent);
+
+        RhzfWtfwComponent build();
+    }
+}

app/src/main/java/com/zkjc/policedemo/di/component/RhzfWtfyComponent.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.RhzfWtfyModule;
+import com.zkjc.policedemo.mvp.contract.RhzfWtfyContract;
+
+import com.jess.arms.di.scope.FragmentScope;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfWtfyFragment;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 15:21
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+@Component(modules = RhzfWtfyModule.class, dependencies = AppComponent.class)
+public interface RhzfWtfyComponent {
+    void inject(RhzfWtfyFragment fragment);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        RhzfWtfyComponent.Builder view(RhzfWtfyContract.View view);
+
+        RhzfWtfyComponent.Builder appComponent(AppComponent appComponent);
+
+        RhzfWtfyComponent build();
+    }
+}

app/src/main/java/com/zkjc/policedemo/di/component/RhzfYyfwComponent.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.RhzfYyfwModule;
+import com.zkjc.policedemo.mvp.contract.RhzfYyfwContract;
+
+import com.jess.arms.di.scope.FragmentScope;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfYyfwFragment;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:57
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+@Component(modules = RhzfYyfwModule.class, dependencies = AppComponent.class)
+public interface RhzfYyfwComponent {
+    void inject(RhzfYyfwFragment fragment);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        RhzfYyfwComponent.Builder view(RhzfYyfwContract.View view);
+
+        RhzfYyfwComponent.Builder appComponent(AppComponent appComponent);
+
+        RhzfYyfwComponent build();
+    }
+}

app/src/main/java/com/zkjc/policedemo/di/component/RhzfZqyjComponent.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.RhzfZqyjModule;
+import com.zkjc.policedemo.mvp.contract.RhzfZqyjContract;
+
+import com.jess.arms.di.scope.FragmentScope;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfZqyjFragment;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 15:21
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+@Component(modules = RhzfZqyjModule.class, dependencies = AppComponent.class)
+public interface RhzfZqyjComponent {
+    void inject(RhzfZqyjFragment fragment);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        RhzfZqyjComponent.Builder view(RhzfZqyjContract.View view);
+
+        RhzfZqyjComponent.Builder appComponent(AppComponent appComponent);
+
+        RhzfZqyjComponent build();
+    }
+}

app/src/main/java/com/zkjc/policedemo/di/component/SelectSydwFwComponent.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.SelectSydwFwModule;
+import com.zkjc.policedemo.mvp.contract.SelectSydwFwContract;
+
+import com.jess.arms.di.scope.ActivityScope;
+import com.zkjc.policedemo.mvp.ui.activity.SelectSydwFwActivity;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/19/2024 09:53
+ * <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 = SelectSydwFwModule.class, dependencies = AppComponent.class)
+public interface SelectSydwFwComponent {
+    void inject(SelectSydwFwActivity activity);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        SelectSydwFwComponent.Builder view(SelectSydwFwContract.View view);
+
+        SelectSydwFwComponent.Builder appComponent(AppComponent appComponent);
+
+        SelectSydwFwComponent build();
+    }
+}

app/src/main/java/com/zkjc/policedemo/di/module/AqffxcModule.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.AqffxcContract;
+import com.zkjc.policedemo.mvp.model.AqffxcModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 14:52
+ * <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 AqffxcModule {
+
+    @Binds
+    abstract AqffxcContract.Model bindAqffxcModel(AqffxcModel model);
+}

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

@@ -0,0 +1,30 @@
+package com.zkjc.policedemo.di.module;
+
+import com.jess.arms.di.scope.FragmentScope;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+
+import com.zkjc.policedemo.mvp.contract.RhzfAqffxcContract;
+import com.zkjc.policedemo.mvp.model.RhzfAqffxcModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 14:53
+ * <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 RhzfAqffxcModule {
+
+    @Binds
+    abstract RhzfAqffxcContract.Model bindRhzfAqffxcModel(RhzfAqffxcModel model);
+}

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

@@ -0,0 +1,30 @@
+package com.zkjc.policedemo.di.module;
+
+import com.jess.arms.di.scope.FragmentScope;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+
+import com.zkjc.policedemo.mvp.contract.RhzfSmfwContract;
+import com.zkjc.policedemo.mvp.model.RhzfSmfwModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:56
+ * <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 RhzfSmfwModule {
+
+    @Binds
+    abstract RhzfSmfwContract.Model bindRhzfSmfwModel(RhzfSmfwModel model);
+}

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

@@ -0,0 +1,30 @@
+package com.zkjc.policedemo.di.module;
+
+import com.jess.arms.di.scope.FragmentScope;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+
+import com.zkjc.policedemo.mvp.contract.RhzfSydwContract;
+import com.zkjc.policedemo.mvp.model.RhzfSydwModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 09:31
+ * <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 RhzfSydwModule {
+
+    @Binds
+    abstract RhzfSydwContract.Model bindRhzfSydwModel(RhzfSydwModel model);
+}

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

@@ -0,0 +1,30 @@
+package com.zkjc.policedemo.di.module;
+
+import com.jess.arms.di.scope.FragmentScope;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+
+import com.zkjc.policedemo.mvp.contract.RhzfTdrkgkContract;
+import com.zkjc.policedemo.mvp.model.RhzfTdrkgkModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 09:19
+ * <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 RhzfTdrkgkModule {
+
+    @Binds
+    abstract RhzfTdrkgkContract.Model bindRhzfTdrkgkModel(RhzfTdrkgkModel model);
+}

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

@@ -0,0 +1,30 @@
+package com.zkjc.policedemo.di.module;
+
+import com.jess.arms.di.scope.FragmentScope;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+
+import com.zkjc.policedemo.mvp.contract.RhzfWtfwContract;
+import com.zkjc.policedemo.mvp.model.RhzfWtfwModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:57
+ * <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 RhzfWtfwModule {
+
+    @Binds
+    abstract RhzfWtfwContract.Model bindRhzfWtfwModel(RhzfWtfwModel model);
+}

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

@@ -0,0 +1,30 @@
+package com.zkjc.policedemo.di.module;
+
+import com.jess.arms.di.scope.FragmentScope;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+
+import com.zkjc.policedemo.mvp.contract.RhzfWtfyContract;
+import com.zkjc.policedemo.mvp.model.RhzfWtfyModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 15:21
+ * <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 RhzfWtfyModule {
+
+    @Binds
+    abstract RhzfWtfyContract.Model bindRhzfWtfyModel(RhzfWtfyModel model);
+}

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

@@ -0,0 +1,30 @@
+package com.zkjc.policedemo.di.module;
+
+import com.jess.arms.di.scope.FragmentScope;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+
+import com.zkjc.policedemo.mvp.contract.RhzfYyfwContract;
+import com.zkjc.policedemo.mvp.model.RhzfYyfwModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:57
+ * <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 RhzfYyfwModule {
+
+    @Binds
+    abstract RhzfYyfwContract.Model bindRhzfYyfwModel(RhzfYyfwModel model);
+}

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

@@ -0,0 +1,30 @@
+package com.zkjc.policedemo.di.module;
+
+import com.jess.arms.di.scope.FragmentScope;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+
+import com.zkjc.policedemo.mvp.contract.RhzfZqyjContract;
+import com.zkjc.policedemo.mvp.model.RhzfZqyjModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 15:21
+ * <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 RhzfZqyjModule {
+
+    @Binds
+    abstract RhzfZqyjContract.Model bindRhzfZqyjModel(RhzfZqyjModel model);
+}

app/src/main/java/com/zkjc/policedemo/di/module/SelectSydwFwModule.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.SelectSydwFwContract;
+import com.zkjc.policedemo.mvp.model.SelectSydwFwModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/19/2024 09:53
+ * <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 SelectSydwFwModule {
+
+    @Binds
+    abstract SelectSydwFwContract.Model bindSelectSydwFwModel(SelectSydwFwModel model);
+}

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

@@ -0,0 +1,31 @@
+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.RhzfEntity;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 14:52
+ * <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 AqffxcContract {
+    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
+    interface View extends IView {
+
+        void onCommitSuccess(RhzfEntity.Room data);
+    }
+
+    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
+    interface Model extends IModel {
+
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/contract/CyryhcContract.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.SydwEntity;
 
 
 /**
@@ -20,6 +21,10 @@ public interface CyryhcContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void getRyDataSuccess(String result, String sfhm);
+
+        void onSaveSuccess(String result, SydwEntity.Cyry cyry);
+
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

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

@@ -2,6 +2,9 @@ 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.SydwEntity;
+
+import java.util.List;
 
 
 /**
@@ -20,6 +23,7 @@ public interface LscyryContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onGetListSuccess(List<SydwEntity.Cyry> data);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/RhzfAqffxcContract.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/15/2024 14:53
+ * <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 RhzfAqffxcContract {
+    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
+    interface View extends IView {
+
+    }
+
+    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
+    interface Model extends IModel {
+
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/contract/RhzfQzqzContract.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.RhzfEntity;
 
 
 /**
@@ -20,6 +21,7 @@ public interface RhzfQzqzContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onCommitSuccess(RhzfEntity.Room data);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/RhzfSmfwContract.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/14/2024 16:56
+ * <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 RhzfSmfwContract {
+    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
+    interface View extends IView {
+
+    }
+
+    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
+    interface Model extends IModel {
+
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/contract/RhzfSydwContract.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/15/2024 09:31
+ * <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 RhzfSydwContract {
+    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
+    interface View extends IView {
+
+    }
+
+    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
+    interface Model extends IModel {
+
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/contract/RhzfTdrkgkContract.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/15/2024 09:19
+ * <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 RhzfTdrkgkContract {
+    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
+    interface View extends IView {
+
+    }
+
+    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
+    interface Model extends IModel {
+
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/contract/RhzfWtfwContract.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/14/2024 16:57
+ * <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 RhzfWtfwContract {
+    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
+    interface View extends IView {
+
+    }
+
+    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
+    interface Model extends IModel {
+
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/contract/RhzfWtfyContract.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/14/2024 15:21
+ * <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 RhzfWtfyContract {
+    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
+    interface View extends IView {
+
+    }
+
+    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
+    interface Model extends IModel {
+
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/contract/RhzfYyfwContract.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/14/2024 16:57
+ * <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 RhzfYyfwContract {
+    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
+    interface View extends IView {
+
+    }
+
+    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
+    interface Model extends IModel {
+
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/contract/RhzfZqyjContract.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/14/2024 15:21
+ * <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 RhzfZqyjContract {
+    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
+    interface View extends IView {
+
+    }
+
+    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
+    interface Model extends IModel {
+
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/contract/RhzfjxcsLbContract.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.RhzfEntity;
 
 
 /**
@@ -20,6 +21,7 @@ public interface RhzfjxcsLbContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onCommitSuccess(RhzfEntity.Room data);
     }
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
     interface Model extends IModel{

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

@@ -0,0 +1,33 @@
+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.RhzfEntity;
+
+import java.util.List;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/19/2024 09:53
+ * <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 SelectSydwFwContract {
+    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
+    interface View extends IView {
+
+        void onDetailDataSuccess(List<RhzfEntity.Unit> data);
+    }
+
+    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
+    interface Model extends IModel {
+
+    }
+}

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

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

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

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

app/src/main/java/com/zkjc/policedemo/mvp/contract/SydwRightContract.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.SydwEntity;
 
 
 /**
@@ -20,6 +21,7 @@ public interface SydwRightContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onDeleteSuccess(int posotion);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

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

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

app/src/main/java/com/zkjc/policedemo/mvp/contract/WtfyContract.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.RhzfEntity;
 
 
 /**
@@ -20,6 +21,7 @@ public interface WtfyContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onCommitSuccess(RhzfEntity.Room data);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/XzSydwContract.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.SydwEntity;
+import com.zkjc.policedemo.mvp.model.entity.ZdAllEntity;
 
 
 /**
@@ -20,6 +22,11 @@ public interface XzSydwContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onGetDictionarySuccess(ZdAllEntity.DataBean data);
+
+        void onSaveSuccess();
+
+        void onGetDetailSuccess(SydwEntity.Sydw data);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/contract/ZqyjContract.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.RhzfEntity;
 
 
 /**
@@ -20,6 +21,7 @@ public interface ZqyjContract {
     //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
     interface View extends IView {
 
+        void onCommitSuccess(RhzfEntity.Room data);
     }
 
     //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存

app/src/main/java/com/zkjc/policedemo/mvp/model/AqffxcModel.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.AqffxcContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 14:52
+ * <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 AqffxcModel extends BaseModel implements AqffxcContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public AqffxcModel(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/RhzfAqffxcModel.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.FragmentScope;
+
+import javax.inject.Inject;
+
+import com.zkjc.policedemo.mvp.contract.RhzfAqffxcContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 14:53
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfAqffxcModel extends BaseModel implements RhzfAqffxcContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public RhzfAqffxcModel(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/RhzfSmfwModel.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.FragmentScope;
+
+import javax.inject.Inject;
+
+import com.zkjc.policedemo.mvp.contract.RhzfSmfwContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:56
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfSmfwModel extends BaseModel implements RhzfSmfwContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public RhzfSmfwModel(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/RhzfSydwModel.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.FragmentScope;
+
+import javax.inject.Inject;
+
+import com.zkjc.policedemo.mvp.contract.RhzfSydwContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 09:31
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfSydwModel extends BaseModel implements RhzfSydwContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public RhzfSydwModel(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/RhzfTdrkgkModel.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.FragmentScope;
+
+import javax.inject.Inject;
+
+import com.zkjc.policedemo.mvp.contract.RhzfTdrkgkContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 09:19
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfTdrkgkModel extends BaseModel implements RhzfTdrkgkContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public RhzfTdrkgkModel(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/RhzfWtfwModel.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.FragmentScope;
+
+import javax.inject.Inject;
+
+import com.zkjc.policedemo.mvp.contract.RhzfWtfwContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:57
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfWtfwModel extends BaseModel implements RhzfWtfwContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public RhzfWtfwModel(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/RhzfWtfyModel.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.FragmentScope;
+
+import javax.inject.Inject;
+
+import com.zkjc.policedemo.mvp.contract.RhzfWtfyContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 15:21
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfWtfyModel extends BaseModel implements RhzfWtfyContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public RhzfWtfyModel(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/RhzfYyfwModel.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.FragmentScope;
+
+import javax.inject.Inject;
+
+import com.zkjc.policedemo.mvp.contract.RhzfYyfwContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:57
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfYyfwModel extends BaseModel implements RhzfYyfwContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public RhzfYyfwModel(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/RhzfZqyjModel.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.FragmentScope;
+
+import javax.inject.Inject;
+
+import com.zkjc.policedemo.mvp.contract.RhzfZqyjContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 15:21
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfZqyjModel extends BaseModel implements RhzfZqyjContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public RhzfZqyjModel(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/SelectSydwFwModel.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.SelectSydwFwContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/19/2024 09:53
+ * <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 SelectSydwFwModel extends BaseModel implements SelectSydwFwContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public SelectSydwFwModel(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/entity/Aqffxc.java

@@ -0,0 +1,33 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+
+public class Aqffxc implements Serializable {
+    private String xcnr;
+    private String fj;
+    private long createTime;
+
+    public String getXcnr() {
+        return xcnr;
+    }
+
+    public void setXcnr(String xcnr) {
+        this.xcnr = xcnr;
+    }
+
+    public String getFj() {
+        return fj;
+    }
+
+    public void setFj(String fj) {
+        this.fj = fj;
+    }
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class CyryHistoryEntity implements Serializable{
+
+    private int code;
+    private boolean success;
+    private String msg;
+    private List<SydwEntity.Cyry> data;
+
+    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 List<SydwEntity.Cyry> getData() {
+        return data;
+    }
+
+    public void setData(List<SydwEntity.Cyry> data) {
+        this.data = data;
+    }
+
+}

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

@@ -1,31 +0,0 @@
-package com.zkjc.policedemo.mvp.model.entity;
-
-public class DwlbEntity {
-    private String url;
-    private String title;
-    private String number;
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getNumber() {
-        return number;
-    }
-
-    public void setNumber(String number) {
-        this.number = number;
-    }
-}

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

@@ -1,11 +1,30 @@
 package com.zkjc.policedemo.mvp.model.entity;
 
 import java.io.Serializable;
+import java.util.List;
 
 public class Fwtd implements Serializable {
     private String value;
     private String label;
     private boolean select;
+    private String id;
+    private List<Fwtd> dwlxList;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public List<Fwtd> getDwlxList() {
+        return dwlxList;
+    }
+
+    public void setDwlxList(List<Fwtd> dwlxList) {
+        this.dwlxList = dwlxList;
+    }
 
     public String getValue() {
         return value;

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

@@ -374,14 +374,41 @@ public class RhzfEntity {
         private List<RhxxBean> listDelete;
 
         private String fwlx;
-        private String wtfy;
+        private List<Wtfy> wtfyHistory;
         private String wtfyFj;
-        private String gzyj;
+        private List<Zqyj> gzyjHistory;
+        private List<FwqzEntity.Fwqz> fwqzHistory;
         private String qzzp;
         private String mdId;
         private String zp; // 房屋照片
         private String fwzpLocal; // 房屋照片的本地地址
         private List<Jxcs> jxcsList;
+        private List<Aqffxc> aqxcffHistory;
+        private SydwEntity.Sydw sydw;
+
+        public SydwEntity.Sydw getSydw() {
+            return sydw;
+        }
+
+        public void setSydw(SydwEntity.Sydw sydw) {
+            this.sydw = sydw;
+        }
+
+        public List<Aqffxc> getAqxcffHistory() {
+            return aqxcffHistory;
+        }
+
+        public void setAqxcffHistory(List<Aqffxc> aqxcffHistory) {
+            this.aqxcffHistory = aqxcffHistory;
+        }
+
+        public List<FwqzEntity.Fwqz> getFwqzHistory() {
+            return fwqzHistory;
+        }
+
+        public void setFwqzHistory(List<FwqzEntity.Fwqz> fwqzHistory) {
+            this.fwqzHistory = fwqzHistory;
+        }
 
         public String getFwzpLocal() {
             return fwzpLocal;
@@ -463,13 +490,6 @@ public class RhzfEntity {
             this.fwlx = fwlx;
         }
 
-        public String getWtfy() {
-            return wtfy;
-        }
-
-        public void setWtfy(String wtfy) {
-            this.wtfy = wtfy;
-        }
 
         public String getWtfyFj() {
             return wtfyFj;
@@ -479,12 +499,20 @@ public class RhzfEntity {
             this.wtfyFj = wtfyFj;
         }
 
-        public String getGzyj() {
-            return gzyj;
+        public List<Wtfy> getWtfyHistory() {
+            return wtfyHistory;
+        }
+
+        public void setWtfyHistory(List<Wtfy> wtfyHistory) {
+            this.wtfyHistory = wtfyHistory;
+        }
+
+        public List<Zqyj> getGzyjHistory() {
+            return gzyjHistory;
         }
 
-        public void setGzyj(String gzyj) {
-            this.gzyj = gzyj;
+        public void setGzyjHistory(List<Zqyj> gzyjHistory) {
+            this.gzyjHistory = gzyjHistory;
         }
 
         public String getQzzp() {

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

@@ -1,5 +1,7 @@
 package com.zkjc.policedemo.mvp.model.entity;
 
+import java.io.Serializable;
+
 public class RkxxEntity {
 
     private int code;
@@ -39,7 +41,7 @@ public class RkxxEntity {
         this.data = data;
     }
 
-    public static class Rkxx {
+    public static class Rkxx implements Serializable {
         //fzXm,  姓名
         //fzDh,   电话
         //hjdz,  地址
@@ -64,6 +66,7 @@ public class RkxxEntity {
         //jzdpcs,  居住地派出所
         //jzdpcsdm  居住地派出所代码
         private String fzXm;
+        private String gmsfhm;
         private String rk_jbxxly;
         private String fzDh;
         private String csrq;
@@ -85,6 +88,14 @@ public class RkxxEntity {
         private String ryZzmm;
         private String ryZzmmDm;
 
+        public String getGmsfhm() {
+            return gmsfhm;
+        }
+
+        public void setGmsfhm(String gmsfhm) {
+            this.gmsfhm = gmsfhm;
+        }
+
         public String getRyxb() {
             return ryxb;
         }

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

@@ -0,0 +1,48 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class SydwDetailEntity implements Serializable{
+
+    private int code;
+    private boolean success;
+    private String msg;
+    private SydwEntity.Sydw data;
+
+    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 SydwEntity.Sydw getData() {
+        return data;
+    }
+
+    public void setData(SydwEntity.Sydw data) {
+        this.data = data;
+    }
+
+    public static class DataBean implements Serializable {
+    }
+
+}

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

@@ -0,0 +1,489 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+import java.util.IdentityHashMap;
+import java.util.List;
+
+public class SydwEntity implements Serializable{
+
+    private int code;
+    private boolean success;
+    private String msg;
+    private DataBean data;
+
+    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 DataBean getData() {
+        return data;
+    }
+
+    public void setData(DataBean data) {
+        this.data = data;
+    }
+
+    public static class DataBean implements Serializable {
+        private List<Sydw> records;
+
+        public List<Sydw> getRecords() {
+            return records;
+        }
+
+        public void setRecords(List<Sydw> records) {
+            this.records = records;
+        }
+    }
+
+    public static class Sydw implements Serializable {
+        private String id;
+        // 从业人员数量
+        private String cyry;
+        // 单位名称
+        private String dwmc;
+        // 统一社会信用代码
+        private String tyshxydm;
+        // 行业类别
+        private String hylb;
+        // 行业类别代码
+        private String hylbDm;
+        // 单位类型
+        private String dwlx;
+        // 单位类型
+        private String dwlxDm;
+        // 经营范围
+        private String zyjyfw;
+        // 经营面积(平方米)
+        private String jymj;
+        // 经营方式
+        private String jyfs;
+        // 营业执照起始日期
+        private String yyzzqsrq;
+        // 营业执照截止日期
+        private String yyzzjzrq;
+        // 注册资金
+        private String zczj;
+        // 联系电话
+        private String lxdh;
+        // 网址
+        private String wz;
+        // 重点单位标识
+        private String zddwbs;
+        // 所属社区
+        private String sssqBm;
+        // 标准地址
+        private String dzbm;
+        // 地址名称
+        private String dzmc;
+        // 法人姓名
+        private String frxm;
+        // 法人证件类型
+        private String frzjlx;
+        // 法人证件号码
+        private String frzjhm;
+        // 法人联系电话
+        private String frlxdh;
+        // 保卫负责人证件类型
+        private String bwfzrzjlx;
+        // 保卫负责人证件号码
+        private String bwfzrzjhm;
+        // 保卫负责人姓名
+        private String bwfzrxm;
+        // 保卫负责人联系电话
+        private String bwfzrlxdh;
+        // 从业人员
+        private List<Cyry> cyryList;
+        // 营业状态
+        private int yyzt;
+
+        public int getYyzt() {
+            return yyzt;
+        }
+
+        public void setYyzt(int yyzt) {
+            this.yyzt = yyzt;
+        }
+
+        public List<Cyry> getCyryList() {
+            return cyryList;
+        }
+
+        public void setCyryList(List<Cyry> cyryList) {
+            this.cyryList = cyryList;
+        }
+
+        public String getCyry() {
+            return cyry;
+        }
+
+        public void setCyry(String cyry) {
+            this.cyry = cyry;
+        }
+
+        public String getHylbDm() {
+            return hylbDm;
+        }
+
+        public void setHylbDm(String hylbDm) {
+            this.hylbDm = hylbDm;
+        }
+
+        public String getDwlxDm() {
+            return dwlxDm;
+        }
+
+        public void setDwlxDm(String dwlxDm) {
+            this.dwlxDm = dwlxDm;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getFrxm() {
+            return frxm;
+        }
+
+        public void setFrxm(String frxm) {
+            this.frxm = frxm;
+        }
+
+        public String getFrzjlx() {
+            return frzjlx;
+        }
+
+        public void setFrzjlx(String frzjlx) {
+            this.frzjlx = frzjlx;
+        }
+
+        public String getFrzjhm() {
+            return frzjhm;
+        }
+
+        public void setFrzjhm(String frzjhm) {
+            this.frzjhm = frzjhm;
+        }
+
+        public String getFrlxdh() {
+            return frlxdh;
+        }
+
+        public void setFrlxdh(String frlxdh) {
+            this.frlxdh = frlxdh;
+        }
+
+        public String getBwfzrzjlx() {
+            return bwfzrzjlx;
+        }
+
+        public void setBwfzrzjlx(String bwfzrzjlx) {
+            this.bwfzrzjlx = bwfzrzjlx;
+        }
+
+        public String getBwfzrzjhm() {
+            return bwfzrzjhm;
+        }
+
+        public void setBwfzrzjhm(String bwfzrzjhm) {
+            this.bwfzrzjhm = bwfzrzjhm;
+        }
+
+        public String getBwfzrxm() {
+            return bwfzrxm;
+        }
+
+        public void setBwfzrxm(String bwfzrxm) {
+            this.bwfzrxm = bwfzrxm;
+        }
+
+        public String getBwfzrlxdh() {
+            return bwfzrlxdh;
+        }
+
+        public void setBwfzrlxdh(String bwfzrlxdh) {
+            this.bwfzrlxdh = bwfzrlxdh;
+        }
+
+        public String getDzmc() {
+            return dzmc;
+        }
+
+        public void setDzmc(String dzmc) {
+            this.dzmc = dzmc;
+        }
+
+        public String getDwmc() {
+            return dwmc;
+        }
+
+        public void setDwmc(String dwmc) {
+            this.dwmc = dwmc;
+        }
+
+        public String getTyshxydm() {
+            return tyshxydm;
+        }
+
+        public void setTyshxydm(String tyshxydm) {
+            this.tyshxydm = tyshxydm;
+        }
+
+        public String getHylb() {
+            return hylb;
+        }
+
+        public void setHylb(String hylb) {
+            this.hylb = hylb;
+        }
+
+        public String getDwlx() {
+            return dwlx;
+        }
+
+        public void setDwlx(String dwlx) {
+            this.dwlx = dwlx;
+        }
+
+        public String getZyjyfw() {
+            return zyjyfw;
+        }
+
+        public void setZyjyfw(String zyjyfw) {
+            this.zyjyfw = zyjyfw;
+        }
+
+        public String getJymj() {
+            return jymj;
+        }
+
+        public void setJymj(String jymj) {
+            this.jymj = jymj;
+        }
+
+        public String getJyfs() {
+            return jyfs;
+        }
+
+        public void setJyfs(String jyfs) {
+            this.jyfs = jyfs;
+        }
+
+        public String getYyzzqsrq() {
+            return yyzzqsrq;
+        }
+
+        public void setYyzzqsrq(String yyzzqsrq) {
+            this.yyzzqsrq = yyzzqsrq;
+        }
+
+        public String getYyzzjzrq() {
+            return yyzzjzrq;
+        }
+
+        public void setYyzzjzrq(String yyzzjzrq) {
+            this.yyzzjzrq = yyzzjzrq;
+        }
+
+        public String getZczj() {
+            return zczj;
+        }
+
+        public void setZczj(String zczj) {
+            this.zczj = zczj;
+        }
+
+        public String getLxdh() {
+            return lxdh;
+        }
+
+        public void setLxdh(String lxdh) {
+            this.lxdh = lxdh;
+        }
+
+        public String getWz() {
+            return wz;
+        }
+
+        public void setWz(String wz) {
+            this.wz = wz;
+        }
+
+        public String getZddwbs() {
+            return zddwbs;
+        }
+
+        public void setZddwbs(String zddwbs) {
+            this.zddwbs = zddwbs;
+        }
+
+        public String getSssqBm() {
+            return sssqBm;
+        }
+
+        public void setSssqBm(String sssqBm) {
+            this.sssqBm = sssqBm;
+        }
+
+        public String getDzbm() {
+            return dzbm;
+        }
+
+        public void setDzbm(String dzbm) {
+            this.dzbm = dzbm;
+        }
+    }
+
+    public static class Cyry implements Serializable {
+        // dwdzbm  单位地址编码
+        //tyshxydm  统一社会信用代码
+        //xm  姓名
+        //gmsfhm  公民身份号码
+        //xb  性别
+        //zy  职业（手填）
+        //zylb  职业类别（汉字）
+        //zylbDm 职业类别（代码）
+        //lxdh  联系电话
+        //xz  现居住地
+        private long createTime;
+        private String id;
+        private String zp;
+        private String dwdzbm;
+        private String tyshxydm;
+        private String xm;
+        private String gmsfhm;
+        private String xb;
+        private String zy;
+        private String zylb;
+        private String zylbDm;
+        private String lxdh;
+        private String xz;
+
+        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 long getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(long createTime) {
+            this.createTime = createTime;
+        }
+
+        public String getDwdzbm() {
+            return dwdzbm;
+        }
+
+        public void setDwdzbm(String dwdzbm) {
+            this.dwdzbm = dwdzbm;
+        }
+
+        public String getTyshxydm() {
+            return tyshxydm;
+        }
+
+        public void setTyshxydm(String tyshxydm) {
+            this.tyshxydm = tyshxydm;
+        }
+
+        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 getZy() {
+            return zy;
+        }
+
+        public void setZy(String zy) {
+            this.zy = zy;
+        }
+
+        public String getZylb() {
+            return zylb;
+        }
+
+        public void setZylb(String zylb) {
+            this.zylb = zylb;
+        }
+
+        public String getZylbDm() {
+            return zylbDm;
+        }
+
+        public void setZylbDm(String zylbDm) {
+            this.zylbDm = zylbDm;
+        }
+
+        public String getLxdh() {
+            return lxdh;
+        }
+
+        public void setLxdh(String lxdh) {
+            this.lxdh = lxdh;
+        }
+
+        public String getXz() {
+            return xz;
+        }
+
+        public void setXz(String xz) {
+            this.xz = xz;
+        }
+    }
+}

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

@@ -0,0 +1,84 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class SydwHyEntity implements Serializable{
+
+    private int code;
+    private boolean success;
+    private String msg;
+    private List<SydwHy> data;
+
+    public List<SydwHy> getData() {
+        return data;
+    }
+
+    public void setData(List<SydwHy> data) {
+        this.data = data;
+    }
+
+    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 static class SydwHy implements Serializable {
+        private String icon;
+        private String name;
+        private String num;
+        private String id;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getIcon() {
+            return icon;
+        }
+
+        public void setIcon(String icon) {
+            this.icon = icon;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getNum() {
+            return num;
+        }
+
+        public void setNum(String num) {
+            this.num = num;
+        }
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+
+public class Wtfy implements Serializable {
+    private String wtfy;
+    private String wtfyFj;
+    private long createTime;
+
+    public String getWtfy() {
+        return wtfy;
+    }
+
+    public void setWtfy(String wtfy) {
+        this.wtfy = wtfy;
+    }
+
+    public String getWtfyFj() {
+        return wtfyFj;
+    }
+
+    public void setWtfyFj(String wtfyFj) {
+        this.wtfyFj = wtfyFj;
+    }
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+}

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

@@ -84,6 +84,33 @@ public class ZdAllEntity implements Serializable {
         private List<Fwtd> smfwlx; // 上门服务类型
         private List<Fwtd> wtfwlx; // 委托服务类型
         private List<Fwtd> yyfwlx; // 委托服务类型
+        private List<Fwtd> jyfs; // 经营方式
+        private List<Fwtd> hylx; // 行业类型
+        private List<Fwtd> zylb; // 行业类型
+
+        public List<Fwtd> getZylb() {
+            return zylb;
+        }
+
+        public void setZylb(List<Fwtd> zylb) {
+            this.zylb = zylb;
+        }
+
+        public List<Fwtd> getHylx() {
+            return hylx;
+        }
+
+        public void setHylx(List<Fwtd> hylx) {
+            this.hylx = hylx;
+        }
+
+        public List<Fwtd> getJyfs() {
+            return jyfs;
+        }
+
+        public void setJyfs(List<Fwtd> jyfs) {
+            this.jyfs = jyfs;
+        }
 
         public List<Fwtd> getSmfwlx() {
             return smfwlx;

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

@@ -0,0 +1,24 @@
+package com.zkjc.policedemo.mvp.model.entity;
+
+import java.io.Serializable;
+
+public class Zqyj implements Serializable {
+    private long createTime;
+    private String gzyj;
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getGzyj() {
+        return gzyj;
+    }
+
+    public void setGzyj(String gzyj) {
+        this.gzyj = gzyj;
+    }
+}

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

@@ -0,0 +1,99 @@
+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;
+import com.jess.arms.http.imageloader.ImageLoader;
+
+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.AqffxcContract;
+import com.zkjc.policedemo.mvp.model.entity.RhzfRoomEntity;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 14:52
+ * <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 AqffxcPresenter extends BasePresenter<AqffxcContract.Model, AqffxcContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public AqffxcPresenter(AqffxcContract.Model model, AqffxcContract.View rootView) {
+        super(model, rootView);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        this.mErrorHandler = null;
+        this.mAppManager = null;
+        this.mImageLoader = null;
+        this.mApplication = null;
+    }
+
+    public void commitRhxx(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "fwInfoController");
+        map1.put("methodName", "saveFwAndRy");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                try {
+                    RhzfRoomEntity entity = new Gson().fromJson(result, RhzfRoomEntity.class);
+                    int code = entity.getCode();
+                    if (code == 200) {
+                        if (mRootView != null) {
+                            mRootView.onCommitSuccess(entity.getData());
+                        }
+                    } else {
+                        ToastUtils.show(entity.getMsg());
+                    }
+                } catch (Exception e) {
+                    ToastUtils.show("提交失败,请重试！");
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("提交失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
+}

app/src/main/java/com/zkjc/policedemo/mvp/presenter/CyryhcPresenter.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,15 @@ 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.CyryhcContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+import com.zkjc.policedemo.mvp.model.entity.SydwEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +60,64 @@ public class CyryhcPresenter extends BasePresenter<CyryhcContract.Model, CyryhcC
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void getRyData(Map<String, String> map, String sfhm) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "userController");
+        map1.put("methodName", "selectRyxxBySfzh");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                if (mRootView != null)
+                    mRootView.getRyDataSuccess(result, sfhm);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
+
+    public void update(Map<String, Object> map, SydwEntity.Cyry cyry) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "sydwController");
+        map1.put("methodName", "saveCyry");
+        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) {
+                        cyry.setCreateTime(System.currentTimeMillis());
+                        mRootView.onSaveSuccess(result, cyry);
+                    }
+                } 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/LscyryPresenter.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,15 @@ 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.LscyryContract;
+import com.zkjc.policedemo.mvp.model.entity.CyryHistoryEntity;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +60,36 @@ public class LscyryPresenter extends BasePresenter<LscyryContract.Model, LscyryC
         this.mImageLoader = null;
         this.mApplication = null;
     }
+    public void getList(Map<String, String> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "sydwController");
+        map1.put("methodName", "cyryHistory");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                CyryHistoryEntity entity = new Gson().fromJson(result, CyryHistoryEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onGetListSuccess(entity.getData());
+                    }
+                } 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/RhzfAqffxcPresenter.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.FragmentScope;
+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.RhzfAqffxcContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 14:53
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfAqffxcPresenter extends BasePresenter<RhzfAqffxcContract.Model, RhzfAqffxcContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public RhzfAqffxcPresenter(RhzfAqffxcContract.Model model, RhzfAqffxcContract.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/RhzfQzqzPresenter.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.FragmentScope;
 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.RhzfQzqzContract;
+import com.zkjc.policedemo.mvp.model.entity.RhzfRoomEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +59,41 @@ public class RhzfQzqzPresenter extends BasePresenter<RhzfQzqzContract.Model, Rhz
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void commitRhxx(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "fwInfoController");
+        map1.put("methodName", "saveFwAndRy");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                try {
+                    RhzfRoomEntity entity = new Gson().fromJson(result, RhzfRoomEntity.class);
+                    int code = entity.getCode();
+                    if (code == 200) {
+                        if (mRootView != null) {
+                            mRootView.onCommitSuccess(entity.getData());
+                        }
+                    } else {
+                        ToastUtils.show(entity.getMsg());
+                    }
+                } catch (Exception e) {
+                    ToastUtils.show("提交失败,请重试！");
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("提交失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/RhzfSmfwPresenter.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.FragmentScope;
+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.RhzfSmfwContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:56
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfSmfwPresenter extends BasePresenter<RhzfSmfwContract.Model, RhzfSmfwContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public RhzfSmfwPresenter(RhzfSmfwContract.Model model, RhzfSmfwContract.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/RhzfSydwPresenter.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.FragmentScope;
+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.RhzfSydwContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 09:31
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfSydwPresenter extends BasePresenter<RhzfSydwContract.Model, RhzfSydwContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public RhzfSydwPresenter(RhzfSydwContract.Model model, RhzfSydwContract.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/RhzfTdrkgkPresenter.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.FragmentScope;
+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.RhzfTdrkgkContract;
+
+
+/**
+ * ================================================
+ * Description: 特定人口管控
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 09:19
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfTdrkgkPresenter extends BasePresenter<RhzfTdrkgkContract.Model, RhzfTdrkgkContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public RhzfTdrkgkPresenter(RhzfTdrkgkContract.Model model, RhzfTdrkgkContract.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/RhzfWtfwPresenter.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.FragmentScope;
+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.RhzfWtfwContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:57
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfWtfwPresenter extends BasePresenter<RhzfWtfwContract.Model, RhzfWtfwContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public RhzfWtfwPresenter(RhzfWtfwContract.Model model, RhzfWtfwContract.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/RhzfWtfyPresenter.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.FragmentScope;
+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.RhzfWtfyContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 15:21
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfWtfyPresenter extends BasePresenter<RhzfWtfyContract.Model, RhzfWtfyContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public RhzfWtfyPresenter(RhzfWtfyContract.Model model, RhzfWtfyContract.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/RhzfYyfwPresenter.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.FragmentScope;
+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.RhzfYyfwContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 16:57
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfYyfwPresenter extends BasePresenter<RhzfYyfwContract.Model, RhzfYyfwContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public RhzfYyfwPresenter(RhzfYyfwContract.Model model, RhzfYyfwContract.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/RhzfZqyjPresenter.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.FragmentScope;
+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.RhzfZqyjContract;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/14/2024 15:21
+ * <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>
+ * ================================================
+ */
+@FragmentScope
+public class RhzfZqyjPresenter extends BasePresenter<RhzfZqyjContract.Model, RhzfZqyjContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public RhzfZqyjPresenter(RhzfZqyjContract.Model model, RhzfZqyjContract.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/RhzfjxcsLbPresenter.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;
@@ -9,7 +11,14 @@ import com.jess.arms.http.imageloader.ImageLoader;
 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.RhzfjxcsLbContract;
+import com.zkjc.policedemo.mvp.model.entity.RhzfRoomEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -48,4 +57,41 @@ public class RhzfjxcsLbPresenter extends BasePresenter<RhzfjxcsLbContract.Model,
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void commitRhxx(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "fwInfoController");
+        map1.put("methodName", "saveFwAndRy");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                try {
+                    RhzfRoomEntity entity = new Gson().fromJson(result, RhzfRoomEntity.class);
+                    int code = entity.getCode();
+                    if (code == 200) {
+                        if (mRootView != null) {
+                            mRootView.onCommitSuccess(entity.getData());
+                        }
+                    } else {
+                        ToastUtils.show(entity.getMsg());
+                    }
+                } catch (Exception e) {
+                    ToastUtils.show("提交失败,请重试！");
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("提交失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
 }

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

@@ -0,0 +1,94 @@
+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;
+import com.jess.arms.http.imageloader.ImageLoader;
+
+import me.jessyan.rxerrorhandler.core.RxErrorHandler;
+
+import javax.inject.Inject;
+
+import com.zkjc.policedemo.app.utils.CommonInterFace;
+import com.zkjc.policedemo.app.utils.ReqToBus;
+import com.zkjc.policedemo.mvp.contract.SelectSydwFwContract;
+import com.zkjc.policedemo.mvp.model.entity.RhzfDetailEntity;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/19/2024 09:53
+ * <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 SelectSydwFwPresenter extends BasePresenter<SelectSydwFwContract.Model, SelectSydwFwContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public SelectSydwFwPresenter(SelectSydwFwContract.Model model, SelectSydwFwContract.View rootView) {
+        super(model, rootView);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        this.mErrorHandler = null;
+        this.mAppManager = null;
+        this.mImageLoader = null;
+        this.mApplication = null;
+    }
+
+    public void getDetailData(Map<String, String> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "fwInfoController");
+        map1.put("methodName", "getLdDetail");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                RhzfDetailEntity entity = new Gson().fromJson(result, RhzfDetailEntity.class);
+                int code = entity.getCode();
+                if (code == 200) {
+                    if (mRootView != null) {
+                        mRootView.onDetailDataSuccess(entity.getData());
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                ToastUtils.show("获取详情失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
+}

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

@@ -11,8 +11,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.SydwLeftContract;
 
+import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * ================================================
@@ -50,4 +56,29 @@ public class SydwLeftPresenter extends BasePresenter<SydwLeftContract.Model, Syd
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void getSq() {
+        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.onGetSqSuccess(result);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/SydwPresenter.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.SydwContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +59,28 @@ public class SydwPresenter extends BasePresenter<SydwContract.Model, SydwContrac
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void getData(Map<String, String> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "sydwController");
+        map1.put("methodName", "cdPage");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                if (mRootView != null)
+                    mRootView.getDataSuccess(result);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/SydwRightPresenter.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.FragmentScope;
 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.SydwRightContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+import com.zkjc.policedemo.mvp.model.entity.SydwDetailEntity;
+import com.zkjc.policedemo.mvp.model.entity.SydwEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +61,37 @@ public class SydwRightPresenter extends BasePresenter<SydwRightContract.Model, S
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void delete(Map<String, String> map, int position) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "sydwController");
+        map1.put("methodName", "cyryzx");
+        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.onDeleteSuccess(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/SydwlbPresenter.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.SydwlbContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +59,65 @@ public class SydwlbPresenter extends BasePresenter<SydwlbContract.Model, SydwlbC
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void getSydwLb(Map<String, String> map) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("className", "sydwController");
+        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 modifyYyzt(Map<String, String> map, int position, int yyzt) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("className", "sydwController");
+        param.put("methodName", "update");
+        param.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(param, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                if (mRootView != null) {
+                    NormalEntity entity = new Gson().fromJson(result, NormalEntity.class);
+                    int code = entity.getCode();
+                    if (code == 200) {
+                        if (mRootView != null) {
+                            mRootView.onModifyYyztSuccess(result, position, yyzt);
+                        }
+                    } else {
+                        ToastUtils.show(entity.getMsg());
+                    }
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/WtfyPresenter.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.WtfyContract;
+import com.zkjc.policedemo.mvp.model.entity.RhzfRoomEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +59,41 @@ public class WtfyPresenter extends BasePresenter<WtfyContract.Model, WtfyContrac
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void commitRhxx(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "fwInfoController");
+        map1.put("methodName", "saveFwAndRy");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                try {
+                    RhzfRoomEntity entity = new Gson().fromJson(result, RhzfRoomEntity.class);
+                    int code = entity.getCode();
+                    if (code == 200) {
+                        if (mRootView != null) {
+                            mRootView.onCommitSuccess(entity.getData());
+                        }
+                    } else {
+                        ToastUtils.show(entity.getMsg());
+                    }
+                } catch (Exception e) {
+                    ToastUtils.show("提交失败,请重试！");
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                Utils.getInstances().dismissDialog();
+                ToastUtils.show("提交失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
 }

app/src/main/java/com/zkjc/policedemo/mvp/presenter/XzSydwPresenter.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,17 @@ 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.XzSydwContract;
+import com.zkjc.policedemo.mvp.model.entity.NormalEntity;
+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 +62,144 @@ public class XzSydwPresenter extends BasePresenter<XzSydwContract.Model, XzSydwC
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    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.onGetDictionarySuccess(data);
+                        }
+                    } else {
+                        ToastUtils.show("数据出错");
+                    }
+                } else {
+                    ToastUtils.show(entity.getMsg());
+                }
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+
+    }
+
+    public void getDetail(Map<String, String> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "sydwController");
+        map1.put("methodName", "detail");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                SydwDetailEntity entity = new Gson().fromJson(result, SydwDetailEntity.class);
+                SydwEntity.Sydw 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) {
+                ToastUtils.show("获取数据失败,请重试！");
+            }
+
+            @Override
+            public void onFinsh() {
+
+            }
+        });
+    }
+
+    public void save(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "sydwController");
+        map1.put("methodName", "sydwSave");
+        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();
+                    }
+                } 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", "sydwController");
+        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.onSaveSuccess();
+                    }
+                } 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/ZqyjPresenter.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.ZqyjContract;
+import com.zkjc.policedemo.mvp.model.entity.RhzfRoomEntity;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -50,4 +59,41 @@ public class ZqyjPresenter extends BasePresenter<ZqyjContract.Model, ZqyjContrac
         this.mImageLoader = null;
         this.mApplication = null;
     }
+
+    public void commitRhxx(Map<String, Object> map) {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("className", "fwInfoController");
+        map1.put("methodName", "saveFwAndRy");
+        map1.put("params", map);
+        ReqToBus.getInstance().init(mApplication).getRequest(map1, new CommonInterFace() {
+            @Override
+            public void onSuccess(String result) {
+                Utils.getInstances().dismissDialog();
+                try {
+                    RhzfRoomEntity entity = new Gson().fromJson(result, RhzfRoomEntity.class);
+                    int code = entity.getCode();
+                    if (code == 200) {
+                        if (mRootView != null) {
+                            mRootView.onCommitSuccess(entity.getData());
+                        }
+                    } else {
+                        ToastUtils.show(entity.getMsg());
+                    }
+                } catch (Exception e) {
+                    ToastUtils.show("提交失败,请重试！");
+                }
+            }
+
+            @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/AddCzrkActivity.java

@@ -553,8 +553,10 @@ public class AddCzrkActivity extends ZkjcBaseActivity<AddCzrkPresenter> implemen
                 Map<String, String> map = new HashMap<>();
                 map.put("sfzh", etSfzh.getText().toString());
 //                mPresenter.verifyRy(map);
-                Utils.getInstances().showDialog(AddCzrkActivity.this, "获取人员信息中");
-                mPresenter.getRyData(map);
+                if (ApkUtils.isSqjw(AddCzrkActivity.this)) {
+                    Utils.getInstances().showDialog(AddCzrkActivity.this, "获取人员信息中");
+                    mPresenter.getRyData(map);
+                }
             }
         });
         ll_price_select.setOnClickListener(new View.OnClickListener() {
@@ -1107,8 +1109,10 @@ public class AddCzrkActivity extends ZkjcBaseActivity<AddCzrkPresenter> implemen
                     Map<String, String> map = new HashMap<>();
                     map.put("sfzh", etSfzh.getText().toString());
 //                    mPresenter.verifyRy(map);
-                    Utils.getInstances().showDialog(AddCzrkActivity.this, "获取人员信息中");
-                    mPresenter.getRyData(map);
+                    if (ApkUtils.isSqjw(AddCzrkActivity.this)) {
+                        Utils.getInstances().showDialog(AddCzrkActivity.this, "获取人员信息中");
+                        mPresenter.getRyData(map);
+                    }
                 }
             }
 
@@ -1454,6 +1458,7 @@ public class AddCzrkActivity extends ZkjcBaseActivity<AddCzrkPresenter> implemen
     @Override
     public void onDeleteSuccess(boolean b) {
         if (b) {
+            setResult(RESULT_OK);
             finish();
         }
     }
@@ -1461,6 +1466,7 @@ public class AddCzrkActivity extends ZkjcBaseActivity<AddCzrkPresenter> implemen
     @Override
     public void onAddSuccess(boolean b) {
         if (b) {
+            setResult(RESULT_OK);
             finish();
         }
     }

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

@@ -818,6 +818,7 @@ public class AddWgrkActivity extends ZkjcBaseActivity<AddWgrkPresenter> implemen
     @Override
     public void onAddSuccess(boolean b) {
         if (b) {
+            setResult(RESULT_OK);
             finish();
         }
     }
@@ -825,6 +826,7 @@ public class AddWgrkActivity extends ZkjcBaseActivity<AddWgrkPresenter> implemen
     @Override
     public void onDeleteSuccess(boolean b) {
         if (b) {
+            setResult(RESULT_OK);
             finish();
         }
     }

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

@@ -483,8 +483,10 @@ public class AddWlhRkActivity extends ZkjcBaseActivity<AddWlhRkPresenter> implem
                 Map<String, String> map = new HashMap<>();
                 map.put("sfzh", etSfzh.getText().toString());
 //                mPresenter.verifyRy(map);
-                Utils.getInstances().showDialog(AddWlhRkActivity.this, "获取人员信息中");
-                mPresenter.getRyData(map);
+                if (ApkUtils.isSqjw(AddWlhRkActivity.this)) {
+                    Utils.getInstances().showDialog(AddWlhRkActivity.this, "获取人员信息中");
+                    mPresenter.getRyData(map);
+                }
             }
         });
         ll_price_select.setOnClickListener(new View.OnClickListener() {
@@ -1062,8 +1064,10 @@ public class AddWlhRkActivity extends ZkjcBaseActivity<AddWlhRkPresenter> implem
                     Map<String, String> map = new HashMap<>();
                     map.put("sfzh", etSfzh.getText().toString());
 //                    mPresenter.verifyRy(map);
-                    Utils.getInstances().showDialog(AddWlhRkActivity.this, "获取人员信息中");
-                    mPresenter.getRyData(map);
+                    if (ApkUtils.isSqjw(AddWlhRkActivity.this)) {
+                        Utils.getInstances().showDialog(AddWlhRkActivity.this, "获取人员信息中");
+                        mPresenter.getRyData(map);
+                    }
                 }
             }
 
@@ -1426,6 +1430,7 @@ public class AddWlhRkActivity extends ZkjcBaseActivity<AddWlhRkPresenter> implem
     @Override
     public void onAddSuccess(boolean b) {
         if (b) {
+            setResult(RESULT_OK);
             finish();
         }
     }
@@ -1433,6 +1438,7 @@ public class AddWlhRkActivity extends ZkjcBaseActivity<AddWlhRkPresenter> implem
     @Override
     public void onDeleteSuccess(boolean b) {
         if (b) {
+            setResult(RESULT_OK);
             finish();
         }
     }

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

@@ -514,8 +514,10 @@ public class AddZzrkActivity extends ZkjcBaseActivity<AddJzrkPresenter> implemen
                 Map<String, String> map = new HashMap<>();
                 map.put("sfzh", etSfzh.getText().toString());
 //                mPresenter.verifyRy(map);
-                Utils.getInstances().showDialog(AddZzrkActivity.this, "获取人员信息中");
-                mPresenter.getRyData(map);
+                if (ApkUtils.isSqjw(AddZzrkActivity.this)) {
+                    Utils.getInstances().showDialog(AddZzrkActivity.this, "获取人员信息中");
+                    mPresenter.getRyData(map);
+                }
             }
         });
         ll_price_select.setOnClickListener(new View.OnClickListener() {
@@ -1134,8 +1136,10 @@ public class AddZzrkActivity extends ZkjcBaseActivity<AddJzrkPresenter> implemen
                     Map<String, String> map = new HashMap<>();
                     map.put("sfzh", etSfzh.getText().toString());
 //                    mPresenter.verifyRy(map);
-                    Utils.getInstances().showDialog(AddZzrkActivity.this, "获取人员信息中");
-                    mPresenter.getRyData(map);
+                    if (ApkUtils.isSqjw(AddZzrkActivity.this)) {
+                        Utils.getInstances().showDialog(AddZzrkActivity.this, "获取人员信息中");
+                        mPresenter.getRyData(map);
+                    }
                 }
             }
 
@@ -1534,6 +1538,7 @@ public class AddZzrkActivity extends ZkjcBaseActivity<AddJzrkPresenter> implemen
     @Override
     public void onDeleteSuccess(boolean b) {
         if (b) {
+            setResult(RESULT_OK);
             finish();
         }
     }
@@ -1541,6 +1546,7 @@ public class AddZzrkActivity extends ZkjcBaseActivity<AddJzrkPresenter> implemen
     @Override
     public void onAddSuccess(boolean b) {
         if (b) {
+            setResult(RESULT_OK);
             finish();
         }
     }

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

@@ -0,0 +1,300 @@
+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.Button;
+import android.widget.EditText;
+
+import androidx.annotation.NonNull;
+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.base.BaseActivity;
+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.ApkUtils;
+import com.zkjc.common.utils.BitmapUtils;
+import com.zkjc.common.utils.Utils;
+import com.zkjc.common.view.CommonTitleBarV3;
+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.DaggerAqffxcComponent;
+import com.zkjc.policedemo.mvp.contract.AqffxcContract;
+import com.zkjc.policedemo.mvp.model.entity.Aqffxc;
+import com.zkjc.policedemo.mvp.model.entity.RhzfEntity;
+import com.zkjc.policedemo.mvp.model.entity.Wtfy;
+import com.zkjc.policedemo.mvp.presenter.AqffxcPresenter;
+
+import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.mvp.ui.adapter.WtfyAdapter;
+
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import butterknife.BindView;
+
+import static com.jess.arms.utils.Preconditions.checkNotNull;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/15/2024 14:52
+ * <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 AqffxcActivity extends ZkjcBaseActivity<AqffxcPresenter> implements AqffxcContract.View, WtfyAdapter.OnRecyclerViewItemClickListener {
+
+    private static final int IMAGE_ITEM_ADD = -1;
+    @BindView(R.id.title_bar)
+    CommonTitleBarV3 titleBar;
+    @BindView(R.id.wtfy_zp)
+    RecyclerView wtfyZp;
+    @BindView(R.id.et_fynr)
+    EditText etFynr;
+    @BindView(R.id.bt_commit)
+    Button btCommit;
+
+    private int maxImgCount = 9;
+    private List<String> urls = new ArrayList<>();
+    private ArrayList<ImageItem> wtlImageList; //当前选择的所有图片
+    private WtfyAdapter wtfyAdapter;
+    public static final int REQUEST_CODE_SELECT_WT = 1002;
+    public static final int REQUEST_CODE_PREVIEW_WT = 1003;
+
+    @Override
+    public void setupActivityComponent(@NonNull AppComponent appComponent) {
+        DaggerAqffxcComponent //如找不到该类,请编译一下项目
+                .builder()
+                .appComponent(appComponent)
+                .view(this)
+                .build()
+                .inject(this);
+    }
+
+    @Override
+    public int initView(@Nullable Bundle savedInstanceState) {
+        return R.layout.activity_aqffxc; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
+    }
+
+    @Override
+    public void initData(@Nullable Bundle savedInstanceState) {
+        titleBar.setTitle("安全防范宣传");
+        initImagePicker();
+        wtlImageList = new ArrayList<>();
+        wtfyAdapter = new WtfyAdapter(this, wtlImageList, maxImgCount);
+        wtfyAdapter.setOnItemClickListener(this);
+        wtfyZp.setLayoutManager(new GridLayoutManager(this, 3));
+        wtfyZp.setHasFixedSize(true);
+        wtfyZp.setAdapter(wtfyAdapter);
+        btCommit.setOnClickListener(v -> {
+            if (urls.size() < wtlImageList.size()) {
+                ToastUtils.show("正在上传图片，请稍后保存");
+                return;
+            }
+            if (TextUtils.isEmpty(etFynr.getText().toString())) {
+                ToastUtils.show("请填写宣传内容");
+                return;
+            }
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", getIntent().getStringExtra("id"));
+            map.put("dzbm", getIntent().getStringExtra("dzbm"));
+            Aqffxc aqffxc = new Aqffxc();
+            aqffxc.setXcnr(etFynr.getText().toString());
+            StringBuffer sbzp = new StringBuffer();
+            for (int i = 0; i < urls.size(); i++) {
+
+                if (i == urls.size() - 1) {
+                    sbzp.append(urls.get(i));
+                } else {
+                    sbzp.append(urls.get(i)).append(",");
+                }
+
+            }
+            aqffxc.setFj(sbzp.toString());
+            map.put("aqxcff", aqffxc);
+            Utils.getInstances().showDialog(AqffxcActivity.this, "上传中");
+            mPresenter.commitRhxx(map);
+        });
+        Aqffxc aqffxc = (Aqffxc) getIntent().getSerializableExtra("aqffxc");
+        if (aqffxc != null) {
+            btCommit.setVisibility(View.GONE);
+            etFynr.setText(aqffxc.getXcnr());
+            String imgs = aqffxc.getFj();
+            if (!TextUtils.isEmpty(imgs)) {
+                String[] split = imgs.split(",");
+                for (String str: split) {
+                    ImageItem imageItem = new ImageItem();
+                    imageItem.path = str;
+                    wtlImageList.add(imageItem);
+                    urls.add(str);
+                }
+            }
+            wtfyAdapter.setImages(wtlImageList);
+        } 
+    }
+
+    private void initImagePicker() {
+        ImagePicker imagePicker = ImagePicker.getInstance();
+        imagePicker.setImageLoader(new GlideImageLoader());   //设置图片加载器
+        imagePicker.setShowCamera(true);                      //显示拍照按钮
+        imagePicker.setCrop(true);                            //允许裁剪（单选才有效）
+        imagePicker.setSaveRectangle(true);                   //是否按矩形区域保存
+        imagePicker.setSelectLimit(maxImgCount);              //选中数量限制
+        imagePicker.setMultiMode(false);                      //多选
+        imagePicker.setStyle(CropImageView.Style.RECTANGLE);  //裁剪框的形状
+        imagePicker.setFocusWidth(1000);                       //裁剪框的宽度。单位像素（圆形自动取宽高最小值）
+        imagePicker.setFocusHeight(1600);                      //裁剪框的高度。单位像素（圆形自动取宽高最小值）
+        imagePicker.setOutPutX(1000);                         //保存文件的宽度。单位像素
+        imagePicker.setOutPutY(1000);                        //保存文件的高度。单位像素
+    }
+    @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();
+    }
+    @Override
+    protected 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_WT) {
+                ArrayList<ImageItem> images = (ArrayList<ImageItem>) data.getSerializableExtra(ImagePicker.EXTRA_RESULT_ITEMS);
+                if (images != null) {
+                    wtlImageList.addAll(images);
+                    for (int i = 0; i < wtlImageList.size(); i++) {
+                        String path = wtlImageList.get(i).path;
+                        System.out.println(i + "图片路径" + path);
+                        String s = BitmapUtils.fileToBase64(new File(path));
+                        //  photos.add("data:image/jpeg;base64," + s);
+                    }
+                    wtfyAdapter.setImages(wtlImageList);
+                    uploadImage(wtlImageList);
+                }
+            }
+        } else if (resultCode == ImagePicker.RESULT_CODE_BACK) {
+            //预览图片返回
+
+            if (data != null && requestCode == REQUEST_CODE_PREVIEW_WT) {
+                ArrayList<ImageItem> images = (ArrayList<ImageItem>) data.getSerializableExtra(ImagePicker.EXTRA_IMAGE_ITEMS);
+                if (images != null) {
+                    wtlImageList.clear();
+                    urls.clear();
+                    wtlImageList.addAll(images);
+                    wtfyAdapter.setImages(wtlImageList);
+                    uploadImage(wtlImageList);
+                }
+            }
+        }
+
+    }
+    private void uploadImage(ArrayList<ImageItem> wtlImageList) {
+        urls.clear();
+        if (wtlImageList.size() > 0) {
+            for (int i = 0; i < wtlImageList.size(); i++) {
+                if (wtlImageList.get(i).path.contains("http")) {
+                    urls.add(wtlImageList.get(i).path);
+                    continue;
+                }
+                UploadUtil.getInstance().init(AqffxcActivity.this).getRequest(wtlImageList.get(i).path, new CommonInterFace() {
+                    @Override
+                    public void onSuccess(String result) {
+
+                        JsonObject jsonObject1 = new JsonParser().parse(result).getAsJsonObject();
+                        JsonObject jsonObject = jsonObject1.get("data").getAsJsonObject();
+                        if (jsonObject.has("link")) {
+                            String url = jsonObject.get("link").getAsString();
+                            urls.add(url);
+                        }
+
+                    }
+
+                    @Override
+                    public void onError(Throwable throwable) {
+
+                    }
+
+                    @Override
+                    public void onFinsh() {
+
+                    }
+                });
+            }
+        }
+    }
+    @Override
+    public void onItemClickwtfy(View view, int position) {
+        switch (position) {
+            case IMAGE_ITEM_ADD:
+                ImagePicker.getInstance().setSelectLimit(maxImgCount - wtlImageList.size());
+                Intent intent = new Intent(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>) wtfyAdapter.getImages());
+
+                startActivityForResult(intent, REQUEST_CODE_SELECT_WT);
+                break;
+            default:
+                //打开预览
+                Intent intentPreview = new Intent(this, ImagePreviewDelActivity.class);
+                intentPreview.putExtra(ImagePicker.EXTRA_IMAGE_ITEMS, (ArrayList<ImageItem>) wtfyAdapter.getImages());
+                intentPreview.putExtra(ImagePicker.EXTRA_SELECTED_IMAGE_POSITION, position);
+                intentPreview.putExtra(ImagePicker.EXTRA_FROM_ITEMS, true);
+                startActivityForResult(intentPreview, REQUEST_CODE_PREVIEW_WT);
+                break;
+        }
+    }
+
+    @Override
+    public void onCommitSuccess(RhzfEntity.Room data) {
+        setResult(RESULT_OK);
+        finish();
+    }
+}

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

@@ -17,28 +17,38 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.gson.Gson;
 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.squareup.picasso.Picasso;
 import com.zkjc.common.base.ZkjcBaseActivity;
 import com.zkjc.common.utils.MyKeyBoardView;
 import com.zkjc.common.utils.RegexUtils;
+import com.zkjc.common.utils.Utils;
 import com.zkjc.policedemo.R;
 import com.zkjc.policedemo.app.utils.KeyboardUtil;
 import com.zkjc.policedemo.app.view.WordGroupView;
 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.SydwEntity;
 import com.zkjc.policedemo.mvp.presenter.CyryhcPresenter;
 import com.zkjc.policedemo.mvp.ui.adapter.RkLxAdapter;
+import com.zkjc.policedemo.mvp.ui.fragment.SelectCyryZyDialog;
 
 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.activity.AddCzrkActivity.TOAST_INFO;
 
 
 /**
@@ -65,8 +75,12 @@ public class CyryhcActivity extends ZkjcBaseActivity<CyryhcPresenter> implements
     LinearLayout llNoseacher;
     @BindView(R.id.iv_head)
     ImageView ivHead;
+    @BindView(R.id.iv_sex)
+    ImageView ivSex;
     @BindView(R.id.ll_ryxm)
     LinearLayout llRyxm;
+    @BindView(R.id.tv_name)
+    TextView tvName;
     @BindView(R.id.tv_name_mj)
     TextView tvNameMj;
     @BindView(R.id.tv_lxdh)
@@ -95,6 +109,8 @@ public class CyryhcActivity extends ZkjcBaseActivity<CyryhcPresenter> implements
     View view2;
     @BindView(R.id.tv_addcy)
     TextView tvAddcy;
+    @BindView(R.id.tv_ryda)
+    TextView tvRyda;
     @BindView(R.id.tv_gmsfzh)
     TextView tv_gmsfzh;
     @BindView(R.id.tv_idcard)
@@ -107,6 +123,8 @@ public class CyryhcActivity extends ZkjcBaseActivity<CyryhcPresenter> implements
     LinearLayout ll_price_select;
     //虚拟键盘工具类
     private KeyboardUtil keyboardUtil;
+    private boolean isCyry;
+    private RkxxEntity.Rkxx mRyxx;
 
     @Override
     public void setupActivityComponent(@NonNull AppComponent appComponent) {
@@ -126,9 +144,11 @@ public class CyryhcActivity extends ZkjcBaseActivity<CyryhcPresenter> implements
     @Override
     public void initData(@Nullable Bundle savedInstanceState) {
         String xstgr = getIntent().getStringExtra("xstgr");
-        if (xstgr.equals("xstgr")) {
+        if ("xstgr".equals(xstgr)) {
+            isCyry = false;
             tvAddcy.setText("添加线索提供人");
         } else {
+            isCyry = true;
             tvAddcy.setText("添加为从业人员");
         }
         String[] words = {"青年组", "大学本科及以上", "公司职员", "离家独居", "失独群体", "故意杀人", "管制", "征地拆迁", "多次进京上访", "多次或经常被人欺凌"};
@@ -168,7 +188,10 @@ public class CyryhcActivity extends ZkjcBaseActivity<CyryhcPresenter> implements
                 ll_price_select.setVisibility(View.GONE);
                 et_id_card.getText().clear();
                 llNoseacher.setVisibility(View.GONE);
-                rl_ryxx.setVisibility(View.VISIBLE);
+                Map<String, String> map = new HashMap<>();
+                map.put("sfzh", tv_gmsfzh.getText().toString().trim());
+                mPresenter.getRyData(map, tv_gmsfzh.getText().toString().trim());
+                Utils.getInstances().showDialog(CyryhcActivity.this, "正在查询人员数据");
             }
         });
         ll_price_select.setOnClickListener(new View.OnClickListener() {
@@ -207,6 +230,77 @@ public class CyryhcActivity extends ZkjcBaseActivity<CyryhcPresenter> implements
             et_id_card.requestFocus();
             ll_price_select.setVisibility(View.VISIBLE);
         });
+
+
+        tvCx.setOnClickListener(v -> {
+            mRyxx = null;
+            rl_ryxx.setVisibility(View.GONE);
+            Utils.getInstances().showDialog(CyryhcActivity.this, "正在查询人员数据");
+            Map<String, String> map = new HashMap<>();
+            map.put("sfzh", tv_gmsfzh.getText().toString().trim());
+            mPresenter.getRyData(map, tv_gmsfzh.getText().toString().trim());
+        });
+        tvRyda.setOnClickListener(v -> {
+
+        });
+        tvAddcy.setOnClickListener(v -> {
+            if (isCyry) {
+                if (mRyxx == null) {
+                    ToastUtils.show("请选择人员");
+                    return;
+                }
+                SelectCyryZyDialog dialog = SelectCyryZyDialog.newInstance((ArrayList<Fwtd>) getIntent().getSerializableExtra("zylb"));
+                dialog.setMyDialogListener(new SelectCyryZyDialog.MyDialogListener() {
+                    @Override
+                    public void onConfirmClick(Fwtd status, String desc) {
+                        String id = getIntent().getStringExtra("id");
+                        SydwEntity.Cyry cyry = new SydwEntity.Cyry();
+                        cyry.setXm(mRyxx.getFzXm());
+                        cyry.setZp(mRyxx.getFzZp());
+                        cyry.setGmsfhm(mRyxx.getGmsfhm());
+                        cyry.setXb(mRyxx.getRyxb());
+                        cyry.setZy(desc);
+                        cyry.setZylb(status.getLabel());
+                        cyry.setZylbDm(status.getValue());
+                        cyry.setLxdh(mRyxx.getFzDh());
+                        cyry.setXz(mRyxx.getHjdz());
+                        if (TextUtils.isEmpty(id)) {
+                            // dwdzbm  单位地址编码
+                            //tyshxydm  统一社会信用代码
+                            //xm  姓名
+                            //gmsfhm  公民身份号码
+                            //xb  性别
+                            //zy  职业（手填）
+                            //zylb  职业类别（字典值）
+                            //lxdh  联系电话
+                            //xz  现居住地
+                            Intent intent = new Intent();
+                            intent.putExtra("cyry", cyry);
+                            setResult(RESULT_OK, intent);
+                            finish();
+                        } else {
+                            Map<String, Object> map = new HashMap<>();
+                            map.put("dwdzbm", getIntent().getStringExtra("dzbm"));
+                            map.put("tyshxydm", getIntent().getStringExtra("tyshxydm"));
+                            map.put("xm", mRyxx.getFzXm());
+                            map.put("zp", mRyxx.getFzZp());
+                            map.put("gmsfhm", mRyxx.getGmsfhm());
+                            map.put("xb", mRyxx.getRyxb());
+                            map.put("zy", desc);
+                            map.put("zylb", status.getLabel());
+                            map.put("lxdh", mRyxx.getFzDh());
+                            map.put("zylbDm", status.getValue());
+                            map.put("xz", mRyxx.getHjdz());
+
+                            mPresenter.update(map, cyry);
+                        }
+                    }
+                });
+                dialog.show(getSupportFragmentManager(), "zy");
+            } else {
+
+            }
+        });
     }
 
     @Override
@@ -245,4 +339,41 @@ public class CyryhcActivity extends ZkjcBaseActivity<CyryhcPresenter> implements
     }
 
 
+    @Override
+    public void getRyDataSuccess(String result, String sfhm) {
+        try {
+            RkxxEntity entity = new Gson().fromJson(result, RkxxEntity.class);
+            RkxxEntity.Rkxx rkxx = entity.getData();
+            if (rkxx == null) {
+                ToastUtils.show(TOAST_INFO);
+            } else {
+                rkxx.setGmsfhm(sfhm);
+                mRyxx = rkxx;
+                rl_ryxx.setVisibility(View.VISIBLE);
+                if (!TextUtils.isEmpty(rkxx.getFzZp())) {
+                    Picasso.with(this).load(rkxx.getFzZp()).into(ivHead);
+                }
+                if ("男".equals(rkxx.getRyxb())) {
+                    ivSex.setBackgroundResource(R.drawable.icon_boy);
+                } else {
+                    ivSex.setBackgroundResource(R.drawable.icon_girl);
+                }
+                tvName.setText(rkxx.getFzXm());
+                tvNameMj.setText(tv_gmsfzh.getText().toString().trim() + " | " + rkxx.getRyMz());
+                tvLxdh.setText(rkxx.getFzDh());
+
+            }
+        } catch (Exception e) {
+            ToastUtils.show(TOAST_INFO);
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void onSaveSuccess(String result, SydwEntity.Cyry cyry) {
+        Intent intent = new Intent();
+        intent.putExtra("cyry", cyry);
+        setResult(RESULT_OK, intent);
+        finish();
+    }
 }

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

@@ -2,6 +2,7 @@ package com.zkjc.policedemo.mvp.ui.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -9,6 +10,7 @@ import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.hjq.toast.ToastUtils;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.zkjc.common.base.ZkjcBaseActivity;
@@ -16,11 +18,15 @@ import com.zkjc.common.view.CommonTitleBarV3;
 import com.zkjc.policedemo.R;
 import com.zkjc.policedemo.di.component.DaggerLscyryComponent;
 import com.zkjc.policedemo.mvp.contract.LscyryContract;
+import com.zkjc.policedemo.mvp.model.entity.SydwEntity;
 import com.zkjc.policedemo.mvp.presenter.LscyryPresenter;
+import com.zkjc.policedemo.mvp.ui.adapter.BaseRecycleAdapter;
 import com.zkjc.policedemo.mvp.ui.adapter.LscyAdapter;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -66,12 +72,10 @@ public class LscyryActivity extends ZkjcBaseActivity<LscyryPresenter> implements
     public void initData(@Nullable Bundle savedInstanceState) {
         titleBar.setTitle("历史从业人员");
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        List<String> list=new ArrayList<>();
-        for (int i = 0; i < 10; i++) {
-            list.add(i+"");
-        }
-        LscyAdapter adapter = new LscyAdapter(list);
-        recyclerView.setAdapter(adapter);
+        Map<String, String> map = new HashMap<>();
+        map.put("tyshxydm", getIntent().getStringExtra("tyshxydm"));
+        map.put("dzbm", getIntent().getStringExtra("dzbm"));
+        mPresenter.getList(map);
     }
 
     @Override
@@ -102,4 +106,27 @@ public class LscyryActivity extends ZkjcBaseActivity<LscyryPresenter> implements
     }
 
 
+    @Override
+    public void onGetListSuccess(List<SydwEntity.Cyry> data) {
+        if (data != null) {
+            List<SydwEntity.Cyry> list=new ArrayList<>();
+            list.addAll(data);
+            LscyAdapter adapter = new LscyAdapter(list);
+            adapter.setShowDelete(false);
+            adapter.setListener(new BaseRecycleAdapter.OnRecyclerViewListenerV2() {
+                @Override
+                public void onItemClick(View view, int position) {
+
+                }
+
+                @Override
+                public boolean onItemLongClick(View view, int position) {
+                    return false;
+                }
+            });
+            recyclerView.setAdapter(adapter);
+        } else {
+            ToastUtils.show("暂无数据");
+        }
+    }
 }

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

@@ -1274,7 +1274,7 @@ public class RhzfActivity extends ZkjcBaseActivity<RhzfPresenter> implements Rhz
             fwqzLx = room.getFwlx();
         }
         jfids = room.getMdId();
-        if (!TextUtils.isEmpty(room.getWtfy()) || !TextUtils.isEmpty(room.getWtfyFj())) {
+        /*if (!TextUtils.isEmpty(room.getWtfy()) || !TextUtils.isEmpty(room.getWtfyFj())) {
             sfywtfy = true;
             wtfyfj = room.getWtfyFj();
             fynr = room.getWtfy();
@@ -1282,7 +1282,7 @@ public class RhzfActivity extends ZkjcBaseActivity<RhzfPresenter> implements Rhz
         if (!TextUtils.isEmpty(room.getGzyj())) {
             sfyzqyj = true;
             zqyj = room.getGzyj();
-        } 
+        } */
         if (room.getListDelete() != null) {
             listDelete = room.getListDelete();
         } 
@@ -1411,8 +1411,8 @@ public class RhzfActivity extends ZkjcBaseActivity<RhzfPresenter> implements Rhz
                 // 空房或者特殊情况可以不填人员和房屋照片
             } else {
                 if (listJzry == null || listJzry.isEmpty()) {
-                    ToastUtils.show("请添加人员信息");
-                    return;
+//                    ToastUtils.show("请添加人员信息");
+//                    return;
                 }
                 if (TextUtils.isEmpty(fwzp)) {
                     if (!TextUtils.isEmpty(fwzpLocal)) {
@@ -1454,10 +1454,10 @@ public class RhzfActivity extends ZkjcBaseActivity<RhzfPresenter> implements Rhz
                 }
             }
 
-            if (listJzry != null && !listJzry.isEmpty()) {
+            /*if (listJzry != null && !listJzry.isEmpty()) {
                 for (RhxxBean bean: listJzry) {
-                /*if (!TextUtils.isEmpty(bean.getRyjbxxxlh())) {
-                }*/
+                *//*if (!TextUtils.isEmpty(bean.getRyjbxxxlh())) {
+                }*//*
                     if (TYPE_RK_JWRK.equals(bean.getRyType())) {
                         if (TextUtils.isEmpty(bean.getRyDh())) {
                             ToastUtils.show("居住人员信息不完整，请补全");
@@ -1475,11 +1475,11 @@ public class RhzfActivity extends ZkjcBaseActivity<RhzfPresenter> implements Rhz
                         return;
                     }
                 }
-            }
-            if (!"空房".equals(mSelectSyyt.getLabel()) && TextUtils.isEmpty(etZrrTsqk.getText().toString()) && TextUtils.isEmpty(etZzTsqk.getText().toString()) && TextUtils.isEmpty(qzImgaview)) {
+            }*/
+            /*if (!"空房".equals(mSelectSyyt.getLabel()) && TextUtils.isEmpty(etZrrTsqk.getText().toString()) && TextUtils.isEmpty(etZzTsqk.getText().toString()) && TextUtils.isEmpty(qzImgaview)) {
                 ToastUtils.show("群众签字后再提交");
                 return;
-            }
+            }*/
             SharedPreferences sharedPreferences = getSharedPreferences("sys", MODE_PRIVATE);
             String role_name = sharedPreferences.getString("role_name", "");
             String mj_id = sharedPreferences.getString("mj_id", "");
@@ -1538,7 +1538,7 @@ public class RhzfActivity extends ZkjcBaseActivity<RhzfPresenter> implements Rhz
                 info.setTsqk(TextUtils.isEmpty(etZzTsqk.getText().toString()) ? "" : etZzTsqk.getText().toString().trim());
             }
             map.put("fzInfo", info);
-            if (switchOne.isChecked()) {
+            /*if (switchOne.isChecked()) {
                 map.put("aqffxc", 1);
             } else {
                 map.put("aqffxc", 0);
@@ -1581,7 +1581,7 @@ public class RhzfActivity extends ZkjcBaseActivity<RhzfPresenter> implements Rhz
             }
             if (jxcsList != null && !jxcsList.isEmpty()) {
                 map.put("jxcsList", jxcsList);
-            }
+            }*/
             Utils.getInstances().showDialog(RhzfActivity.this, "正在上传数据");
             mPresenter.commitRhxx(map);
         }
@@ -1969,6 +1969,12 @@ public class RhzfActivity extends ZkjcBaseActivity<RhzfPresenter> implements Rhz
             intent.putExtra("id", result.getId());
         }
         setResult(RESULT_OK, intent);
+        Intent intent1 = new Intent(RhzfActivity.this, RhzfDetailActivity.class);
+        intent1.putExtra("title", getIntent().getStringExtra("title"));
+        intent1.putExtra("name", getIntent().getStringExtra("name"));
+        intent1.putExtra("data", result);
+        intent1.putExtra("ldphxlh", getIntent().getStringExtra("ldphxlh"));
+        startActivity(intent1);
         finish();
     }
 
@@ -2053,9 +2059,9 @@ public class RhzfActivity extends ZkjcBaseActivity<RhzfPresenter> implements Rhz
             }
             mRoom.setSyjzryList(listJzry);
             mRoom.setFwlx(fwqzLx);
-            mRoom.setWtfy(fynr);
+//            mRoom.setWtfy(fynr);
             mRoom.setWtfyFj(wtfyfj);
-            mRoom.setGzyj(zqyj);
+//            mRoom.setGzyj(zqyj);
             mRoom.setQzzp(qzImgaview);
             mRoom.setJxcsList(jxcsList);
             mRoom.setJxcsRemoveList(jxcsRemoveList);

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

@@ -24,21 +24,33 @@ import com.jess.arms.utils.ArmsUtils;
 
 import com.squareup.picasso.Picasso;
 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.di.component.DaggerRhzfDetailComponent;
 import com.zkjc.policedemo.mvp.contract.RhzfDetailContract;
+import com.zkjc.policedemo.mvp.model.entity.Aqffxc;
+import com.zkjc.policedemo.mvp.model.entity.FwqzEntity;
 import com.zkjc.policedemo.mvp.model.entity.FzInfo;
+import com.zkjc.policedemo.mvp.model.entity.Jxcs;
 import com.zkjc.policedemo.mvp.model.entity.RhxxBean;
 import com.zkjc.policedemo.mvp.model.entity.RhzfEntity;
+import com.zkjc.policedemo.mvp.model.entity.Wtfy;
 import com.zkjc.policedemo.mvp.model.entity.ZdAllEntity;
+import com.zkjc.policedemo.mvp.model.entity.Zqyj;
 import com.zkjc.policedemo.mvp.presenter.RhzfDetailPresenter;
 
 import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfAqffxcFragment;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfFwqzFragment;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfJxcsFragment;
 import com.zkjc.policedemo.mvp.ui.fragment.RhzfMdFragment;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfQzqzFragment;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfSydwFragment;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfTdrkgkFragment;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfWtfwFragment;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfWtfyFragment;
+import com.zkjc.policedemo.mvp.ui.fragment.RhzfZqyjFragment;
 import com.zkjc.policedemo.mvp.ui.fragment.SyrkFragment;
-import com.zkjc.policedemo.mvp.ui.fragment.WtjFragment;
 
 
 import java.util.ArrayList;
@@ -117,11 +129,14 @@ public class RhzfDetailActivity extends ZkjcBaseActivity<RhzfDetailPresenter> im
     TextView tvTsqk;
     @BindView(R.id.rhzf_detail_layout_fz)
     View layoutFz;
+    @BindView(R.id.float_button)
+    View floatButton;
 
     private int oldVerticalOffset;
     private RhzfEntity.Room mRoom;
     private RhzfEntity.Room mNetData;
     private ZdAllEntity.DataBean mZdAllData;
+    private ArrayList<Fragment> fragments;
 
     @Override
     public void setupActivityComponent(@NonNull AppComponent appComponent) {
@@ -146,7 +161,7 @@ public class RhzfDetailActivity extends ZkjcBaseActivity<RhzfDetailPresenter> im
         layoutFw.setOnClickListener(v -> {
             Log.e("eee", "onclick is run !!!!!");
             if (mNetData == null) {
-                ToastUtils.show("正在初始话数据");
+                ToastUtils.show("正在初始化数据");
                 return;
             }
             Intent intent = new Intent(RhzfDetailActivity.this, RhzfActivity.class);
@@ -166,10 +181,70 @@ public class RhzfDetailActivity extends ZkjcBaseActivity<RhzfDetailPresenter> im
         map.put("ldphxlh", ldphxlh);
         mPresenter.getRoomData(map);
         Utils.getInstances().showDialog(this, "正在获取数据");
+        floatButton.setOnClickListener(v -> {
+            onAddClick();
+        });
+
+        mPresenter.getDictionary(new HashMap<>());
+    }
+
+    private void onAddClick() {
+        Fragment fragment = fragments.get(viewPager.getCurrentItem());
+        if (fragment instanceof RhzfJxcsFragment) {
+            // 九小
+            Intent intent = new Intent(this, RhzfjxcsLbActivity.class);
+            intent.putExtra("id", mNetData.getId());
+            intent.putExtra("dzbm", mNetData.getDzbm());
+            startActivityForResult(intent, 100);
+        } else if (fragment instanceof RhzfWtfwFragment) {
+            Intent intent = new Intent(this, WtfyActivity.class);
+            intent.putExtra("id", mNetData.getId());
+            intent.putExtra("dzbm", mNetData.getDzbm());
+            startActivityForResult(intent, 100);
+        } else if (fragment instanceof RhzfZqyjFragment) {
+            Intent intent = new Intent(this, ZqyjActivity.class);
+            intent.putExtra("id", mNetData.getId());
+            intent.putExtra("dzbm", mNetData.getDzbm());
+            startActivityForResult(intent, 100);
+        } else if (fragment instanceof RhzfWtfyFragment) {
+            Intent intent = new Intent(this, WtfyActivity.class);
+            intent.putExtra("id", mNetData.getId());
+            intent.putExtra("dzbm", mNetData.getDzbm());
+            startActivityForResult(intent, 100);
+        } else if (fragment instanceof RhzfZqyjFragment) {
+            Intent intent = new Intent(this, ZqyjActivity.class);
+            intent.putExtra("id", mNetData.getId());
+            intent.putExtra("dzbm", mNetData.getDzbm());
+            startActivityForResult(intent, 100);
+        } else if (fragment instanceof RhzfAqffxcFragment) {
+            Intent intent = new Intent(this, AqffxcActivity.class);
+            intent.putExtra("id", mNetData.getId());
+            intent.putExtra("dzbm", mNetData.getDzbm());
+            startActivityForResult(intent, 100);
+        } else if (fragment instanceof RhzfFwqzFragment) {
+            int currentItem = ((RhzfFwqzFragment) fragment).getCurrentItem();
+            Intent intent = new Intent(this, SmfwActivity.class);
+            switch (currentItem) {
+                case 0:
+                    intent = new Intent(this, SmfwActivity.class);
+                    break;
+                case 1:
+                    intent = new Intent(this, YyfwActivity.class);
+                    break;
+                case 2:
+                    intent = new Intent(this, WtfwActivity.class);
+                    break;
+                default:
+                    break;
+            }
+            intent.putExtra("id", mNetData.getId());
+            intent.putExtra("dzbm", mNetData.getDzbm());
+            startActivityForResult(intent, 100);
+        }
     }
 
     private void initVpData() {
-        List<Fragment> fragments = new ArrayList<>();
+        fragments = new ArrayList<>();
         List<String> titles = new ArrayList<>();
         ArrayList<RhxxBean> list = new ArrayList<>();
         if (mNetData.getSyjzryList() != null) {
@@ -180,8 +255,24 @@ public class RhzfDetailActivity extends ZkjcBaseActivity<RhzfDetailPresenter> im
         }
         fragments.add(SyrkFragment.newInstance(list));
         titles.add("实有人口(" + list.size() + ")");
+        fragments.add(RhzfTdrkgkFragment.newInstance(list));
+        titles.add("特定人口管控(" + list.size() + ")");
+        fragments.add(RhzfSydwFragment.newInstance(mNetData.getSydw()));
+        titles.add("实有单位");
         fragments.add(RhzfMdFragment.newInstance(mNetData.getMdId()));
         titles.add("排查矛盾纠纷");
+        fragments.add(RhzfAqffxcFragment.newInstance((ArrayList<Aqffxc>) mNetData.getAqxcffHistory()));
+        titles.add("安全防范宣传");
+        fragments.add(RhzfJxcsFragment.newInstance((ArrayList<Jxcs>) mNetData.getJxcsList()));
+        titles.add("九小场所从商从业情况(" + mNetData.getJxcsList().size() + ")");
+        fragments.add(RhzfFwqzFragment.newInstance((ArrayList<FwqzEntity.Fwqz>) mNetData.getFwqzHistory()));
+        titles.add("服务群众");
+        fragments.add(RhzfWtfyFragment.newInstance((ArrayList<Wtfy>) mNetData.getWtfyHistory()));
+        titles.add("问题反应");
+        fragments.add(RhzfZqyjFragment.newInstance((ArrayList<Zqyj>) mNetData.getGzyjHistory()));
+        titles.add("征求意见");
+        fragments.add(RhzfQzqzFragment.newInstance(mNetData.getQzzp()));
+        titles.add("群众签字");
         FragmentStateAdapter mAdapter = new FragmentStateAdapter(this) {
             @Override
             public int getItemCount() {
@@ -199,9 +290,21 @@ public class RhzfDetailActivity extends ZkjcBaseActivity<RhzfDetailPresenter> im
         new TabLayoutMediator(tabLayout, viewPager, new TabLayoutMediator.TabConfigurationStrategy() {
             @Override
             public void onConfigureTab(@NonNull TabLayout.Tab tab, int position) {
+                Log.e("eee", "onConfigureTab is run !!!!!");
                 tab.setText(titles.get(position));
+
             }
         }).attach();
+        viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
+            @Override
+            public void onPageSelected(int position) {
+                if (position <= 2 || position == titles.size() - 1) {
+                    floatButton.setVisibility(View.GONE);
+                } else {
+                    floatButton.setVisibility(View.VISIBLE);
+                }
+            }
+        });
     }
 
     // 这里的处理是当AppBarLayout处于最顶部也就是完全打开状态verticalOffse=0时才允许刷新控件可用.
@@ -325,6 +428,10 @@ public class RhzfDetailActivity extends ZkjcBaseActivity<RhzfDetailPresenter> im
         return mZdAllData;
     }
 
+    public String getDzmc() {
+        return getIntent().getStringExtra("title") + getIntent().getStringExtra("name");
+    }
+
     public RhzfEntity.Room getNetData() {
         return mNetData;
     }
@@ -338,4 +445,12 @@ public class RhzfDetailActivity extends ZkjcBaseActivity<RhzfDetailPresenter> im
         mPresenter.getRoomData(map);
         Utils.getInstances().showDialog(this, "正在获取数据");
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK) {
+            refreshData();
+        }
+    }
 }

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

@@ -460,7 +460,8 @@ public class RhzfLdActivity extends ZkjcBaseActivity<RhzfLdPresenter> implements
                     break;
                 case KRequestAdd:
                     if (resultCode == RESULT_OK) {
-                        if (mInfo == null || mUnits == null) {
+                        getData();
+                        /*if (mInfo == null || mUnits == null) {
                             return;
                         }
                         RhzfEntity.Unit unit = mUnits.get(mSelectUnit);
@@ -486,7 +487,7 @@ public class RhzfLdActivity extends ZkjcBaseActivity<RhzfLdPresenter> implements
                             tvInfo.setEnabled(false);
                         }
 
-                        tvCount.setText("本年度已采集" + room.getTimes() + "次");
+                        tvCount.setText("本年度已采集" + room.getTimes() + "次");*/
                     }
                     break;
                 case KRequestAddRoom:

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

@@ -23,16 +23,20 @@ import com.hjq.toast.ToastUtils;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.zkjc.common.base.ZkjcBaseActivity;
+import com.zkjc.common.utils.ApkUtils;
 import com.zkjc.common.utils.AssetsUtil;
+import com.zkjc.common.utils.Utils;
 import com.zkjc.common.view.CommonTitleBarV3;
 import com.zkjc.policedemo.R;
 import com.zkjc.policedemo.di.component.DaggerRhzfjxcsLbComponent;
 import com.zkjc.policedemo.mvp.contract.RhzfjxcsLbContract;
 import com.zkjc.policedemo.mvp.model.entity.CommonEntity;
 import com.zkjc.policedemo.mvp.model.entity.Jxcs;
+import com.zkjc.policedemo.mvp.model.entity.RhzfEntity;
 import com.zkjc.policedemo.mvp.presenter.RhzfjxcsLbPresenter;
 import com.zkjc.policedemo.mvp.ui.adapter.JwcjAdapter;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -133,8 +137,19 @@ public class RhzfjxcsLbActivity extends ZkjcBaseActivity<RhzfjxcsLbPresenter> im
             jxcs.setSffr(switchTsqt.isChecked() ? 1 : 0);
             jxcs.setTyxydm(etXydm.getText().toString());
             intent.putExtra("data", jxcs);
-            setResult(RESULT_OK, intent);
-            finish();
+            if (ApkUtils.isSqjw(RhzfjxcsLbActivity.this)) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id", getIntent().getStringExtra("id"));
+                map.put("dzbm", getIntent().getStringExtra("dzbm"));
+                ArrayList<Jxcs> jxcsList = new ArrayList<>();
+                jxcsList.add(jxcs);
+                map.put("jxcsList", jxcsList);
+                Utils.getInstances().showDialog(RhzfjxcsLbActivity.this, "上传中");
+                mPresenter.commitRhxx(map);
+            } else {
+                setResult(RESULT_OK, intent);
+                finish();
+            }
         });
 
         setData();
@@ -153,12 +168,23 @@ public class RhzfjxcsLbActivity extends ZkjcBaseActivity<RhzfjxcsLbPresenter> im
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
                                     dialog.dismiss();
-                                    Intent intent = new Intent();
-                                    intent.putExtra("position", getIntent().getIntExtra("position", 0));
-                                    intent.putExtra("delete", true);
-                                    intent.putExtra("data", mData);
-                                    setResult(RESULT_OK, intent);
-                                    finish();
+                                    if (ApkUtils.isSqjw(RhzfjxcsLbActivity.this)) {
+                                        Map<String, Object> map = new HashMap<>();
+                                        map.put("id", getIntent().getStringExtra("id"));
+                                        map.put("dzbm", getIntent().getStringExtra("dzbm"));
+                                        ArrayList<Jxcs> jxcsList = new ArrayList<>();
+                                        mData.setIsDeleted(1);
+                                        jxcsList.add(mData);
+                                        map.put("jxcsList", jxcsList);
+                                        mPresenter.commitRhxx(map);
+                                    } else {
+                                        Intent intent = new Intent();
+                                        intent.putExtra("position", getIntent().getIntExtra("position", 0));
+                                        intent.putExtra("delete", true);
+                                        intent.putExtra("data", mData);
+                                        setResult(RESULT_OK, intent);
+                                        finish();
+                                    }
                                 }
                             })
                             .setNegativeButton("取消", new DialogInterface.OnClickListener() {
@@ -245,4 +271,9 @@ public class RhzfjxcsLbActivity extends ZkjcBaseActivity<RhzfjxcsLbPresenter> im
     }
 
 
+    @Override
+    public void onCommitSuccess(RhzfEntity.Room data) {
+        setResult(RESULT_OK);
+        finish();
+    }
 }

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

@@ -0,0 +1,222 @@
+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.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.tabs.TabLayout;
+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.utils.Utils;
+import com.zkjc.common.view.CommonTitleBarV3;
+import com.zkjc.policedemo.di.component.DaggerRhzfLdComponent;
+import com.zkjc.policedemo.di.component.DaggerSelectSydwFwComponent;
+import com.zkjc.policedemo.mvp.contract.SelectSydwFwContract;
+import com.zkjc.policedemo.mvp.model.entity.RhzfCountEntity;
+import com.zkjc.policedemo.mvp.model.entity.RhzfEntity;
+import com.zkjc.policedemo.mvp.presenter.SelectSydwFwPresenter;
+
+import com.zkjc.policedemo.R;
+import com.zkjc.policedemo.mvp.ui.adapter.RhzfUnitAdapter;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import butterknife.BindView;
+
+import static com.jess.arms.utils.Preconditions.checkNotNull;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 11/19/2024 09:53
+ * <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 SelectSydwFwActivity extends ZkjcBaseActivity<SelectSydwFwPresenter> implements SelectSydwFwContract.View {
+
+    @BindView(R.id.title_bar)
+    CommonTitleBarV3 titleBar;
+    @BindView(R.id.rhzf_ld_name)
+    TextView tvName;
+    @BindView(R.id.rhzf_ld_address)
+    TextView tvAddress;
+    @BindView(R.id.rhzf_ld_tab)
+    TabLayout tabLayout;
+    @BindView(R.id.rhzf_ld_rv)
+    RecyclerView recyclerView;
+    private List<RhzfEntity.Unit> mUnits;
+    private ArrayList<RhzfEntity.Floor> mList;
+    private RhzfUnitAdapter mAdapter;
+    private RhzfEntity.Building mInfo;
+
+    @Override
+    public void setupActivityComponent(@NonNull AppComponent appComponent) {
+        DaggerSelectSydwFwComponent //如找不到该类,请编译一下项目
+                .builder()
+                .appComponent(appComponent)
+                .view(this)
+                .build()
+                .inject(this);
+    }
+
+    @Override
+    public int initView(@Nullable Bundle savedInstanceState) {
+        return R.layout.activity_select_sydw_fw; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
+    }
+
+    @Override
+    public void initData(@Nullable Bundle savedInstanceState) {
+        titleBar.setTitle("选择场所具体地址");
+        mInfo = (RhzfEntity.Building) getIntent().getSerializableExtra("building");
+        tvName.setText(mInfo.getName());
+        tvAddress.setText(mInfo.getDzmcDt());
+        recyclerView.setLayoutManager(new LinearLayoutManager(this));
+        mList = new ArrayList<>();
+        mAdapter = new RhzfUnitAdapter(mList);
+        recyclerView.setAdapter(mAdapter);
+        mAdapter.setListener(new RhzfUnitAdapter.OnFloorClickListener() {
+            @Override
+            public void onFloorItemClick(View floorView, int floorPosition, View roomView, int roomPosition) {
+                if (mInfo == null || mUnits == null) {
+                    return;
+                }
+                if (mInfo.getUnit() == null || mInfo.getUnit().isEmpty()) {
+                    return;
+                }
+                RhzfEntity.Unit unit = mInfo.getUnit().get(tabLayout.getSelectedTabPosition());
+                if (unit.getFloors() == null || unit.getFloors().isEmpty()) {
+                    return;
+                }
+                RhzfEntity.Floor floor = unit.getFloors().get(floorPosition);
+                if (floor.getRooms() == null || floor.getRooms().isEmpty()) {
+                    return;
+                }
+                RhzfEntity.Room room = floor.getRooms().get(roomPosition);
+                Intent intent = new Intent();
+                intent.putExtra("dzbm", room.getDzbm());
+                intent.putExtra("dzmc", mInfo.getName() + unit.getName() + "-" + room.getName());
+                setResult(RESULT_OK, intent);
+                finish();
+            }
+
+        });
+
+        mAdapter.notifyDataSetChanged();
+        getData();
+    }
+
+    private void getData() {
+        if (mInfo != null) {
+            Map<String, String> map = new HashMap<>();
+            map.put("dzbm", mInfo.getDzbm());
+            map.put("jlxxqzdzrcmc", mInfo.getJlxxqzdzrcmc());
+            map.put("sqjcwhmc", mInfo.getSqjcwhmc());
+            map.put("mlph", mInfo.getMlph());
+            map.put("ldph", mInfo.getLdph());
+            map.put("dzjd", mInfo.getDzjd() + "");
+            map.put("dzwd", mInfo.getDzwd() + "");
+            map.put("ldphxlh", mInfo.getLdphxlh());
+            Utils.getInstances().showDialog(SelectSydwFwActivity.this, "正在加载数据");
+            mPresenter.getDetailData(map);
+        }
+    }
+
+
+
+    @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();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Utils.getInstances().dismissDialog();
+    }
+
+    @Override
+    public void onDetailDataSuccess(List<RhzfEntity.Unit> result) {
+        Utils.getInstances().dismissDialog();
+        mUnits = result;
+        mInfo.setUnit(result);
+        tabLayout.removeAllTabs();
+        if (mUnits != null) {
+            for (int i = 0; i < mUnits.size(); i++) {
+                RhzfEntity.Unit unit = mUnits.get(i);
+                tabLayout.addTab(tabLayout.newTab().setText(unit.getName()/* + unit.getDyhSuffix()*/ + (mInfo.getLdType() == RhzfEntity.Building.LD ? "单元" : "")));
+            }
+            tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+                @Override
+                public void onTabSelected(TabLayout.Tab tab) {
+                    mList.clear();
+                    mList.addAll(mUnits.get(tab.getPosition()).getFloors());
+                    mAdapter.notifyDataSetChanged();
+                }
+
+                @Override
+                public void onTabUnselected(TabLayout.Tab tab) {
+
+                }
+
+                @Override
+                public void onTabReselected(TabLayout.Tab tab) {
+
+                }
+            });
+            if (!mUnits.isEmpty() && mUnits.get(0) != null) {
+                mList.clear();
+                mList.addAll(mUnits.get(0).getFloors());
+                mAdapter.notifyDataSetChanged();
+            } else {
+                ToastUtils.show("暂无房屋数据");
+            }
+        } else {
+            ToastUtils.show("暂无房屋数据");
+        }
+    }
+}

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

@@ -240,9 +240,27 @@ public class SelectXfjcDzActivity extends ZkjcBaseActivity<SelectXfjcDzPresenter
 
     @Override
     public void onItemClick(RhzfMainNewEntity.Jlx jlx, RhzfMainNewEntity.Mlph mlph, RhzfEntity.Building building) {
-        Intent intent = new Intent();
-        intent.putExtra("building", building);
-        setResult(RESULT_OK, intent);
-        finish();
+        if (getIntent().getBooleanExtra("sydw", false)) {
+            Intent intent = new Intent(this, SelectSydwFwActivity.class);
+            intent.putExtra("building", building);
+            startActivityForResult(intent, 100);
+        } else {
+            Intent intent = new Intent();
+            intent.putExtra("building", building);
+            setResult(RESULT_OK, intent);
+            finish();
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == RESULT_OK && requestCode == 100) {
+            Intent intent = new Intent();
+            intent.putExtra("dzbm", data.getStringExtra("dzbm"));
+            intent.putExtra("dzmc", data.getStringExtra("dzmc"));
+            setResult(RESULT_OK, intent);
+            finish();
+        }
     }
 }

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

@@ -258,6 +258,8 @@ public class SmfwActivity extends ZkjcBaseActivity<SmfwPresenter> implements Smf
             ToastUtils.show("请上传佐证材料");
             return;
         }
+        map.put("fwId", getIntent().getStringExtra("id"));
+        map.put("dzbm", getIntent().getStringExtra("dzbm"));
         map.put("fwlx", "上门服务");
         map.put("xm", etBlrXm.getText().toString());
         map.put("sfzh", tvSfzh.getText().toString());
@@ -423,6 +425,7 @@ public class SmfwActivity extends ZkjcBaseActivity<SmfwPresenter> implements Smf
     @Override
     public void onCommitSuccess() {
         ToastUtils.show("提交成功");
+        setResult(RESULT_OK);
         finish();
     }