对接二期接口

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.police.policedatasystem"
         minSdk 24
         targetSdk 33
-        versionCode 10019
+        versionCode 10026
-        versionName "1.0.19"
+        versionName "1.0.26"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -72,4 +72,5 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.8.1' // OkHttp库
     implementation 'com.github.bumptech.glide:glide:4.16.0'
     implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.github.barteksc:android-pdf-viewer:3.2.0-beta.1'
 }

app/src/main/AndroidManifest.xml

@@ -3,10 +3,21 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:versionCode="1">
 
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
 
     <queries>
         <provider android:authorities="com.xdja.app.pj" />
@@ -26,7 +37,14 @@
         android:roundIcon="@mipmap/jinghui"
         android:supportsRtl="true"
         android:theme="@style/Theme.PoliceDataSystem"
+        tools:ignore="MissingTvBanner"
         tools:targetApi="31">
+        <activity
+            android:name=".mine.activity.ApplyDetailActivity"
+            android:exported="false" />
+        <activity
+            android:name=".apply.activity.SuccessActivity"
+            android:exported="false" />
         <activity
             android:name=".data.activity.PoliceEmergencyDetailActivity"
             android:exported="false"
@@ -42,6 +60,7 @@
         <meta-data
             android:name="networkCode"
             android:value="网络区域编码" />
+
         <activity
             android:name=".data.activity.KeyPersonDetailActivity"
             android:exported="false" />
@@ -53,7 +72,12 @@
             android:theme="@style/Theme.PoliceDataSystem">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <data android:host="indexActivity" android:scheme="indexActivity" />
+
+                <data
+                    android:host="indexActivity"
+                    android:scheme="indexActivity"
+                    tools:ignore="AppLinkUrlError" />
+
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
         </activity>

app/src/main/java/com/police/policedatasystem/apply/activity/SuccessActivity.java

@@ -0,0 +1,30 @@
+package com.police.policedatasystem.apply.activity;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.police.policedatasystem.databinding.ActivitySuccessBinding;
+import com.police.policedatasystem.main.App;
+
+public class SuccessActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ActivitySuccessBinding binding = ActivitySuccessBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        binding.ivBack.setOnClickListener(view -> {
+            App.mainIndex = 1;
+            finish();
+        });
+        binding.tvApplyBtn.setOnClickListener(view -> {
+            App.mainIndex = 1;
+            finish();
+        });
+        binding.tvMineBtn.setOnClickListener(view -> {
+            App.mainIndex = 2;
+            finish();
+        });
+    }
+}

app/src/main/java/com/police/policedatasystem/apply/fragment/ApplyFragment.java

@@ -1,5 +1,6 @@
 package com.police.policedatasystem.apply.fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -8,6 +9,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -19,24 +21,33 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.police.policedatasystem.R;
+import com.police.policedatasystem.apply.activity.SuccessActivity;
 import com.police.policedatasystem.apply.model.ApplyDept;
 import com.police.policedatasystem.apply.model.ApplyPerson;
 import com.police.policedatasystem.apply.model.ApplyType;
 import com.police.policedatasystem.apply.viewmodel.ApplyViewModel;
+import com.police.policedatasystem.databinding.DialogDeptSelectorBinding;
 import com.police.policedatasystem.databinding.DialogSelectorBinding;
 import com.police.policedatasystem.databinding.DropdownLayout4Binding;
 import com.police.policedatasystem.databinding.FragmentApplyBinding;
 import com.police.policedatasystem.indexActivity;
+import com.police.policedatasystem.main.App;
 import com.police.policedatasystem.util.UiUtils;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class ApplyFragment extends Fragment {
     private FragmentApplyBinding binding;
     private ApplyViewModel viewModel;
+    public List<ApplyType> applyTypes;
     public List<ApplyDept> applyDept;
     public List<ApplyPerson> applyPeople;
+    public List<ApplyType> applyXXLY;
+    public List<ApplyType> applyJWLX;
+    private String dictValue;
 
     @Nullable
     @Override
@@ -48,17 +59,44 @@ public class ApplyFragment extends Fragment {
 
     private void initView() {
         viewModel = new ApplyViewModel(this, (indexActivity) this.getActivity());
+        binding.includeApply.tvCommitBtn.setOnClickListener(view -> addApply());
+        binding.rlLoading.setOnClickListener(view -> {
+        });
+        binding.vLock.setOnClickListener(view -> {
+        });
+        viewModel.getApplyType();
+        viewModel.getApplyDept();
+        viewModel.getApplyXXLY();
+        viewModel.getApplyJWLX();
+        binding.includeApply.tvQueryOrg.setOnClickListener(view -> showDept(applyDept));
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (App.isLock) {
+            binding.includeApply.etSearchTitle.setText(App.jqbh);
+            binding.vLock.setVisibility(View.VISIBLE);
+        } else {
+            binding.vLock.setVisibility(View.INVISIBLE);
+        }
     }
 
     @Override
     public void onStart() {
         super.onStart();
-        viewModel.getApplyType();
-        viewModel.getApplyDept();
-        viewModel.getApplyPerson();
     }
 
+    /**
+     * 设置申请事由下拉框
+     *
+     * @param applyTypes 申请事由集合
+     */
     public void setPopupWindow(List<ApplyType> applyTypes) {
+        if (applyTypes.isEmpty()) {
+            Toast.makeText(this.getContext(), "用户未在大数据实战赋能系统登记，无法进行赋能", Toast.LENGTH_SHORT).show();
+            return;
+        }
         // 初始化 PopupWindow
         PopupWindow popupWindow = new PopupWindow(getContext());
         // 加载自定义布局
@@ -70,7 +108,9 @@ public class ApplyFragment extends Fragment {
         popupWindow.setHeight(LinearLayout.LayoutParams.WRAP_CONTENT);
         // 设置 PopupWindow 显示的位置（相对于按钮）
         popupWindow.showAtLocation(binding.typeGroup, Gravity.NO_GRAVITY, 0, 0);
+        this.applyTypes = applyTypes;
         binding.tvApplySearchTitle.setText(applyTypes.get(0).getDictLabel());
+        this.dictValue = applyTypes.get(0).getDictValue();
         for (ApplyType item : applyTypes) {
             TextView textView = new TextView(getContext());
             textView.setWidth(ViewGroup.LayoutParams.MATCH_PARENT);
@@ -83,6 +123,7 @@ public class ApplyFragment extends Fragment {
             textView.setOnClickListener(view -> {
                 // 处理菜单项 1 的点击事件
                 binding.tvApplySearchTitle.setText(item.getDictLabel());
+                changeView(item.getDictValue());
                 popupWindow.dismiss(); // 关闭 PopupWindow
             });
         }
@@ -95,22 +136,299 @@ public class ApplyFragment extends Fragment {
             popupWindow.setWidth(binding.typeGroup.getWidth());
             popupWindow.showAsDropDown(binding.typeGroup);
         });
-        binding.includeApply.tvQueryName.setOnClickListener(view -> {
+        binding.includeApply.tvQueryOrg.setOnClickListener(view -> showDeptDialog((TextView) view, "选择部门", applyDept));
-            setPopupWindow2(applyDept);
+        binding.includeApply.tvQueryName.setOnClickListener(view -> showPerson(applyPeople));
-        });
+        binding.includeApply.tvSearchTitle.setOnClickListener(view -> {
-        binding.includeApply.tvQueryOrg.setOnClickListener(view -> {
+            if ("2".equals(dictValue)) {
-            setPopupWindow3(applyPeople);
+                showXXLY(applyXXLY);
+            }
+            if ("3".equals(dictValue)) {
+                showJWLX(applyJWLX);
+            }
         });
     }
 
-    public void setPopupWindow2(List<ApplyDept> applyDept) {
+    /**
-        List<String> names = applyDept.stream().map(ApplyDept::getName).collect(Collectors.toList());
+     * 根据申请事由，改变输入选项title
-        showDialog(names);
+     *
+     * @param dictValue 申请事由类型
+     */
+    private void changeView(String dictValue) {
+        this.dictValue = dictValue;
+        binding.includeApply.etSearchTitle.setText("");
+        binding.includeApply.tvSearchTitle.setText("");
+        switch (dictValue) {
+            case "0":
+                binding.includeApply.etSearchTitle.setVisibility(View.VISIBLE);
+                binding.includeApply.tvSearchTitle.setVisibility(View.INVISIBLE);
+                binding.includeApply.tvMyKeyPerson.setText("警情编号:");
+                break;
+            case "1":
+            case "6":
+                binding.includeApply.etSearchTitle.setVisibility(View.VISIBLE);
+                binding.includeApply.tvSearchTitle.setVisibility(View.INVISIBLE);
+                binding.includeApply.tvMyKeyPerson.setText("身份证号码:");
+                break;
+            case "2":
+                binding.includeApply.etSearchTitle.setVisibility(View.INVISIBLE);
+                binding.includeApply.tvSearchTitle.setVisibility(View.VISIBLE);
+                binding.includeApply.tvMyKeyPerson.setText("线索来源:");
+                break;
+            case "3":
+                binding.includeApply.etSearchTitle.setVisibility(View.INVISIBLE);
+                binding.includeApply.tvSearchTitle.setVisibility(View.VISIBLE);
+                binding.includeApply.tvMyKeyPerson.setText("警务类型:");
+                break;
+            case "5":
+                binding.includeApply.etSearchTitle.setVisibility(View.VISIBLE);
+                binding.includeApply.tvSearchTitle.setVisibility(View.INVISIBLE);
+                binding.includeApply.tvMyKeyPerson.setText("事由详情:");
+                break;
+            case "7":
+                binding.includeApply.etSearchTitle.setVisibility(View.VISIBLE);
+                binding.includeApply.tvSearchTitle.setVisibility(View.INVISIBLE);
+                binding.includeApply.tvMyKeyPerson.setText("案件编号:");
+                break;
+            default:
+        }
     }
 
-    public void setPopupWindow3(List<ApplyPerson> applyPeople) {
+    public void showDept(List<ApplyDept> applyDept) {
+        if (applyDept == null || applyDept.isEmpty()) return;
+        showDeptDialog(binding.includeApply.tvQueryOrg, "选择归属部门", applyDept);
+    }
+
+    public void showPerson(List<ApplyPerson> applyPeople) {
+        if (applyPeople == null || applyPeople.isEmpty()) {
+            return;
+        }
         List<String> names = applyPeople.stream().map(ApplyPerson::getUserName).collect(Collectors.toList());
-        showDialog(names);
+        showDialog(binding.includeApply.tvQueryName, "选择审批人", names);
+    }
+
+    public void showXXLY(List<ApplyType> applyPeople) {
+        if (applyPeople == null || applyPeople.isEmpty()) return;
+        List<String> names = applyPeople.stream().map(ApplyType::getDictLabel).collect(Collectors.toList());
+        showDialog(binding.includeApply.tvSearchTitle, "选择消息来源", names);
+    }
+
+    public void showJWLX(List<ApplyType> applyPeople) {
+        if (applyPeople == null || applyPeople.isEmpty()) return;
+        List<String> names = applyPeople.stream().map(ApplyType::getDictLabel).collect(Collectors.toList());
+        showDialog(binding.includeApply.tvSearchTitle, "选择警务类型", names);
+    }
+
+    /**
+     * 提交
+     */
+    private void addApply() {
+        if (applyTypes == null) {
+            Toast.makeText(this.getContext(), "用户未在大数据实战赋能系统登记，无法进行赋能", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        HashMap<String, String> params = new HashMap<>();
+        for (ApplyType item : applyTypes) {
+            if (item.getDictLabel().equals(binding.tvApplySearchTitle.getText().toString())) {
+                dictValue = item.getDictValue();
+                break;
+            }
+        }
+        if (dictValue == null) {
+            return;
+        }
+        switch (dictValue) {
+            case "0":
+            case "1":
+            case "5":
+            case "7":
+                params.put("jqbh", binding.includeApply.etSearchTitle.getText().toString());
+                break;
+            case "2":
+                params.put("xsly", binding.includeApply.tvSearchTitle.getText().toString());
+                break;
+            case "3":
+                params.put("jwlx", binding.includeApply.tvSearchTitle.getText().toString());
+                break;
+            case "6":
+                params.put("syBz", binding.includeApply.etSearchTitle.getText().toString());
+                break;
+            default:
+                return;
+        }
+        params.put("sy", dictValue);
+        params.put("sqnr", binding.includeApply.etQueryBody.getText().toString());
+        params.put("shrName", binding.includeApply.tvQueryName.getText().toString());
+        for (ApplyPerson item : applyPeople) {
+            if (item.getUserName().equals(binding.includeApply.tvQueryName.getText().toString())) {
+                params.put("shrSfhm", item.getLoginName());
+                break;
+            }
+        }
+        viewModel.addApply(params);
+    }
+
+    /**
+     * 发送成功，跳转到成功页面
+     */
+    public void sendSuccess() {
+        if (getActivity() == null) return;
+        getActivity().startActivity(new Intent(getActivity(), SuccessActivity.class));
+    }
+
+    public void showDialog(TextView textView, String title, List<String> items) {
+        if (getContext() == null) return;
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        DialogSelectorBinding selectorBinding = DialogSelectorBinding.inflate(getLayoutInflater());
+        View dialogView = selectorBinding.getRoot();
+        selectorBinding.tvDialogTitle.setText(title);
+        RecyclerView recyclerView = selectorBinding.rcv;
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        BaseQuickAdapter<String, BaseViewHolder> adapter = new BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_dialog_selector, items) {
+            @Override
+            protected void convert(@NonNull BaseViewHolder baseViewHolder, String s) {
+                baseViewHolder.setText(R.id.tv_item_text, s);
+            }
+        };
+        recyclerView.setAdapter(adapter);
+        builder.setView(dialogView);
+        AlertDialog dialog = builder.create();
+        adapter.setOnItemClickListener((adapter1, view, position) -> {
+            textView.setText(items.get(position));
+            dialog.dismiss();
+        });
+        dialog.show();
+    }
+
+    public void showDeptDialog(TextView textView, String title, List<ApplyDept> items) {
+        if (getContext() == null) return;
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext(), R.style.TransparentAlertDialog);
+        DialogDeptSelectorBinding selectorBinding = DialogDeptSelectorBinding.inflate(getLayoutInflater());
+        View dialogView = selectorBinding.getRoot();
+        selectorBinding.tvDialogTitle.setText(title);
+        RecyclerView recyclerView = selectorBinding.rcv;
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        List<ApplyDept> data = new ArrayList<>();
+        for (ApplyDept item : items) {
+            if ("0".equals(item.getpId())) {
+                data.add(item);
+                break;
+            }
+        }
+        BaseQuickAdapter<ApplyDept, BaseViewHolder> adapter = new BaseQuickAdapter<ApplyDept, BaseViewHolder>(R.layout.item_select_dept, data) {
+            @Override
+            protected void convert(@NonNull BaseViewHolder baseViewHolder, ApplyDept s) {
+                baseViewHolder.setText(R.id.tv_title, s.getName());
+                boolean hasChild = false;
+                for (ApplyDept item : items) {
+                    if (s.getId().equals(item.getpId())) {
+                        hasChild = true;
+                        break;
+                    }
+                }
+                baseViewHolder.setVisible(R.id.iv_sanjiao, hasChild);
+                if (s.isOpen()) {
+                    baseViewHolder.setImageResource(R.id.iv_sanjiao, R.mipmap.icon_down_sanjiao);
+                    baseViewHolder.setImageResource(R.id.iv_box, R.mipmap.icon_selected);
+                    baseViewHolder.setTextColor(R.id.tv_title, getResources().getColor(R.color.main_color));
+                    baseViewHolder.setBackgroundColor(R.id.tv_title, getResources().getColor(R.color.selected_bg_color));
+                } else {
+                    baseViewHolder.setImageResource(R.id.iv_sanjiao, R.mipmap.icon_right_sanjiao);
+                    baseViewHolder.setImageResource(R.id.iv_box, R.mipmap.icon_unselected);
+                    baseViewHolder.setTextColor(R.id.tv_title, getResources().getColor(R.color.color_666));
+                    baseViewHolder.setBackgroundColor(R.id.tv_title, getResources().getColor(R.color.white));
+                }
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < s.getLevel(); i++) {
+                    sb.append("   ");
+                }
+                baseViewHolder.setText(R.id.v_level, sb);
+            }
+        };
+        recyclerView.setAdapter(adapter);
+        builder.setView(dialogView);
+        AlertDialog dialog = builder.create();
+        adapter.setOnItemClickListener((adapter1, view, position) -> {
+            ApplyDept dept = data.get(position);
+            boolean open = dept.isOpen();
+            int addCount = 1;
+            for (ApplyDept item : items) {
+                if (item.getpId().equals(dept.getId())) {
+                    if (open) {
+                        removeItem(data, item);
+                    } else {
+                        item.setLevel(dept.getLevel() + 1);
+                        data.add(position + addCount, item);
+                        addCount += 1;
+                    }
+                }
+            }
+            if (open) {
+                cancelSelected(dept);
+            } else {
+                enterSelected(data, dept);
+            }
+            adapter.setList(data);
+            selectorBinding.tvEnter.setOnClickListener(view1 -> {
+                long selectId = -1;
+                ApplyDept selectDept = null;
+                for (ApplyDept item : applyDept) {
+                    if (item.isOpen()) {
+                        item.setOpen(false);
+                        if (selectId < Long.parseLong(item.getId())) {
+                            selectId = Long.parseLong(item.getId());
+                            selectDept = item;
+                        }
+                    }
+                }
+                if (selectId >= 0) {
+                    textView.setText(selectDept.getTitle());
+                    viewModel.getApplyPerson(selectId + "");
+                    dialog.dismiss();
+                } else {
+                    Toast.makeText(getContext(), "请选择一个归属部门", Toast.LENGTH_SHORT).show();
+                }
+
+            });
+        });
+        dialog.show();
+    }
+
+    private void removeItem(List<ApplyDept> data, ApplyDept dept) {
+        data.remove(dept);
+        for (int i = 0; i < data.size(); i++) {
+            if (data.get(i).getpId().equals(dept.getId())) {
+                removeItem(data, data.get(i));
+            }
+        }
+    }
+
+    /**
+     * 取消勾选
+     */
+    private void cancelSelected(ApplyDept dept) {
+        dept.setOpen(false);
+        for (ApplyDept item : applyDept) {
+            if (item.getpId().equals(dept.getId())) {
+                cancelSelected(item);
+            }
+        }
+    }
+
+    /**
+     * 选择勾选
+     */
+    private void enterSelected(List<ApplyDept> data, ApplyDept dept) {
+        for (ApplyDept item : applyDept) {
+            if (item.getpId().equals(dept.getpId()) && !item.equals(dept)) {
+                cancelSelected(item);
+                for (ApplyDept i : applyDept) {
+                    if (i.getpId().equals(item.getId())) {
+                        removeItem(data, i);
+                    }
+                }
+            }
+        }
+        dept.setOpen(true);
     }
 
     public void loadingShow() {
@@ -124,26 +442,4 @@ public class ApplyFragment extends Fragment {
             getActivity().runOnUiThread(() -> binding.rlLoading.setVisibility(View.GONE));
         }
     }
-
-    public void showDialog(List<String> items) {
-        if (getContext() == null) return;
-        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-        DialogSelectorBinding selectorBinding = DialogSelectorBinding.inflate(getLayoutInflater());
-        View dialogView = selectorBinding.getRoot();
-        RecyclerView recyclerView = selectorBinding.rcv;
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        BaseQuickAdapter<String, BaseViewHolder> adapter = new BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_dialog_selector, items) {
-            @Override
-            protected void convert(@NonNull BaseViewHolder baseViewHolder, String s) {
-                baseViewHolder.setText(R.id.tv_item_text, s);
-            }
-        };
-        recyclerView.setAdapter(adapter);
-        adapter.setOnItemClickListener((adapter1, view, position) -> {
-
-        });
-        builder.setView(dialogView);
-        AlertDialog dialog = builder.create();
-        dialog.show();
-    }
 }

app/src/main/java/com/police/policedatasystem/apply/model/ApplyDept.java

@@ -11,6 +11,7 @@ public class ApplyDept implements Serializable {
     private String name;
     private String pId;
     private String title;
+    private int level = 0;
     private boolean open;
     private boolean nocheck;
 
@@ -34,6 +35,14 @@ public class ApplyDept implements Serializable {
         return name;
     }
 
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
     public void setName(String name) {
         this.name = name;
     }

app/src/main/java/com/police/policedatasystem/apply/model/DetailQueryResult.java

@@ -0,0 +1,15 @@
+package com.police.policedatasystem.apply.model;
+
+import java.io.Serializable;
+
+public class DetailQueryResult implements Serializable {
+    private String GOBACK;
+
+    public String getGOBACK() {
+        return GOBACK;
+    }
+
+    public void setGOBACK(String GOBACK) {
+        this.GOBACK = GOBACK;
+    }
+}

app/src/main/java/com/police/policedatasystem/apply/viewmodel/ApplyViewModel.java

@@ -11,6 +11,7 @@ import com.police.policedatasystem.indexActivity;
 import com.police.policedatasystem.util.UiUtils;
 
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 
 import okhttp3.Call;
@@ -53,16 +54,15 @@ public class ApplyViewModel {
 
             @Override
             public void onSuccess(List<ApplyDept> value) {
-//                value.sort(Comparator.comparing(ApplyDept::getDictSort));
                 fragment.applyDept = value;
                 fragment.loadingNone();
             }
         });
     }
 
-    public void getApplyPerson() {
+    public void getApplyPerson(String deptId) {
         fragment.loadingShow();
-        activity.requestClient.getApplyPerson(new CustomCallBack<List<ApplyPerson>>() {
+        activity.requestClient.getApplyPerson(deptId,new CustomCallBack<List<ApplyPerson>>() {
             @Override
             public void onError(@NonNull Call call, @NonNull Exception e) {
                 UiUtils.toast(e.getMessage());
@@ -71,10 +71,60 @@ public class ApplyViewModel {
 
             @Override
             public void onSuccess(List<ApplyPerson> value) {
-//                value.sort(Comparator.comparing(ApplyDept::getDictSort));
                 fragment.applyPeople = value;
                 fragment.loadingNone();
             }
         });
     }
+
+    public void getApplyJWLX() {
+        fragment.loadingShow();
+        activity.requestClient.getApplyJWLX(new CustomCallBack<List<ApplyType>>() {
+            @Override
+            public void onError(@NonNull Call call, @NonNull Exception e) {
+                UiUtils.toast(e.getMessage());
+                fragment.loadingNone();
+            }
+
+            @Override
+            public void onSuccess(List<ApplyType> value) {
+                fragment.applyJWLX = value;
+                fragment.loadingNone();
+            }
+        });
+    }
+
+    public void getApplyXXLY() {
+        fragment.loadingShow();
+        activity.requestClient.getApplyXXLY(new CustomCallBack<List<ApplyType>>() {
+            @Override
+            public void onError(@NonNull Call call, @NonNull Exception e) {
+                UiUtils.toast(e.getMessage());
+                fragment.loadingNone();
+            }
+
+            @Override
+            public void onSuccess(List<ApplyType> value) {
+                fragment.applyXXLY = value;
+                fragment.loadingNone();
+            }
+        });
+    }
+
+    public void addApply(HashMap<String, String> map) {
+        fragment.loadingShow();
+        activity.requestClient.addApply(map, new CustomCallBack<Object>() {
+            @Override
+            public void onError(@NonNull Call call, @NonNull Exception e) {
+                UiUtils.toast(e.getMessage());
+                fragment.loadingNone();
+            }
+
+            @Override
+            public void onSuccess(Object value) {
+                fragment.sendSuccess();
+                fragment.loadingNone();
+            }
+        });
+    }
 }

app/src/main/java/com/police/policedatasystem/data/activity/PoliceEmergencyDetailActivity.java

@@ -1,19 +1,37 @@
 package com.police.policedatasystem.data.activity;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
-import com.police.policedatasystem.main.App;
+import com.police.policedatasystem.R;
-import com.police.policedatasystem.databinding.ActivityPoliceEmergencyDetailBinding;
+import com.police.policedatasystem.apply.model.ApplyType;
+import com.police.policedatasystem.apply.model.DetailQueryResult;
 import com.police.policedatasystem.data.model.PoliceEmergencyDetail;
+import com.police.policedatasystem.databinding.ActivityPoliceEmergencyDetailBinding;
+import com.police.policedatasystem.http.CustomCallBack;
+import com.police.policedatasystem.http.RequestClient;
+import com.police.policedatasystem.main.App;
+import com.police.policedatasystem.mine.activity.ApplyDetailActivity;
 import com.police.policedatasystem.util.Constants;
 import com.police.policedatasystem.util.UiUtils;
 
+import java.util.List;
+
+import okhttp3.Call;
+
 /**
  * 警情详情页面
  */
@@ -31,28 +49,157 @@ public class PoliceEmergencyDetailActivity extends Activity {
         binding.ivBack.setOnClickListener(view -> finish());
         PoliceEmergencyDetail detail = new Gson().fromJson(getIntent().getStringExtra("param"), PoliceEmergencyDetail.class);
         if (UiUtils.isNotEmpty(detail.getZp())) {
-            Glide.with(App.getApp()).asBitmap().load(detail.getZp()).into(binding.ivZp);
+            Glide.with(App.getApp()).asBitmap().load(detail.getZp()).into(binding.includePersonInfo.ivZp);
         }
-        setText(binding.tvJcjbh, detail.getJcjbh());//报警编号
+        setText(binding.includeBaseInfo.tvJcjbh, detail.getJcjbh());//报警编号
-        setText(binding.tvBjjyqk, detail.getBjjyqk());//报警内容
+        setText(binding.includeBaseInfo.tvBjjyqk, detail.getBjjyqk());//报警内容
-        setText(binding.tvBjrlxdh, detail.getBjrlxdh());//报警电话
+        setText(binding.includeBaseInfo.tvBjrlxdh, detail.getBjrlxdh());//报警电话
-        setText(binding.tvJjsj, UiUtils.formatTime(detail.getJjsj()));//报警时间
+        setText(binding.includeBaseInfo.tvJjsj, UiUtils.formatTime(detail.getJjsj()));//报警时间
-        setText(binding.tvAsjfsdddzmc, detail.getAsjfsdddzmc());//报警位置
+        setText(binding.includeBaseInfo.tvAsjfsdddzmc, detail.getAsjfsdddzmc());//报警位置
-        setText(binding.tvCjdwgajgjgdm, detail.getCjdwgajgjgdm());//出警单位
+        setText(binding.includeBaseInfo.tvCjdwgajgjgdm, detail.getCjdwgajgjgdm());//出警单位
-        setText(binding.tvCjrxm, detail.getCjrxm());//出警民警
+        setText(binding.includeBaseInfo.tvCjrxm, detail.getCjrxm());//出警民警
-        setText(binding.tvBq, detail.getBq());//标签
+        setText(binding.includeBaseInfo.tvJqlb, detail.getJqlb());//警情类别
-        setText(binding.tvJg, detail.getJg());//籍贯
+        setText(binding.includeBaseInfo.tvCllb, detail.getCllx());//处理类型
-        setText(binding.tvXm, detail.getXm());//姓名
+        setText(binding.includeBaseInfo.tvCljg, detail.getCljg());//处理结果
-        setText(binding.tvXb, detail.getXb());//性别
+
-        setText(binding.tvMz, detail.getMz());//民族
+        setText(binding.includePersonInfo.tvBq, detail.getBq());//标签
-        setText(binding.tvHyzk, detail.getHyzk());//婚姻状况
+        setText(binding.includePersonInfo.tvJg, detail.getJg());//籍贯
-        setText(binding.tvSfzh, detail.getBjrzjhm());//身份证号
+        setText(binding.includePersonInfo.tvXm, detail.getXm());//姓名
-        setText(binding.tvNl, detail.getNl());//年龄
+        setText(binding.includePersonInfo.tvXb, detail.getXb());//性别
-        setText(binding.tvFwcs, detail.getFwcs());//服务场所
+        setText(binding.includePersonInfo.tvMz, detail.getMz());//民族
-        setText(binding.tvLsbjcs, detail.getLsbjcs());//历史报警次数
+        setText(binding.includePersonInfo.tvHyzk, detail.getHyzk());//婚姻状况
-        setText(binding.tvJqlb, detail.getJqlb());//警情类别
+        setText(binding.includePersonInfo.tvSfzh, detail.getBjrzjhm());//身份证号
-        setText(binding.tvCllb, detail.getCllx());//处理类型
+        setText(binding.includePersonInfo.tvNl, detail.getNl());//年龄
-        setText(binding.tvCljg, detail.getCljg());//处理结果
+        setText(binding.includePersonInfo.tvFwcs, detail.getFwcs());//服务场所
+        setText(binding.includePersonInfo.tvLsbjcs, detail.getLsbjcs());//历史报警次数
+
+        setText(binding.includeCjyaInfo.tvContent, detail.getLsbjcs());//todo 处警预案
+
+        binding.includeQueryInfo.tvQueryType1.setOnClickListener(view -> {
+            queryType = 1;
+            changeView();
+        });
+        binding.includeQueryInfo.tvQueryType2.setOnClickListener(view -> {
+            queryType = 2;
+            changeView();
+        });
+        binding.includeQueryInfo.tvQueryType3.setOnClickListener(view -> {
+            queryType = 3;
+            changeView();
+        });
+        binding.includeQueryInfo.tvQueryBtn.setOnClickListener(view -> {
+            sendQuery();
+        });
+        binding.includeApplyInfo.tvQueryResult.setOnClickListener(view -> {
+            //跳转到赋能详情
+            jumpApplyDetail(detail.getJcjbh());
+        });
+        binding.includeApplyInfo.tvGoApply.setOnClickListener(view -> {
+            jumpApplyFragment(detail.getJcjbh());
+        });
+        binding.includeApplyInfo.tvMakeCall.setOnClickListener(view -> {
+            //拨打电话660110
+            makeCall();
+        });
+    }
+
+    private void jumpApplyFragment(String jqbh) {
+        RequestClient.instance().getApplyType(new CustomCallBack<List<ApplyType>>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+
+            }
+
+            @Override
+            public void onSuccess(List<ApplyType> value) {
+                if (value.isEmpty()) {
+                    Toast.makeText(PoliceEmergencyDetailActivity.this, "用户未在大数据实战赋能系统登记，无法填写工单", Toast.LENGTH_SHORT).show();
+                } else {
+                    App.mainIndex = 1;
+                    App.isLock = true;
+                    App.jqbh = jqbh;
+                    finish();
+                }
+            }
+        });
+
+    }
+
+    private void jumpApplyDetail(String jqbh) {
+        RequestClient.instance().getApplyType(new CustomCallBack<List<ApplyType>>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+
+            }
+
+            @Override
+            public void onSuccess(List<ApplyType> value) {
+                if (value.isEmpty()) {
+                    Toast.makeText(PoliceEmergencyDetailActivity.this, "用户未在大数据实战赋能系统登记，无法查看结果", Toast.LENGTH_SHORT).show();
+                } else {
+                    Intent intent = new Intent(PoliceEmergencyDetailActivity.this, ApplyDetailActivity.class);
+                    intent.putExtra("jqbh", jqbh);
+                    startActivity(intent);
+                }
+            }
+        });
+    }
+
+    private void makeCall() {
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CALL_PHONE)
+                != PackageManager.PERMISSION_GRANTED) {
+            // 权限尚未被授予
+            ActivityCompat.requestPermissions(this,
+                    new String[]{Manifest.permission.CALL_PHONE},
+                    500);
+        } else {
+            // 权限已经被授予，可以拨打电话
+            Intent intent = new Intent(Intent.ACTION_CALL);
+            intent.setData(Uri.parse("tel:660110"));
+            if (intent.resolveActivity(getPackageManager()) != null) {
+                startActivity(intent);
+            }
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        if (requestCode == 500) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                // 权限被授予，可以拨打电话
+                makeCall();
+            }
+        }
+    }
+
+    private void sendQuery() {
+        String str = binding.includeQueryInfo.etInput.getText().toString();
+        if (str.isEmpty()) {
+            Toast.makeText(this, "请输入查询内容", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        RequestClient.instance().policeEmergencyDetailQuery(queryType, str, new CustomCallBack<DetailQueryResult>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+                Toast.makeText(PoliceEmergencyDetailActivity.this, "查询失败", Toast.LENGTH_SHORT).show();
+            }
+
+            @Override
+            public void onSuccess(DetailQueryResult value) {
+                binding.includeQueryInfo.tvQueryResult.setText(value.getGOBACK());
+            }
+        });
+    }
+
+    private int queryType = 1;
+
+    private void changeView() {
+        binding.includeQueryInfo.tvQueryType1.setTextColor(queryType == 1 ? getColor(R.color.white) : getColor(R.color.color_999));
+        binding.includeQueryInfo.tvQueryType2.setTextColor(queryType == 2 ? getColor(R.color.white) : getColor(R.color.color_999));
+        binding.includeQueryInfo.tvQueryType3.setTextColor(queryType == 3 ? getColor(R.color.white) : getColor(R.color.color_999));
+        binding.includeQueryInfo.tvQueryType1.setBackgroundResource(queryType == 1 ? R.drawable.all_7_main_bg : R.drawable.all_7_999_border_bg);
+        binding.includeQueryInfo.tvQueryType2.setBackgroundResource(queryType == 2 ? R.drawable.all_7_main_bg : R.drawable.all_7_999_border_bg);
+        binding.includeQueryInfo.tvQueryType3.setBackgroundResource(queryType == 3 ? R.drawable.all_7_main_bg : R.drawable.all_7_999_border_bg);
     }
 
     public static void startAction(Context context, String num) {

app/src/main/java/com/police/policedatasystem/data/fragment/DataFragment.java

@@ -21,11 +21,12 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.police.policedatasystem.R;
 import com.police.policedatasystem.data.adapter.KeyPersonAdapter;
 import com.police.policedatasystem.data.adapter.PoliceEmergencyAdapter;
-import com.police.policedatasystem.databinding.FragmentDataBinding;
-import com.police.policedatasystem.indexActivity;
 import com.police.policedatasystem.data.model.KeyPerson;
 import com.police.policedatasystem.data.model.PoliceEmergency;
 import com.police.policedatasystem.data.viewmodel.DataViewModel;
+import com.police.policedatasystem.databinding.FragmentDataBinding;
+import com.police.policedatasystem.indexActivity;
+import com.police.policedatasystem.main.App;
 import com.scwang.smart.refresh.footer.ClassicsFooter;
 import com.scwang.smart.refresh.header.ClassicsHeader;
 
@@ -51,6 +52,9 @@ public class DataFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = FragmentDataBinding.inflate(inflater);
         initView();
+        currentTabBar = 1;
+        currentTab = 1;
+        filterType = 0;
         Activity activity = getActivity();
         if (activity instanceof indexActivity) {
             act = (indexActivity) activity;
@@ -71,6 +75,7 @@ public class DataFragment extends Fragment {
     }
 
     public void initData() {
+        if (viewModel == null) return;
         viewModel.keyPersonInit();
         viewModel.getKeyPersonMessageCount();
     }
@@ -79,7 +84,7 @@ public class DataFragment extends Fragment {
     public void onResume() {
         super.onResume();
         if (!act.findAddress) {
-            act.requestClient.init();
+            act.requestClient.init(this::initData);
         } else {
             initData();
         }
@@ -279,12 +284,12 @@ public class DataFragment extends Fragment {
     }
 
     public void loadingShow() {
-        getActivity().runOnUiThread(() -> binding.rlLoading.setVisibility(View.VISIBLE));
+        App.getHandler().post(() -> binding.rlLoading.setVisibility(View.VISIBLE));
 
     }
 
     public void loadingNone() {
-        getActivity().runOnUiThread(() -> binding.rlLoading.setVisibility(View.GONE));
+        App.getHandler().post(() -> binding.rlLoading.setVisibility(View.GONE));
     }
 
     private void setPopupWindow() {

app/src/main/java/com/police/policedatasystem/data/model/PoliceEmergencyDetail.java

@@ -1,7 +1,6 @@
 package com.police.policedatasystem.data.model;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 警情详情

app/src/main/java/com/police/policedatasystem/http/BaseRequestClient.java

@@ -14,7 +14,6 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.police.policedatasystem.http.requestparams.RequestParams;
 import com.police.policedatasystem.http.requestparams.ResponseParams;
-import com.police.policedatasystem.indexActivity;
 import com.police.policedatasystem.main.App;
 import com.police.policedatasystem.main.model.ResourceList;
 import com.police.policedatasystem.main.model.UserCredential;
@@ -37,11 +36,11 @@ import okhttp3.Response;
 import okhttp3.logging.HttpLoggingInterceptor;
 
 public class BaseRequestClient {
-    public final indexActivity activity;
     private OkHttpClient okHttpClient;
+    private FindAddressCallback callback;
 
-    public BaseRequestClient(indexActivity activity) {
+    public interface FindAddressCallback {
-        this.activity = activity;
+        void success();
     }
 
     /*
@@ -63,7 +62,8 @@ public class BaseRequestClient {
 
     }
 
-    public void init() {
+    public void init(FindAddressCallback callback) {
+        this.callback = callback;
         HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor();
         loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY); // 设置日志级别，例如打印请求和响应的body
         okHttpClient = new OkHttpClient.Builder()
@@ -100,9 +100,9 @@ public class BaseRequestClient {
             if (PARAMS_KEY_UA_RET_SUCCESS == resultCode) {
                 Constants.APP_CREDENTIAL = bundle.getString(PARAMS_KEY_UA_APP_CREDENTIAL);
                 Constants.USER_CREDENTIAL = bundle.getString(PARAMS_KEY_UA_USER_CREDENTIAL);
-                Constants.USER_ID = new Gson().fromJson(Constants.USER_CREDENTIAL, UserCredential.class).getCredential().getLoad().getUserInfo().getJh();
+                Constants.setUserId(new Gson().fromJson(Constants.USER_CREDENTIAL, UserCredential.class).getCredential().getLoad().getUserInfo().getJh());
-                Constants.SFZH = new Gson().fromJson(Constants.USER_CREDENTIAL, UserCredential.class).getCredential().getLoad().getUserInfo().getSfzh();
+                Constants.setSFZH(new Gson().fromJson(Constants.USER_CREDENTIAL, UserCredential.class).getCredential().getLoad().getUserInfo().getSfzh());
-                Constants.USER_ORG_ID = new Gson().fromJson(Constants.USER_CREDENTIAL, UserCredential.class).getCredential().getLoad().getUserInfo().getOrgId();
+                Constants.setORG_ID(new Gson().fromJson(Constants.USER_CREDENTIAL, UserCredential.class).getCredential().getLoad().getUserInfo().getOrgId());
                 //根据票据寻址
                 findAddress();
             } else {
@@ -144,7 +144,9 @@ public class BaseRequestClient {
                         Constants.resourceListsMap.put(item.getResourceId(), item);
                     }
                     //2.发起请求，获取重点人数据
-                    activity.initData();
+                    if (callback != null) {
+                        callback.success();
+                    }
                 } else {
                     if (UiUtils.isEmpty(resourceList)) {
                         UiUtils.toast("寻址失败，错误码：" + resultCode);
@@ -173,67 +175,39 @@ public class BaseRequestClient {
             @Override
             public void onFailure(@NonNull Call call, @NonNull IOException e) {
                 // 请求失败
-                activity.runOnUiThread(() -> callBack.onError(call, e));
+                App.getHandler().post(() -> callBack.onError(call, e));
             }
 
             @Override
             public void onResponse(@NonNull Call call, @NonNull Response response) {
                 if (!response.isSuccessful()) {
-                    activity.runOnUiThread(() -> callBack.onError(call, new IOException("Unexpected code " + response)));
+                    App.getHandler().post(() -> callBack.onError(call, new IOException("Unexpected code " + response)));
                     return;
                 }
                 try {
                     // 请求成功，处理响应数据
                     if (response.body() == null) {
-                        activity.runOnUiThread(() -> callBack.onError(call, new Exception("服务器返回数据异常")));
+                        App.getHandler().post(() -> callBack.onError(call, new Exception("服务器返回数据异常")));
                         return;
                     }
                     String responseBody = response.body().string();
-//                    if (urlKey.equals(Constants.APPLY_TYPE_ID)){
-//                        responseBody = "{\n" +
-//                                "\"code\":\"200\",\n" +
-//                                "\"data\":{\n" +
-//                                "\"dataList\":[\n" +
-//                                "{\n" +
-//                                "\"fieldValues\":[\n" +
-//                                "{\n" +
-//                                "\"field\":\"outjson\",\n" +
-//                                "\"value\":\"[{\\\"dictLabel\\\":\\\"管控重点人\\\",\\\"dictSort\\\":1,\\\"dictValue\\\":\\\"1\\\"},{\\\"dictLabel\\\":\\\"核验信息\\\",\\\"dictSort\\\":3,\\\"dictValue\\\":\\\"3\\\"},{\\\"dictLabel\\\":\\\"追踪逃犯\\\",\\\"dictSort\\\":2,\\\"dictValue\\\":\\\"6\\\"},{\\\"dictLabel\\\":\\\"处置警情\\\",\\\"dictSort\\\":0,\\\"dictValue\\\":\\\"0\\\"},{\\\"dictLabel\\\":\\\"核查线索\\\",\\\"dictSort\\\":2,\\\"dictValue\\\":\\\"2\\\"},{\\\"dictLabel\\\":\\\"其他\\\",\\\"dictSort\\\":5,\\\"dictValue\\\":\\\"5\\\"},{\\\"dictLabel\\\":\\\"处置案情\\\",\\\"dictSort\\\":1,\\\"dictValue\\\":\\\"7\\\"}]\"\n" +
-//                                "}\n" +
-//                                "]\n" +
-//                                "}\n" +
-//                                "],\n" +
-//                                "\"page\":{\n" +
-//                                "\"total\":7,\n" +
-//                                "\"pageNo\":10,\n" +
-//                                "\"pageSize\":1\n" +
-//                                "}\n" +
-//                                "},\n" +
-//                                "\"messageId\":\"788a1cc4-2009-4744-ba66-7503ca37b0f2\",\n" +
-//                                "\"message\":\"ok\",\n" +
-//                                "\"version\":\"1.0\"\n" +
-//                                "}";
-//                    }
-                    if (urlKey.equals(Constants.APPLY_TYPE_ID)){
-                        responseBody="[{\"checked\":false,\"id\":\"220000000000\",\"name\":\"吉林省公安厅\",\"nocheck\":false,\"open\":false,\"pId\":\"0\",\"title\":\"吉林省公安厅\"},{\"checked\":false,\"id\":\"220100000000\",\"name\":\"吉林省长春市公安局\",\"nocheck\":false,\"open\":false,\"pId\":\"220000000000\",\"title\":\"吉林省长春市公安局\"},{\"checked\":false,\"id\":\"220197000000\",\"name\":\"吉林省长春市公安局经济技术开发区分局\",\"nocheck\":false,\"open\":false,\"pId\":\"220100000000\",\"title\":\"吉林省长春市公安局经济技术开发区分局\"},{\"checked\":false,\"id\":\"220197170000\",\"name\":\"吉林省长春市公安局经济技术开发区分局花园路派出所\",\"nocheck\":false,\"open\":false,\"pId\":\"220197000000\",\"title\":\"吉林省长春市公安局经济技术开发区分局花园路派出所\"}]";
-                    }
                     ResponseParams responseParams = new Gson().fromJson(responseBody, ResponseParams.class);
                     if (!"200".equals(responseParams.getCode())) {
-                        activity.runOnUiThread(() -> callBack.onError(call, new Exception("服务器出错，请联系开发人员或稍后重试！")));
+                        App.getHandler().post(() -> callBack.onError(call, new Exception("服务器出错，请联系开发人员或稍后重试！")));
                         return;
                     }
                     if (responseParams.getData().getDataList() == null || responseParams.getData().getDataList().isEmpty()) {
-                        activity.runOnUiThread(() -> callBack.onError(call, new Exception("服务器返回数据异常")));
+                        App.getHandler().post(() -> callBack.onError(call, new Exception("服务器返回数据异常")));
                         return;
                     }
                     ResponseParams.FieldData fieldData = responseParams.getData().getDataList().get(0);
                     if (fieldData.getFieldValues() == null || fieldData.getFieldValues().isEmpty()) {
-                        activity.runOnUiThread(() -> callBack.onError(call, new Exception("服务器返回数据异常")));
+                        App.getHandler().post(() -> callBack.onError(call, new Exception("服务器返回数据异常")));
                         return;
                     }
-                    activity.runOnUiThread(() -> callBack.onSuccess(fieldData.getFieldValues().get(0).getValue()));
+                    App.getHandler().post(() -> callBack.onSuccess(fieldData.getFieldValues().get(0).getValue()));
                 } catch (Exception e) {
-                    activity.runOnUiThread(() -> callBack.onError(call, e));
+                    App.getHandler().post(() -> callBack.onError(call, e));
                 }
             }
         });

app/src/main/java/com/police/policedatasystem/http/RequestClient.java

@@ -7,6 +7,7 @@ import com.google.gson.reflect.TypeToken;
 import com.police.policedatasystem.apply.model.ApplyDept;
 import com.police.policedatasystem.apply.model.ApplyPerson;
 import com.police.policedatasystem.apply.model.ApplyType;
+import com.police.policedatasystem.apply.model.DetailQueryResult;
 import com.police.policedatasystem.data.model.DataCount;
 import com.police.policedatasystem.data.model.KeyPerson;
 import com.police.policedatasystem.data.model.KeyPersonDetail;
@@ -18,7 +19,8 @@ import com.police.policedatasystem.http.requestparams.GetKeyPersonMessageCountPa
 import com.police.policedatasystem.http.requestparams.GetOrgKeyPersonListParams;
 import com.police.policedatasystem.http.requestparams.GetPoliceEmergencyDetailParams;
 import com.police.policedatasystem.http.requestparams.GetPoliceEmergencyListParams;
-import com.police.policedatasystem.indexActivity;
+import com.police.policedatasystem.mine.model.Apply;
+import com.police.policedatasystem.mine.model.ApplyDetail;
 import com.police.policedatasystem.util.Constants;
 
 import java.util.HashMap;
@@ -28,8 +30,15 @@ import okhttp3.Call;
 
 public class RequestClient extends BaseRequestClient {
 
-    public RequestClient(indexActivity activity) {
+    private RequestClient() {
-        super(activity);
+    }
+
+    private static final class RequestClientHolder {
+        static final RequestClient requestClient = new RequestClient();
+    }
+
+    public static RequestClient instance() {
+        return RequestClientHolder.requestClient;
     }
 
     /**
@@ -66,7 +75,7 @@ public class RequestClient extends BaseRequestClient {
         params.setSfhm(Constants.SFZH);
         params.setDept(Constants.USER_ORG_ID);
         params.setPageSize(Constants.PAGE_SIZE + "");
-        request(Constants.KEY_PERSON_ID, new Gson().toJson(params), new CustomCallBack<String>() {
+        request(Constants.ORG_KEY_PERSON_ID, new Gson().toJson(params), new CustomCallBack<String>() {
             @Override
             public void onError(Call call, @NonNull Exception e) {
                 callback.onError(call, e);
@@ -114,7 +123,6 @@ public class RequestClient extends BaseRequestClient {
      */
     public void getPoliceEmergency(GetPoliceEmergencyListParams params, CustomCallBack<List<PoliceEmergency>> callBack) {
         params.setSfhm(Constants.SFZH);
-//        params.setSfhm("220104198105200331");
         params.setPageSize(Constants.PAGE_SIZE + "");
         request(Constants.POLICE_EMERGENCY_ID, new Gson().toJson(params), new CustomCallBack<String>() {
             @Override
@@ -163,9 +171,9 @@ public class RequestClient extends BaseRequestClient {
         params.setSfhm(Constants.SFZH);
         params.setJybh(Constants.USER_ID);
         params.setDept(Constants.USER_ORG_ID);
-//        params.setSfhm("220104198105200331");
+//        params.setSfhm("220183197210264653");
 //        params.setJybh("106222");
-//        params.setDept(Constants.USER_ORG_ID);
+//        params.setDept("220183210000");
         request(Constants.KEY_PERSON_MESSAGE_COUNT_ID, new Gson().toJson(params), new CustomCallBack<String>() {
             @Override
             public void onError(Call call, @NonNull Exception e) {
@@ -225,13 +233,14 @@ public class RequestClient extends BaseRequestClient {
             }
         });
     }
+
     /**
      * 获取申请支援审批人
      */
-    public void getApplyPerson(CustomCallBack<List<ApplyPerson>> callBack) {
+    public void getApplyPerson(String deptId, CustomCallBack<List<ApplyPerson>> callBack) {
         HashMap<String, String> params = new HashMap<>();
         params.put("type", "3");
-        params.put("deptId", Constants.USER_ORG_ID);
+        params.put("deptId", deptId);
         params.put("sfhm", Constants.SFZH);
         request(Constants.APPLY_TYPE_ID, new Gson().toJson(params), new CustomCallBack<String>() {
             @Override
@@ -247,4 +256,209 @@ public class RequestClient extends BaseRequestClient {
             }
         });
     }
+
+    /**
+     * 获取申请支援-消息来源
+     */
+    public void getApplyXXLY(CustomCallBack<List<ApplyType>> callBack) {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("type", "4");
+        params.put("deptId", Constants.USER_ORG_ID);
+        params.put("sfhm", Constants.SFZH);
+        request(Constants.APPLY_TYPE_ID, new Gson().toJson(params), new CustomCallBack<String>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+                callBack.onError(call, e);
+            }
+
+            @Override
+            public void onSuccess(String value) {
+                List<ApplyType> applyTypes = new Gson().fromJson(value, new TypeToken<List<ApplyType>>() {
+                }.getType());
+                callBack.onSuccess(applyTypes);
+            }
+        });
+    }
+
+    /**
+     * 获取申请支援-警务类型
+     */
+    public void getApplyJWLX(CustomCallBack<List<ApplyType>> callBack) {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("type", "5");
+        params.put("deptId", Constants.USER_ORG_ID);
+        params.put("sfhm", Constants.SFZH);
+        request(Constants.APPLY_TYPE_ID, new Gson().toJson(params), new CustomCallBack<String>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+                callBack.onError(call, e);
+            }
+
+            @Override
+            public void onSuccess(String value) {
+                List<ApplyType> applyTypes = new Gson().fromJson(value, new TypeToken<List<ApplyType>>() {
+                }.getType());
+                callBack.onSuccess(applyTypes);
+            }
+        });
+    }
+
+    /**
+     * 获取我的赋能-办理状态
+     */
+    public void getMineBLZT(CustomCallBack<List<ApplyType>> callBack) {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("type", "6");
+        params.put("deptId", Constants.USER_ORG_ID);
+        params.put("sfhm", Constants.SFZH);
+        request(Constants.APPLY_TYPE_ID, new Gson().toJson(params), new CustomCallBack<String>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+                callBack.onError(call, e);
+            }
+
+            @Override
+            public void onSuccess(String value) {
+                List<ApplyType> applyTypes = new Gson().fromJson(value, new TypeToken<List<ApplyType>>() {
+                }.getType());
+                callBack.onSuccess(applyTypes);
+            }
+        });
+    }
+
+
+    /**
+     * 获取我的赋能-信息来源
+     */
+    public void getMineXXLY(CustomCallBack<List<ApplyType>> callBack) {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("type", "7");
+        params.put("deptId", Constants.USER_ORG_ID);
+        params.put("sfhm", Constants.SFZH);
+        request(Constants.APPLY_TYPE_ID, new Gson().toJson(params), new CustomCallBack<String>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+                callBack.onError(call, e);
+            }
+
+            @Override
+            public void onSuccess(String value) {
+                List<ApplyType> applyTypes = new Gson().fromJson(value, new TypeToken<List<ApplyType>>() {
+                }.getType());
+                callBack.onSuccess(applyTypes);
+            }
+        });
+    }
+
+    /**
+     * 申请赋能-提交申请
+     */
+    public void addApply(HashMap<String, String> params, CustomCallBack<Object> callBack) {
+        params.put("sfhm", Constants.SFZH);
+        request(Constants.APPLY_COMMIT_ID, new Gson().toJson(params), new CustomCallBack<String>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+                callBack.onError(call, e);
+            }
+
+            @Override
+            public void onSuccess(String value) {
+                callBack.onSuccess(null);
+            }
+        });
+    }
+
+    /**
+     * 我的赋能-查询我申请的赋能{
+     * "sfhm": "220104199208240015",
+     * "sqsj": "",
+     * "sy": "",
+     * "ly": "",
+     * "spzt": "",
+     * "fnbh": ""
+     * }
+     */
+    public void getApplyList(HashMap<String, String> params, CustomCallBack<List<Apply>> callBack) {
+        params.put("sfhm", "220183197210264653");
+        request(Constants.MINE_LIST_ID, new Gson().toJson(params), new CustomCallBack<String>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+                callBack.onError(call, e);
+            }
+
+            @Override
+            public void onSuccess(String value) {
+                List<Apply> applyTypes = new Gson().fromJson(value, new TypeToken<List<Apply>>() {
+                }.getType());
+                callBack.onSuccess(applyTypes);
+            }
+        });
+    }
+
+    /**
+     * 我的赋能详情
+     */
+    public void getApplyDetail(String fnbh, CustomCallBack<ApplyDetail> callBack) {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("sfhm", Constants.SFZH);
+        params.put("fnbh", fnbh);
+        params.put("deptId", Constants.USER_ORG_ID);
+        request(Constants.MINE_DETAIL_ID, new Gson().toJson(params), new CustomCallBack<String>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+                callBack.onError(call, e);
+            }
+
+            @Override
+            public void onSuccess(String value) {
+                ApplyDetail applyDetail = new Gson().fromJson(value, ApplyDetail.class);
+                callBack.onSuccess(applyDetail);
+            }
+        });
+    }
+
+    /**
+     * 警情详情跳转到我的赋能详情
+     */
+    public void jumpApplyDetail(String jqbh, CustomCallBack<ApplyDetail> callBack) {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("sfhm", Constants.SFZH);
+        params.put("sfzh", Constants.SFZH);
+        params.put("jqbh", jqbh);
+        params.put("deptId", Constants.USER_ORG_ID);
+        request(Constants.MINE_DETAIL_ID, new Gson().toJson(params), new CustomCallBack<String>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+                callBack.onError(call, e);
+            }
+
+            @Override
+            public void onSuccess(String value) {
+                ApplyDetail applyDetail = new Gson().fromJson(value, ApplyDetail.class);
+                callBack.onSuccess(applyDetail);
+            }
+        });
+    }
+
+    /**
+     * 我的赋能详情
+     */
+    public void policeEmergencyDetailQuery(int type, String content, CustomCallBack<DetailQueryResult> callBack) {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("sfhm", Constants.SFZH);
+        params.put("type", type + "");
+        params.put("condi", content);
+        request(Constants.SELF_QUERY_ID, new Gson().toJson(params), new CustomCallBack<String>() {
+            @Override
+            public void onError(Call call, @NonNull Exception e) {
+                callBack.onError(call, e);
+            }
+
+            @Override
+            public void onSuccess(String value) {
+                DetailQueryResult applyDetail = new Gson().fromJson(value, DetailQueryResult.class);
+                callBack.onSuccess(applyDetail);
+            }
+        });
+    }
 }

app/src/main/java/com/police/policedatasystem/indexActivity.java

@@ -18,8 +18,9 @@ import androidx.fragment.app.FragmentTransaction;
 import com.police.policedatasystem.apply.fragment.ApplyFragment;
 import com.police.policedatasystem.data.fragment.DataFragment;
 import com.police.policedatasystem.databinding.ActivityIndexBinding;
+import com.police.policedatasystem.http.BaseRequestClient;
 import com.police.policedatasystem.http.RequestClient;
-import com.police.policedatasystem.improve.fragment.ImproveFragment;
+import com.police.policedatasystem.main.App;
 import com.police.policedatasystem.main.viewmodel.IndexViewModel;
 import com.police.policedatasystem.mine.fragment.MineFragment;
 import com.police.policedatasystem.util.Constants;
@@ -32,7 +33,7 @@ public class indexActivity extends AppCompatActivity {
     private final DataFragment dataFragment = new DataFragment();
     private final ApplyFragment applyFragment = new ApplyFragment();
     private final MineFragment mineFragment = new MineFragment();
-    private final ImproveFragment improveFragment = new ImproveFragment();
+//    private final ImproveFragment improveFragment = new ImproveFragment();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -41,56 +42,71 @@ public class indexActivity extends AppCompatActivity {
         setContentView(binding.getRoot());
         initView();
         viewModel = new IndexViewModel(this);
-        requestClient = new RequestClient(this);
+        requestClient = RequestClient.instance();
+        requestClient.init(() -> {
+            initData();
+        });
     }
 
     private void initView() {
         binding.navBarGroup.navBar1.setOnClickListener(view -> {
+            App.mainIndex = 0;
+            App.isLock=false;
+            changeFootBar();
+        });
+        binding.navBarGroup.navBar2.setOnClickListener(view -> {
+            App.mainIndex = 1;
+            changeFootBar();
+        });
+        binding.navBarGroup.navBar3.setOnClickListener(view -> {
+            App.mainIndex = 2;
+            App.isLock=false;
+            changeFootBar();
+        });
+//        binding.navBarGroup.navBar4.setOnClickListener(view -> {
+//          changeFootBar(3);
+//        });
+        registerBroadcastReceiver();
+    }
+
+    private void changeFootBar() {
+        binding.navBarGroup.navBarIcon1.setImageResource(R.mipmap.icon_data_normal);
+        binding.navBarGroup.navBarText1.setTextColor(getColor(R.color.normal_color));
+        binding.navBarGroup.navBarIcon2.setImageResource(R.mipmap.icon_apply_normal);
+        binding.navBarGroup.navBarText2.setTextColor(getColor(R.color.normal_color));
+        binding.navBarGroup.navBarIcon3.setImageResource(R.mipmap.icon_mine_normal);
+        binding.navBarGroup.navBarText3.setTextColor(getColor(R.color.normal_color));
+//      binding.navBarGroup.navBarIcon4.setImageResource(R.mipmap.icon_improve_normal);
+//      binding.navBarGroup.navBarText4.setTextColor(getColor(R.color.normal_color));
+        if (App.mainIndex == 0) {
             replaceFragment(dataFragment);
             binding.navBarGroup.navBarIcon1.setImageResource(R.mipmap.icon_data_selected);
             binding.navBarGroup.navBarText1.setTextColor(getColor(R.color.selected_color));
-            binding.navBarGroup.navBarIcon2.setImageResource(R.mipmap.icon_apply_normal);
+            return;
-            binding.navBarGroup.navBarText2.setTextColor(getColor(R.color.normal_color));
+        }
-            binding.navBarGroup.navBarIcon3.setImageResource(R.mipmap.icon_mine_normal);
+        if (App.mainIndex == 1) {
-            binding.navBarGroup.navBarText3.setTextColor(getColor(R.color.normal_color));
-            binding.navBarGroup.navBarIcon4.setImageResource(R.mipmap.icon_improve_normal);
-            binding.navBarGroup.navBarText4.setTextColor(getColor(R.color.normal_color));
-        });
-        binding.navBarGroup.navBar2.setOnClickListener(view -> {
             replaceFragment(applyFragment);
-            binding.navBarGroup.navBarIcon1.setImageResource(R.mipmap.icon_data_normal);
-            binding.navBarGroup.navBarText1.setTextColor(getColor(R.color.normal_color));
             binding.navBarGroup.navBarIcon2.setImageResource(R.mipmap.icon_apply_selected);
             binding.navBarGroup.navBarText2.setTextColor(getColor(R.color.selected_color));
-            binding.navBarGroup.navBarIcon3.setImageResource(R.mipmap.icon_mine_normal);
+            return;
-            binding.navBarGroup.navBarText3.setTextColor(getColor(R.color.normal_color));
+        }
-            binding.navBarGroup.navBarIcon4.setImageResource(R.mipmap.icon_improve_normal);
+        if (App.mainIndex == 2) {
-            binding.navBarGroup.navBarText4.setTextColor(getColor(R.color.normal_color));
-        });
-        binding.navBarGroup.navBar3.setOnClickListener(view -> {
             replaceFragment(mineFragment);
-            binding.navBarGroup.navBarIcon1.setImageResource(R.mipmap.icon_data_normal);
-            binding.navBarGroup.navBarText1.setTextColor(getColor(R.color.normal_color));
-            binding.navBarGroup.navBarIcon2.setImageResource(R.mipmap.icon_apply_normal);
-            binding.navBarGroup.navBarText2.setTextColor(getColor(R.color.normal_color));
             binding.navBarGroup.navBarIcon3.setImageResource(R.mipmap.icon_mine_selected);
             binding.navBarGroup.navBarText3.setTextColor(getColor(R.color.selected_color));
-            binding.navBarGroup.navBarIcon4.setImageResource(R.mipmap.icon_improve_normal);
+            return;
-            binding.navBarGroup.navBarText4.setTextColor(getColor(R.color.normal_color));
+        }
-        });
+        if (App.mainIndex == 3) {
-        binding.navBarGroup.navBar4.setOnClickListener(view -> {
+            //replaceFragment(improveFragment);
-            replaceFragment(improveFragment);
+//            binding.navBarGroup.navBarIcon4.setImageResource(R.mipmap.icon_improve_selected);
-            binding.navBarGroup.navBarIcon1.setImageResource(R.mipmap.icon_data_normal);
+//            binding.navBarGroup.navBarText4.setTextColor(getColor(R.color.selected_color));
-            binding.navBarGroup.navBarText1.setTextColor(getColor(R.color.normal_color));
+        }
-            binding.navBarGroup.navBarIcon2.setImageResource(R.mipmap.icon_apply_normal);
+    }
-            binding.navBarGroup.navBarText2.setTextColor(getColor(R.color.normal_color));
+
-            binding.navBarGroup.navBarIcon3.setImageResource(R.mipmap.icon_mine_normal);
+    @Override
-            binding.navBarGroup.navBarText3.setTextColor(getColor(R.color.normal_color));
+    protected void onResume() {
-            binding.navBarGroup.navBarIcon4.setImageResource(R.mipmap.icon_improve_selected);
+        super.onResume();
-            binding.navBarGroup.navBarText4.setTextColor(getColor(R.color.selected_color));
+        changeFootBar();
-        });
-        replaceFragment(dataFragment);
-        registerBroadcastReceiver();
     }
 
     public void initData() {
@@ -134,7 +150,9 @@ public class indexActivity extends AppCompatActivity {
             if (action.contains(ACTION_SUFFIX_UA_LOGIN)) {
                 //再次获取票据
                 if (requestClient != null) {
-                    requestClient.init();
+                    requestClient.init(() -> {
+                        initData();
+                    });
                 }
                 return;
             }

app/src/main/java/com/police/policedatasystem/main/App.java

@@ -6,6 +6,12 @@ import android.os.Handler;
 
 public class App extends Application {
     private static App app;
+    /**
+     * 首页显示fragment索引
+     */
+    public static int mainIndex = 0;
+    public static boolean isLock = false;
+    public static String jqbh = "";
     private static Handler handler;
 
 

app/src/main/java/com/police/policedatasystem/mine/activity/ApplyDetailActivity.java

@@ -0,0 +1,70 @@
+package com.police.policedatasystem.mine.activity;
+
+import android.os.Bundle;
+import android.util.Base64;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.github.barteksc.pdfviewer.PDFView;
+import com.police.policedatasystem.databinding.ActivityApplyDetailBinding;
+import com.police.policedatasystem.mine.model.ApplyDetail;
+import com.police.policedatasystem.mine.viewmodel.DetailViewModel;
+import com.police.policedatasystem.util.UiUtils;
+
+public class ApplyDetailActivity extends AppCompatActivity {
+
+    private ActivityApplyDetailBinding binding;
+    private DetailViewModel viewModel;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityApplyDetailBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        binding.ivBack.setOnClickListener(view -> finish());
+        binding.rlLoading.setOnClickListener(view -> {
+
+        });
+        viewModel = new DetailViewModel(this);
+        if (getIntent().getStringExtra("applyDetail") == null) {
+            viewModel.jumpApplyDetail(getIntent().getStringExtra("jqbh"));
+        } else {
+            viewModel.getApplyDetail(getIntent().getStringExtra("applyDetail"));
+        }
+
+    }
+
+    public void applyDetail(ApplyDetail detail) {
+        binding.tvDetailFnbh.setText(detail.getBh());
+        binding.tvDetailSqsy.setText(detail.getSy());
+        binding.tvDetailSqsj.setText(detail.getCreateTimeStr());
+        binding.tvDetailJwlx.setText(detail.getLy());
+        binding.tvDetailShzt.setText(detail.getSpzt());
+//        binding.tvDetailFnxq.setText(detail.getFj());
+        // 加载PDF文件
+//        File file = new File("/path/to/your/pdf/file.pdf"); // 替换为你的PDF文件路径
+        if (detail.getFj() != null && !detail.getFj().isEmpty()) {
+            for (String item : detail.getFj()) {
+                PDFView pdfView = new PDFView(this, null);
+                pdfView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, UiUtils.dp2Px(500)));
+                pdfView.fromBytes(Base64.decode(item, Base64.DEFAULT))
+                        .enableSwipe(true) // 允许滑动翻页
+                        .enableDoubletap(true) // 允许双击缩放
+                        .enableAnnotationRendering(true) // 允许渲染注释
+                        .load();
+                binding.llGroup.addView(pdfView);
+            }
+        }
+    }
+
+    public void loadingShow() {
+        binding.rlLoading.setVisibility(View.VISIBLE);
+    }
+
+    public void loadingNone() {
+        binding.rlLoading.setVisibility(View.GONE);
+    }
+}

app/src/main/java/com/police/policedatasystem/mine/adapter/MineApplyListAdapter.java

@@ -0,0 +1,28 @@
+package com.police.policedatasystem.mine.adapter;
+
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.police.policedatasystem.R;
+import com.police.policedatasystem.data.model.KeyPerson;
+import com.police.policedatasystem.main.App;
+import com.police.policedatasystem.mine.model.Apply;
+import com.police.policedatasystem.util.UiUtils;
+
+public class MineApplyListAdapter extends BaseQuickAdapter<Apply, BaseViewHolder> {
+
+    public MineApplyListAdapter() {
+        super(R.layout.item_mine_apply); // 指定列表项的布局
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, Apply item) {
+        helper.setText(R.id.tv_fnbh, item.getBh());
+        helper.setText(R.id.tv_sqsy, item.getSy());
+        helper.setText(R.id.tv_sqsj, item.getCreateTimeStr());
+        helper.setText(R.id.tv_xxly, item.getLy());
+        helper.setText(R.id.tv_blzt, item.getSpzt());
+    }
+}

app/src/main/java/com/police/policedatasystem/mine/fragment/MineFragment.java

@@ -1,6 +1,7 @@
 package com.police.policedatasystem.mine.fragment;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -12,14 +13,36 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.police.policedatasystem.R;
+import com.police.policedatasystem.apply.model.ApplyType;
+import com.police.policedatasystem.databinding.DialogSelectorBinding;
 import com.police.policedatasystem.databinding.FragmentMineBinding;
+import com.police.policedatasystem.indexActivity;
+import com.police.policedatasystem.mine.activity.ApplyDetailActivity;
+import com.police.policedatasystem.mine.adapter.MineApplyListAdapter;
+import com.police.policedatasystem.mine.model.Apply;
+import com.police.policedatasystem.mine.viewmodel.MineViewModel;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class MineFragment extends Fragment {
     private FragmentMineBinding binding;
     private PopupWindow popupWindow;
+    private MineApplyListAdapter adapter;
+    private List<Apply> applyList;
+    private List<ApplyType> applyTypes;
+    private List<ApplyType> applyXXLY;
+    private List<ApplyType> applyBLZT;
+    private final MineViewModel viewModel = new MineViewModel(this, (indexActivity) getActivity());
 
     @Nullable
     @Override
@@ -35,8 +58,75 @@ public class MineFragment extends Fragment {
             popupWindow.setWidth(binding.mineTypeGroup.getWidth());
             popupWindow.showAsDropDown(binding.mineTypeGroup);
         });
+//        binding.refreshLayout.setRefreshHeader(new ClassicsHeader(getContext()));
+//        binding.refreshLayout.setRefreshFooter(new ClassicsFooter(getContext()));
+        binding.mineRvGroup.setLayoutManager(new LinearLayoutManager(getContext()));
+        adapter = new MineApplyListAdapter();
+        binding.mineRvGroup.setAdapter(adapter);
+        adapter.setOnItemClickListener((adapter1, view, position) -> applyDetail(applyList.get(position).getBh()));
+        binding.mineTvInput.setOnClickListener(view -> {
+            switch (searchType) {
+                case "sy":
+                    showDialog((TextView) view, "选择申请事由", applyTypes.stream()
+                            .map(ApplyType::getDictLabel)
+                            .collect(Collectors.toList()));
+                    break;
+                case "ly":
+                    showDialog((TextView) view, "选择信息来源", applyXXLY.stream()
+                            .map(ApplyType::getDictLabel)
+                            .collect(Collectors.toList()));
+                    break;
+                case "spzt":
+                    showDialog((TextView) view, "选择办理状态", applyBLZT.stream()
+                            .map(ApplyType::getDictLabel)
+                            .collect(Collectors.toList()));
+                    break;
+                default:
             }
 
+        });
+        binding.tvMineSearchBtn.setOnClickListener(view -> searchData());
+        searchData();
+    }
+
+    private void searchData() {
+        String value = "";
+        switch (searchType) {
+            case "sy":
+                for (ApplyType item : applyTypes) {
+                    String str = binding.mineTvInput.getText().toString();
+                    if (item.getDictLabel().equals(str)) {
+                        value = item.getDictValue();
+                        break;
+                    }
+                }
+                break;
+            case "ly":
+                for (ApplyType item : applyXXLY) {
+                    if (item.getDictLabel().equals(binding.mineTvInput.getText().toString())) {
+                        value = item.getDictValue();
+                        break;
+                    }
+                }
+                break;
+            case "spzt":
+                for (ApplyType item : applyBLZT) {
+                    if (item.getDictLabel().equals(binding.mineTvInput.getText().toString())) {
+                        value = item.getDictValue();
+                        break;
+                    }
+                }
+                break;
+            default:
+                value = binding.mineEtInput.getText().toString();
+        }
+        HashMap<String, String> map = new HashMap<>();
+        map.put(searchType, value);
+        viewModel.getApplyList(map);
+    }
+
+    private String searchType = "fnbh";
+
     private void setPopupWindow() {
         // 初始化 PopupWindow
         popupWindow = new PopupWindow(getContext());
@@ -59,27 +149,56 @@ public class MineFragment extends Fragment {
         TextView textView5 = contentView.findViewById(R.id.textView5); // 假设这是菜单项2的ID
         textView1.setOnClickListener(v -> {
             // 处理菜单项 1 的点击事件
-            binding.tvMineSearchTitle.setText("赋能编码");
+            binding.tvMineSearchTitle.setText("赋能编号");
+            searchType = "fnbh";
+            binding.mineTvInput.setVisibility(View.INVISIBLE);
+            binding.mineEtInput.setText("");
+            binding.mineEtInput.setVisibility(View.VISIBLE);
             popupWindow.dismiss(); // 关闭 PopupWindow
         });
         textView2.setOnClickListener(v -> {
             // 处理菜单项 2 的点击事件
             binding.tvMineSearchTitle.setText("申请事由");
+            searchType = "sy";
+            binding.mineTvInput.setVisibility(View.VISIBLE);
+            binding.mineTvInput.setText("");
+            binding.mineEtInput.setVisibility(View.INVISIBLE);
+            if (applyTypes == null) {
+                viewModel.getApplyType();
+            }
             popupWindow.dismiss(); // 关闭 PopupWindow
         });
         textView3.setOnClickListener(v -> {
             // 处理菜单项 2 的点击事件
             binding.tvMineSearchTitle.setText("申请时间");
+            searchType = "sqsj";
+            binding.mineTvInput.setVisibility(View.INVISIBLE);
+            binding.mineEtInput.setText("");
+            binding.mineEtInput.setVisibility(View.VISIBLE);
             popupWindow.dismiss(); // 关闭 PopupWindow
         });
         textView4.setOnClickListener(v -> {
             // 处理菜单项 2 的点击事件
             binding.tvMineSearchTitle.setText("信息来源");
+            searchType = "ly";
+            binding.mineTvInput.setVisibility(View.VISIBLE);
+            binding.mineTvInput.setText("");
+            binding.mineEtInput.setVisibility(View.INVISIBLE);
+            if (applyXXLY == null) {
+                viewModel.getMineXXLY();
+            }
             popupWindow.dismiss(); // 关闭 PopupWindow
         });
         textView5.setOnClickListener(v -> {
             // 处理菜单项 2 的点击事件
             binding.tvMineSearchTitle.setText("办理状态");
+            searchType = "spzt";
+            binding.mineTvInput.setVisibility(View.VISIBLE);
+            binding.mineTvInput.setText("");
+            binding.mineEtInput.setVisibility(View.INVISIBLE);
+            if (applyBLZT == null) {
+                viewModel.getMineBLZT();
+            }
             popupWindow.dismiss(); // 关闭 PopupWindow
         });
         // 将自定义布局设置为 PopupWindow 的内容视图
@@ -88,4 +207,63 @@ public class MineFragment extends Fragment {
         popupWindow.setFocusable(true);
         popupWindow.setOutsideTouchable(true); // 设置点击 PopupWindow 外部区域使其消失
     }
+
+    public void applyType(List<ApplyType> list) {
+        applyTypes = list;
+    }
+
+    public void applyBLZT(List<ApplyType> list) {
+        applyBLZT = list;
+    }
+
+    public void applyXXLY(List<ApplyType> list) {
+        applyXXLY = list;
+    }
+
+    public void showDialog(TextView textView, String title, List<String> items) {
+        if (getContext() == null) return;
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        DialogSelectorBinding selectorBinding = DialogSelectorBinding.inflate(getLayoutInflater());
+        View dialogView = selectorBinding.getRoot();
+        selectorBinding.tvDialogTitle.setText(title);
+        RecyclerView recyclerView = selectorBinding.rcv;
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        BaseQuickAdapter<String, BaseViewHolder> adapter = new BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_dialog_selector, items) {
+            @Override
+            protected void convert(@NonNull BaseViewHolder baseViewHolder, String s) {
+                baseViewHolder.setText(R.id.tv_item_text, s);
+            }
+        };
+        recyclerView.setAdapter(adapter);
+        builder.setView(dialogView);
+        AlertDialog dialog = builder.create();
+        adapter.setOnItemClickListener((adapter1, view, position) -> {
+            textView.setText(items.get(position));
+            dialog.dismiss();
+        });
+        dialog.show();
+    }
+
+    public void applyList(List<Apply> list) {
+        applyList = list;
+        adapter.setList(list);
+    }
+
+    public void applyDetail(String applyDetail) {
+        Intent intent = new Intent(this.getActivity(), ApplyDetailActivity.class);
+        intent.putExtra("applyDetail", applyDetail);
+        startActivity(intent);
+    }
+
+    public void loadingShow() {
+        if (getActivity() != null) {
+            getActivity().runOnUiThread(() -> binding.mineRlLoading.setVisibility(View.VISIBLE));
+        }
+    }
+
+    public void loadingNone() {
+        if (getActivity() != null) {
+            getActivity().runOnUiThread(() -> binding.mineRlLoading.setVisibility(View.GONE));
+        }
+    }
 }

app/src/main/java/com/police/policedatasystem/mine/model/Apply.java

@@ -0,0 +1,61 @@
+package com.police.policedatasystem.mine.model;
+
+import java.io.Serializable;
+
+/**
+ * {
+ * "bh": "JL0100002016",
+ * "createTimeStr": "2024-03-13 09:05:39.0",
+ * "ly": "PC",
+ * "params": {},
+ * "spzt": "审批驳回",
+ * "sy": "处置警情"
+ * }
+ */
+public class Apply implements Serializable {
+    private String bh;//赋能编号
+    private String sy;//申请事由
+    private String createTimeStr;//申请时间
+    private String ly;//信息来源
+    private String spzt;//办理状态
+
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh;
+    }
+
+    public String getSy() {
+        return sy;
+    }
+
+    public void setSy(String sy) {
+        this.sy = sy;
+    }
+
+    public String getCreateTimeStr() {
+        return createTimeStr;
+    }
+
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
+    }
+
+    public String getLy() {
+        return ly;
+    }
+
+    public void setLy(String ly) {
+        this.ly = ly;
+    }
+
+    public String getSpzt() {
+        return spzt;
+    }
+
+    public void setSpzt(String spzt) {
+        this.spzt = spzt;
+    }
+}

app/src/main/java/com/police/policedatasystem/mine/model/ApplyDetail.java

@@ -0,0 +1,71 @@
+package com.police.policedatasystem.mine.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * {
+ * "bh": "JL0100002016",
+ * "createTimeStr": "2024-03-13 09:05:39.0",
+ * "ly": "PC",
+ * "params": {},
+ * "spzt": "审批驳回",
+ * "sy": "处置警情"
+ * }
+ */
+public class ApplyDetail implements Serializable {
+    private String bh;//赋能编号
+    private String sy;//申请事由
+    private String createTimeStr;//申请时间
+    private String ly;//信息来源
+    private String spzt;//办理状态
+    private List<String> fj;//附件
+
+    public List<String> getFj() {
+        return fj;
+    }
+
+    public void setFj(List<String> fj) {
+        this.fj = fj;
+    }
+
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh;
+    }
+
+    public String getSy() {
+        return sy;
+    }
+
+    public void setSy(String sy) {
+        this.sy = sy;
+    }
+
+    public String getCreateTimeStr() {
+        return createTimeStr;
+    }
+
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
+    }
+
+    public String getLy() {
+        return ly;
+    }
+
+    public void setLy(String ly) {
+        this.ly = ly;
+    }
+
+    public String getSpzt() {
+        return spzt;
+    }
+
+    public void setSpzt(String spzt) {
+        this.spzt = spzt;
+    }
+}

app/src/main/java/com/police/policedatasystem/mine/viewmodel/DetailViewModel.java

@@ -0,0 +1,53 @@
+package com.police.policedatasystem.mine.viewmodel;
+
+import androidx.annotation.NonNull;
+
+import com.police.policedatasystem.http.CustomCallBack;
+import com.police.policedatasystem.http.RequestClient;
+import com.police.policedatasystem.mine.activity.ApplyDetailActivity;
+import com.police.policedatasystem.mine.model.ApplyDetail;
+import com.police.policedatasystem.util.UiUtils;
+
+import okhttp3.Call;
+
+public class DetailViewModel {
+    public ApplyDetailActivity activity;
+    public RequestClient requestClient = RequestClient.instance();
+
+    public DetailViewModel(ApplyDetailActivity activity) {
+        this.activity = activity;
+    }
+
+    public void getApplyDetail(String fnbh) {
+        activity.loadingShow();
+        requestClient.getApplyDetail(fnbh, new CustomCallBack<ApplyDetail>() {
+            @Override
+            public void onError(@NonNull Call call, @NonNull Exception e) {
+                UiUtils.toast(e.getMessage());
+                activity.loadingNone();
+            }
+
+            @Override
+            public void onSuccess(ApplyDetail value) {
+                activity.applyDetail(value);
+                activity.loadingNone();
+            }
+        });
+    }
+    public void jumpApplyDetail(String fnbh) {
+        activity.loadingShow();
+        requestClient.jumpApplyDetail(fnbh, new CustomCallBack<ApplyDetail>() {
+            @Override
+            public void onError(@NonNull Call call, @NonNull Exception e) {
+                UiUtils.toast(e.getMessage());
+                activity.loadingNone();
+            }
+
+            @Override
+            public void onSuccess(ApplyDetail value) {
+                activity.applyDetail(value);
+                activity.loadingNone();
+            }
+        });
+    }
+}

app/src/main/java/com/police/policedatasystem/mine/viewmodel/MineViewModel.java

@@ -0,0 +1,94 @@
+package com.police.policedatasystem.mine.viewmodel;
+
+import androidx.annotation.NonNull;
+
+import com.police.policedatasystem.apply.model.ApplyType;
+import com.police.policedatasystem.http.CustomCallBack;
+import com.police.policedatasystem.http.RequestClient;
+import com.police.policedatasystem.indexActivity;
+import com.police.policedatasystem.mine.fragment.MineFragment;
+import com.police.policedatasystem.mine.model.Apply;
+import com.police.policedatasystem.util.UiUtils;
+
+import java.util.HashMap;
+import java.util.List;
+
+import okhttp3.Call;
+
+public class MineViewModel {
+    private final MineFragment fragment;
+    public indexActivity activity;
+
+    public MineViewModel(MineFragment fragment, indexActivity activity) {
+        this.fragment = fragment;
+        this.activity = activity;
+    }
+
+    public void getApplyList(HashMap<String, String> params) {
+        fragment.loadingShow();
+        RequestClient.instance().getApplyList(params, new CustomCallBack<List<Apply>>() {
+            @Override
+            public void onError(@NonNull Call call, @NonNull Exception e) {
+                UiUtils.toast(e.getMessage());
+                fragment.loadingNone();
+            }
+
+            @Override
+            public void onSuccess(List<Apply> value) {
+                fragment.applyList(value);
+                fragment.loadingNone();
+            }
+        });
+    }
+
+    public void getApplyType() {
+        fragment.loadingShow();
+        RequestClient.instance().getApplyType(new CustomCallBack<List<ApplyType>>() {
+            @Override
+            public void onError(@NonNull Call call, @NonNull Exception e) {
+                UiUtils.toast(e.getMessage());
+                fragment.loadingNone();
+            }
+
+            @Override
+            public void onSuccess(List<ApplyType> value) {
+                fragment.applyType(value);
+                fragment.loadingNone();
+            }
+        });
+    }
+
+    public void getMineBLZT() {
+        fragment.loadingShow();
+        RequestClient.instance().getMineBLZT(new CustomCallBack<List<ApplyType>>() {
+            @Override
+            public void onError(@NonNull Call call, @NonNull Exception e) {
+                UiUtils.toast(e.getMessage());
+                fragment.loadingNone();
+            }
+
+            @Override
+            public void onSuccess(List<ApplyType> value) {
+                fragment.applyBLZT(value);
+                fragment.loadingNone();
+            }
+        });
+    }
+
+    public void getMineXXLY() {
+        fragment.loadingShow();
+        RequestClient.instance().getMineXXLY(new CustomCallBack<List<ApplyType>>() {
+            @Override
+            public void onError(@NonNull Call call, @NonNull Exception e) {
+                UiUtils.toast(e.getMessage());
+                fragment.loadingNone();
+            }
+
+            @Override
+            public void onSuccess(List<ApplyType> value) {
+                fragment.applyXXLY(value);
+                fragment.loadingNone();
+            }
+        });
+    }
+}

app/src/main/java/com/police/policedatasystem/util/Constants.java

@@ -45,6 +45,10 @@ public final class Constants {
      * 赋能详情查询
      */
     public static final String MINE_DETAIL_ID = "220000000000-3-0100-8c3e36bb5bdb4ee8b55b4ad0c4a83d13";
+    /**
+     * 自助查询
+     */
+    public static final String SELF_QUERY_ID = "220000000000-3-0100-dec70ae1354e4281b6eeced50dc2a7be";
     /**
      * 组织机构id
      */
@@ -62,12 +66,24 @@ public final class Constants {
     /**
      * 当前用户身份证号
      */
-    public static String SFZH = "100307";
+    public static String SFZH = "220183197210264653";
+
+    public static void setUserId(String str) {
+        USER_ID = str;
+    }
+
+    public static void setSFZH(String str) {
+//        SFZH = str;
+    }
+
+    public static void setORG_ID(String str) {
+//        USER_ORG_ID = str;
+    }
 
     /**
      * 当前用户警员组织代码
      */
-    public static String USER_ORG_ID = "22018421000";//22018421000//220106290000
+    public static String USER_ORG_ID = "220183210000";//22018421000//220106290000
     /**
      * 寻址后得到的数据-接口列表
      */

app/src/main/java/com/police/policedatasystem/util/UiUtils.java

@@ -23,7 +23,7 @@ public class UiUtils {
     }
 
     public static void toast(String str) {
-        App.getApp().getHandler().post(() -> Toast.makeText(App.getApp(), str, Toast.LENGTH_LONG).show());
+        App.getHandler().post(() -> Toast.makeText(App.getApp(), str, Toast.LENGTH_LONG).show());
     }
 
     public static boolean isEmpty(String str) {

app/src/main/res/drawable/all_15_fff_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#fff"/>
+    <corners android:radius="15dp"/>
+</shape>

app/src/main/res/drawable/all_7_4b8e01_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#4b8e01"/>
+    <corners android:radius="7dp"/>
+</shape>

app/src/main/res/drawable/all_7_999_border_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#999" />
+    <corners android:radius="7dp" />
+</shape>

app/src/main/res/drawable/all_7_999_bottom_border_bg.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#999" />
+        </shape>
+    </item>
+    <item android:bottom="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#fff" />
+        </shape>
+    </item>
+
+</layer-list>

app/src/main/res/drawable/all_7_de7900_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#de7900"/>
+    <corners android:radius="7dp"/>
+</shape>

app/src/main/res/drawable/all_7_line_ccc_bg.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <stroke android:width="1dp" android:color="#ccc"/> <!-- 边框颜色和宽度 -->
+    <stroke android:width="1dp"
-    <corners android:radius="7dp"/>
+        android:color="#ccc"/> <!-- 边框颜色和宽度 -->
+    <corners
+        android:radius="7dp"/>
+
 </shape>

app/src/main/res/drawable/all_7_main_border_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#052eba" />
+    <corners android:radius="7dp" />
+</shape>

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

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".mine.activity.ApplyDetailActivity">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/white"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:padding="16dp"
+            android:src="@drawable/back" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="赋能详情"
+            android:textColor="@color/black"
+            android:textSize="16sp" />
+    </RelativeLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="65dp">
+
+        <LinearLayout
+            android:id="@+id/ll_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="15dp"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:padding="15dp"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="赋能编号："
+                    android:textColor="@color/color_999"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_detail_fnbh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="funengbianhao"
+                    android:textColor="@color/normal_color"
+                    android:textSize="15sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="申请事由："
+                    android:textColor="@color/color_999"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_detail_sqsy"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="处置警情"
+                    android:textColor="@color/normal_color"
+                    android:textSize="15sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="申请时间："
+                    android:textColor="@color/color_999"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_detail_sqsj"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="2024-05-05"
+                    android:textColor="@color/normal_color"
+                    android:textSize="15sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="警务类型："
+                    android:textColor="@color/color_999"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_detail_jwlx"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="警务类型"
+                    android:textColor="@color/normal_color"
+                    android:textSize="15sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="查询内容："
+                    android:textColor="@color/color_999"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_detail_cxnr"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="查询内容"
+                    android:textColor="@color/normal_color"
+                    android:textSize="15sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="审核状态："
+                    android:textColor="@color/color_999"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_detail_shzt"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="审核状态"
+                    android:textColor="@color/normal_color"
+                    android:textSize="15sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="赋能详情："
+                    android:textColor="@color/color_999"
+                    android:textSize="15sp" />
+
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+    <RelativeLayout
+        android:id="@+id/rl_loading"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+        <ProgressBar
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_centerInParent="true" />
+    </RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -36,531 +36,32 @@
         android:layout_marginTop="50dp"
         android:scrollbars="none">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/iv_person_icon"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_marginStart="13dp"
-                android:layout_marginTop="14dp"
-                android:background="@drawable/all_2_selected_bg"
-                android:padding="2dp"
-                android:src="@drawable/baojing"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="7dp"
-                android:text="警情信息"
-                android:textColor="#FF052EBA"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="@id/iv_person_icon"
-                app:layout_constraintLeft_toRightOf="@id/iv_person_icon"
-                app:layout_constraintTop_toTopOf="@id/iv_person_icon" />
-
-            <LinearLayout
-                android:id="@+id/ll_location_group"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="10dp"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/all_7_fff_bg"
-                android:orientation="vertical"
-                android:padding="13dp"
-                app:layout_constraintTop_toBottomOf="@id/iv_person_icon">
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-                    android:layout_marginVertical="5dp"
+            android:orientation="vertical">
-                    android:orientation="horizontal">
 
-                    <TextView
+            <include
-                        android:layout_width="wrap_content"
+                android:id="@+id/include_base_info"
-                        android:layout_height="wrap_content"
+                layout="@layout/include_police_emergency_detail_base_info" />
-                        android:text="警情编号："
-                        android:textColor="#999"
-                        android:textSize="14sp" />
 
-                    <TextView
+            <include
-                        android:id="@+id/tv_jcjbh"
+                android:id="@+id/include_person_info"
-                        android:layout_width="match_parent"
+                layout="@layout/include_police_emergency_detail_person_info" />
-                        android:layout_height="wrap_content"
+
-                        android:layout_marginStart="5dp"
+            <include
-                        android:text="无"
+                android:id="@+id/include_cjya_info"
-                        android:textColor="#333"
+                android:visibility="gone"
-                        android:textSize="14sp" />
+                layout="@layout/include_police_emergency_detail_cjya_info" />
+
+            <include
+                android:id="@+id/include_query_info"
+                layout="@layout/include_police_emergency_detail_query_info" />
+
+            <include
+                android:id="@+id/include_apply_info"
+                layout="@layout/include_police_emergency_detail_apply_info" />
         </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="5dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="报警内容："
-                        android:textColor="#999"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tv_bjjyqk"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        android:text="无"
-                        android:textColor="#333"
-                        android:textSize="14sp" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="5dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="处理类型："
-                        android:textColor="#999"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tv_cllb"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        tools:text="报警或求助"
-                        android:textColor="#333"
-                        android:textSize="14sp" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="5dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="处理结果："
-                        android:textColor="#999"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tv_cljg"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        tools:text="其它"
-                        android:textColor="#333"
-                        android:textSize="14sp" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="5dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="警情类别："
-                        android:textColor="#999"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tv_jqlb"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        tools:text="求助"
-                        android:textColor="#333"
-                        android:textSize="14sp" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="5dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="报警电话："
-                        android:textColor="#999"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tv_bjrlxdh"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        android:text="无"
-                        android:textColor="#333"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="5dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="报警时间："
-                        android:textColor="#999"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tv_jjsj"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        android:text="无"
-                        android:textColor="#333"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="5dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="报警位置："
-                        android:textColor="#999"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tv_asjfsdddzmc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        android:text="无"
-                        android:textColor="#333"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="5dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="出警单位："
-                        android:textColor="#999"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tv_cjdwgajgjgdm"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        android:text="无"
-                        android:textColor="#333"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="5dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="出警民警："
-                        android:textColor="#999"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tv_cjrxm"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        android:text="无"
-                        android:textColor="#333"
-                        android:textSize="14sp" />
-                </LinearLayout>
-            </LinearLayout>
-
-
-            <ImageView
-                android:id="@+id/iv_location_icon"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_marginStart="13dp"
-                android:layout_marginTop="23dp"
-                android:background="@drawable/all_2_de7900_bg"
-                android:padding="2dp"
-                android:src="@drawable/mine"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/ll_location_group" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="7dp"
-                android:text="报警电话登记人信息"
-                android:textColor="#de7900"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="@id/iv_location_icon"
-                app:layout_constraintLeft_toRightOf="@id/iv_location_icon"
-                app:layout_constraintTop_toTopOf="@id/iv_location_icon" />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_base_info"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="10dp"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/all_7_fff_bg"
-                android:padding="13dp"
-                app:layout_constraintTop_toBottomOf="@id/iv_location_icon">
-
-                <ImageView
-                    android:id="@+id/iv_zp"
-                    android:layout_width="47dp"
-                    android:layout_height="57dp"
-                    android:background="#FFE5E5E5"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/tv_xm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="9dp"
-                    android:text="张三"
-                    android:textColor="#FF333333"
-                    android:textSize="14sp"
-                    android:textStyle="bold"
-                    app:layout_constraintLeft_toRightOf="@id/iv_zp"
-                    app:layout_constraintTop_toTopOf="@id/iv_zp" />
-
-                <TextView
-                    android:id="@+id/tv_gang"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
-                    android:text="/"
-                    android:textColor="#FF333333"
-                    android:textSize="14sp"
-                    app:layout_constraintLeft_toRightOf="@id/tv_xm"
-                    app:layout_constraintTop_toTopOf="@id/tv_xm" />
-
-                <TextView
-                    android:id="@+id/tv_xb"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
-                    android:text="男"
-                    android:textColor="#FF333333"
-                    android:textSize="14sp"
-                    app:layout_constraintLeft_toRightOf="@id/tv_gang"
-                    app:layout_constraintTop_toTopOf="@id/tv_gang" />
-
-                <TextView
-                    android:id="@+id/tv_mz"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="9dp"
-                    android:layout_marginBottom="5dp"
-                    android:background="@drawable/all_3_ccc_bg"
-                    android:paddingHorizontal="5dp"
-                    android:paddingVertical="1dp"
-                    android:text="汉族"
-                    android:textColor="#333333"
-                    android:textSize="13sp"
-                    app:layout_constraintBottom_toBottomOf="@id/iv_zp"
-                    app:layout_constraintLeft_toRightOf="@id/iv_zp" />
-
-                <TextView
-                    android:id="@+id/tv_hyzk"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="9dp"
-                    android:layout_marginBottom="5dp"
-                    android:background="@drawable/all_3_ccc_bg"
-                    android:paddingHorizontal="5dp"
-                    android:paddingVertical="1dp"
-                    android:textColor="#333333"
-                    android:textSize="13sp"
-                    app:layout_constraintBottom_toBottomOf="@id/iv_zp"
-                    app:layout_constraintLeft_toRightOf="@id/tv_mz"
-                    tools:text="已婚" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginTop="10dp"
-                    app:layout_constraintTop_toBottomOf="@id/iv_zp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginVertical="5dp"
-                        android:orientation="horizontal"
-                        app:layout_constraintTop_toBottomOf="@id/tv_link_address">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="身份证号："
-                            android:textColor="#999"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:id="@+id/tv_sfzh"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="5dp"
-                            android:text="无"
-                            android:textColor="#333"
-                            android:textSize="14sp" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginVertical="5dp"
-                        android:orientation="horizontal"
-                        app:layout_constraintTop_toBottomOf="@id/tv_link_address">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="年龄："
-                            android:textColor="#999"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:id="@+id/tv_nl"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="5dp"
-                            android:text="无"
-                            android:textColor="#333"
-                            android:textSize="14sp" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginVertical="5dp"
-                        android:orientation="horizontal"
-                        app:layout_constraintTop_toBottomOf="@id/tv_link_address">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="标签："
-                            android:textColor="#999"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:id="@+id/tv_bq"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="5dp"
-                            android:text="无"
-                            android:textColor="#333"
-                            android:textSize="14sp" />
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginVertical="5dp"
-                        android:orientation="horizontal"
-                        app:layout_constraintTop_toBottomOf="@id/tv_link_address">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="籍贯："
-                            android:textColor="#999"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:id="@+id/tv_jg"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="5dp"
-                            android:text="无"
-                            android:textColor="#333"
-                            android:textSize="14sp" />
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginVertical="5dp"
-                        android:orientation="horizontal"
-                        app:layout_constraintTop_toBottomOf="@id/tv_link_address">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="服务场所："
-                            android:textColor="#999"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:id="@+id/tv_fwcs"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="5dp"
-                            android:text="无"
-                            android:textColor="#333"
-                            android:textSize="14sp" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginVertical="5dp"
-                        android:orientation="horizontal"
-                        app:layout_constraintTop_toBottomOf="@id/tv_link_address">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="历史报警次数："
-                            android:textColor="#999"
-                            android:textSize="14sp" />
-
-                        <TextView
-                            android:id="@+id/tv_lsbjcs"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="5dp"
-                            android:text="0"
-                            android:textColor="#F00"
-                            android:textSize="14sp" />
-                    </LinearLayout>
-                </LinearLayout>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
     <com.police.policedatasystem.main.widget.WaterMarkView

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

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".apply.activity.SuccessActivity">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/white"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:layout_gravity="center"
+            android:text="申请结果" />
+
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:padding="16dp"
+            android:src="@drawable/back" />
+    </FrameLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginTop="65dp"
+        android:background="@color/white"
+        android:padding="30dp"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/icon_apply_success"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="120dp"
+            android:text="提交成功"
+            android:textSize="21sp"
+            android:textStyle="bold"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <TextView
+                android:id="@+id/tv_apply_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginEnd="15dp"
+                android:background="@drawable/all_7_main_bg"
+                android:gravity="center"
+                android:paddingHorizontal="10dp"
+                android:text="返回申请支援"
+                android:textColor="@color/white" />
+
+            <TextView
+                android:id="@+id/tv_mine_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginStart="15dp"
+                android:background="@drawable/all_7_main_border_bg"
+                android:gravity="center"
+                android:paddingHorizontal="10dp"
+                android:text="返回我的赋能"
+                android:textColor="@color/main_color" />
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -77,27 +77,27 @@
             android:textColor="@color/normal_color" />
     </LinearLayout>
 
-    <LinearLayout
+<!--    <LinearLayout-->
-        android:id="@+id/nav_bar_4"
+<!--        android:id="@+id/nav_bar_4"-->
-        android:layout_width="0dp"
+<!--        android:layout_width="0dp"-->
-        android:layout_height="match_parent"
+<!--        android:layout_height="match_parent"-->
-        android:layout_weight="1"
+<!--        android:layout_weight="1"-->
-        android:gravity="center_horizontal"
+<!--        android:gravity="center_horizontal"-->
-        android:orientation="vertical">
+<!--        android:orientation="vertical">-->
 
-        <ImageView
+<!--        <ImageView-->
-            android:id="@+id/nav_bar_icon_4"
+<!--            android:id="@+id/nav_bar_icon_4"-->
-            android:layout_width="30dp"
+<!--            android:layout_width="30dp"-->
-            android:layout_height="30dp"
+<!--            android:layout_height="30dp"-->
-            android:padding="5dp"
+<!--            android:padding="5dp"-->
-            android:src="@mipmap/icon_improve_normal" />
+<!--            android:src="@mipmap/icon_improve_normal" />-->
 
-        <TextView
+<!--        <TextView-->
-            android:id="@+id/nav_bar_text_4"
+<!--            android:id="@+id/nav_bar_text_4"-->
-            android:layout_width="match_parent"
+<!--            android:layout_width="match_parent"-->
-            android:layout_height="wrap_content"
+<!--            android:layout_height="wrap_content"-->
-            android:gravity="center"
+<!--            android:gravity="center"-->
-            android:text="改进意见"
+<!--            android:text="改进意见"-->
-            android:textColor="@color/normal_color" />
+<!--            android:textColor="@color/normal_color" />-->
-    </LinearLayout>
+<!--    </LinearLayout>-->
 </LinearLayout>

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/all_15_fff_bg"
+    android:padding="10dp">
+
+    <TextView
+        android:id="@+id/tv_dialog_title"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:gravity="center"
+        android:text="选择部门"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        android:textStyle="bold" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rcv"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginBottom="10dp"
+        android:paddingBottom="10dp"
+        android:verticalSpacing="8dp" />
+
+    <TextView
+        android:id="@+id/tv_enter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/rcv"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="15dp"
+        android:background="@drawable/all_7_main_bg"
+        android:paddingHorizontal="30dp"
+        android:paddingVertical="10dp"
+        android:text="确定"
+        android:textColor="@color/white"
+        android:textSize="18sp" />
+</RelativeLayout>

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

@@ -2,10 +2,11 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/all_7_fff_bg"
+    android:background="@drawable/all_15_fff_bg"
     android:padding="10dp">
 
     <TextView
+        android:id="@+id/tv_dialog_title"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:gravity="center"
@@ -19,6 +20,6 @@
         android:layout_width="match_parent"
         android:layout_height="300dp"
         android:layout_marginTop="40dp"
+        android:paddingBottom="10dp"
         android:verticalSpacing="8dp" />
-
 </RelativeLayout>

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

@@ -14,7 +14,7 @@
         android:clickable="true"
         android:focusable="true"
         android:gravity="center_vertical"
-        android:text="赋能编码"
+        android:text="赋能编号"
         android:textSize="16sp" />
 
     <TextView

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

@@ -98,6 +98,13 @@
             layout="@layout/item_apply_fragment_1" />
     </FrameLayout>
 
+    <View
+        android:id="@+id/v_lock"
+        android:layout_width="match_parent"
+        android:layout_height="140dp"
+        android:layout_marginTop="60dp"
+        android:visibility="invisible" />
+
     <RelativeLayout
         android:id="@+id/rl_loading"
         android:layout_width="match_parent"

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

@@ -86,6 +86,7 @@
             android:background="@drawable/all_7_main_bg"
             android:paddingHorizontal="5dp"
             android:textColor="@color/white"
+            android:visibility="invisible"
             android:textSize="10sp"
             tools:text="99+" />
 
@@ -128,6 +129,7 @@
             android:layout_marginLeft="45dp"
             android:background="@drawable/all_7_main_bg"
             android:paddingHorizontal="5dp"
+            android:visibility="invisible"
             android:textColor="@color/white"
             android:textSize="10sp"
             tools:text="99+" />
@@ -171,6 +173,7 @@
             android:layout_marginLeft="45dp"
             android:background="@drawable/all_7_main_bg"
             android:paddingHorizontal="5dp"
+            android:visibility="invisible"
             android:textColor="@color/white"
             android:textSize="10sp"
             tools:text="99+" />
@@ -287,6 +290,7 @@
                 android:background="@drawable/all_7_main_bg"
                 android:paddingHorizontal="5dp"
                 android:textColor="@color/white"
+                android:visibility="invisible"
                 android:textSize="10sp"
                 tools:text="99+" />
         </RelativeLayout>
@@ -325,6 +329,7 @@
                 android:layout_toRightOf="@id/tv_area_key_person"
                 android:background="@drawable/all_7_main_bg"
                 android:paddingHorizontal="5dp"
+                android:visibility="invisible"
                 android:textColor="@color/white"
                 android:textSize="10sp"
                 tools:text="99+" />

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

@@ -98,6 +98,18 @@
                 android:textColor="#333"
                 android:textSize="13sp" />
 
+            <TextView
+                android:id="@+id/mine_tv_input"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="27dp"
+                android:layout_marginEnd="51dp"
+                android:background="#0000"
+                android:gravity="center_vertical"
+                android:textColor="#333"
+                android:textSize="13sp"
+                android:visibility="invisible" />
+
             <TextView
                 android:id="@+id/tv_mine_search_btn"
                 android:layout_width="51dp"

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

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#f7f7f7"
+    android:fitsSystemWindows="true">
+
+    <ImageView
+        android:id="@+id/iv_self_query_icon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginStart="13dp"
+        android:layout_marginTop="23dp"
+        android:background="@drawable/all_2_de7900_bg"
+        android:padding="2dp"
+        android:src="@drawable/icon_14"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="7dp"
+        android:text="申请支援"
+        android:textColor="#DE7900"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@id/iv_self_query_icon"
+        app:layout_constraintLeft_toRightOf="@id/iv_self_query_icon"
+        app:layout_constraintTop_toTopOf="@id/iv_self_query_icon" />
+
+    <RelativeLayout
+        android:id="@+id/cl_self_query_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/all_7_fff_bg"
+        android:padding="13dp"
+        app:layout_constraintTop_toBottomOf="@id/iv_self_query_icon">
+
+        <TextView
+            android:id="@+id/tv_make_call"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/all_7_main_bg"
+            android:paddingHorizontal="15dp"
+            android:paddingVertical="10dp"
+            android:text="电话支援 660110"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tv_go_apply"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tv_make_call"
+            android:layout_marginStart="17dp"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/all_7_de7900_bg"
+            android:paddingVertical="10dp"
+            android:paddingStart="40dp"
+            android:paddingEnd="15dp"
+            android:text="填写工单"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_alignLeft="@id/tv_go_apply"
+            android:layout_alignTop="@id/tv_go_apply"
+            android:layout_alignBottom="@id/tv_go_apply"
+            android:layout_marginStart="10dp"
+            android:padding="6dp"
+            android:src="@drawable/icon_14" />
+
+        <TextView
+            android:id="@+id/tv_query_result"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tv_make_call"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/all_7_4b8e01_bg"
+            android:paddingVertical="10dp"
+            android:paddingStart="40dp"
+            android:paddingEnd="15dp"
+            android:text="查看结果"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_alignLeft="@id/tv_query_result"
+            android:layout_alignTop="@id/tv_query_result"
+            android:layout_alignBottom="@id/tv_query_result"
+            android:layout_marginStart="10dp"
+            android:padding="2dp"
+            android:src="@mipmap/icon_apply_detail_query" />
+    </RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/iv_person_icon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginStart="13dp"
+        android:layout_marginTop="14dp"
+        android:background="@drawable/all_2_selected_bg"
+        android:padding="2dp"
+        android:src="@drawable/baojing"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="7dp"
+        android:text="警情信息"
+        android:textColor="#FF052EBA"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@id/iv_person_icon"
+        app:layout_constraintLeft_toRightOf="@id/iv_person_icon"
+        app:layout_constraintTop_toTopOf="@id/iv_person_icon" />
+
+    <LinearLayout
+        android:id="@+id/ll_location_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/all_7_fff_bg"
+        android:orientation="vertical"
+        android:padding="13dp"
+        app:layout_constraintTop_toBottomOf="@id/iv_person_icon">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="警情编号："
+                android:textColor="#999"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_jcjbh"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:text="无"
+                android:textColor="#333"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="报警内容："
+                android:textColor="#999"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_bjjyqk"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:text="无"
+                android:textColor="#333"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="处理类型："
+                android:textColor="#999"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_cllb"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:textColor="#333"
+                android:textSize="14sp"
+                tools:text="报警或求助" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="处理结果："
+                android:textColor="#999"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_cljg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:textColor="#333"
+                android:textSize="14sp"
+                tools:text="其它" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="警情类别："
+                android:textColor="#999"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_jqlb"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:textColor="#333"
+                android:textSize="14sp"
+                tools:text="求助" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="报警电话："
+                android:textColor="#999"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_bjrlxdh"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:text="无"
+                android:textColor="#333"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="报警时间："
+                android:textColor="#999"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_jjsj"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:text="无"
+                android:textColor="#333"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="报警位置："
+                android:textColor="#999"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_asjfsdddzmc"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:text="无"
+                android:textColor="#333"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="出警单位："
+                android:textColor="#999"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_cjdwgajgjgdm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:text="无"
+                android:textColor="#333"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="出警民警："
+                android:textColor="#999"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_cjrxm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:text="无"
+                android:textColor="#333"
+                android:textSize="14sp" />
+        </LinearLayout>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#f7f7f7"
+    android:fitsSystemWindows="true">
+
+    <ImageView
+        android:id="@+id/iv_location_icon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginStart="13dp"
+        android:layout_marginTop="23dp"
+        android:background="@drawable/all_2_4b8e01_bg"
+        android:padding="2dp"
+        android:src="@mipmap/icon_czya"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="7dp"
+        android:text="处警预案"
+        android:textColor="#4B8E01"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@id/iv_location_icon"
+        app:layout_constraintLeft_toRightOf="@id/iv_location_icon"
+        app:layout_constraintTop_toTopOf="@id/iv_location_icon" />
+
+    <LinearLayout
+        android:id="@+id/cl_base_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/all_7_fff_bg"
+        android:orientation="horizontal"
+        android:padding="13dp"
+        app:layout_constraintTop_toBottomOf="@id/iv_location_icon">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="7dp"
+            android:text="预案内容："
+            android:textColor="#999999"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tv_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="7dp"
+            android:textColor="#333333"
+            android:textSize="14sp"
+            tools:text="预案内容" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#f7f7f7">
+
+    <ImageView
+        android:id="@+id/iv_location_icon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginStart="13dp"
+        android:layout_marginTop="23dp"
+        android:background="@drawable/all_2_de7900_bg"
+        android:padding="2dp"
+        android:src="@drawable/mine"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="7dp"
+        android:text="报警电话登记人信息（仅供参考）"
+        android:textColor="#de7900"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@id/iv_location_icon"
+        app:layout_constraintLeft_toRightOf="@id/iv_location_icon"
+        app:layout_constraintTop_toTopOf="@id/iv_location_icon" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_base_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/all_7_fff_bg"
+        android:padding="13dp"
+        app:layout_constraintTop_toBottomOf="@id/iv_location_icon">
+
+        <ImageView
+            android:id="@+id/iv_zp"
+            android:layout_width="47dp"
+            android:layout_height="57dp"
+            android:background="#FFE5E5E5"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_xm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="9dp"
+            android:text="张三"
+            android:textColor="#FF333333"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintLeft_toRightOf="@id/iv_zp"
+            app:layout_constraintTop_toTopOf="@id/iv_zp" />
+
+        <TextView
+            android:id="@+id/tv_gang"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:text="/"
+            android:textColor="#FF333333"
+            android:textSize="14sp"
+            app:layout_constraintLeft_toRightOf="@id/tv_xm"
+            app:layout_constraintTop_toTopOf="@id/tv_xm" />
+
+        <TextView
+            android:id="@+id/tv_xb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:text="男"
+            android:textColor="#FF333333"
+            android:textSize="14sp"
+            app:layout_constraintLeft_toRightOf="@id/tv_gang"
+            app:layout_constraintTop_toTopOf="@id/tv_gang" />
+
+        <TextView
+            android:id="@+id/tv_mz"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="9dp"
+            android:layout_marginBottom="5dp"
+            android:background="@drawable/all_3_ccc_bg"
+            android:paddingHorizontal="5dp"
+            android:paddingVertical="1dp"
+            android:text="汉族"
+            android:textColor="#333333"
+            android:textSize="13sp"
+            app:layout_constraintBottom_toBottomOf="@id/iv_zp"
+            app:layout_constraintLeft_toRightOf="@id/iv_zp" />
+
+        <TextView
+            android:id="@+id/tv_hyzk"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="9dp"
+            android:layout_marginBottom="5dp"
+            android:background="@drawable/all_3_ccc_bg"
+            android:paddingHorizontal="5dp"
+            android:paddingVertical="1dp"
+            android:textColor="#333333"
+            android:textSize="13sp"
+            app:layout_constraintBottom_toBottomOf="@id/iv_zp"
+            app:layout_constraintLeft_toRightOf="@id/tv_mz"
+            tools:text="已婚" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:orientation="vertical"
+            app:layout_constraintTop_toBottomOf="@id/iv_zp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@id/tv_link_address">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="身份证号："
+                    android:textColor="#999"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_sfzh"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:text="无"
+                    android:textColor="#333"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@id/tv_link_address">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="年龄："
+                    android:textColor="#999"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_nl"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:text="无"
+                    android:textColor="#333"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@id/tv_link_address">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="标签："
+                    android:textColor="#999"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_bq"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:text="无"
+                    android:textColor="#333"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@id/tv_link_address">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="籍贯："
+                    android:textColor="#999"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_jg"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:text="无"
+                    android:textColor="#333"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@id/tv_link_address">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="服务场所："
+                    android:textColor="#999"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_fwcs"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:text="无"
+                    android:textColor="#333"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@id/tv_link_address">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="历史报警次数："
+                    android:textColor="#999"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_lsbjcs"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:text="0"
+                    android:textColor="#F00"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#f7f7f7"
+    android:fitsSystemWindows="true">
+
+    <ImageView
+        android:id="@+id/iv_self_query_icon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginStart="13dp"
+        android:layout_marginTop="23dp"
+        android:background="@drawable/all_2_selected_bg"
+        android:padding="1dp"
+        android:src="@mipmap/icon_query"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="7dp"
+        android:text="自助查询"
+        android:textColor="@color/main_color"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@id/iv_self_query_icon"
+        app:layout_constraintLeft_toRightOf="@id/iv_self_query_icon"
+        app:layout_constraintTop_toTopOf="@id/iv_self_query_icon" />
+
+    <LinearLayout
+        android:id="@+id/cl_self_query_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/all_7_fff_bg"
+        android:orientation="vertical"
+        android:padding="13dp"
+        app:layout_constraintTop_toBottomOf="@id/iv_self_query_icon">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_query_type_1"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginEnd="10dp"
+                android:layout_weight="1"
+                android:background="@drawable/all_7_main_bg"
+                android:gravity="center"
+                android:text="身份证号查询车牌号"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/tv_query_type_2"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:background="@drawable/all_7_999_border_bg"
+                android:gravity="center"
+                android:text="车牌号查询手机号"
+                android:textColor="@color/color_999"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_query_type_3"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_marginTop="15dp"
+            android:layout_weight="1"
+            android:background="@drawable/all_7_999_border_bg"
+            android:gravity="center"
+            android:paddingHorizontal="15dp"
+            android:text="手机号查询身份证号"
+            android:textColor="@color/color_999"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="查询条件："
+                android:textColor="@color/black"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+            <EditText
+                android:id="@+id/et_input"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:textColor="@color/main_color"
+                android:layout_weight="1"
+                android:textSize="14sp"
+                android:background="@drawable/all_7_999_bottom_border_bg"
+                android:maxLines="1" />
+
+            <TextView
+                android:id="@+id/tv_query_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginStart="10dp"
+                android:background="@drawable/all_7_main_bg"
+                android:gravity="center"
+                android:paddingHorizontal="20dp"
+                android:text="查询"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="查询结果："
+                android:textColor="@color/color_333"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/tv_query_result"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:textColor="#ed7900"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                tools:text="吉A23H14" />
+        </LinearLayout>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -13,13 +13,26 @@
         android:layout_width="wrap_content"
         android:layout_height="40dp"
         android:gravity="center"
-        android:text="警员编号:"
+        android:text="警情编号:"
         android:textColor="@color/normal_color"
         android:textSize="16sp" />
 
+    <TextView
+        android:id="@+id/tv_search_title"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_marginStart="10dp"
+        android:layout_toRightOf="@id/tv_my_key_person"
+        android:background="@drawable/all_7_line_ccc_bg"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:paddingHorizontal="10dp"
+        android:textColor="@color/color_666"
+        android:textSize="16sp"
+        tools:text="987645561321312313" />
 
     <EditText
-        android:id="@+id/tv_search_title"
+        android:id="@+id/et_search_title"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_marginStart="10dp"

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

@@ -4,14 +4,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/all_7_fff_bg"
-    android:padding="10dp">
+    android:paddingHorizontal="10dp"
+    android:paddingVertical="3dp">
 
     <TextView
         android:id="@+id/tv_item_text"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="40dp"
         android:gravity="center"
         android:textColor="@color/normal_color"
+        android:background="#eeeeee"
         android:textSize="16sp"
         tools:text="item内容" />
 

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

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginVertical="5dp"
+        android:background="@drawable/all_7_fff_bg"
+        android:padding="10dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/main_color"
+            android:textSize="14sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:text="查看详情" />
+
+        <TextView
+            android:id="@+id/tv_title_fnbh"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/main_color"
+            android:textSize="15sp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:text="赋能编号：" />
+
+        <TextView
+            android:id="@+id/tv_fnbh"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/main_color"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="@id/tv_title_fnbh"
+            app:layout_constraintLeft_toRightOf="@id/tv_title_fnbh"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="220181187609124532" />
+
+        <TextView
+            android:id="@+id/tv_title_sqsy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:text="申请事由："
+            android:textColor="#999"
+            android:textSize="14sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_fnbh" />
+
+        <TextView
+            android:id="@+id/tv_sqsy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="#333"
+            android:textSize="14sp"
+            app:layout_constraintLeft_toRightOf="@id/tv_title_sqsy"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_fnbh"
+            tools:text="处置警情" />
+
+        <TextView
+            android:id="@+id/tv_title_sqsj"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="7dp"
+            android:text="申请时间："
+            android:textColor="#999"
+            android:textSize="14sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_sqsy" />
+
+        <TextView
+            android:id="@+id/tv_sqsj"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="7dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="#333"
+            android:textSize="14sp"
+            app:layout_constraintLeft_toRightOf="@id/tv_title_sqsj"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_sqsy"
+            tools:text="2024-05-05 10：10：50" />
+
+        <TextView
+            android:id="@+id/tv_title_xxly"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="7dp"
+            android:text="信息来源："
+            android:textColor="#999"
+            android:textSize="14sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_sqsj" />
+
+        <TextView
+            android:id="@+id/tv_xxly"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="7dp"
+            android:ellipsize="end"
+            android:lines="1"
+            android:textColor="#333"
+            android:textSize="14sp"
+            app:layout_constraintStart_toEndOf="@id/tv_title_xxly"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_sqsj"
+            tools:text="平常段" />
+
+        <TextView
+            android:id="@+id/tv_title_blzt"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="7dp"
+            android:text="办理状态："
+            android:textColor="#999"
+            android:textSize="14sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_xxly" />
+
+        <TextView
+            android:id="@+id/tv_blzt"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="7dp"
+            android:ellipsize="end"
+            android:lines="1"
+            android:textColor="#333"
+            android:textSize="14sp"
+            app:layout_constraintStart_toEndOf="@id/tv_title_blzt"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_xxly"
+            tools:text="待审批" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>

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

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingVertical="5dp">
+
+    <TextView
+        android:id="@+id/v_level"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent" />
+
+    <ImageView
+        android:id="@+id/iv_sanjiao"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:padding="3dp"
+        android:src="@mipmap/icon_right_sanjiao" />
+
+    <ImageView
+        android:id="@+id/iv_box"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:padding="3dp"
+        android:src="@mipmap/icon_unselected" />
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:gravity="center_vertical"
+        android:paddingVertical="4dp"
+        android:paddingHorizontal="10dp"
+        android:textColor="@color/color_666"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        tools:text="长春市公安局" />
+</LinearLayout>

app/src/main/res/values/colors.xml

@@ -4,12 +4,17 @@
     <color name="purple_500">#FF6200EE</color>
     <color name="purple_700">#FF3700B3</color>
     <color name="teal_200">#FF03DAC5</color>
+    <color name="main_color">#052eba</color>
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="color_666">#666</color>
+    <color name="color_333">#333</color>
+    <color name="color_999">#999</color>
+    <color name="color_ccc">#ccc</color>
     <color name="normal_color">#101010</color>
     <color name="selected_color">#052EBA</color>
+    <color name="selected_bg_color">#33052EBA</color>
     <color name="transparent_color">#00000000</color>
     <color name="water_color">#55cccccc</color>
 </resources>

app/src/main/res/values/themes.xml

@@ -16,4 +16,8 @@
 
         <!-- 其他自定义样式 -->
     </style>
+
+    <style name="TransparentAlertDialog" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
 </resources>