diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 29611d0..324c230 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,12 +11,12 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/GisMap" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/baselib" />
             <option value="$PROJECT_DIR$/chatmodule" />
             <option value="$PROJECT_DIR$/commandmodule" />
             <option value="$PROJECT_DIR$/commonmodule" />
+            <option value="$PROJECT_DIR$/gismapmodule" />
             <option value="$PROJECT_DIR$/gridmodule" />
             <option value="$PROJECT_DIR$/mainmodule" />
             <option value="$PROJECT_DIR$/moduleijkplayer" />
diff --git a/app/build.gradle b/app/build.gradle
index d26411a..6649d70 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,7 +50,7 @@ dependencies {
         implementation project(':gridmodule')//网格员端
         implementation project(':commandmodule')//中心端
         implementation project(':supervisionmodule')//部门端
-        implementation project(':GisMap')
+        implementation project(':gismapmodule')
     }
     //ARouter
     api "com.alibaba:arouter-api:$rootProject.ext.gRouterApiVersion"
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
new file mode 100644
index 0000000..8ba355c
Binary files /dev/null and b/app/release/app-release.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index a3b866c..c7a25a3 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 2,
-      "versionName": "1.0.1",
+      "versionCode": 3,
+      "versionName": "1.0.2",
       "outputFile": "app-release.apk"
     }
   ]
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 85ad9ae..4f72adf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,13 +5,13 @@
     <application
         android:name=".BaseMyApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/app_logo"
         android:label="@string/app_name"
         android:maxAspectRatio="2.4"
         android:networkSecurityConfig="@xml/network_config"
         android:requestLegacyExternalStorage="true"
         android:resizeableActivity="true"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/app_logo"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/BaseConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/BaseConfig.java
index e5cf8d6..24e8091 100644
--- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/BaseConfig.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/BaseConfig.java
@@ -7,6 +7,7 @@ package com.tenlionsoft.baselib.constant;
  * 描述: 项目基础配置
  */
 public class BaseConfig {
-    //    public static final String APP_VERSION_ID = "f311fd32-cd36-45a1-9652-599d5f2c2d4f";/*正式App下载码*/
-    public static final String APP_VERSION_ID = "c16826e7-8cfb-4db1-8844-09d2be697bc7";/*测试App下载码*/
+    public static final String APP_VERSION_ID = "2f384d5c-419d-47a2-94cb-4a05b6f00936";/*测试App下载码*/
+//    public static final String APP_VERSION_ID = "c16826e7-8cfb-4db1-8844-09d2be697bc7";/* 155 测试App下载码*/
+//    public static final String APP_VERSION_ID = "2f384d5c-419d-47a2-94cb-4a05b6f00936";/*正式App下载码*/
 }
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java
index aefcb2d..0ca8753 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java
@@ -2,8 +2,6 @@ package com.tenlionsoft.baselib.constant;
 
 import android.os.Environment;
 
-import com.tenlionsoft.baselib.app.BaseAppContext;
-
 import java.io.File;
 
 /**
@@ -15,6 +13,7 @@ public class PathConfig {
 
     public static final String PROVIDER_URL = "content://com.tengshisoft.citygovernance.content_provider";//内容提供者url
     public static final String BASE_LAYER = "http://support.supermap.com.cn:8090/iserver/services/map-china400/rest/maps/China";//地图基础图层
+    public static final int CRS = 4326;//坐标系
 
     /*===========================================*/
     public static final String ACTION_FROM_SOCKET_PUSH_MSG = "com.tengshisoft.city-governace.push_msg";//系统推送来的消息  根据 推送过来的消息 分为三类  系统消息类  通知类  聊天类 根据type来判断
@@ -48,7 +47,7 @@ public class PathConfig {
     public static final String ACTION_CALL_LOGIN_SUCCESS = "com.tengshisoft.city-governance.call_login_local_success";//本地登录成功
     public static final String ACTION_CALL_LOGIN_OUT = "com.tengshisoft.city-governance.call_login_local_loginout";//通知本地退出登录
     public static final String ACTION_CALL_LOCAL_PHONE_NO_SUPPORT = "com.tengshisoft.city-governance.call_login_local_no.support";//本地通知手机不支持通话
-
+    public static final String ACTION_NET_CHANGE = "android.net.conn.CONNECTIVITY_CHANGE";//网络状态变化
     //=============================主页按钮模块类型===========================
     public static final String SECRET = "CMXX_TOKEN_INFOS";//秘钥
     public static final String SOCKET_MSG_SECRET = "SocKEtsEcReT_KeY";//消息秘钥
@@ -68,12 +67,6 @@ public class PathConfig {
     public static final int CITY_DEFAULT_LEVEL = 3;
     public static final String DID_CITY_CODE = "640675";//日喀则市编码
     public static final boolean IS_SECRET = false;//websocket 是否信息是否加密
-
-    //包头坐标 109.926934,40.574501
-    //呼市坐标 40.823879   111.771815
-    //集宁市政府 41.000587 113.138723
-    public static final double LA = 41.000587;//纬度
-    public static final double LO = 113.138723;//经度
     //百度定位city-code
 //    public static final String CITY_BAIDU_CODE = "168";//乌兰察布市
     public static final String CITY_BAIDU_CODE = "321";//呼和浩特市
@@ -84,6 +77,11 @@ public class PathConfig {
     public static final String DEFAULT_AREA_2_Name = "乌兰察布市";
     public static final String DEFAULT_AREA_1_CODE = "150000000000";
     public static final String DEFAULT_AREA_2_CODE = "150900000000";
+    public static final double DEFAULT_LAT = 40.98896497581636;//默认纬度
+    public static final double DEFAULT_LNG = 113.11412662267688;//默认经度
+    public static final int DEFAULT_ZOOM = 15;//地图默认缩放
+
+
     //    区直领导：b01dac8e-c516-4974-b513-f1352ca40202
 //    片长：e483f019-d971-49ac-b5fa-3314220da703
 //    N员：bc405346-8714-4ded-89ac-9cc4d755f66a
@@ -500,8 +498,10 @@ public class PathConfig {
     /*=========================================中心端============================================*/
     public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_LIST = "/modulecommand/activity/incidentAcceptList";//事件受理列表
     public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_DETAIL = "/modulecommand/activity/incidentAcceptDetail";//事件受理
+
     public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_LIST = "/modulecommand/activity/incidentDispatchList";//事件派遣列表
     public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_DETAIL = "/modulecommand/activity/incidentDispatchDetail";//事件派遣
+
     public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_SEL_DEPT = "/modulecommand/activity/incidentDeptSel";//选择组织机构
 
 
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
index 851f5cc..ac73457 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
@@ -1,7 +1,6 @@
 package com.tenlionsoft.baselib.core.retrofit_net;
 
 import com.tenlionsoft.baselib.constant.BaseConfig;
-import com.tenlionsoft.baselib.constant.PathConfig;
 
 /**
  * 作者 : Adam on 2018/12/5.
@@ -10,32 +9,35 @@ import com.tenlionsoft.baselib.constant.PathConfig;
  */
 public class BaseUrlApi {
 
-//    public static final String IP = "http://192.168.0.103:7011/";/* 测试IP */
-    public static final String IP = "http://192.168.0.155:7011/";/* 测试IP */
+    //    public static final String IP = "http://192.168.0.155:7011/";/* 测试IP */
+    public static final String IP = "http://1.24.238.149:37210/";/* 正式IP */
     public static final String SYS_USERCENTER = "usercenter/";
     public static final String SYS_POPULATION = "population/";/*人口系统*/
     public static final String SYS_CASE = "case/";/*事件部件*/
-    public static final String SYS_HOUSE = "systemhouse/";/*房屋系统*/
-    public static final String SYS_SECURITY = "systembase/";/*社会治安*/
-    public static final String SYS_TASK = "systemtask/";/*任务系统*/
+    public static final String SYS_HOUSE = "house/";/*房屋系统*/
+    public static final String SYS_SECURITY = "manage/";/*社会治安*/
+    public static final String SYS_TASK = "task/";/*任务系统*/
     public static final String SYS_LIBRARY = "library/";/*知识库系统*/
     public static final String SYS_VISITS = "systemvisits/";/*信访系统*/
-    public static final String TEMP_IP = "http://192.168.0.120:8080/";
 
     public static final String BASE_MAIN_IP = IP + SYS_USERCENTER;
-    public static final String BASE_CASE_IP = "http://192.168.0.120:8080/" + SYS_CASE;
-    public static final String BASE_SECURITY_IP = "http://192.168.0.111:8081/" + SYS_SECURITY;
-    public static final String BASE_HOUSE_IP = "http://192.168.0.111:8083/" + SYS_HOUSE;
-    public static final String BASE_LIBRARY_IP = "http://192.168.0.109:9000/" + SYS_LIBRARY;
-    public static final String BASE_PERSON_IP = "http://192.168.0.109:8080/" + SYS_POPULATION;
-    public static final String BASE_TASK_IP = "http://192.168.0.111:8080/" + SYS_TASK;
-    public static final String BASE_VISITS = "http://192.168.0.111:8084/" + SYS_VISITS;
+    public static final String BASE_CASE_IP = IP + SYS_CASE;
+    public static final String BASE_LIBRARY_IP = IP + SYS_LIBRARY;
+    public static final String BASE_TASK_IP = IP + SYS_TASK;
+    public static final String BASE_PERSON_IP = IP + SYS_POPULATION;
+    public static final String BASE_HOUSE_IP = IP + SYS_HOUSE;
+    public static final String BASE_SECURITY_IP = IP + SYS_SECURITY;
+    public static final String BASE_VISITS = IP + SYS_VISITS;
     public static final String BASE_URL = BASE_MAIN_IP;//基础URL
 
-        public static final String SOCKET_IP = "http://192.168.0.155:1991/websocket";/*SocketIP*/
-//    public static final String SOCKET_IP = "http://192.168.0.103:8081/websocket";/*SocketIP*/
+    public static final String SOCKET_IP = IP + "websocket";/*SocketIP*/
+    //    public static final String SOCKET_IP = "http://192.168.0.103:8081/websocket";/*SocketIP*/
+    //    public static final String BASE_SECURITY_IP = "http://192.168.0.111:8081/systembase/";
+//    public static final String BASE_CASE_IP = "http://192.168.0.120:8080/" + SYS_CASE;
+//    public static final String BASE_HOUSE_IP = "http://192.168.0.111:8083/systemhouse/";/*测试*/
+//    public static final String BASE_PERSON_IP = "http://1.24.238.149:37210/" + SYS_POPULATION;/*测试*/
+//    public static final String BASE_TASK_IP = "http://192.168.0.111:8080/systemtask/";
 
-    //地图页面展示类型
 
     public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/download/" + BaseConfig.APP_VERSION_ID;
 
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/RetrofitManager.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/RetrofitManager.java
index 5c167c3..59ec4a7 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/RetrofitManager.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/RetrofitManager.java
@@ -3,9 +3,12 @@ package com.tenlionsoft.baselib.core.retrofit_net;
 import com.tenlionsoft.baselib.core.retrofit_net.conver.AreaInterceptor;
 import com.tenlionsoft.baselib.core.retrofit_net.conver.BaseUrlInterceptor;
 
+import java.net.ProxySelector;
+import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.OkHttpClient;
+import okhttp3.internal.proxy.NullProxySelector;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -56,6 +59,7 @@ public class RetrofitManager {
 
     private OkHttpClient.Builder getOkBuilder() {
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        setLocalProxy();
         // 设置超时
         builder.connectTimeout(TIMEOUT, TimeUnit.MINUTES);
         builder.readTimeout(TIMEOUT, TimeUnit.MINUTES);
@@ -68,6 +72,27 @@ public class RetrofitManager {
         return builder;
     }
 
+    /*设置本地代理*/
+    private void setLocalProxy() {
+        Properties prop = System.getProperties();
+        prop.setProperty("http.proxyHost", "192.168.0.36");//设置http网络请求的代理
+        prop.setProperty("http.proxyPort", "8888");//设置http网络请求的代理
+        prop.setProperty("http.nonProxyHosts", "http://1.24.238.149:37210/case/*");//设置http不需要代理的
+
+        prop.setProperty("https.proxyHost", "192.168.0.36");//设置http网络请求的代理
+        prop.setProperty("https.proxyPort", "8888");//设置http网络请求的代理
+
+    }
+
+    /*清除本地代理*/
+    private void removeLocalProxy() {
+        Properties prop = System.getProperties();
+        prop.remove("http.proxyHost");//设置http网络请求的代理
+        prop.remove("http.proxyPort");//设置http网络请求的代理
+        prop.remove("http.nonProxyHosts");//设置http不需要代理的
+        prop.remove("https.proxyHost");//设置http网络请求的代理
+        prop.remove("https.proxyPort");//设置http网络请求的代理
+    }
 
     /**
      * 创建API
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/ViewPageNavigatorAdapter.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/ViewPageNavigatorAdapter.java
index 0217a44..0e4aebc 100644
--- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/ViewPageNavigatorAdapter.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/ViewPageNavigatorAdapter.java
@@ -6,9 +6,8 @@ import android.graphics.Color;
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
-import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.BezierPagerIndicator;
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView;
-import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView;
 
 import java.util.List;
 
@@ -49,8 +48,9 @@ public class ViewPageNavigatorAdapter extends CommonNavigatorAdapter {
 
     @Override
     public IPagerIndicator getIndicator(Context context) {
-        LinePagerIndicator indicator = new LinePagerIndicator(context);
-        indicator.setMode(LinePagerIndicator.MODE_EXACTLY);
+        BezierPagerIndicator indicator = new BezierPagerIndicator(context);
+//        LinePagerIndicator indicator = new LinePagerIndicator(context);
+//        indicator.setMode(LinePagerIndicator.MODE_EXACTLY);
         indicator.setColors(Color.parseColor("#1189FF"));
         return indicator;
     }
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java
index 112b278..e02a051 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java
@@ -141,7 +141,7 @@ public class SearchPersonDialogView extends Dialog {
 
     private void doSearchPerson() {
         String card = mEtCard.getText().toString().trim();
-        if (TextUtils.isEmpty(card) || !RegexUtils.isIDCard18Exact(card)) {
+        if (TextUtils.isEmpty(card) || !RegexUtils.isIDNumber(card)) {
             ToastUtils.show("请输入合法的身份证号码");
             return;
         }
diff --git a/baselib/src/main/res/drawable-xhdpi/app_logo_smal.png b/baselib/src/main/res/drawable-xhdpi/app_logo_smal.png
index 7f95b8b..4990459 100644
Binary files a/baselib/src/main/res/drawable-xhdpi/app_logo_smal.png and b/baselib/src/main/res/drawable-xhdpi/app_logo_smal.png differ
diff --git a/baselib/src/main/res/drawable-xhdpi/bg_login.png b/baselib/src/main/res/drawable-xhdpi/bg_login.png
index e278d29..a549326 100644
Binary files a/baselib/src/main/res/drawable-xhdpi/bg_login.png and b/baselib/src/main/res/drawable-xhdpi/bg_login.png differ
diff --git a/baselib/src/main/res/drawable-xhdpi/ic_list_cache.png b/baselib/src/main/res/drawable-xhdpi/ic_list_cache.png
new file mode 100644
index 0000000..f277693
Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_list_cache.png differ
diff --git a/baselib/src/main/res/drawable-xhdpi/ic_list_collect.png b/baselib/src/main/res/drawable-xhdpi/ic_list_collect.png
new file mode 100644
index 0000000..da21f78
Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_list_collect.png differ
diff --git a/baselib/src/main/res/drawable-xhdpi/ic_list_contact.png b/baselib/src/main/res/drawable-xhdpi/ic_list_contact.png
new file mode 100644
index 0000000..3336976
Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_list_contact.png differ
diff --git a/baselib/src/main/res/drawable-xhdpi/ic_list_pwd.png b/baselib/src/main/res/drawable-xhdpi/ic_list_pwd.png
new file mode 100644
index 0000000..123b2cc
Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_list_pwd.png differ
diff --git a/baselib/src/main/res/drawable-xhdpi/ic_list_version.png b/baselib/src/main/res/drawable-xhdpi/ic_list_version.png
new file mode 100644
index 0000000..f6ed6b3
Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_list_version.png differ
diff --git a/baselib/src/main/res/drawable-xhdpi/splash_bg.png b/baselib/src/main/res/drawable-xhdpi/splash_bg.png
new file mode 100644
index 0000000..83f2f20
Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/splash_bg.png differ
diff --git a/baselib/src/main/res/layout/item_base_search.xml b/baselib/src/main/res/layout/item_base_search.xml
index b721365..95104da 100644
--- a/baselib/src/main/res/layout/item_base_search.xml
+++ b/baselib/src/main/res/layout/item_base_search.xml
@@ -32,7 +32,7 @@
         android:orientation="horizontal">
 
         <EditText
-            android:id="@+id/et_base_search_content"
+            android:id="@+id/et_base_search_v"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
diff --git a/baselib/src/main/res/values/styles.xml b/baselib/src/main/res/values/styles.xml
index d0c090f..a3be5b3 100755
--- a/baselib/src/main/res/values/styles.xml
+++ b/baselib/src/main/res/values/styles.xml
@@ -114,7 +114,7 @@
         <item name="colorPrimary">@color/main_theme</item>
         <item name="colorPrimaryDark">@color/main_theme</item>
         <item name="colorAccent">@color/main_theme</item>
-        <item name="android:background">@drawable/bg_login</item>
+        <item name="android:background">@drawable/splash_bg</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowFullscreen">true</item>
     </style>
diff --git a/build.gradle b/build.gradle
index aed3a3e..c946b78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,8 +55,8 @@ ext {
     gCompileSdkVersion = 30
     gMinSdkVersion = 21
     gTargetSdkVersion = 30
-    gVersionCode = 2
-    gVersionName = '1.0.1'
+    gVersionCode = 3
+    gVersionName = '1.0.2'
     gBuildToolsVersion = "29.0.2"
 //    gVersionCode=26
 //    gVersionName='1.3.0'
diff --git a/chatmodule/build.gradle b/chatmodule/build.gradle
index 06db05d..3a905ab 100644
--- a/chatmodule/build.gradle
+++ b/chatmodule/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     implementation project(':baselib')
     implementation project(':modulemap')
     implementation project(':commonmodule')
-    implementation project(':GisMap')
+    implementation project(':gismapmodule')
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'//地图
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/BusinessService.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/BusinessService.java
index 4809a24..ff696bd 100644
--- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/BusinessService.java
+++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/BusinessService.java
@@ -1,5 +1,7 @@
 package com.tengshisoft.chatmodule.keeplive.services;
 
+import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
@@ -8,6 +10,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.location.Address;
+import android.location.Criteria;
+import android.location.Geocoder;
+import android.location.Location;
+import android.location.LocationListener;
 import android.location.LocationManager;
 import android.media.MediaPlayer;
 import android.os.Build;
@@ -24,6 +32,7 @@ import com.baidu.location.LocationClientOption;
 import com.google.gson.Gson;
 import com.tengshisoft.chatmodule.KeepLiveAidl;
 import com.tengshisoft.chatmodule.R;
+import com.tengshisoft.chatmodule.hwclud.utils.LogUtil;
 import com.tengshisoft.chatmodule.keeplive.broadcast.OnePxReceiver;
 import com.tengshisoft.chatmodule.sockets.AppSocketMessage;
 import com.tengshisoft.chatmodule.sockets.BaseSocketBodyBean;
@@ -52,12 +61,15 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 
@@ -109,6 +121,7 @@ public class BusinessService extends Service {
             LogUtils.e(e.getMessage());
         }
         startBusiness();//开启定位
+        startGpsLocation();
         getSessionId();
         return START_STICKY;
     }
@@ -423,7 +436,7 @@ public class BusinessService extends Service {
     }
 
     /**
-     * TODO 发送本地定位广播
+     * 发送本地定位广播
      */
     private void sendLocationCurrent(BDLocation bdLocation) {
         if (bdLocation.getRadius() <= mPrecision) {
@@ -431,11 +444,51 @@ public class BusinessService extends Service {
                 Intent mIntent = new Intent(PathConfig.ACTION_LOCATION_MESSAGE);
                 Double[] doubles = PointUtils.GCJ02ToWGS84(bdLocation.getLongitude(), bdLocation.getLatitude());
                 mIntent.putExtra("data", new Location84(doubles[1], doubles[0]));
+                mIntent.putExtra("address", bdLocation.getAddrStr());
                 sendBroadcast(mIntent);
             }
         }
     }
 
+    /*开启本地GPS定位*/
+    private void startGpsLocation() {
+        LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
+        Criteria baseProvider = getBaseProvider();
+        String provider = locationManager.getBestProvider(baseProvider, false);
+        LogUtils.e("定位提供器:==" + provider);
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            return;
+        }
+        LogUtils.e("开始定位");
+        locationManager.requestLocationUpdates(provider, 0, 0, location -> {
+            if (location != null) {
+                LogUtils.e(location.getLatitude() + "=" + location.getLongitude());
+                Geocoder geocoder = new Geocoder(BusinessService.this);
+                try {
+                    List<Address> fromLocation = geocoder.getFromLocation(location.getLatitude(), location.getLongitude(), 1);
+                    if (fromLocation != null && fromLocation.size() > 0) {
+                        Address address = fromLocation.get(0);
+                        LogUtils.e(address.getAdminArea() + "=" + address.getLocality() + "=" + address.getFeatureName());
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    /*获取定位提供*/
+    @SuppressLint("WrongConstant")
+    private Criteria getBaseProvider() {
+        Criteria criteria = new Criteria();
+        criteria.setAccuracy(Criteria.ACCURACY_FINE);
+        criteria.setBearingRequired(false);
+        criteria.setAltitudeRequired(true);
+        criteria.setSpeedRequired(false);
+        criteria.setPowerRequirement(Criteria.ACCURACY_HIGH);
+        return criteria;
+    }
+
     private void registerTimeReceiver() {
         mReceiver = new PunchTimeReceiver();
         IntentFilter filter = new IntentFilter();
@@ -453,6 +506,7 @@ public class BusinessService extends Service {
         filter.addAction(PathConfig.ACTION_CALL_LOGIN_FAIL);//本地融合通信登录失败
         filter.addAction(PathConfig.ACTION_CALL_LOGIN_SUCCESS);//本地融合融信登录成功
         filter.addAction(PathConfig.ACTION_CALL_LOCAL_PHONE_NO_SUPPORT);//本地手机不支持通知
+        filter.addAction(PathConfig.ACTION_NET_CHANGE);//网络状态
         registerReceiver(mReceiver, filter);
 
     }
@@ -530,6 +584,9 @@ public class BusinessService extends Service {
                         String msg3 = gson3.toJson(bean3);
                         sendSocketNoticeMsg(msg3);
                         break;
+                    case PathConfig.ACTION_NET_CHANGE:
+                        LogUtils.e("网络发生变化");
+                        break;
                 }
             }
         }
diff --git a/chatmodule/src/main/res/layout/activity_address_list.xml b/chatmodule/src/main/res/layout/activity_address_list.xml
index d4ec6c4..f8e9df9 100644
--- a/chatmodule/src/main/res/layout/activity_address_list.xml
+++ b/chatmodule/src/main/res/layout/activity_address_list.xml
@@ -7,17 +7,12 @@
     android:background="@color/gray_bg"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shp_bottom_shadow_white_no_radius"
-        android:orientation="horizontal">
 
-        <net.lucode.hackware.magicindicator.MagicIndicator
-            android:id="@+id/mi_tabs"
-            android:layout_width="match_parent"
-            android:layout_height="40dp" />
-    </LinearLayout>
+    <net.lucode.hackware.magicindicator.MagicIndicator
+        android:id="@+id/mi_tabs"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@drawable/shp_bottom_shadow_white_no_radius" />
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/vp_content"
diff --git a/commandmodule/build.gradle b/commandmodule/build.gradle
index 9d63887..754b666 100644
--- a/commandmodule/build.gradle
+++ b/commandmodule/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     implementation project(':modulemap')
     implementation project(':commonmodule')
     implementation project(':moduleijkplayer')
+    implementation project(':gismapmodule')
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'//地图
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
diff --git a/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/DeptSelActivity.java b/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/DeptSelActivity.java
index 285b7fd..680899c 100644
--- a/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/DeptSelActivity.java
+++ b/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/DeptSelActivity.java
@@ -47,7 +47,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
  */
 @Route(path = PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_SEL_DEPT)
 public class DeptSelActivity extends BaseActivity {
-    @BindView(R2.id.et_base_search_content)
+    @BindView(R2.id.et_base_search_v)
     EditText mEtSearch;
     @BindView(R2.id.iv_base_clear)
     ImageView mIvClear;
diff --git a/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentAcceptDetailActivity.java b/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentAcceptDetailActivity.java
index 805b6cf..b97718e 100644
--- a/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentAcceptDetailActivity.java
+++ b/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentAcceptDetailActivity.java
@@ -1,22 +1,24 @@
 package com.tengshisoft.commandmodule.activitys.incident;
 
-import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
-import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.ZoomControls;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.google.gson.Gson;
 import com.hjq.toast.ToastUtils;
+import com.supermap.imobilelite.maps.CoordinateReferenceSystem;
+import com.supermap.imobilelite.maps.DefaultItemizedOverlay;
+import com.supermap.imobilelite.maps.LayerView;
+import com.supermap.imobilelite.maps.OverlayItem;
+import com.supermap.imobilelite.maps.Point2D;
 import com.tengshisoft.commandmodule.R;
 import com.tengshisoft.commandmodule.R2;
 import com.tengshisoft.commonmodule.adapters.IncidentTagListAdapter;
@@ -29,6 +31,7 @@ import com.tengshisoft.commonmodule.beans.SuccessBean;
 import com.tengshisoft.commonmodule.beans.TagListBean;
 import com.tengshisoft.commonmodule.nets.CenterApis;
 import com.tengshisoft.commonmodule.nets.GridApis;
+import com.tengshisoft.gismap.TouchMapView;
 import com.tenlionsoft.baselib.constant.PathConfig;
 import com.tenlionsoft.baselib.core.beans.OperateBean;
 import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi;
@@ -107,6 +110,8 @@ public class IncidentAcceptDetailActivity extends BaseActivity {
     NestedScrollView mNsvContent;
     @BindView(R2.id.rlv_tags)
     RecyclerView mRlvTags;
+    @BindView(R2.id.mv_map)
+    TouchMapView mMvMap;
 
     private Unbinder mBind;
     private String mId;
@@ -188,10 +193,29 @@ public class IncidentAcceptDetailActivity extends BaseActivity {
             mOperates.add(reportBean);
         }
 
-
+        initMap();
         getDetailData();
     }
 
+    private DefaultItemizedOverlay mItemizedOverlay;
+
+    private void initMap() {
+        Drawable marker = getResources().getDrawable(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker);
+        mItemizedOverlay = new DefaultItemizedOverlay(marker);
+        LayerView layerView = new LayerView(this);
+        layerView.setURL(PathConfig.BASE_LAYER);
+        CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
+        crs.wkid = PathConfig.CRS;
+        layerView.setCRS(crs);
+        mMvMap.addLayer(layerView);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
+        mMvMap.setBuiltInZoomControls(false);//内置缩放控件
+        mMvMap.setClickable(true);
+        mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
+    }
+
     /**
      * 显示操作
      */
@@ -833,17 +857,11 @@ public class IncidentAcceptDetailActivity extends BaseActivity {
         mTvContent.setText(b.getReportContent());
         double lat = Double.parseDouble(b.getReportLat());
         double lng = Double.parseDouble(b.getReportLng());
-
-//        moveMapToCenter(new LatLng(lat, lng), 18);
-//        if (mBitMap == null) {
-//            mBitMap = BitmapDescriptorFactory.fromResource(R.drawable.ic_map_location_marker);
-//        }
-//        MarkerOptions markerOptions = new MarkerOptions()
-//            .position(new LatLng(lat, lng))//mark出现的位置
-//            .icon(mBitMap) //mark图标
-//            .draggable(false)//mark可拖拽
-//            .animateType(MarkerOptions.MarkerAnimateType.none);
-//        mBaiduMap.addOverlay(markerOptions);
+        Point2D point = new Point2D(lng, lat);
+        mMvMap.getController().setCenter(point);
+        OverlayItem item = new OverlayItem(point, "", "");
+        mItemizedOverlay.addItem(item);
+        mMvMap.invalidate();
         if (!TextUtils.isEmpty(b.getReportPhotos())) {
             //有图片
             mTvPhotoHint.setVisibility(View.GONE);
diff --git a/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentDispatchDetailActivity.java b/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentDispatchDetailActivity.java
index c232dce..c4e0ba4 100644
--- a/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentDispatchDetailActivity.java
+++ b/commandmodule/src/main/java/com/tengshisoft/commandmodule/activitys/incident/IncidentDispatchDetailActivity.java
@@ -18,6 +18,11 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.google.gson.Gson;
 import com.hjq.toast.ToastUtils;
+import com.supermap.imobilelite.maps.CoordinateReferenceSystem;
+import com.supermap.imobilelite.maps.DefaultItemizedOverlay;
+import com.supermap.imobilelite.maps.LayerView;
+import com.supermap.imobilelite.maps.OverlayItem;
+import com.supermap.imobilelite.maps.Point2D;
 import com.tengshisoft.commandmodule.R;
 import com.tengshisoft.commandmodule.R2;
 import com.tengshisoft.commonmodule.adapters.IncidentTagListAdapter;
@@ -29,6 +34,7 @@ import com.tengshisoft.commonmodule.beans.SuccessBean;
 import com.tengshisoft.commonmodule.beans.TagListBean;
 import com.tengshisoft.commonmodule.nets.CenterApis;
 import com.tengshisoft.commonmodule.nets.GridApis;
+import com.tengshisoft.gismap.TouchMapView;
 import com.tenlionsoft.baselib.constant.PathConfig;
 import com.tenlionsoft.baselib.core.beans.OperateBean;
 import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi;
@@ -138,6 +144,8 @@ public class IncidentDispatchDetailActivity extends BaseActivity {
     Button mBtnSubmit;
     @BindView(R2.id.rlv_tags)
     RecyclerView mRlvTags;
+    @BindView(R2.id.mv_map)
+    TouchMapView mMvMap;
     private Unbinder mBind;
     private String mId;
     private String mTaskId;
@@ -275,6 +283,26 @@ public class IncidentDispatchDetailActivity extends BaseActivity {
         mOperates.add(warnBean);
         mOperates.add(collectBean);
         mOperates.add(diffBean);
+        initMap();
+    }
+
+    private DefaultItemizedOverlay mItemizedOverlay;
+
+    private void initMap() {
+        Drawable marker = getResources().getDrawable(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker);
+        mItemizedOverlay = new DefaultItemizedOverlay(marker);
+        LayerView layerView = new LayerView(this);
+        layerView.setURL(PathConfig.BASE_LAYER);
+        CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
+        crs.wkid = PathConfig.CRS;
+        layerView.setCRS(crs);
+        mMvMap.addLayer(layerView);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
+        mMvMap.setBuiltInZoomControls(false);//内置缩放控件
+        mMvMap.setClickable(true);
+        mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     /**
@@ -662,17 +690,11 @@ public class IncidentDispatchDetailActivity extends BaseActivity {
         mTvContent.setText(b.getReportContent());
         double lat = Double.parseDouble(b.getReportLat());
         double lng = Double.parseDouble(b.getReportLng());
-//
-//        moveMapToCenter(new LatLng(lat, lng), 18);
-//        if (mBitMap == null) {
-//            mBitMap = BitmapDescriptorFactory.fromResource(R.drawable.ic_map_location_marker);
-//        }
-//        MarkerOptions markerOptions = new MarkerOptions()
-//            .position(new LatLng(lat, lng))//mark出现的位置
-//            .icon(mBitMap) //mark图标
-//            .draggable(false)//mark可拖拽
-//            .animateType(MarkerOptions.MarkerAnimateType.none);
-//        mBaiduMap.addOverlay(markerOptions);
+        Point2D point = new Point2D(lng, lat);
+        mMvMap.getController().setCenter(point);
+        OverlayItem item = new OverlayItem(point, "", "");
+        mItemizedOverlay.addItem(item);
+        mMvMap.invalidate();
         if (!TextUtils.isEmpty(b.getReportPhotos())) {
             //有图片
             mTvPhotoHint.setVisibility(View.GONE);
diff --git a/commandmodule/src/main/res/layout/activity_incident_accept_detail.xml b/commandmodule/src/main/res/layout/activity_incident_accept_detail.xml
index 161cef9..427dfd4 100644
--- a/commandmodule/src/main/res/layout/activity_incident_accept_detail.xml
+++ b/commandmodule/src/main/res/layout/activity_incident_accept_detail.xml
@@ -183,6 +183,14 @@
                             style="@style/item_content" />
                     </LinearLayout>
 
+                    <LinearLayout style="@style/item_gray_vertical_top">
+
+                        <com.tengshisoft.gismap.TouchMapView
+                            android:id="@+id/mv_map"
+                            android:layout_width="match_parent"
+                            android:layout_height="200dp" />
+                    </LinearLayout>
+
 
                     <LinearLayout style="@style/item_gray_vertical">
 
diff --git a/commandmodule/src/main/res/layout/activity_incident_dispatch_detail.xml b/commandmodule/src/main/res/layout/activity_incident_dispatch_detail.xml
index 64d35ef..97795fd 100644
--- a/commandmodule/src/main/res/layout/activity_incident_dispatch_detail.xml
+++ b/commandmodule/src/main/res/layout/activity_incident_dispatch_detail.xml
@@ -25,7 +25,7 @@
                 app:cardCornerRadius="5dp"
                 app:cardPreventCornerOverlap="true"
                 app:cardUseCompatPadding="false"
-                tools:visibility="gone">
+                tools:visibility="visible">
 
 
                 <LinearLayout
@@ -190,6 +190,14 @@
                                 style="@style/item_content" />
                         </LinearLayout>
 
+                        <LinearLayout style="@style/item_gray_vertical_top">
+
+                            <com.tengshisoft.gismap.TouchMapView
+                                android:id="@+id/mv_map"
+                                android:layout_width="match_parent"
+                                android:layout_height="200dp" />
+                        </LinearLayout>
+
                         <LinearLayout style="@style/item_gray_vertical">
 
                             <TextView
diff --git a/commonmodule/build.gradle b/commonmodule/build.gradle
index 7b54e7b..82d2e39 100644
--- a/commonmodule/build.gradle
+++ b/commonmodule/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.1'
     implementation project(':baselib')
     implementation project(':modulemap')
-    implementation project(':GisMap')
+    implementation project(':gismapmodule')
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'//地图
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/MineCollectActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/MineCollectActivity.java
index d113c13..197e295 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/MineCollectActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/MineCollectActivity.java
@@ -84,9 +84,9 @@ public class MineCollectActivity extends BaseActivity {
         mVpContent.setAdapter(adapter);
         CommonNavigator commonNavigator = new CommonNavigator(this);
         commonNavigator.setAdapter(new ViewPageNavigatorAdapter(this, mTitles, mVpContent));
-        commonNavigator.setAdjustMode(true);
+        commonNavigator.setAdjustMode(false);
         mMiTabs.setNavigator(commonNavigator);
-        UIUtil.bindViewPager2(mMiTabs, mVpContent,null);
+        UIUtil.bindViewPager2(mMiTabs, mVpContent, null);
     }
 
     private class VpRecordAdapter extends FragmentStateAdapter {
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCenterCheckDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCenterCheckDetailActivity.java
index d6e2cc4..f650e3d 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCenterCheckDetailActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCenterCheckDetailActivity.java
@@ -15,6 +15,11 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.google.gson.Gson;
 import com.hjq.toast.ToastUtils;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
+import com.supermap.imobilelite.maps.CoordinateReferenceSystem;
+import com.supermap.imobilelite.maps.DefaultItemizedOverlay;
+import com.supermap.imobilelite.maps.LayerView;
+import com.supermap.imobilelite.maps.OverlayItem;
+import com.supermap.imobilelite.maps.Point2D;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;
 import com.tengshisoft.commonmodule.adapters.HandleRecordAdapter;
@@ -26,6 +31,7 @@ import com.tengshisoft.commonmodule.beans.SaveCenterCheckBean;
 import com.tengshisoft.commonmodule.beans.SuccessBean;
 import com.tengshisoft.commonmodule.nets.CenterApis;
 import com.tengshisoft.commonmodule.nets.GridApis;
+import com.tengshisoft.gismap.TouchMapView;
 import com.tenlionsoft.baselib.constant.PathConfig;
 import com.tenlionsoft.baselib.core.beans.AddPhotoBean;
 import com.tenlionsoft.baselib.core.beans.OperateBean;
@@ -123,6 +129,8 @@ public class IncidentCenterCheckDetailActivity extends BaseActivity {
     RecyclerView mRlvDispose;
     @BindView(R2.id.cv_dispose)
     CardView mCvDispose;
+    @BindView(R2.id.mv_map)
+    TouchMapView mMvMap;
     private Unbinder mBind;
     private String mId;
     private int mCurrentPage = 1;
@@ -212,7 +220,11 @@ public class IncidentCenterCheckDetailActivity extends BaseActivity {
         mTvContent.setText(b.getReportContent());
         double lat = Double.parseDouble(b.getReportLat());
         double lng = Double.parseDouble(b.getReportLng());
-        //TODO 地图
+        Point2D point = new Point2D(lng, lat);
+        mMvMap.getController().setCenter(point);
+        OverlayItem item = new OverlayItem(point, "", "");
+        mItemizedOverlay.addItem(item);
+        mMvMap.invalidate();
         if (!TextUtils.isEmpty(b.getReportPhotos())) {
             //有图片
             mTvPhotoHint.setVisibility(View.GONE);
@@ -435,6 +447,26 @@ public class IncidentCenterCheckDetailActivity extends BaseActivity {
         mOperates.add(flagBean);
         mOperates.add(warnBean);
         mOperates.add(diffBean);
+        initMap();
+    }
+
+    private DefaultItemizedOverlay mItemizedOverlay;
+
+    private void initMap() {
+        Drawable marker = getResources().getDrawable(R.drawable.ic_map_location_marker);
+        mItemizedOverlay = new DefaultItemizedOverlay(marker);
+        LayerView layerView = new LayerView(this);
+        layerView.setURL(PathConfig.BASE_LAYER);
+        CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
+        crs.wkid = PathConfig.CRS;
+        layerView.setCRS(crs);
+        mMvMap.addLayer(layerView);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
+        mMvMap.setBuiltInZoomControls(false);//内置缩放控件
+        mMvMap.setClickable(true);
+        mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     /**
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCheckDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCheckDetailActivity.java
index ecb34ae..c1e8f2e 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCheckDetailActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCheckDetailActivity.java
@@ -23,6 +23,11 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.google.gson.Gson;
 import com.hjq.toast.ToastUtils;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
+import com.supermap.imobilelite.maps.CoordinateReferenceSystem;
+import com.supermap.imobilelite.maps.DefaultItemizedOverlay;
+import com.supermap.imobilelite.maps.LayerView;
+import com.supermap.imobilelite.maps.OverlayItem;
+import com.supermap.imobilelite.maps.Point2D;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;
 import com.tengshisoft.commonmodule.adapters.HandleRecordAdapter;
@@ -31,6 +36,7 @@ import com.tengshisoft.commonmodule.beans.IncidentDetailBean;
 import com.tengshisoft.commonmodule.beans.SaveCheckBean;
 import com.tengshisoft.commonmodule.beans.SuccessBean;
 import com.tengshisoft.commonmodule.nets.GridApis;
+import com.tengshisoft.gismap.TouchMapView;
 import com.tenlionsoft.baselib.constant.PathConfig;
 import com.tenlionsoft.baselib.core.beans.AddPhotoBean;
 import com.tenlionsoft.baselib.core.beans.BaseSuccessBean;
@@ -78,8 +84,6 @@ import okhttp3.RequestBody;
 @Route(path = PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_DETAIL)
 public class IncidentCheckDetailActivity extends BaseActivity {
 
-    @BindView(R2.id.tv_issue_base_info)
-    TextView mTvIssueBaseInfo;
     @BindView(R2.id.tv_grid)
     TextView mTvGrid;
     @BindView(R2.id.tv_component)
@@ -92,8 +96,6 @@ public class IncidentCheckDetailActivity extends BaseActivity {
     TextView mTvArea5;
     @BindView(R2.id.tv_address)
     TextView mTvAddress;
-    @BindView(R2.id.tv_issue_detail_info)
-    TextView mTvIssueDetailInfo;
     @BindView(R2.id.tv_content)
     TextView mTvContent;
     @BindView(R2.id.rlv_photos)
@@ -128,6 +130,8 @@ public class IncidentCheckDetailActivity extends BaseActivity {
     Button mBtnConfirm;
     @BindView(R2.id.rg_way)
     RadioGroup mRgWay;
+    @BindView(R2.id.mv_map)
+    TouchMapView mMvMap;
 
     private Unbinder mBind;
     private String mId;
@@ -221,6 +225,26 @@ public class IncidentCheckDetailActivity extends BaseActivity {
                 mSelPassType = "failed";
             }
         });
+        initMap();
+    }
+
+    private DefaultItemizedOverlay mItemizedOverlay;
+
+    private void initMap() {
+        Drawable marker = getResources().getDrawable(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker);
+        mItemizedOverlay = new DefaultItemizedOverlay(marker);
+        LayerView layerView = new LayerView(this);
+        layerView.setURL(PathConfig.BASE_LAYER);
+        CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
+        crs.wkid = PathConfig.CRS;
+        layerView.setCRS(crs);
+        mMvMap.addLayer(layerView);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
+        mMvMap.setBuiltInZoomControls(false);//内置缩放控件
+        mMvMap.setClickable(true);
+        mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     /**
@@ -540,7 +564,11 @@ public class IncidentCheckDetailActivity extends BaseActivity {
         mTvContent.setText(b.getReportContent());
         double lat = Double.parseDouble(b.getReportLat());
         double lng = Double.parseDouble(b.getReportLng());
-
+        Point2D point = new Point2D(lng, lat);
+        mMvMap.getController().setCenter(point);
+        OverlayItem item = new OverlayItem(point, "", "");
+        mItemizedOverlay.addItem(item);
+        mMvMap.invalidate();
         if (!TextUtils.isEmpty(b.getReportPhotos())) {
             //有图片
             mTvPhotoHint.setVisibility(View.GONE);
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineDetailActivity.java
index 6493a99..3fdcf27 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineDetailActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineDetailActivity.java
@@ -17,8 +17,14 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.google.gson.Gson;
 import com.hjq.toast.ToastUtils;
+import com.supermap.imobilelite.maps.CoordinateReferenceSystem;
+import com.supermap.imobilelite.maps.DefaultItemizedOverlay;
+import com.supermap.imobilelite.maps.LayerView;
+import com.supermap.imobilelite.maps.OverlayItem;
+import com.supermap.imobilelite.maps.Point2D;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;
+import com.tengshisoft.commonmodule.activitys.checkwork.AttendanceActivity;
 import com.tengshisoft.commonmodule.adapters.IncidentTagListAdapter;
 import com.tengshisoft.commonmodule.beans.DeferDetailBean;
 import com.tengshisoft.commonmodule.beans.DelayApplyBean;
@@ -29,6 +35,7 @@ import com.tengshisoft.commonmodule.beans.SuccessBean;
 import com.tengshisoft.commonmodule.beans.TagListBean;
 import com.tengshisoft.commonmodule.nets.CenterApis;
 import com.tengshisoft.commonmodule.nets.GridApis;
+import com.tengshisoft.gismap.TouchMapView;
 import com.tenlionsoft.baselib.constant.PathConfig;
 import com.tenlionsoft.baselib.core.beans.OperateBean;
 import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi;
@@ -133,6 +140,8 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity {
     TextView mTvApplyUser;
     @BindView(R2.id.tv_apply_time)
     TextView mTvApplyTime;
+    @BindView(R2.id.mv_map)
+    TouchMapView mMvMap;
 
     private Unbinder mBind;
     private String mDeferApplyId;
@@ -256,9 +265,24 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity {
         }
     }
 
-    @SuppressLint("ClickableViewAccessibility")
-    private void initMap() {
 
+    private DefaultItemizedOverlay mItemizedOverlay;
+
+    private void initMap() {
+        Drawable marker = getResources().getDrawable(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker);
+        mItemizedOverlay = new DefaultItemizedOverlay(marker);
+        LayerView layerView = new LayerView(this);
+        layerView.setURL(PathConfig.BASE_LAYER);
+        CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
+        crs.wkid = PathConfig.CRS;
+        layerView.setCRS(crs);
+        mMvMap.addLayer(layerView);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
+        mMvMap.setBuiltInZoomControls(false);//内置缩放控件
+        mMvMap.setClickable(true);
+        mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     /**
@@ -362,7 +386,11 @@ public class IncidentDeferExamineDetailActivity extends BaseActivity {
         mTvContent.setText(b.getReportContent());
         double lat = Double.parseDouble(b.getReportLat());
         double lng = Double.parseDouble(b.getReportLng());
-
+        Point2D point = new Point2D(lng, lat);
+        mMvMap.getController().setCenter(point);
+        OverlayItem item = new OverlayItem(point, "", "");
+        mItemizedOverlay.addItem(item);
+        mMvMap.invalidate();
 
         if (!TextUtils.isEmpty(b.getReportPhotos())) {
             //有图片
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java
index ec4b688..d409f79 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java
@@ -638,21 +638,24 @@ public class IncidentDetailActivity extends BaseActivity {
         mSrlContent.finishLoadMore();
 //        getHandleList(mCurrentPage);
     }
+
     private DefaultItemizedOverlay mItemizedOverlay;
+
     private void initMap() {
         Drawable marker = getResources().getDrawable(R.drawable.ic_map_location_marker);
         mItemizedOverlay = new DefaultItemizedOverlay(marker);
         LayerView layerView = new LayerView(this);
         layerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         layerView.setCRS(crs);
         mMvMap.addLayer(layerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(12);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     /**
@@ -1076,6 +1079,11 @@ public class IncidentDetailActivity extends BaseActivity {
             });
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mMvMap.destroy();
+    }
 
     @Override
     protected void clearSearch() {
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentHandleActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentHandleActivity.java
index 4430673..a31a697 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentHandleActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentHandleActivity.java
@@ -1,6 +1,5 @@
 package com.tengshisoft.commonmodule.activitys.cases;
 
-import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.database.Cursor;
@@ -23,17 +22,25 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.google.gson.Gson;
 import com.hjq.toast.ToastUtils;
+import com.supermap.imobilelite.maps.CoordinateReferenceSystem;
+import com.supermap.imobilelite.maps.DefaultItemizedOverlay;
+import com.supermap.imobilelite.maps.LayerView;
+import com.supermap.imobilelite.maps.OverlayItem;
+import com.supermap.imobilelite.maps.Point2D;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;
 import com.tengshisoft.commonmodule.adapters.DeferRecordAdapter;
+import com.tengshisoft.commonmodule.adapters.HandleRecordAdapter;
 import com.tengshisoft.commonmodule.beans.DeferRecordListBean;
 import com.tengshisoft.commonmodule.beans.DelayApplyBean;
 import com.tengshisoft.commonmodule.beans.DispatchDetailBean;
+import com.tengshisoft.commonmodule.beans.HandleListBean;
 import com.tengshisoft.commonmodule.beans.IncidentDetailBean;
 import com.tengshisoft.commonmodule.beans.IncidentRebackBean;
 import com.tengshisoft.commonmodule.beans.SaveHandleIncidentBean;
 import com.tengshisoft.commonmodule.beans.SuccessBean;
 import com.tengshisoft.commonmodule.nets.GridApis;
+import com.tengshisoft.gismap.TouchMapView;
 import com.tenlionsoft.baselib.constant.PathConfig;
 import com.tenlionsoft.baselib.core.beans.AddPhotoBean;
 import com.tenlionsoft.baselib.core.beans.BaseSuccessBean;
@@ -149,6 +156,12 @@ public class IncidentHandleActivity extends BaseActivity {
     TextView mTvDeferTime;
     @BindView(R2.id.ll_defer_time)
     LinearLayout mLlDeferTime;
+    @BindView(R2.id.mv_map)
+    TouchMapView mMvMap;
+    @BindView(R2.id.rlv_handles)
+    RecyclerView mRlvHandles;
+    @BindView(R2.id.cv_handle)
+    CardView mCvHandle;
     private Unbinder mBind;
     private String mReportId;
     private IncidentDetailBean mIncidentDetailBean;
@@ -160,6 +173,8 @@ public class IncidentHandleActivity extends BaseActivity {
     private String mPhotoIds = "";//相片Id
     private String mPicPath;
     private String mTaskId;
+    private List<HandleListBean.RowsBean> mDatas;
+    private HandleRecordAdapter mHandleRecordAdapter;
 
     @Override
     protected int setLayoutId() {
@@ -283,6 +298,10 @@ public class IncidentHandleActivity extends BaseActivity {
                 startActivity(intent);
             }
         });
+        mDatas = new ArrayList<>();
+        mHandleRecordAdapter = new HandleRecordAdapter(mActivity, mDatas, 0);
+        mRlvHandles.setLayoutManager(new LinearLayoutManager(mActivity));
+        mRlvHandles.setAdapter(mHandleRecordAdapter);
     }
 
     /**
@@ -560,8 +579,23 @@ public class IncidentHandleActivity extends BaseActivity {
             });
     }
 
-    @SuppressLint("ClickableViewAccessibility")
+    private DefaultItemizedOverlay mItemizedOverlay;
+
     private void initMap() {
+        Drawable marker = getResources().getDrawable(R.drawable.ic_map_location_marker);
+        mItemizedOverlay = new DefaultItemizedOverlay(marker);
+        LayerView layerView = new LayerView(this);
+        layerView.setURL(PathConfig.BASE_LAYER);
+        CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
+        crs.wkid = PathConfig.CRS;
+        layerView.setCRS(crs);
+        mMvMap.addLayer(layerView);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
+        mMvMap.setBuiltInZoomControls(false);//内置缩放控件
+        mMvMap.setClickable(true);
+        mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     /**
@@ -586,6 +620,7 @@ public class IncidentHandleActivity extends BaseActivity {
                     setIncidentDetailToView();
                     getDispatchDetail();//获取派遣信息
                     getDeferRecord();
+                    getHandleList(1);
 
                 }
 
@@ -602,6 +637,53 @@ public class IncidentHandleActivity extends BaseActivity {
             });
     }
 
+    private int mCurrentPage = 1;
+
+    /**
+     * 获取处理记录列表
+     */
+    private void getHandleList(int page) {
+        mCurrentPage = page;
+        RetrofitManager.getInstance()
+            .create(GridApis.class)
+            .getHandleLNewListByReportId(mReportId, UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<List<HandleListBean.RowsBean>>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
+
+                }
+
+                @Override
+                public void onNext(@NonNull List<HandleListBean.RowsBean> handleListBean) {
+                    if (handleListBean.size() > 0) {
+                        ++mCurrentPage;
+                        mCvHandle.setVisibility(View.VISIBLE);
+                        if (page == 1) {
+                            mDatas.clear();
+                            mDatas.addAll(handleListBean);
+                        } else {
+                            mDatas.addAll(handleListBean);
+                        }
+                        mHandleRecordAdapter.notifyDataSetChanged();
+                    } else {
+                        mCvHandle.setVisibility(View.GONE);
+                    }
+                }
+
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    mCvHandle.setVisibility(View.GONE);
+                }
+
+                @Override
+                public void onComplete() {
+
+                }
+            });
+    }
+
     /**
      * 获取延期记录
      */
@@ -714,8 +796,11 @@ public class IncidentHandleActivity extends BaseActivity {
         mTvContent.setText(mIncidentDetailBean.getReportContent());
         double lat = Double.parseDouble(mIncidentDetailBean.getReportLat());
         double lng = Double.parseDouble(mIncidentDetailBean.getReportLng());
-
-
+        Point2D point = new Point2D(lng, lat);
+        mMvMap.getController().setCenter(point);
+        OverlayItem item = new OverlayItem(point, "", "");
+        mItemizedOverlay.addItem(item);
+        mMvMap.invalidate();
         if (!TextUtils.isEmpty(mIncidentDetailBean.getReportPhotos())) {
             //有图片
             mTvPhotoHint.setVisibility(View.GONE);
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java
index 1d6a69b..9ec4f66 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.graphics.Color;
 import android.graphics.drawable.AnimationDrawable;
+import android.media.MediaRecorder;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
@@ -40,6 +41,7 @@ import com.tenlionsoft.baselib.core.beans.BaseSuccessBean;
 import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi;
 import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
 import com.tenlionsoft.baselib.core.retrofit_net.api.BaseApiService;
+import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
 import com.tenlionsoft.baselib.core.widget.PhotoActivity;
 import com.tenlionsoft.baselib.core.widget.base.AddPhotoAdapter;
 import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
@@ -330,8 +332,7 @@ public class IncidentReportActivity extends BaseActivity {
             RetrofitManager.getInstance()
                 .create(GridApis.class)
                 .doSaveCase(body, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .compose(RxTransformer.getTransformer())
                 .subscribe(new Observer<SuccessBean>() {
                     @Override
                     public void onSubscribe(@NonNull Disposable d) {
@@ -809,9 +810,7 @@ public class IncidentReportActivity extends BaseActivity {
                         mSelType2Name = bean1.getName();
                         mTvType.setText(bean1.getName());
                     } else {
-                        mSelType1 = bean.getId();
-                        mSelType2 = "";
-                        mTvType.setText(bean.getName());
+                        ToastUtils.show("详细类型数据未录入,无法选取");
                     }
                 })
                     .setTitleText("请选择")
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java
index 1dca576..02343cd 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java
@@ -32,6 +32,7 @@ import com.supermap.imobilelite.maps.Util;
 import com.supermap.imobilelite.resources.UtilsCommon;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;
+import com.tengshisoft.gismap.TouchMapView;
 import com.tengshisoft.modulemap.common.Location84;
 import com.tenlionsoft.baselib.constant.PathConfig;
 import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi;
@@ -83,7 +84,7 @@ public class AttendanceActivity extends BaseActivity {
     @BindView(R2.id.btn_reset_loc)
     Button mBtnResetLoc;
     @BindView(R2.id.mv_map)
-    MapView mMvMap;
+    TouchMapView mMvMap;
 
 
     private Unbinder mBind;
@@ -157,17 +158,18 @@ public class AttendanceActivity extends BaseActivity {
         mBaseLayerView = new LayerView(this);
         mBaseLayerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         mBaseLayerView.setCRS(crs);
         mMvMap.addLayer(mBaseLayerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(6);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(new TouchOverlay());
         Drawable marker = getResources().getDrawable(R.drawable.ic_map_location_marker);
         mItemizedOverlay = new DefaultItemizedOverlay(marker);
         mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
 
     }
 
@@ -264,6 +266,8 @@ public class AttendanceActivity extends BaseActivity {
             if (PathConfig.ACTION_LOCATION_MESSAGE.equals(action)) {
                 //定位到了
                 mCurrentLoc = (Location84) intent.getSerializableExtra("data");
+                String address = intent.getStringExtra("address");
+                mTvCurLocation.setText(address);
                 setMyCurrentLocation();
             }
         }
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/MapDemoActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/MapDemoActivity.java
index 846fecc..20c8306 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/MapDemoActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/MapDemoActivity.java
@@ -1,21 +1,30 @@
 package com.tengshisoft.commonmodule.activitys.checkwork;
 
 import android.graphics.Color;
+import android.graphics.DashPathEffect;
 import android.graphics.Paint;
 import android.os.Handler;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.supermap.imobilelite.maps.CoordinateReferenceSystem;
+import com.supermap.imobilelite.maps.LayerView;
+import com.supermap.imobilelite.maps.LineOverlay;
 import com.supermap.imobilelite.maps.Point2D;
 import com.supermap.imobilelite.maps.PolygonOverlay;
 import com.tengshisoft.commonmodule.R;
+import com.tengshisoft.commonmodule.R2;
+import com.tengshisoft.commonmodule.beans.DrawMapLineBean;
+import com.tengshisoft.gismap.TouchMapView;
 import com.tenlionsoft.baselib.constant.PathConfig;
 import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
 import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
+import com.tenlionsoft.baselib.utils.LogUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 import io.reactivex.rxjava3.core.Observable;
@@ -23,10 +32,12 @@ import io.reactivex.rxjava3.core.Observable;
 @Route(path = PathConfig.PATH_MODULE_COMMON_DEMO)
 public class MapDemoActivity extends BaseActivity {
 
+    @BindView(R2.id.mv_map)
+    TouchMapView mMvMap;
     private Unbinder mBind;
 
     private Handler mHandler;
-
+    private LayerView mBaseLayerView;
     // 通过设置间隔时间和距离可以控制速度和图标移动的距离
     private static final int TIME_INTERVAL = 30;
     private static final double DISTANCE = 0.000005;
@@ -61,6 +72,23 @@ public class MapDemoActivity extends BaseActivity {
 
     }
 
+    /**
+     * 初始化地图
+     */
+    private void initMap() {
+        mBaseLayerView = new LayerView(this);
+        mBaseLayerView.setURL(PathConfig.BASE_LAYER);
+        CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
+        crs.wkid = PathConfig.CRS;
+        mBaseLayerView.setCRS(crs);
+        mMvMap.addLayer(mBaseLayerView);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
+        mMvMap.setBuiltInZoomControls(false);//内置缩放控件
+        mMvMap.setClickable(true);
+        mMvMap.invalidate();
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -68,14 +96,11 @@ public class MapDemoActivity extends BaseActivity {
 
     private void init() {
         initMap();
-        drawPolyLine();
+        drawLine();
+        drawGrid();
         mHandler = new Handler(getMainLooper());
     }
 
-    private void initMap() {
-
-
-    }
 
     private void drawPolyLine() {
 
@@ -188,11 +213,72 @@ public class MapDemoActivity extends BaseActivity {
                 point2DS.add(new Point2D(111.74426503720412, 40.80230021884654));
                 point2DS.add(new Point2D(111.72573276691429, 40.8620153120026));
                 polygonOverlay.setData(point2DS);
-//                mMvMap.getOverlays().add(polygonOverlay);
-//                mMvMap.invalidate();
+                mMvMap.getOverlays().add(polygonOverlay);
+                mMvMap.invalidate();
             });
     }
 
+    private void drawLine() {
+        List<DrawMapLineBean> o = new ArrayList<>();
+        DrawMapLineBean bean = new DrawMapLineBean();
+        //TODO 速度大于20/s异常
+        bean.setOnePoint(new Point2D(111.64800018875428, 40.85532310328682));
+        bean.setTwoPoint(new Point2D(111.65829589447088, 40.78222359269927));
+        bean.setType(14);
+        bean.setLineColor(Integer.valueOf(Color.RED));
+        bean.setEffect(false);
+        DrawMapLineBean bean1 = new DrawMapLineBean();
+        //TODO 速度小于0.5m/s等待
+        bean1.setOnePoint(new Point2D(111.65829589447088, 40.78222359269927));
+        bean1.setTwoPoint(new Point2D(111.74426503720412, 40.80230021884654));
+        bean1.setType(13);
+        bean1.setLineColor(Integer.valueOf(Color.YELLOW));
+        bean1.setEffect(true);
+        DrawMapLineBean bean2 = new DrawMapLineBean();
+        //TODO 移动 绿色
+        bean2.setOnePoint(new Point2D(111.74426503720412, 40.80230021884654));
+        bean2.setTwoPoint(new Point2D(111.72573276691429, 40.8620153120026));
+        bean2.setType(12);
+        bean2.setLineColor(Integer.valueOf(Color.parseColor("#218868")));
+        bean2.setEffect(false);
+        DrawMapLineBean bean3 = new DrawMapLineBean();
+        bean3.setOnePoint(new Point2D(111.72573276691429, 40.8620153120026));
+        bean3.setTwoPoint(new Point2D(111.64800018875428, 40.85532310328682));
+        bean3.setType(12);
+        bean3.setLineColor(Integer.valueOf(Color.BLUE));
+        bean3.setEffect(true);
+        o.add(bean);
+        o.add(bean1);
+        o.add(bean2);
+        o.add(bean3);
+        for (int i = 0; i < o.size(); i++) {
+            LineOverlay overlay = new LineOverlay(getLinePaint(o.get(i).getLineColor(), o.get(i).isEffect()));
+            List<Point2D> points = new ArrayList<>();
+            points.add(o.get(i).getOnePoint());
+            points.add(o.get(i).getTwoPoint());
+            overlay.setData(points);
+            mMvMap.getOverlays().add(overlay);
+        }
+        mMvMap.getController().setCenter(o.get(0).getOnePoint());
+        mMvMap.getController().setZoom(12);
+        mMvMap.invalidate();
+    }
+
+    /**
+     * 绘线风格
+     */
+    public static Paint getLinePaint(int color, boolean isEffect) {
+        Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        paint.setColor(color);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(5);
+        paint.setAntiAlias(true);
+        if (isEffect) {
+            paint.setPathEffect(new DashPathEffect(new float[]{15, 5}, 5));
+        }
+        return paint;
+    }
+
     /**
      * 画网格的画笔
      *
@@ -200,12 +286,13 @@ public class MapDemoActivity extends BaseActivity {
      */
     public static Paint getPolygonPaint() {
         Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        paint.setColor(Color.argb(200, 10, 230, 250));
-        paint.setStyle(Paint.Style.FILL_AND_STROKE);
+        int a = Math.min(255, Math.max(0, (int) (0.4 * 255))) << 24;
+        int rgb = 0x00ffffff & Color.parseColor("#000000");
+        int col = a + rgb;
+        paint.setColor(col);
         paint.setStrokeWidth(2);
         paint.setAntiAlias(true);
         return paint;
-
     }
     /**
      * 循环进行移动逻辑
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/BuildSubmitBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/BuildSubmitBean.java
index ddb3707..680ba17 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/BuildSubmitBean.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/BuildSubmitBean.java
@@ -28,6 +28,24 @@ public class BuildSubmitBean {
     private List<FloorCountBean> floorCountList;
     private List<HouseCountBean> houseCountList;
     private List<List<UnitCountBean>> unitCountList;
+    private String longitude;
+    private String latitude;
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
 
     public String getBuildingNum() {
         return buildingNum;
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/BuildingDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/BuildingDetailBean.java
index bb6cb83..b408e8b 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/BuildingDetailBean.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/BuildingDetailBean.java
@@ -25,6 +25,26 @@ public class BuildingDetailBean {
     private String residentialName;
     private int unitCount;
     private String unitCountStr;
+    private String longitude;
+    private String latitude;
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+
 
     private List<FloorCountBean> floorCountList;
     private List<HouseCountBean> houseCountList;
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CommunityAreaDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CommunityAreaDetailBean.java
index 8704f9e..894ccf6 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CommunityAreaDetailBean.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/CommunityAreaDetailBean.java
@@ -24,6 +24,25 @@ public class CommunityAreaDetailBean {
     private String modifier;
     private String phone;
     private String remake;
+    private String longitude;
+    private String latitude;
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
 
     public String getAddress() {
         return address;
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DrawMapLineBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DrawMapLineBean.java
index 6f7afe3..1b3e86b 100755
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DrawMapLineBean.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/DrawMapLineBean.java
@@ -1,5 +1,8 @@
 package com.tengshisoft.commonmodule.beans;
 
+
+import com.supermap.imobilelite.maps.Point2D;
+
 /**
  * 作者: Adam
  * 日期: 2019/8/29 - 17:34
@@ -7,40 +10,49 @@ package com.tengshisoft.commonmodule.beans;
  * 描述: type 线的类型 12:移动  13:等待  14:异常
  */
 public class DrawMapLineBean {
-//    private int type;//线的类型
-//    private LatLng onePoint;
-//    private LatLng twoPoint;
-//    private Integer lineColor;
-//
-//    public int getType() {
-//        return type;
-//    }
-//
-//    public void setType(int type) {
-//        this.type = type;
-//    }
-//
-//    public LatLng getOnePoint() {
-//        return onePoint;
-//    }
-//
-//    public void setOnePoint(LatLng onePoint) {
-//        this.onePoint = onePoint;
-//    }
-//
-//    public LatLng getTwoPoint() {
-//        return twoPoint;
-//    }
-//
-//    public void setTwoPoint(LatLng twoPoint) {
-//        this.twoPoint = twoPoint;
-//    }
-//
-//    public Integer getLineColor() {
-//        return lineColor;
-//    }
-//
-//    public void setLineColor(Integer lineColor) {
-//        this.lineColor = lineColor;
-//    }
+    private int type;//线的类型
+    private Point2D onePoint;
+    private Point2D twoPoint;
+    private Integer lineColor;
+    private boolean isEffect;
+
+    public boolean isEffect() {
+        return isEffect;
+    }
+
+    public void setEffect(boolean effect) {
+        isEffect = effect;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public Point2D getOnePoint() {
+        return onePoint;
+    }
+
+    public void setOnePoint(Point2D onePoint) {
+        this.onePoint = onePoint;
+    }
+
+    public Point2D getTwoPoint() {
+        return twoPoint;
+    }
+
+    public void setTwoPoint(Point2D twoPoint) {
+        this.twoPoint = twoPoint;
+    }
+
+    public Integer getLineColor() {
+        return lineColor;
+    }
+
+    public void setLineColor(Integer lineColor) {
+        this.lineColor = lineColor;
+    }
 }
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/KeyAreaDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/KeyAreaDetailBean.java
index 27225ab..ec1aef6 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/KeyAreaDetailBean.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/KeyAreaDetailBean.java
@@ -32,6 +32,24 @@ public class KeyAreaDetailBean {
     private String securityQuestion;
     private String securityQuestionCode;
     private String securityQuestionName;
+    private String longitude;
+    private String latitude;
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
 
     public String getEffectEvaluation() {
         return effectEvaluation;
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCommunityAreaBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCommunityAreaBean.java
index 6abce03..d0f1d7b 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCommunityAreaBean.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveCommunityAreaBean.java
@@ -17,6 +17,24 @@ public class SaveCommunityAreaBean {
     private String locationCode;
     private String phone;
     private String remake;
+    private String longitude;
+    private String latitude;
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
 
     public String getAddress() {
         return address;
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveKeyAreaBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveKeyAreaBean.java
index 31c7d0b..5f5cb81 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveKeyAreaBean.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveKeyAreaBean.java
@@ -30,6 +30,24 @@ public class SaveKeyAreaBean {
     private String securityQuestion;
     private String securityQuestionCode;
     private String securityQuestionName;
+    private String longitude;
+    private String latitude;
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
 
     public String getEffectEvaluation() {
         return effectEvaluation;
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/UserGridList.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/UserGridList.java
new file mode 100644
index 0000000..9bfbbfb
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/UserGridList.java
@@ -0,0 +1,178 @@
+package com.tengshisoft.commonmodule.beans;
+
+import java.util.List;
+
+/**
+ * 作者: adam
+ * 日期: 2021/12/24 - 5:05 下午
+ * 邮箱: itgaojian@163.com
+ * 描述:
+ */
+public class UserGridList {
+
+    private String areaCode;
+    private String areaName;
+    private String fillColor;
+    private String gmtCreate;
+    private String gmtModified;
+    private String gridCode;
+    private String gridDuty;
+    private String gridGroupId;
+    private String gridId;
+    private String gridName;
+    private double gridSquare;
+    private String gridSummary;
+    private String relationId;
+    private List<PointArrayBean> pointArray;
+    private List<?> relationIdArray;
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    public String getFillColor() {
+        return fillColor;
+    }
+
+    public void setFillColor(String fillColor) {
+        this.fillColor = fillColor;
+    }
+
+    public String getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(String gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public String getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(String gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getGridCode() {
+        return gridCode;
+    }
+
+    public void setGridCode(String gridCode) {
+        this.gridCode = gridCode;
+    }
+
+    public String getGridDuty() {
+        return gridDuty;
+    }
+
+    public void setGridDuty(String gridDuty) {
+        this.gridDuty = gridDuty;
+    }
+
+    public String getGridGroupId() {
+        return gridGroupId;
+    }
+
+    public void setGridGroupId(String gridGroupId) {
+        this.gridGroupId = gridGroupId;
+    }
+
+    public String getGridId() {
+        return gridId;
+    }
+
+    public void setGridId(String gridId) {
+        this.gridId = gridId;
+    }
+
+    public String getGridName() {
+        return gridName;
+    }
+
+    public void setGridName(String gridName) {
+        this.gridName = gridName;
+    }
+
+    public double getGridSquare() {
+        return gridSquare;
+    }
+
+    public void setGridSquare(double gridSquare) {
+        this.gridSquare = gridSquare;
+    }
+
+    public String getGridSummary() {
+        return gridSummary;
+    }
+
+    public void setGridSummary(String gridSummary) {
+        this.gridSummary = gridSummary;
+    }
+
+    public String getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(String relationId) {
+        this.relationId = relationId;
+    }
+
+    public List<PointArrayBean> getPointArray() {
+        return pointArray;
+    }
+
+    public void setPointArray(List<PointArrayBean> pointArray) {
+        this.pointArray = pointArray;
+    }
+
+    public List<?> getRelationIdArray() {
+        return relationIdArray;
+    }
+
+    public void setRelationIdArray(List<?> relationIdArray) {
+        this.relationIdArray = relationIdArray;
+    }
+
+    public static class PointArrayBean {
+        private String gridId;
+        private String lat;
+        private String lng;
+
+        public String getGridId() {
+            return gridId;
+        }
+
+        public void setGridId(String gridId) {
+            this.gridId = gridId;
+        }
+
+        public String getLat() {
+            return lat;
+        }
+
+        public void setLat(String lat) {
+            this.lat = lat;
+        }
+
+        public String getLng() {
+            return lng;
+        }
+
+        public void setLng(String lng) {
+            this.lng = lng;
+        }
+    }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/SmartConsultFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/SmartConsultFragment.java
index f4c623d..2b6da18 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/SmartConsultFragment.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/SmartConsultFragment.java
@@ -4,7 +4,10 @@ import android.graphics.Bitmap;
 import android.net.http.SslError;
 import android.os.Build;
 import android.view.View;
+import android.webkit.CookieManager;
 import android.webkit.HttpAuthHandler;
+import android.webkit.JsResult;
+import android.webkit.PermissionRequest;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
@@ -36,6 +39,7 @@ import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
+import okhttp3.Cookie;
 
 /**
  * 作者: adam
@@ -80,15 +84,31 @@ public class SmartConsultFragment extends BaseFragment {
     private void initWebView() {
         mWvContent.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
         WebSettings settings = mWvContent.getSettings();
-        settings.setCacheMode(WebSettings.LOAD_DEFAULT);
+        settings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
         settings.setAppCacheEnabled(true);
         settings.setJavaScriptEnabled(true);//启用JS
         settings.setBlockNetworkImage(true);//阻塞页面图片加载
         settings.setDomStorageEnabled(true);
         settings.setUseWideViewPort(true);
+        settings.setAllowFileAccess(true);
         settings.setLoadWithOverviewMode(true);
+        settings.setJavaScriptCanOpenWindowsAutomatically(true);
         settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+        settings.setAllowFileAccessFromFileURLs(true);
+        settings.setAllowUniversalAccessFromFileURLs(true);
+        settings.setMediaPlaybackRequiresUserGesture(false);
+        settings.setPluginState(WebSettings.PluginState.ON);
+        settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        String absolutePath = getApplicationContext().getCacheDir().getAbsolutePath();
+        settings.setAppCachePath(absolutePath);
+        settings.setDatabaseEnabled(true);
         mWvContent.requestFocus();
+        if (Build.VERSION.SDK_INT >= 21) {
+            CookieManager.getInstance().setAcceptThirdPartyCookies(mWvContent, true);
+            WebView.setWebContentsDebuggingEnabled(true);
+        } else {
+            CookieManager.getInstance().setAcceptCookie(true);
+        }
         mWvContent.setWebChromeClient(new WebChromeClient() {
             @Override
             public void onProgressChanged(WebView view, int newProgress) {
@@ -100,6 +120,20 @@ public class SmartConsultFragment extends BaseFragment {
                     mRlBar.setVisibility(View.GONE);
                 }
             }
+
+            @Override
+            public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
+                result.confirm();
+                return true;
+            }
+
+            @Override
+            public void onPermissionRequest(PermissionRequest request) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    request.grant(request.getResources());
+                    request.getOrigin();
+                }
+            }
         });
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -141,6 +175,7 @@ public class SmartConsultFragment extends BaseFragment {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                LogUtils.e(url);
                 if (Build.VERSION.SDK_INT < 26) {
                     view.loadUrl(url);
                     return true;
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java
index c17b719..cc6e1b0 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java
@@ -31,6 +31,13 @@ import retrofit2.http.Query;
 public interface GridApis {
     /*=============================================================基础类接口===============================================================================*/
 
+    /**
+     * 获取网格员网格
+     */
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @GET("app/grid/list-with-point/relation-id/{relationId}")
+    Observable<List<UserGridList>> getUserGrid(@Path("relationId") String userId, @Header("token") String token);
+
     /**
      * 事件数量
      */
@@ -1122,7 +1129,7 @@ public interface GridApis {
      * 上报事件
      */
     @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"})
-    @POST("app/report/save-app")
+    @POST("app/report/save-grid")
     Observable<SuccessBean> doSaveCase(@Body RequestBody body, @Header("token") String token);
 
     /**
@@ -1372,7 +1379,15 @@ public interface GridApis {
      */
     @Headers({"base_url_name:task", "Content-Type: application/json", "Accept: application/json"})
     @GET("app/receiveruser/listpagereceiveruser")
-    Observable<TaskListBean> getTaskListByType(@Query("distributeStatus") String disStatus, @Query("distributeTaskType") String type, @Query("executeStatus") String status, @Query("isWarning") String warn, @Query("isSupervision") String sv, @Query("keywords") String key, @Query("page") String page, @Header("token") String token);
+    Observable<TaskListBean> getTaskListByType(@Query("distributeStatus") String disStatus,
+                                               @Query("orderDesc") String order,
+                                               @Query("distributeTaskType") String type,
+                                               @Query("executeStatus") String status,
+                                               @Query("isWarning") String warn,
+                                               @Query("isSupervision") String sv,
+                                               @Query("keywords") String key,
+                                               @Query("page") String page,
+                                               @Header("token") String token);
 
     /**
      * 获取任务详情
diff --git a/commonmodule/src/main/res/layout/activity_attendance.xml b/commonmodule/src/main/res/layout/activity_attendance.xml
index 0955ee6..efaa5df 100644
--- a/commonmodule/src/main/res/layout/activity_attendance.xml
+++ b/commonmodule/src/main/res/layout/activity_attendance.xml
@@ -140,7 +140,7 @@
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
-                android:layout_height="350dp"
+                android:layout_height="match_parent"
                 android:layout_margin="5dp"
                 app:cardCornerRadius="5dp"
                 app:cardElevation="0dp">
@@ -149,7 +149,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                    <com.supermap.imobilelite.maps.MapView
+                    <com.tengshisoft.gismap.TouchMapView
                         android:id="@+id/mv_map"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent" />
@@ -164,7 +164,8 @@
                         android:layout_marginBottom="10dp"
                         android:background="@drawable/bm_btn_background"
                         android:minWidth="0dp"
-                        android:minHeight="0dp" />
+                        android:minHeight="0dp"
+                        android:visibility="gone" />
                 </RelativeLayout>
             </androidx.cardview.widget.CardView>
         </LinearLayout>
diff --git a/commonmodule/src/main/res/layout/activity_incident_center_check_detail.xml b/commonmodule/src/main/res/layout/activity_incident_center_check_detail.xml
index d95b1ea..aded3c1 100644
--- a/commonmodule/src/main/res/layout/activity_incident_center_check_detail.xml
+++ b/commonmodule/src/main/res/layout/activity_incident_center_check_detail.xml
@@ -183,6 +183,13 @@
                                     style="@style/item_content" />
                             </LinearLayout>
 
+                            <LinearLayout style="@style/item_gray_vertical_top">
+
+                                <com.tengshisoft.gismap.TouchMapView
+                                    android:id="@+id/mv_map"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="200dp" />
+                            </LinearLayout>
 
 
                             <LinearLayout style="@style/item_gray_vertical">
diff --git a/commonmodule/src/main/res/layout/activity_incident_check_detail.xml b/commonmodule/src/main/res/layout/activity_incident_check_detail.xml
index ff44866..6756eeb 100644
--- a/commonmodule/src/main/res/layout/activity_incident_check_detail.xml
+++ b/commonmodule/src/main/res/layout/activity_incident_check_detail.xml
@@ -38,13 +38,14 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:orientation="vertical"
+                        android:paddingBottom="5dp">
 
                         <com.tenlionsoft.baselib.core.widget.views.ExpandableLinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="vertical"
-                            app:defaultItemCount="3"
+                            app:defaultItemCount="5"
                             app:expandText="点击展开"
                             app:hideText="点击收起"
                             app:useDefaultBottom="true">
@@ -183,43 +184,13 @@
                                     style="@style/item_content" />
                             </LinearLayout>
 
+                            <LinearLayout style="@style/item_gray_vertical_top">
 
-                        </com.tenlionsoft.baselib.core.widget.views.ExpandableLinearLayout>
-                    </LinearLayout>
-
-                </androidx.cardview.widget.CardView>
-
-
-                <androidx.cardview.widget.CardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    app:cardCornerRadius="10dp"
-                    app:cardElevation="1dp"
-                    app:cardPreventCornerOverlap="true"
-                    app:cardUseCompatPadding="false"
-                    tools:visibility="gone">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <com.tenlionsoft.baselib.core.widget.views.ExpandableLinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            app:defaultItemCount="3"
-                            app:expandText="点击展开"
-                            app:hideText="点击收起"
-                            app:useDefaultBottom="true">
-
-                            <TextView
-                                android:id="@+id/tv_issue_detail_info"
-                                style="@style/issue_report_title"
-                                android:padding="8dp"
-                                android:text="事件详细信息"
-                                android:textStyle="bold" />
+                                <com.tengshisoft.gismap.TouchMapView
+                                    android:id="@+id/mv_map"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="200dp" />
+                            </LinearLayout>
 
                             <LinearLayout style="@style/item_gray_vertical">
 
@@ -338,10 +309,13 @@
 
                                 </LinearLayout>
                             </LinearLayout>
+
                         </com.tenlionsoft.baselib.core.widget.views.ExpandableLinearLayout>
                     </LinearLayout>
+
                 </androidx.cardview.widget.CardView>
 
+
                 <androidx.cardview.widget.CardView
                     android:id="@+id/cv_handle"
                     android:layout_width="match_parent"
diff --git a/commonmodule/src/main/res/layout/activity_incident_defer_examine_detail.xml b/commonmodule/src/main/res/layout/activity_incident_defer_examine_detail.xml
index b76a468..e155fb5 100644
--- a/commonmodule/src/main/res/layout/activity_incident_defer_examine_detail.xml
+++ b/commonmodule/src/main/res/layout/activity_incident_defer_examine_detail.xml
@@ -191,6 +191,13 @@
                                 style="@style/item_content" />
                         </LinearLayout>
 
+                        <LinearLayout style="@style/item_gray_vertical_top">
+
+                            <com.tengshisoft.gismap.TouchMapView
+                                android:id="@+id/mv_map"
+                                android:layout_width="match_parent"
+                                android:layout_height="200dp" />
+                        </LinearLayout>
 
 
                         <LinearLayout style="@style/item_gray_vertical">
diff --git a/commonmodule/src/main/res/layout/activity_incident_handle.xml b/commonmodule/src/main/res/layout/activity_incident_handle.xml
index b88768c..9bce005 100644
--- a/commonmodule/src/main/res/layout/activity_incident_handle.xml
+++ b/commonmodule/src/main/res/layout/activity_incident_handle.xml
@@ -39,7 +39,7 @@
                         app:expandText="点击展开"
                         app:hideText="点击收起"
                         app:useDefaultBottom="true"
-                        tools:visibility="gone">
+                        tools:visibility="visible">
 
                         <TextView
                             style="@style/issue_report_title"
@@ -174,6 +174,14 @@
                                 style="@style/item_content" />
                         </LinearLayout>
 
+                        <LinearLayout style="@style/item_gray_vertical_top">
+
+                            <com.tengshisoft.gismap.TouchMapView
+                                android:id="@+id/mv_map"
+                                android:layout_width="match_parent"
+                                android:layout_height="200dp" />
+                        </LinearLayout>
+
                         <LinearLayout style="@style/item_gray_vertical">
 
                             <TextView
@@ -487,6 +495,35 @@
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
 
+            <androidx.cardview.widget.CardView
+                android:id="@+id/cv_handle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                app:cardCornerRadius="5dp"
+                app:cardPreventCornerOverlap="true"
+                app:cardUseCompatPadding="false"
+                tools:visibility="visible">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        style="@style/issue_report_title"
+                        android:padding="8dp"
+                        android:text="处理详情"
+                        android:textStyle="bold" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rlv_handles"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        tools:listitem="@layout/item_incident_handle" />
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
             <!--  处理详情  -->
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
diff --git a/commonmodule/src/main/res/layout/activity_incident_oversee.xml b/commonmodule/src/main/res/layout/activity_incident_oversee.xml
index f6c03bb..f8e9df9 100644
--- a/commonmodule/src/main/res/layout/activity_incident_oversee.xml
+++ b/commonmodule/src/main/res/layout/activity_incident_oversee.xml
@@ -11,7 +11,7 @@
     <net.lucode.hackware.magicindicator.MagicIndicator
         android:id="@+id/mi_tabs"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="50dp"
         android:background="@drawable/shp_bottom_shadow_white_no_radius" />
 
     <androidx.viewpager2.widget.ViewPager2
diff --git a/commonmodule/src/main/res/layout/activity_incident_special.xml b/commonmodule/src/main/res/layout/activity_incident_special.xml
index 37ead32..9fe0b98 100644
--- a/commonmodule/src/main/res/layout/activity_incident_special.xml
+++ b/commonmodule/src/main/res/layout/activity_incident_special.xml
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/gray_bg"
     android:orientation="vertical">
 
-    <LinearLayout
+    <net.lucode.hackware.magicindicator.MagicIndicator
+        android:id="@+id/mi_tabs"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shp_bottom_shadow_white_no_radius"
-        android:orientation="horizontal">
+        android:layout_height="50dp"
+        android:background="@drawable/shp_bottom_shadow_white_no_radius" />
 
-        <net.lucode.hackware.magicindicator.MagicIndicator
-            android:id="@+id/mi_tabs"
-            android:layout_width="match_parent"
-            android:layout_height="40dp" />
-
-        <TextView
-            android:id="@+id/tv_condition"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:clickable="true"
-            android:drawableRight="@drawable/ic_arrow_down_circle"
-            android:elevation="12dp"
-            android:focusable="true"
-            android:gravity="center"
-            android:padding="5dp"
-            android:text="筛选"
-            android:textColor="@color/black"
-            android:visibility="gone" />
-    </LinearLayout>
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/vp_content"
diff --git a/commonmodule/src/main/res/layout/activity_incident_special_dept.xml b/commonmodule/src/main/res/layout/activity_incident_special_dept.xml
index 952a939..1c6672d 100644
--- a/commonmodule/src/main/res/layout/activity_incident_special_dept.xml
+++ b/commonmodule/src/main/res/layout/activity_incident_special_dept.xml
@@ -7,31 +7,14 @@
     android:background="@color/gray_bg"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shp_bottom_shadow_white_no_radius"
-        android:orientation="horizontal">
 
         <net.lucode.hackware.magicindicator.MagicIndicator
             android:id="@+id/mi_tabs"
             android:layout_width="match_parent"
+            android:background="@drawable/shp_bottom_shadow_white_no_radius"
             android:layout_height="50dp" />
 
-        <TextView
-            android:id="@+id/tv_condition"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:clickable="true"
-            android:drawableRight="@drawable/ic_arrow_down_circle"
-            android:elevation="12dp"
-            android:focusable="true"
-            android:gravity="center"
-            android:padding="5dp"
-            android:text="筛选"
-            android:textColor="@color/black"
-            android:visibility="gone" />
-    </LinearLayout>
+
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/vp_content"
diff --git a/commonmodule/src/main/res/layout/activity_know_ledge_list.xml b/commonmodule/src/main/res/layout/activity_know_ledge_list.xml
index d4ec6c4..7dd314d 100644
--- a/commonmodule/src/main/res/layout/activity_know_ledge_list.xml
+++ b/commonmodule/src/main/res/layout/activity_know_ledge_list.xml
@@ -7,17 +7,13 @@
     android:background="@color/gray_bg"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shp_bottom_shadow_white_no_radius"
-        android:orientation="horizontal">
 
-        <net.lucode.hackware.magicindicator.MagicIndicator
-            android:id="@+id/mi_tabs"
-            android:layout_width="match_parent"
-            android:layout_height="40dp" />
-    </LinearLayout>
+    <net.lucode.hackware.magicindicator.MagicIndicator
+        android:id="@+id/mi_tabs"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@drawable/shp_bottom_shadow_white_no_radius" />
+
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/vp_content"
diff --git a/commonmodule/src/main/res/layout/activity_map_demo.xml b/commonmodule/src/main/res/layout/activity_map_demo.xml
index 7ad18d0..81b20eb 100644
--- a/commonmodule/src/main/res/layout/activity_map_demo.xml
+++ b/commonmodule/src/main/res/layout/activity_map_demo.xml
@@ -6,5 +6,9 @@
     android:layout_height="match_parent"
     tools:context=".activitys.checkwork.MapDemoActivity">
 
+    <com.tengshisoft.gismap.TouchMapView
+        android:id="@+id/mv_map"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/commonmodule/src/main/res/layout/activity_mine_collect.xml b/commonmodule/src/main/res/layout/activity_mine_collect.xml
index d4c13c7..aff595c 100644
--- a/commonmodule/src/main/res/layout/activity_mine_collect.xml
+++ b/commonmodule/src/main/res/layout/activity_mine_collect.xml
@@ -10,7 +10,7 @@
     <net.lucode.hackware.magicindicator.MagicIndicator
         android:id="@+id/mi_tabs"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="50dp"
         android:background="@drawable/shp_bottom_shadow_white_no_radius" />
 
 
diff --git a/commonmodule/src/main/res/layout/fragment_user_center.xml b/commonmodule/src/main/res/layout/fragment_user_center.xml
index ae8c7ed..ef12a14 100644
--- a/commonmodule/src/main/res/layout/fragment_user_center.xml
+++ b/commonmodule/src/main/res/layout/fragment_user_center.xml
@@ -55,7 +55,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_pwd_cir"
+                android:drawableLeft="@drawable/ic_list_pwd"
                 android:drawableRight="@drawable/ic_arrow_cir"
                 android:drawablePadding="10dp"
                 android:text="修改密码"
@@ -77,7 +77,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_clear_cache"
+                android:drawableLeft="@drawable/ic_list_cache"
                 android:drawablePadding="10dp"
                 android:text="清除缓存"
                 android:textColor="@color/black"
@@ -107,7 +107,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_clear_cache"
+                android:drawableLeft="@drawable/ic_list_cache"
                 android:drawableRight="@drawable/ic_arrow_cir"
                 android:drawablePadding="10dp"
                 android:text="清空聊天记录"
@@ -129,7 +129,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_check_versionl"
+                android:drawableLeft="@drawable/ic_list_version"
                 android:drawablePadding="10dp"
                 android:text="版本更新"
                 android:textColor="@color/black"
@@ -159,7 +159,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_pwd_cir"
+                android:drawableLeft="@drawable/ic_list_collect"
                 android:drawableRight="@drawable/ic_arrow_cir"
                 android:drawablePadding="10dp"
                 android:text="我的收藏"
@@ -181,7 +181,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_pwd_cir"
+                android:drawableLeft="@drawable/ic_list_contact"
                 android:drawableRight="@drawable/ic_arrow_cir"
                 android:drawablePadding="10dp"
                 android:text="同步通讯录"
diff --git a/GisMap/.gitignore b/gismapmodule/.gitignore
similarity index 100%
rename from GisMap/.gitignore
rename to gismapmodule/.gitignore
diff --git a/GisMap/build.gradle b/gismapmodule/build.gradle
similarity index 100%
rename from GisMap/build.gradle
rename to gismapmodule/build.gradle
diff --git a/GisMap/consumer-rules.pro b/gismapmodule/consumer-rules.pro
similarity index 100%
rename from GisMap/consumer-rules.pro
rename to gismapmodule/consumer-rules.pro
diff --git a/GisMap/libs/armeabi/liblite.so b/gismapmodule/libs/armeabi/liblite.so
similarity index 100%
rename from GisMap/libs/armeabi/liblite.so
rename to gismapmodule/libs/armeabi/liblite.so
diff --git a/GisMap/libs/cal10n-api-0.7.7.jar b/gismapmodule/libs/cal10n-api-0.7.7.jar
similarity index 100%
rename from GisMap/libs/cal10n-api-0.7.7.jar
rename to gismapmodule/libs/cal10n-api-0.7.7.jar
diff --git a/GisMap/libs/com.supermap.imobilelite_v1001.jar b/gismapmodule/libs/com.supermap.imobilelite_v1001.jar
similarity index 100%
rename from GisMap/libs/com.supermap.imobilelite_v1001.jar
rename to gismapmodule/libs/com.supermap.imobilelite_v1001.jar
diff --git a/GisMap/libs/commons-codec-1.10.jar b/gismapmodule/libs/commons-codec-1.10.jar
similarity index 100%
rename from GisMap/libs/commons-codec-1.10.jar
rename to gismapmodule/libs/commons-codec-1.10.jar
diff --git a/GisMap/libs/commons-io-2.5.jar b/gismapmodule/libs/commons-io-2.5.jar
similarity index 100%
rename from GisMap/libs/commons-io-2.5.jar
rename to gismapmodule/libs/commons-io-2.5.jar
diff --git a/GisMap/libs/commons-lang-2.6.jar b/gismapmodule/libs/commons-lang-2.6.jar
similarity index 100%
rename from GisMap/libs/commons-lang-2.6.jar
rename to gismapmodule/libs/commons-lang-2.6.jar
diff --git a/GisMap/libs/commons-lang3-3.4.jar b/gismapmodule/libs/commons-lang3-3.4.jar
similarity index 100%
rename from GisMap/libs/commons-lang3-3.4.jar
rename to gismapmodule/libs/commons-lang3-3.4.jar
diff --git a/GisMap/libs/commons-logging-1.2.jar b/gismapmodule/libs/commons-logging-1.2.jar
similarity index 100%
rename from GisMap/libs/commons-logging-1.2.jar
rename to gismapmodule/libs/commons-logging-1.2.jar
diff --git a/GisMap/libs/fastjson-1.2.8.jar b/gismapmodule/libs/fastjson-1.2.8.jar
similarity index 100%
rename from GisMap/libs/fastjson-1.2.8.jar
rename to gismapmodule/libs/fastjson-1.2.8.jar
diff --git a/GisMap/libs/httpclient-4.0.1.jar b/gismapmodule/libs/httpclient-4.0.1.jar
similarity index 100%
rename from GisMap/libs/httpclient-4.0.1.jar
rename to gismapmodule/libs/httpclient-4.0.1.jar
diff --git a/GisMap/libs/httpcore-4.0.1.jar b/gismapmodule/libs/httpcore-4.0.1.jar
similarity index 100%
rename from GisMap/libs/httpcore-4.0.1.jar
rename to gismapmodule/libs/httpcore-4.0.1.jar
diff --git a/GisMap/libs/jsr311-api-1.1.1.jar b/gismapmodule/libs/jsr311-api-1.1.1.jar
similarity index 100%
rename from GisMap/libs/jsr311-api-1.1.1.jar
rename to gismapmodule/libs/jsr311-api-1.1.1.jar
diff --git a/GisMap/libs/lite-commons-mapping-cache.jar b/gismapmodule/libs/lite-commons-mapping-cache.jar
similarity index 100%
rename from GisMap/libs/lite-commons-mapping-cache.jar
rename to gismapmodule/libs/lite-commons-mapping-cache.jar
diff --git a/GisMap/libs/lite-commons-utils-rest.jar b/gismapmodule/libs/lite-commons-utils-rest.jar
similarity index 100%
rename from GisMap/libs/lite-commons-utils-rest.jar
rename to gismapmodule/libs/lite-commons-utils-rest.jar
diff --git a/GisMap/libs/lite-commons-utils.jar b/gismapmodule/libs/lite-commons-utils.jar
similarity index 100%
rename from GisMap/libs/lite-commons-utils.jar
rename to gismapmodule/libs/lite-commons-utils.jar
diff --git a/GisMap/libs/lite-commontypes-rest.jar b/gismapmodule/libs/lite-commontypes-rest.jar
similarity index 100%
rename from GisMap/libs/lite-commontypes-rest.jar
rename to gismapmodule/libs/lite-commontypes-rest.jar
diff --git a/GisMap/libs/lite-commontypes.jar b/gismapmodule/libs/lite-commontypes.jar
similarity index 100%
rename from GisMap/libs/lite-commontypes.jar
rename to gismapmodule/libs/lite-commontypes.jar
diff --git a/GisMap/libs/lite-components-context.jar b/gismapmodule/libs/lite-components-context.jar
similarity index 100%
rename from GisMap/libs/lite-components-context.jar
rename to gismapmodule/libs/lite-components-context.jar
diff --git a/GisMap/libs/lite-components-spi.jar b/gismapmodule/libs/lite-components-spi.jar
similarity index 100%
rename from GisMap/libs/lite-components-spi.jar
rename to gismapmodule/libs/lite-components-spi.jar
diff --git a/GisMap/libs/lite-components.jar b/gismapmodule/libs/lite-components.jar
similarity index 100%
rename from GisMap/libs/lite-components.jar
rename to gismapmodule/libs/lite-components.jar
diff --git a/GisMap/libs/lite-providers-rest.jar b/gismapmodule/libs/lite-providers-rest.jar
similarity index 100%
rename from GisMap/libs/lite-providers-rest.jar
rename to gismapmodule/libs/lite-providers-rest.jar
diff --git a/GisMap/libs/org.restlet-2.2.3.jar b/gismapmodule/libs/org.restlet-2.2.3.jar
similarity index 100%
rename from GisMap/libs/org.restlet-2.2.3.jar
rename to gismapmodule/libs/org.restlet-2.2.3.jar
diff --git a/GisMap/libs/org.restlet.ext.json-2.2.3.jar b/gismapmodule/libs/org.restlet.ext.json-2.2.3.jar
similarity index 100%
rename from GisMap/libs/org.restlet.ext.json-2.2.3.jar
rename to gismapmodule/libs/org.restlet.ext.json-2.2.3.jar
diff --git a/GisMap/libs/slf4j-api-1.6.6.jar b/gismapmodule/libs/slf4j-api-1.6.6.jar
similarity index 100%
rename from GisMap/libs/slf4j-api-1.6.6.jar
rename to gismapmodule/libs/slf4j-api-1.6.6.jar
diff --git a/GisMap/libs/slf4j-ext-1.6.6.jar b/gismapmodule/libs/slf4j-ext-1.6.6.jar
similarity index 100%
rename from GisMap/libs/slf4j-ext-1.6.6.jar
rename to gismapmodule/libs/slf4j-ext-1.6.6.jar
diff --git a/GisMap/libs/slf4j-simple-1.6.6.jar b/gismapmodule/libs/slf4j-simple-1.6.6.jar
similarity index 100%
rename from GisMap/libs/slf4j-simple-1.6.6.jar
rename to gismapmodule/libs/slf4j-simple-1.6.6.jar
diff --git a/GisMap/proguard-rules.pro b/gismapmodule/proguard-rules.pro
similarity index 100%
rename from GisMap/proguard-rules.pro
rename to gismapmodule/proguard-rules.pro
diff --git a/GisMap/src/androidTest/java/com/tengshisoft/gismap/ExampleInstrumentedTest.java b/gismapmodule/src/androidTest/java/com/tengshisoft/gismap/ExampleInstrumentedTest.java
similarity index 100%
rename from GisMap/src/androidTest/java/com/tengshisoft/gismap/ExampleInstrumentedTest.java
rename to gismapmodule/src/androidTest/java/com/tengshisoft/gismap/ExampleInstrumentedTest.java
diff --git a/GisMap/src/main/AndroidManifest.xml b/gismapmodule/src/main/AndroidManifest.xml
similarity index 100%
rename from GisMap/src/main/AndroidManifest.xml
rename to gismapmodule/src/main/AndroidManifest.xml
diff --git a/GisMap/src/main/java/com/tengshisoft/gismap/TouchMapView.java b/gismapmodule/src/main/java/com/tengshisoft/gismap/TouchMapView.java
similarity index 81%
rename from GisMap/src/main/java/com/tengshisoft/gismap/TouchMapView.java
rename to gismapmodule/src/main/java/com/tengshisoft/gismap/TouchMapView.java
index 6f9472d..b8a0c56 100644
--- a/GisMap/src/main/java/com/tengshisoft/gismap/TouchMapView.java
+++ b/gismapmodule/src/main/java/com/tengshisoft/gismap/TouchMapView.java
@@ -10,19 +10,26 @@ import com.supermap.imobilelite.maps.MapView;
  * 作者: adam
  * 日期: 2021/12/21 - 3:55 下午
  * 邮箱: itgaojian@163.com
- * 描述:
+ * 描述: 解决滑动冲突
  */
 public class TouchMapView extends MapView {
     public TouchMapView(Context context) {
         super(context);
+//        init();
     }
 
     public TouchMapView(Context context, AttributeSet attrs) {
         super(context, attrs);
+//        init();
     }
 
     public TouchMapView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
+//        init();
+    }
+
+    private void init() {
+        this.setBackgroundResource(R.drawable.shp_border_line);
     }
 
     @Override
diff --git a/gismapmodule/src/main/res/drawable-xhdpi/shp_border_line.xml b/gismapmodule/src/main/res/drawable-xhdpi/shp_border_line.xml
new file mode 100644
index 0000000..cc487e8
--- /dev/null
+++ b/gismapmodule/src/main/res/drawable-xhdpi/shp_border_line.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="2dp" />
+    <stroke
+        android:width="2dp"
+        android:color="@color/cardview_shadow_start_color" />
+    <padding
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp" />
+</shape>
\ No newline at end of file
diff --git a/GisMap/src/test/java/com/tengshisoft/gismap/ExampleUnitTest.java b/gismapmodule/src/test/java/com/tengshisoft/gismap/ExampleUnitTest.java
similarity index 100%
rename from GisMap/src/test/java/com/tengshisoft/gismap/ExampleUnitTest.java
rename to gismapmodule/src/test/java/com/tengshisoft/gismap/ExampleUnitTest.java
diff --git a/gridmodule/build.gradle b/gridmodule/build.gradle
index c88e2e5..754b666 100644
--- a/gridmodule/build.gradle
+++ b/gridmodule/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     implementation project(':modulemap')
     implementation project(':commonmodule')
     implementation project(':moduleijkplayer')
-    implementation project(':GisMap')
+    implementation project(':gismapmodule')
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'//地图
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BindPersonToHouseActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BindPersonToHouseActivity.java
index ed20d8b..fec03c2 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BindPersonToHouseActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BindPersonToHouseActivity.java
@@ -33,6 +33,7 @@ import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
 import com.tenlionsoft.baselib.core.retrofit_net.api.BaseApiService;
 import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
 import com.tenlionsoft.baselib.utils.ExceptionHandler;
+import com.tenlionsoft.baselib.utils.LogUtils;
 import com.tenlionsoft.baselib.utils.RegexUtils;
 import com.tenlionsoft.baselib.utils.UIUtil;
 import com.tenlionsoft.baselib.utils.UserLgUtils;
@@ -63,7 +64,7 @@ import okhttp3.RequestBody;
 @Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_HOUSE_BIND_PERSON)
 public class BindPersonToHouseActivity extends BaseActivity {
 
-    @BindView(R2.id.et_base_search_content)
+    @BindView(R2.id.et_base_search_v)
     EditText mEtBaseSearchContent;
     @BindView(R2.id.iv_base_clear)
     ImageView mIvBaseClear;
@@ -148,10 +149,10 @@ public class BindPersonToHouseActivity extends BaseActivity {
         mBtnBaseSearch.setOnClickListener(v -> doSearchPerson());
         mBtnBind.setOnClickListener(v -> doBind());
         mAdapter.addOnItemClickListener(v -> ARouter.getInstance()
-                .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_HIRER_DETAIL)
-                .withString("id", v.getHouseUserId())
-                .withString("houseId", v.getBuildingHouseId())
-                .navigation(mActivity, 12));
+            .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_HIRER_DETAIL)
+            .withString("id", v.getHouseUserId())
+            .withString("houseId", v.getBuildingHouseId())
+            .navigation(mActivity, 12));
 
     }
 
@@ -185,11 +186,11 @@ public class BindPersonToHouseActivity extends BaseActivity {
                     DicBean bean = mDictionaryBeanList.get(o1);
                     mTvType.setText(bean.getDataName());
                 })
-                        .setTitleText("请选择")
-                        .setCancelColor(Color.parseColor("#1189FF"))
-                        .setSubmitColor(Color.parseColor("#1189FF"))
-                        .setTitleColor(Color.parseColor("#1189FF"))
-                        .build();
+                    .setTitleText("请选择")
+                    .setCancelColor(Color.parseColor("#1189FF"))
+                    .setSubmitColor(Color.parseColor("#1189FF"))
+                    .setTitleColor(Color.parseColor("#1189FF"))
+                    .build();
                 mPicker.setPicker(mDictionaryBeanList);
             }
             mPicker.show();
@@ -201,49 +202,49 @@ public class BindPersonToHouseActivity extends BaseActivity {
     private void doSearchPerson() {
         hideSoftKeyboard();
         String card = mEtBaseSearchContent.getText().toString().trim();
-        if (TextUtils.isEmpty(card) || !RegexUtils.isIDCard18Exact(card)) {
+        if (TextUtils.isEmpty(card) || !RegexUtils.isIDNumber(card)) {
             ToastUtils.show("请输入合法的身份证号码");
             return;
         }
         ProgressDialog dialog = UIUtil.initDialog(mActivity, "搜索中...");
         dialog.show();
         RetrofitManager.getInstance()
-                .create(BaseApiService.class)
-                .doSearchPerson(card, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<PersonSearchBean>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
+            .create(BaseApiService.class)
+            .doSearchPerson(card, UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<PersonSearchBean>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
 
+                }
+
+                @Override
+                public void onNext(@NonNull PersonSearchBean personSearchBean) {
+                    dialog.dismiss();
+                    if (!TextUtils.isEmpty(personSearchBean.getFullName())) {
+                        mSearchBean = personSearchBean;
+                        setSearchContentView(2);
+                        mTvGender.setText(personSearchBean.getGenderDictionaryName());
+                        mTvName.setText(personSearchBean.getFullName());
+                        mEtPhone.setText(personSearchBean.getTelephone());
+                    } else {
+                        setSearchContentView(1);
+                        mTvSearchHint.setText("人口数据库中未找到该人员");
                     }
+                }
 
-                    @Override
-                    public void onNext(@NonNull PersonSearchBean personSearchBean) {
-                        dialog.dismiss();
-                        if (!TextUtils.isEmpty(personSearchBean.getFullName())) {
-                            mSearchBean = personSearchBean;
-                            setSearchContentView(2);
-                            mTvGender.setText(personSearchBean.getGenderDictionaryName());
-                            mTvName.setText(personSearchBean.getFullName());
-                            mEtPhone.setText(personSearchBean.getTelephone());
-                        } else {
-                            setSearchContentView(1);
-                            mTvSearchHint.setText("人口数据库中未找到该人员");
-                        }
-                    }
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    dialog.dismiss();
+                    ExceptionHandler.handleException(e);
+                }
 
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        dialog.dismiss();
-                        ExceptionHandler.handleException(e);
-                    }
+                @Override
+                public void onComplete() {
 
-                    @Override
-                    public void onComplete() {
-
-                    }
-                });
+                }
+            });
     }
 
 
@@ -267,59 +268,59 @@ public class BindPersonToHouseActivity extends BaseActivity {
     private void getHireRecordList(int page) {
         mCurrentPage = page;
         RetrofitManager.getInstance()
-                .create(GridApis.class)
-                .getHouseHireRecordByHouseId(mId, page + "", UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<HireRecordListBean>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
+            .create(GridApis.class)
+            .getHouseHireRecordByHouseId(mId, page + "", UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<HireRecordListBean>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
 
-                    }
+                }
 
-                    @Override
-                    public void onNext(@NonNull HireRecordListBean hireRecordListBean) {
-                        if (hireRecordListBean.getRows() != null && hireRecordListBean.getRows().size() > 0) {
-                            ++mCurrentPage;
-                            if (page == 1) {
-                                mDatas.clear();
-                                mDatas.addAll(hireRecordListBean.getRows());
-                            } else {
-                                mDatas.addAll(hireRecordListBean.getRows());
-                            }
-                            setStateView(14);
-                            mAdapter.notifyDataSetChanged();
-                            mSrlContent.finishRefresh();
-                            if (mDatas.size() >= hireRecordListBean.getTotal()) {
-                                mSrlContent.finishLoadMore();
-                                mSrlContent.setNoMoreData(true);
-                            } else {
-                                mSrlContent.finishLoadMore();
-                                mSrlContent.setNoMoreData(false);
-                            }
+                @Override
+                public void onNext(@NonNull HireRecordListBean hireRecordListBean) {
+                    if (hireRecordListBean.getRows() != null && hireRecordListBean.getRows().size() > 0) {
+                        ++mCurrentPage;
+                        if (page == 1) {
+                            mDatas.clear();
+                            mDatas.addAll(hireRecordListBean.getRows());
                         } else {
-                            if (page > 1) {
-                                mSrlContent.finishLoadMore();
-                                mSrlContent.setNoMoreData(true);
-                                setStateView(14);
-                            } else {
-                                setStateView(15);
-                            }
+                            mDatas.addAll(hireRecordListBean.getRows());
+                        }
+                        setStateView(14);
+                        mAdapter.notifyDataSetChanged();
+                        mSrlContent.finishRefresh();
+                        if (mDatas.size() >= hireRecordListBean.getTotal()) {
+                            mSrlContent.finishLoadMore();
+                            mSrlContent.setNoMoreData(true);
+                        } else {
+                            mSrlContent.finishLoadMore();
+                            mSrlContent.setNoMoreData(false);
+                        }
+                    } else {
+                        if (page > 1) {
+                            mSrlContent.finishLoadMore();
+                            mSrlContent.setNoMoreData(true);
+                            setStateView(14);
+                        } else {
+                            setStateView(15);
                         }
                     }
+                }
 
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        mSrlContent.finishLoadMore();
-                        mSrlContent.finishRefresh();
-                        ExceptionHandler.handleException(e);
-                    }
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    mSrlContent.finishLoadMore();
+                    mSrlContent.finishRefresh();
+                    ExceptionHandler.handleException(e);
+                }
 
-                    @Override
-                    public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                    }
-                });
+                }
+            });
     }
 
     /**
@@ -353,59 +354,8 @@ public class BindPersonToHouseActivity extends BaseActivity {
             dialog.show();
             RequestBody body = buildParams();
             RetrofitManager.getInstance()
-                    .create(GridApis.class)
-                    .doBindPersonToHouse(body, UserLgUtils.getToken())
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Observer<SuccessBean>() {
-                        @Override
-                        public void onSubscribe(@NonNull Disposable d) {
-
-                        }
-
-                        @Override
-                        public void onNext(@NonNull SuccessBean successBean) {
-                            //绑定成功 刷列表 重置搜索
-                            dialog.dismiss();
-                            ToastUtils.show("添加成功");
-                            doRefresh();
-                            setSearchContentView(1);
-                        }
-
-                        @Override
-                        public void onError(@NonNull Throwable e) {
-                            dialog.dismiss();
-                            ExceptionHandler.handleException(e);
-                        }
-
-                        @Override
-                        public void onComplete() {
-
-                        }
-                    });
-        }
-    }
-
-    private void delHire(String id) {
-        AlertDialog dialog = new AlertDialog.Builder(mActivity)
-                .setTitle("警告")
-                .setIcon(android.R.drawable.ic_dialog_info)
-                .setMessage("确定要删除该租住记录吗?")
-                .setPositiveButton("确定", (dialog1, which) -> doDelHire(id))
-                .setNegativeButton("取消", (d, which) -> d.dismiss())
-                .create();
-        dialog.show();
-    }
-
-    /**
-     * 删除绑定记录
-     */
-    private void doDelHire(String id) {
-        ProgressDialog dialog = UIUtil.initDialog(mActivity, "删除中...");
-        dialog.show();
-        RetrofitManager.getInstance()
                 .create(GridApis.class)
-                .doDelHireRecord(id, UserLgUtils.getToken())
+                .doBindPersonToHouse(body, UserLgUtils.getToken())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<SuccessBean>() {
@@ -416,8 +366,9 @@ public class BindPersonToHouseActivity extends BaseActivity {
 
                     @Override
                     public void onNext(@NonNull SuccessBean successBean) {
+                        //绑定成功 刷列表 重置搜索
                         dialog.dismiss();
-                        ToastUtils.show("删除成功");
+                        ToastUtils.show("添加成功");
                         doRefresh();
                         setSearchContentView(1);
                     }
@@ -433,6 +384,56 @@ public class BindPersonToHouseActivity extends BaseActivity {
 
                     }
                 });
+        }
+    }
+
+    private void delHire(String id) {
+        AlertDialog dialog = new AlertDialog.Builder(mActivity)
+            .setTitle("警告")
+            .setIcon(android.R.drawable.ic_dialog_info)
+            .setMessage("确定要删除该租住记录吗?")
+            .setPositiveButton("确定", (dialog1, which) -> doDelHire(id))
+            .setNegativeButton("取消", (d, which) -> d.dismiss())
+            .create();
+        dialog.show();
+    }
+
+    /**
+     * 删除绑定记录
+     */
+    private void doDelHire(String id) {
+        ProgressDialog dialog = UIUtil.initDialog(mActivity, "删除中...");
+        dialog.show();
+        RetrofitManager.getInstance()
+            .create(GridApis.class)
+            .doDelHireRecord(id, UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<SuccessBean>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
+
+                }
+
+                @Override
+                public void onNext(@NonNull SuccessBean successBean) {
+                    dialog.dismiss();
+                    ToastUtils.show("删除成功");
+                    doRefresh();
+                    setSearchContentView(1);
+                }
+
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    dialog.dismiss();
+                    ExceptionHandler.handleException(e);
+                }
+
+                @Override
+                public void onComplete() {
+
+                }
+            });
     }
 
     /**
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingAddActivity.java
index c3e7d63..37e9b35 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingAddActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingAddActivity.java
@@ -101,6 +101,8 @@ public class BuildingAddActivity extends BaseActivity {
     NestedScrollView mNsvContent;
     @BindView(R2.id.et_elevator_num)
     EditText mEtElevatorNum;//电梯数
+    @BindView(R2.id.tv_location)
+    TextView mTvLocation;
     private Unbinder mBind;
     private BuildingSaveBean mBeans;
     private final ViewHandler mHandler = new ViewHandler(this);
@@ -109,6 +111,9 @@ public class BuildingAddActivity extends BaseActivity {
     private List<DicBean> mCommunityTypeList = new ArrayList<>();
     private OptionsPickerView mCommunityTypePicker;
     private String mSelCommunityType = "";//小区类型ID
+    private Double mLat;
+    private Double mLng;
+
 
     @Override
     protected int setLayoutId() {
@@ -166,6 +171,9 @@ public class BuildingAddActivity extends BaseActivity {
             .navigation(mActivity, 12));
         mTvBuildingType.setOnClickListener(v -> showCommunityType());
         mBtnConfirm.setOnClickListener(v -> doSubmit());
+        mTvLocation.setOnClickListener(v -> ARouter.getInstance()
+            .build(PathConfig.PATH_MODULE_MAP_SEL_POINT)
+            .navigation(mActivity, 16));
     }
 
     @Override
@@ -178,6 +186,12 @@ public class BuildingAddActivity extends BaseActivity {
                 mTvCommunity.setText(name);
                 mSelCommunityId = id;
             }
+        } else if (requestCode == 16) {
+            if (resultCode == 22) {
+                mLat = data.getDoubleExtra("lat", -1);
+                mLng = data.getDoubleExtra("lng", -1);
+                mTvLocation.setText(mLat + "-" + mLng);
+            }
         }
     }
 
@@ -763,6 +777,10 @@ public class BuildingAddActivity extends BaseActivity {
         bean.setBuildingType(mSelCommunityType);
         bean.setFloorCountForUnit(mBeans.isLayerType() ? "相同" : "不相同");
         bean.setHouseCountForFloor(mBeans.isDoorType() ? "相同" : "不相同");
+
+        bean.setLatitude(mLat + "");
+        bean.setLongitude(mLng + "");
+
         int cellNum = mBeans.getCellNum();
         bean.setUnitCount(cellNum);
 
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingDetailActivity.java
index 0e3ff6a..c36e71d 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingDetailActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingDetailActivity.java
@@ -90,6 +90,8 @@ public class BuildingDetailActivity extends BaseActivity {
     SmartRefreshLayout mSrlContent;
     @BindView(R2.id.tv_hint)
     TextView mTvHint;
+    @BindView(R2.id.tv_location)
+    TextView mTvLocation;
 
     private Unbinder mBind;
     private String mId;
@@ -148,13 +150,13 @@ public class BuildingDetailActivity extends BaseActivity {
         mSrlContent.setOnLoadMoreListener(v -> getBuildingManager(mCurrentPage));
         mSrlContent.setOnRefreshListener(v -> doRefresh());
         mBtnAdd.setOnClickListener(v -> ARouter.getInstance()
-                .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_BUILDING_MANAGER_ADD)
-                .withString("id", mId)
-                .navigation(mActivity, 12));
+            .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_BUILDING_MANAGER_ADD)
+            .withString("id", mId)
+            .navigation(mActivity, 12));
         mAdapter.addOnItemClickListener(v -> ARouter.getInstance()
-                .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_BUILDING_MANAGER_DETAIL)
-                .withString("id", v.getBuildingLeaderId())
-                .navigation(mActivity, 12));
+            .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_BUILDING_MANAGER_DETAIL)
+            .withString("id", v.getBuildingLeaderId())
+            .navigation(mActivity, 12));
     }
 
     /**
@@ -172,15 +174,15 @@ public class BuildingDetailActivity extends BaseActivity {
      */
     private void doDelBuilding() {
         AlertDialog dialog = new AlertDialog.Builder(mActivity)
-                .setIcon(android.R.drawable.ic_dialog_info)
-                .setTitle("警告")
-                .setMessage("删除楼宇会导致该楼宇下的房屋以及房屋所绑定的人员信息一并删除,确定要删除吗?")
-                .setNegativeButton("取消", (dialog1, which) -> dialog1.dismiss())
-                .setPositiveButton("确定", (dialog12, which) -> {
-                    dialog12.dismiss();
-                    doDel();
-                })
-                .create();
+            .setIcon(android.R.drawable.ic_dialog_info)
+            .setTitle("警告")
+            .setMessage("删除楼宇会导致该楼宇下的房屋以及房屋所绑定的人员信息一并删除,确定要删除吗?")
+            .setNegativeButton("取消", (dialog1, which) -> dialog1.dismiss())
+            .setPositiveButton("确定", (dialog12, which) -> {
+                dialog12.dismiss();
+                doDel();
+            })
+            .create();
         dialog.show();
     }
 
@@ -191,35 +193,35 @@ public class BuildingDetailActivity extends BaseActivity {
         ProgressDialog dialog = UIUtil.initDialog(mActivity, "删除中...");
         dialog.show();
         RetrofitManager.getInstance()
-                .create(GridApis.class)
-                .doDelBuilding(mId, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<SuccessBean>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
+            .create(GridApis.class)
+            .doDelBuilding(mId, UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<SuccessBean>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
 
-                    }
+                }
 
-                    @Override
-                    public void onNext(@NonNull SuccessBean successBean) {
-                        dialog.dismiss();
-                        ToastUtils.show("删除成功");
-                        setResult(13);
-                        finish();
-                    }
+                @Override
+                public void onNext(@NonNull SuccessBean successBean) {
+                    dialog.dismiss();
+                    ToastUtils.show("删除成功");
+                    setResult(13);
+                    finish();
+                }
 
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        dialog.dismiss();
-                        ExceptionHandler.handleException(e);
-                    }
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    dialog.dismiss();
+                    ExceptionHandler.handleException(e);
+                }
 
-                    @Override
-                    public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                    }
-                });
+                }
+            });
     }
 
     @Override
@@ -238,9 +240,9 @@ public class BuildingDetailActivity extends BaseActivity {
      */
     private void doEditBuilding() {
         ARouter.getInstance()
-                .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_BUILDING_EDIT)
-                .withString("id", mId)
-                .navigation(mActivity, 12);
+            .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_BUILDING_EDIT)
+            .withString("id", mId)
+            .navigation(mActivity, 12);
     }
 
     /**
@@ -248,32 +250,32 @@ public class BuildingDetailActivity extends BaseActivity {
      */
     private void getBuildingDetail() {
         RetrofitManager.getInstance()
-                .create(GridApis.class)
-                .getBuildingDetailById(mId, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BuildingDetailBean>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
+            .create(GridApis.class)
+            .getBuildingDetailById(mId, UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<BuildingDetailBean>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
 
-                    }
+                }
 
-                    @Override
-                    public void onNext(@NonNull BuildingDetailBean buildingDetailBean) {
-                        setDataToView(buildingDetailBean);
-                    }
+                @Override
+                public void onNext(@NonNull BuildingDetailBean buildingDetailBean) {
+                    setDataToView(buildingDetailBean);
+                }
 
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        refreshView(STATE_LOAD_ERROR);
-                        ExceptionHandler.handleException(e);
-                    }
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    refreshView(STATE_LOAD_ERROR);
+                    ExceptionHandler.handleException(e);
+                }
 
-                    @Override
-                    public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                    }
-                });
+                }
+            });
     }
 
     /**
@@ -290,6 +292,7 @@ public class BuildingDetailActivity extends BaseActivity {
         mTvElevator.setText(bean.getElevator() + "");
         mTvFloorType.setText(bean.getFloorCountForUnit());
         mTvDoorType.setText(bean.getHouseCountForFloor());
+        mTvLocation.setText(bean.getLatitude() + "-" + bean.getLongitude());
         String floorType = bean.getFloorCountForUnit();//每层层数
         String doorType = bean.getHouseCountForFloor();//每层户数
         if ("相同".equals(floorType)) {
@@ -349,62 +352,62 @@ public class BuildingDetailActivity extends BaseActivity {
     private void getBuildingManager(int currentPage) {
         mCurrentPage = currentPage;
         RetrofitManager.getInstance()
-                .create(GridApis.class)
-                .getBuildingManagerList(mId, mCurrentPage + "", UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BuildingManagerListBean>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
+            .create(GridApis.class)
+            .getBuildingManagerList(mId, mCurrentPage + "", UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<BuildingManagerListBean>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
 
-                    }
+                }
 
-                    @Override
-                    public void onNext(@NonNull BuildingManagerListBean communityListBean) {
-                        if (communityListBean != null && communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
-                            ++mCurrentPage;
-                            if (currentPage == 1) {
-                                mDatas.clear();
-                                mDatas.addAll(communityListBean.getRows());
-                            } else {
-                                mDatas.addAll(communityListBean.getRows());
-                            }
+                @Override
+                public void onNext(@NonNull BuildingManagerListBean communityListBean) {
+                    if (communityListBean != null && communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
+                        ++mCurrentPage;
+                        if (currentPage == 1) {
+                            mDatas.clear();
+                            mDatas.addAll(communityListBean.getRows());
+                        } else {
+                            mDatas.addAll(communityListBean.getRows());
+                        }
+                        mRlvPersons.setVisibility(View.VISIBLE);
+                        mTvHint.setVisibility(View.GONE);
+                        mAdapter.notifyDataSetChanged();
+                        mSrlContent.finishRefresh();
+                        if (mDatas.size() >= communityListBean.getTotal()) {
+                            mSrlContent.finishLoadMore();
+                            mSrlContent.setNoMoreData(true);
+                        } else {
+                            mSrlContent.finishLoadMore();
+                            mSrlContent.setNoMoreData(false);
+                        }
+                    } else {
+                        mSrlContent.finishLoadMore();
+                        mSrlContent.setNoMoreData(true);
+                        if (currentPage > 1) {
                             mRlvPersons.setVisibility(View.VISIBLE);
                             mTvHint.setVisibility(View.GONE);
-                            mAdapter.notifyDataSetChanged();
-                            mSrlContent.finishRefresh();
-                            if (mDatas.size() >= communityListBean.getTotal()) {
-                                mSrlContent.finishLoadMore();
-                                mSrlContent.setNoMoreData(true);
-                            } else {
-                                mSrlContent.finishLoadMore();
-                                mSrlContent.setNoMoreData(false);
-                            }
                         } else {
-                            if (currentPage > 1) {
-                                mSrlContent.finishLoadMore();
-                                mSrlContent.setNoMoreData(true);
-                                mRlvPersons.setVisibility(View.VISIBLE);
-                                mTvHint.setVisibility(View.GONE);
-                            } else {
-                                mRlvPersons.setVisibility(View.GONE);
-                                mTvHint.setVisibility(View.VISIBLE);
-                            }
+                            mRlvPersons.setVisibility(View.GONE);
+                            mTvHint.setVisibility(View.VISIBLE);
                         }
                     }
+                }
 
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        mSrlContent.finishLoadMore();
-                        mSrlContent.finishRefresh();
-                        ExceptionHandler.handleException(e);
-                    }
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    mSrlContent.finishLoadMore();
+                    mSrlContent.finishRefresh();
+                    ExceptionHandler.handleException(e);
+                }
 
-                    @Override
-                    public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                    }
-                });
+                }
+            });
     }
 
     /**
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingEditActivity.java
index cd642a2..ac7644e 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingEditActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/BuildingEditActivity.java
@@ -102,6 +102,8 @@ public class BuildingEditActivity extends BaseActivity {
     NestedScrollView mNsvContent;
     @BindView(R2.id.et_elevator_num)
     EditText mEtElevatorNum;//电梯数
+    @BindView(R2.id.tv_location)
+    TextView mTvLocation;
     private Unbinder mBind;
     private BuildingSaveBean mBeans;
     private final ViewHandler mHandler = new ViewHandler(this);
@@ -112,6 +114,8 @@ public class BuildingEditActivity extends BaseActivity {
     private String mSelCommunityType = "";//小区类型ID
     private String mId;
     private Gson mGson = new Gson();
+    private Double mLat;
+    private Double mLng;
 
     @Override
     protected int setLayoutId() {
@@ -158,6 +162,12 @@ public class BuildingEditActivity extends BaseActivity {
                 mTvCommunity.setText(name);
                 mSelCommunityId = id;
             }
+        } else if (requestCode == 16) {
+            if (resultCode == 22) {
+                mLat = data.getDoubleExtra("lat", -1);
+                mLng = data.getDoubleExtra("lng", -1);
+                mTvLocation.setText(mLat + "-" + mLng);
+            }
         }
     }
 
@@ -191,11 +201,11 @@ public class BuildingEditActivity extends BaseActivity {
                     mSelCommunityType = bean.getDataId();
                     mTvBuildingType.setText(bean.getDataName());
                 })
-                        .setTitleText("请选择")
-                        .setCancelColor(Color.parseColor("#1189FF"))
-                        .setSubmitColor(Color.parseColor("#1189FF"))
-                        .setTitleColor(Color.parseColor("#1189FF"))
-                        .build();
+                    .setTitleText("请选择")
+                    .setCancelColor(Color.parseColor("#1189FF"))
+                    .setSubmitColor(Color.parseColor("#1189FF"))
+                    .setTitleColor(Color.parseColor("#1189FF"))
+                    .build();
                 LogUtils.e(mCommunityTypePicker);
                 mCommunityTypePicker.setPicker(mCommunityTypeList);
             }
@@ -212,42 +222,42 @@ public class BuildingEditActivity extends BaseActivity {
         ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中...");
         dialog.show();
         RetrofitManager.getInstance()
-                .create(GridApis.class)
-                .getDictListAllByPid(pId, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<List<DicBean>>() {
-                    @Override
-                    public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
+            .create(GridApis.class)
+            .getDictListAllByPid(pId, UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<List<DicBean>>() {
+                @Override
+                public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
 
-                    }
+                }
 
-                    @Override
-                    public void onNext(@io.reactivex.rxjava3.annotations.NonNull List<DicBean> dicBeans) {
-                        dialog.dismiss();
-                        if (dicBeans.size() > 0) {
-                            switch (i) {
-                                case 4://小区类型
-                                    mCommunityTypeList = dicBeans;
-                                    showCommunityType();
-                                    break;
-                            }
-                        } else {
-                            ToastUtils.show("暂无数据");
+                @Override
+                public void onNext(@io.reactivex.rxjava3.annotations.NonNull List<DicBean> dicBeans) {
+                    dialog.dismiss();
+                    if (dicBeans.size() > 0) {
+                        switch (i) {
+                            case 4://小区类型
+                                mCommunityTypeList = dicBeans;
+                                showCommunityType();
+                                break;
                         }
+                    } else {
+                        ToastUtils.show("暂无数据");
                     }
+                }
 
-                    @Override
-                    public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
-                        dialog.dismiss();
-                        ExceptionHandler.handleException(e);
-                    }
+                @Override
+                public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
+                    dialog.dismiss();
+                    ExceptionHandler.handleException(e);
+                }
 
-                    @Override
-                    public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                    }
-                });
+                }
+            });
     }
 
     /**
@@ -338,11 +348,14 @@ public class BuildingEditActivity extends BaseActivity {
         mBeans = new BuildingSaveBean();
         initTypeList();
         mTvCommunity.setOnClickListener(v -> ARouter.getInstance()
-                .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_MANAGE)
-                .withInt("type", 2)
-                .navigation(mActivity, 12));
+            .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_MANAGE)
+            .withInt("type", 2)
+            .navigation(mActivity, 12));
         mTvBuildingType.setOnClickListener(v -> showCommunityType());
         mBtnConfirm.setOnClickListener(v -> doEdit());
+        mTvLocation.setOnClickListener(v -> ARouter.getInstance()
+            .build(PathConfig.PATH_MODULE_MAP_SEL_POINT)
+            .navigation(mActivity, 16));
         getBuildingDetail();
     }
 
@@ -351,32 +364,32 @@ public class BuildingEditActivity extends BaseActivity {
      */
     private void getBuildingDetail() {
         RetrofitManager.getInstance()
-                .create(GridApis.class)
-                .getBuildingDetailById(mId, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BuildingDetailBean>() {
-                    @Override
-                    public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
+            .create(GridApis.class)
+            .getBuildingDetailById(mId, UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<BuildingDetailBean>() {
+                @Override
+                public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
 
-                    }
+                }
 
-                    @Override
-                    public void onNext(@io.reactivex.rxjava3.annotations.NonNull BuildingDetailBean buildingDetailBean) {
-                        setDataToView(buildingDetailBean);
-                    }
+                @Override
+                public void onNext(@io.reactivex.rxjava3.annotations.NonNull BuildingDetailBean buildingDetailBean) {
+                    setDataToView(buildingDetailBean);
+                }
 
-                    @Override
-                    public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
-                        refreshView(STATE_LOAD_ERROR);
-                        ExceptionHandler.handleException(e);
-                    }
+                @Override
+                public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
+                    refreshView(STATE_LOAD_ERROR);
+                    ExceptionHandler.handleException(e);
+                }
 
-                    @Override
-                    public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                    }
-                });
+                }
+            });
     }
 
     /**
@@ -400,6 +413,9 @@ public class BuildingEditActivity extends BaseActivity {
         mEtElevatorNum.setText(bean.getElevator() + "");
         //备注
         mEtRemark.setText(Html.fromHtml(bean.getRemake()));
+        mLat = Double.parseDouble(bean.getLatitude());
+        mLng = Double.parseDouble(bean.getLongitude());
+        mTvLocation.setText(mLat + "-" + mLng);
 
         String floorType = bean.getFloorCountForUnit();//每层层数
         String doorType = bean.getHouseCountForFloor();//每层户数
@@ -890,35 +906,35 @@ public class BuildingEditActivity extends BaseActivity {
             ProgressDialog dialog = UIUtil.initDialog(mActivity, "保存中...");
             dialog.show();
             RetrofitManager.getInstance()
-                    .create(GridApis.class)
-                    .doEditBuilding(mId, body, UserLgUtils.getToken())
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Observer<SuccessBean>() {
-                        @Override
-                        public void onSubscribe(@NonNull Disposable d) {
+                .create(GridApis.class)
+                .doEditBuilding(mId, body, UserLgUtils.getToken())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<SuccessBean>() {
+                    @Override
+                    public void onSubscribe(@NonNull Disposable d) {
 
-                        }
+                    }
 
-                        @Override
-                        public void onNext(@NonNull SuccessBean successBean) {
-                            dialog.dismiss();
-                            ToastUtils.show("修改成功");
-                            setResult(13);
-                            finish();
-                        }
+                    @Override
+                    public void onNext(@NonNull SuccessBean successBean) {
+                        dialog.dismiss();
+                        ToastUtils.show("修改成功");
+                        setResult(13);
+                        finish();
+                    }
 
-                        @Override
-                        public void onError(@NonNull Throwable e) {
-                            dialog.dismiss();
-                            ExceptionHandler.handleException(e);
-                        }
+                    @Override
+                    public void onError(@NonNull Throwable e) {
+                        dialog.dismiss();
+                        ExceptionHandler.handleException(e);
+                    }
 
-                        @Override
-                        public void onComplete() {
+                    @Override
+                    public void onComplete() {
 
-                        }
-                    });
+                    }
+                });
         }
     }
 
@@ -936,6 +952,9 @@ public class BuildingEditActivity extends BaseActivity {
         bean.setBuildingType(mSelCommunityType);
         bean.setFloorCountForUnit(mBeans.isLayerType() ? "相同" : "不相同");
         bean.setHouseCountForFloor(mBeans.isDoorType() ? "相同" : "不相同");
+        bean.setLatitude(mLat + "");
+        bean.setLongitude(mLng + "");
+
         int cellNum = mBeans.getCellNum();
         bean.setUnitCount(cellNum);
 
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaAddActivity.java
index ea1b300..abdd716 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaAddActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaAddActivity.java
@@ -66,12 +66,15 @@ public class CommunityAreaAddActivity extends BaseActivity {
     EditText mEtMasterPhone;
     @BindView(R2.id.et_ink_phone)
     EditText mEtInkPhone;
+    @BindView(R2.id.tv_location)
+    TextView mTvLocation;
     private Unbinder mBind;
     private String mSelAreaCode;
     private String mSelAreaId;
     private String mSelAreaNames;
     private AreaGridListBean.RowsBean mSelGridBean;
-
+    private Double mLat;
+    private Double mLng;
     @Override
     protected int setLayoutId() {
         return R.layout.activity_community_area_add;
@@ -98,6 +101,9 @@ public class CommunityAreaAddActivity extends BaseActivity {
             }
         });
         mBtnConfirm.setOnClickListener(v -> doConfirm());
+        mTvLocation.setOnClickListener(v -> ARouter.getInstance()
+            .build(PathConfig.PATH_MODULE_MAP_SEL_POINT)
+            .navigation(mActivity, 16));
     }
 
     private void doConfirm() {
@@ -189,6 +195,8 @@ public class CommunityAreaAddActivity extends BaseActivity {
         bean.setLinkPhone(masterPhone);
         String phone = mEtInkPhone.getText().toString().trim();
         bean.setPhone(phone);
+        bean.setLatitude(mLat + "");
+        bean.setLongitude(mLng + "");
         String remark = mEtRemark.getText().toString().trim();
         if (!TextUtils.isEmpty(remark)) {
             bean.setRemake(remark);
@@ -226,6 +234,12 @@ public class CommunityAreaAddActivity extends BaseActivity {
                 mSelGridBean = (AreaGridListBean.RowsBean) data.getSerializableExtra("bean");
                 mTvGrid.setText(mSelGridBean.getGridName());
             }
+        }else if (requestCode == 16) {
+            if (resultCode == 22) {
+                mLat = data.getDoubleExtra("lat", -1);
+                mLng = data.getDoubleExtra("lng", -1);
+                mTvLocation.setText(mLat + "-" + mLng);
+            }
         }
     }
 
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaDetailActivity.java
index b1a8914..176c29a 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaDetailActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaDetailActivity.java
@@ -79,6 +79,8 @@ public class CommunityAreaDetailActivity extends BaseActivity {
     SmartRefreshLayout mSrlContent;
     @BindView(R2.id.tv_desc_hint)
     TextView mTvDescHint;
+    @BindView(R2.id.tv_location)
+    TextView mTvLocation;
     private String mId;
     private Unbinder mBind;
     private int mCurrentPage = 1;
@@ -291,6 +293,7 @@ public class CommunityAreaDetailActivity extends BaseActivity {
         mTvMasterPhone.setText(bean.getLinkPhone());
         mTvInkPhone.setText(bean.getPhone());
         mTvRemark.setText(Html.fromHtml(bean.getRemake()));
+        mTvLocation.setText(bean.getLatitude() + "-" + bean.getLongitude());
         doRefresh();
     }
 
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaEditActivity.java
index b0cd245..3e02592 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaEditActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityAreaEditActivity.java
@@ -65,12 +65,15 @@ public class CommunityAreaEditActivity extends BaseActivity {
     EditText mEtMasterPhone;
     @BindView(R2.id.et_ink_phone)
     EditText mEtInkPhone;
+    @BindView(R2.id.tv_location)
+    TextView mTvLocation;
     private Unbinder mBind;
     private String mSelAreaCode;
     private String mSelAreaId;
     private String mSelAreaNames;
     private AreaGridListBean.RowsBean mSelGridBean;
-
+    private Double mLat;
+    private Double mLng;
     private String mId;
 
     @Override
@@ -101,6 +104,9 @@ public class CommunityAreaEditActivity extends BaseActivity {
             }
         });
         mBtnConfirm.setOnClickListener(v -> doConfirm());
+        mTvLocation.setOnClickListener(v -> ARouter.getInstance()
+            .build(PathConfig.PATH_MODULE_MAP_SEL_POINT)
+            .navigation(mActivity, 16));
     }
 
     private void doConfirm() {
@@ -191,6 +197,8 @@ public class CommunityAreaEditActivity extends BaseActivity {
         String masterPhone = mEtMasterPhone.getText().toString().trim();
         bean.setLinkPhone(masterPhone);
         String phone = mEtInkPhone.getText().toString().trim();
+        bean.setLatitude(mLat + "");
+        bean.setLongitude(mLng + "");
         bean.setPhone(phone);
         String remark = mEtRemark.getText().toString().trim();
         if (!TextUtils.isEmpty(remark)) {
@@ -229,6 +237,12 @@ public class CommunityAreaEditActivity extends BaseActivity {
                 mSelGridBean = (AreaGridListBean.RowsBean) data.getSerializableExtra("bean");
                 mTvGrid.setText(mSelGridBean.getGridName());
             }
+        } else if (requestCode == 16) {
+            if (resultCode == 22) {
+                mLat = data.getDoubleExtra("lat", -1);
+                mLng = data.getDoubleExtra("lng", -1);
+                mTvLocation.setText(mLat + "-" + mLng);
+            }
         }
     }
 
@@ -273,6 +287,11 @@ public class CommunityAreaEditActivity extends BaseActivity {
         mTvArea.setText(bean.getLocation());
         mSelAreaCode = bean.getLocationCode();
         mSelAreaNames = bean.getLocation();
+        if (!TextUtils.isEmpty(bean.getLatitude())) {
+            mLat = Double.parseDouble(bean.getLatitude());
+            mLng = Double.parseDouble(bean.getLongitude());
+            mTvLocation.setText(mLat + "-" + mLng);
+        }
         mSelGridBean = new AreaGridListBean.RowsBean();
         mSelGridBean.setGridName(bean.getGridName());
         mSelGridBean.setGridId(bean.getGrid());
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityDetailActivity.java
index 0cc87ec..f7594b8 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityDetailActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityDetailActivity.java
@@ -355,14 +355,15 @@ public class CommunityDetailActivity extends BaseActivity {
         LayerView layerView = new LayerView(this);
         layerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         layerView.setCRS(crs);
         mMvMap.addLayer(layerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(12);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     private void doLoadMore() {
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityEditActivity.java
index 49624de..a5b60a0 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityEditActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/CommunityEditActivity.java
@@ -493,9 +493,9 @@ public class CommunityEditActivity extends BaseActivity {
         mEtPropertyLinkPhone.setText(bean.getPhone());
         mEtAddress.setText(bean.getResidentialAddress());
         if (!TextUtils.isEmpty(bean.getLatitude()) && !TextUtils.isEmpty(bean.getLongitude())) {
-            Double lat = Double.parseDouble(bean.getLatitude());
-            Double lng = Double.parseDouble(bean.getLongitude());
-            mTvAddressSel.setText(lat + "-" + lng);
+            mLat = Double.parseDouble(bean.getLatitude());
+            mLng = Double.parseDouble(bean.getLongitude());
+            mTvAddressSel.setText(mLat + "-" + mLng);
         }
         mEtRemark.setText(bean.getRemake());
     }
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/FamilyMemberAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/FamilyMemberAddActivity.java
index 6bd4875..ad1259b 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/FamilyMemberAddActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/FamilyMemberAddActivity.java
@@ -65,7 +65,7 @@ import okhttp3.RequestBody;
 public class FamilyMemberAddActivity extends BaseActivity {
 
 
-    @BindView(R2.id.et_base_search_content)
+    @BindView(R2.id.et_base_search_v)
     EditText mEtBaseSearchContent;
     @BindView(R2.id.iv_base_clear)
     ImageView mIvBaseClear;
@@ -154,9 +154,9 @@ public class FamilyMemberAddActivity extends BaseActivity {
         mBtnBaseSearch.setOnClickListener(v -> doSearchPerson());
         mBtnBind.setOnClickListener(v -> doBind());
         mAdapter.addOnItemClickListener(bean -> ARouter.getInstance()
-                .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_MEMBER_DETAIL)
-                .withString("id", bean.getHouseUserSubId())
-                .navigation(mActivity, 12));
+            .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_MEMBER_DETAIL)
+            .withString("id", bean.getHouseUserSubId())
+            .navigation(mActivity, 12));
     }
 
 
@@ -211,11 +211,11 @@ public class FamilyMemberAddActivity extends BaseActivity {
                     DicBean bean = mDictionaryBeanList.get(o1);
                     mTvType.setText(bean.getDataName());
                 })
-                        .setTitleText("请选择")
-                        .setCancelColor(Color.parseColor("#1189FF"))
-                        .setSubmitColor(Color.parseColor("#1189FF"))
-                        .setTitleColor(Color.parseColor("#1189FF"))
-                        .build();
+                    .setTitleText("请选择")
+                    .setCancelColor(Color.parseColor("#1189FF"))
+                    .setSubmitColor(Color.parseColor("#1189FF"))
+                    .setTitleColor(Color.parseColor("#1189FF"))
+                    .build();
                 mPicker.setPicker(mDictionaryBeanList);
             }
             mPicker.show();
@@ -227,49 +227,49 @@ public class FamilyMemberAddActivity extends BaseActivity {
     private void doSearchPerson() {
         hideSoftKeyboard();
         String card = mEtBaseSearchContent.getText().toString().trim();
-        if (TextUtils.isEmpty(card) || !RegexUtils.isIDCard18Exact(card)) {
+        if (TextUtils.isEmpty(card) || !RegexUtils.isIDNumber(card)) {
             ToastUtils.show("请输入合法的身份证号码");
             return;
         }
         ProgressDialog dialog = UIUtil.initDialog(mActivity, "搜索中...");
         dialog.show();
         RetrofitManager.getInstance()
-                .create(BaseApiService.class)
-                .doSearchPerson(card, UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<PersonSearchBean>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
+            .create(BaseApiService.class)
+            .doSearchPerson(card, UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<PersonSearchBean>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
 
+                }
+
+                @Override
+                public void onNext(@NonNull PersonSearchBean personSearchBean) {
+                    dialog.dismiss();
+                    if (!TextUtils.isEmpty(personSearchBean.getFullName())) {
+                        mSearchBean = personSearchBean;
+                        setSearchContentView(2);
+                        mTvGender.setText(personSearchBean.getGenderDictionaryName());
+                        mTvName.setText(personSearchBean.getFullName());
+                        mEtPhone.setText(personSearchBean.getTelephone());
+                    } else {
+                        setSearchContentView(1);
+                        mTvSearchHint.setText("人口数据库中未找到该人员");
                     }
+                }
 
-                    @Override
-                    public void onNext(@NonNull PersonSearchBean personSearchBean) {
-                        dialog.dismiss();
-                        if (!TextUtils.isEmpty(personSearchBean.getFullName())) {
-                            mSearchBean = personSearchBean;
-                            setSearchContentView(2);
-                            mTvGender.setText(personSearchBean.getGenderDictionaryName());
-                            mTvName.setText(personSearchBean.getFullName());
-                            mEtPhone.setText(personSearchBean.getTelephone());
-                        } else {
-                            setSearchContentView(1);
-                            mTvSearchHint.setText("人口数据库中未找到该人员");
-                        }
-                    }
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    dialog.dismiss();
+                    ExceptionHandler.handleException(e);
+                }
 
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        dialog.dismiss();
-                        ExceptionHandler.handleException(e);
-                    }
+                @Override
+                public void onComplete() {
 
-                    @Override
-                    public void onComplete() {
-
-                    }
-                });
+                }
+            });
     }
 
 
@@ -293,59 +293,59 @@ public class FamilyMemberAddActivity extends BaseActivity {
     private void getHireRecordList(int page) {
         mCurrentPage = page;
         RetrofitManager.getInstance()
-                .create(GridApis.class)
-                .getFamilyMemberList(mId, page + "", UserLgUtils.getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<FamilyMemberListBean>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
+            .create(GridApis.class)
+            .getFamilyMemberList(mId, page + "", UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<FamilyMemberListBean>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
 
-                    }
+                }
 
-                    @Override
-                    public void onNext(@NonNull FamilyMemberListBean hireRecordListBean) {
-                        if (hireRecordListBean.getRows() != null && hireRecordListBean.getRows().size() > 0) {
-                            ++mCurrentPage;
-                            if (page == 1) {
-                                mDatas.clear();
-                                mDatas.addAll(hireRecordListBean.getRows());
-                            } else {
-                                mDatas.addAll(hireRecordListBean.getRows());
-                            }
-                            setStateView(14);
-                            mAdapter.notifyDataSetChanged();
-                            mSrlContent.finishRefresh();
-                            if (mDatas.size() >= hireRecordListBean.getTotal()) {
-                                mSrlContent.finishLoadMore();
-                                mSrlContent.setNoMoreData(true);
-                            } else {
-                                mSrlContent.finishLoadMore();
-                                mSrlContent.setNoMoreData(false);
-                            }
+                @Override
+                public void onNext(@NonNull FamilyMemberListBean hireRecordListBean) {
+                    if (hireRecordListBean.getRows() != null && hireRecordListBean.getRows().size() > 0) {
+                        ++mCurrentPage;
+                        if (page == 1) {
+                            mDatas.clear();
+                            mDatas.addAll(hireRecordListBean.getRows());
                         } else {
-                            if (page > 1) {
-                                mSrlContent.finishLoadMore();
-                                mSrlContent.setNoMoreData(true);
-                                setStateView(14);
-                            } else {
-                                setStateView(15);
-                            }
+                            mDatas.addAll(hireRecordListBean.getRows());
+                        }
+                        setStateView(14);
+                        mAdapter.notifyDataSetChanged();
+                        mSrlContent.finishRefresh();
+                        if (mDatas.size() >= hireRecordListBean.getTotal()) {
+                            mSrlContent.finishLoadMore();
+                            mSrlContent.setNoMoreData(true);
+                        } else {
+                            mSrlContent.finishLoadMore();
+                            mSrlContent.setNoMoreData(false);
+                        }
+                    } else {
+                        if (page > 1) {
+                            mSrlContent.finishLoadMore();
+                            mSrlContent.setNoMoreData(true);
+                            setStateView(14);
+                        } else {
+                            setStateView(15);
                         }
                     }
+                }
 
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        mSrlContent.finishLoadMore();
-                        mSrlContent.finishRefresh();
-                        ExceptionHandler.handleException(e);
-                    }
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    mSrlContent.finishLoadMore();
+                    mSrlContent.finishRefresh();
+                    ExceptionHandler.handleException(e);
+                }
 
-                    @Override
-                    public void onComplete() {
+                @Override
+                public void onComplete() {
 
-                    }
-                });
+                }
+            });
     }
 
     /**
@@ -381,59 +381,8 @@ public class FamilyMemberAddActivity extends BaseActivity {
             dialog.show();
             RequestBody body = buildParams();
             RetrofitManager.getInstance()
-                    .create(GridApis.class)
-                    .doAddFamilyMember(body, UserLgUtils.getToken())
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Observer<SuccessBean>() {
-                        @Override
-                        public void onSubscribe(@NonNull Disposable d) {
-
-                        }
-
-                        @Override
-                        public void onNext(@NonNull SuccessBean successBean) {
-                            //绑定成功 刷列表 重置搜索
-                            dialog.dismiss();
-                            ToastUtils.show("添加成功");
-                            doRefresh();
-                            setSearchContentView(1);
-                        }
-
-                        @Override
-                        public void onError(@NonNull Throwable e) {
-                            dialog.dismiss();
-                            ExceptionHandler.handleException(e);
-                        }
-
-                        @Override
-                        public void onComplete() {
-
-                        }
-                    });
-        }
-    }
-
-    private void delHire(String id) {
-        AlertDialog dialog = new AlertDialog.Builder(mActivity)
-                .setTitle("警告")
-                .setIcon(android.R.drawable.ic_dialog_info)
-                .setMessage("确定要删除该租住记录吗?")
-                .setPositiveButton("确定", (dialog1, which) -> doDelHire(id))
-                .setNegativeButton("取消", (d, which) -> d.dismiss())
-                .create();
-        dialog.show();
-    }
-
-    /**
-     * 删除绑定记录
-     */
-    private void doDelHire(String id) {
-        ProgressDialog dialog = UIUtil.initDialog(mActivity, "删除中...");
-        dialog.show();
-        RetrofitManager.getInstance()
                 .create(GridApis.class)
-                .doDelHireRecord(id, UserLgUtils.getToken())
+                .doAddFamilyMember(body, UserLgUtils.getToken())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<SuccessBean>() {
@@ -444,8 +393,9 @@ public class FamilyMemberAddActivity extends BaseActivity {
 
                     @Override
                     public void onNext(@NonNull SuccessBean successBean) {
+                        //绑定成功 刷列表 重置搜索
                         dialog.dismiss();
-                        ToastUtils.show("删除成功");
+                        ToastUtils.show("添加成功");
                         doRefresh();
                         setSearchContentView(1);
                     }
@@ -461,6 +411,56 @@ public class FamilyMemberAddActivity extends BaseActivity {
 
                     }
                 });
+        }
+    }
+
+    private void delHire(String id) {
+        AlertDialog dialog = new AlertDialog.Builder(mActivity)
+            .setTitle("警告")
+            .setIcon(android.R.drawable.ic_dialog_info)
+            .setMessage("确定要删除该租住记录吗?")
+            .setPositiveButton("确定", (dialog1, which) -> doDelHire(id))
+            .setNegativeButton("取消", (d, which) -> d.dismiss())
+            .create();
+        dialog.show();
+    }
+
+    /**
+     * 删除绑定记录
+     */
+    private void doDelHire(String id) {
+        ProgressDialog dialog = UIUtil.initDialog(mActivity, "删除中...");
+        dialog.show();
+        RetrofitManager.getInstance()
+            .create(GridApis.class)
+            .doDelHireRecord(id, UserLgUtils.getToken())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(new Observer<SuccessBean>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
+
+                }
+
+                @Override
+                public void onNext(@NonNull SuccessBean successBean) {
+                    dialog.dismiss();
+                    ToastUtils.show("删除成功");
+                    doRefresh();
+                    setSearchContentView(1);
+                }
+
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    dialog.dismiss();
+                    ExceptionHandler.handleException(e);
+                }
+
+                @Override
+                public void onComplete() {
+
+                }
+            });
     }
 
     /**
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/HouseListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/HouseListActivity.java
index d57112d..d30b630 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/HouseListActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/HouseListActivity.java
@@ -84,6 +84,7 @@ public class HouseListActivity extends BaseActivity {
     @Override
     protected void clearSearch() {
         mKeywords = "";
+        mSelCondition = "";
         doRefresh();
     }
 
@@ -150,7 +151,7 @@ public class HouseListActivity extends BaseActivity {
             doRefresh();
             popup.dismiss();
         });
-        popup.showPopupWindow(mLlAppSearchContent);
+        popup.showPopupWindow(mTvOptions);
     }
 
     /**
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentDetailActivity.java
index 5181d90..58878e8 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentDetailActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentDetailActivity.java
@@ -229,14 +229,15 @@ public class ComponentDetailActivity extends BaseActivity {
         LayerView layerView = new LayerView(this);
         layerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         layerView.setCRS(crs);
         mMvMap.addLayer(layerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(12);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
 }
\ No newline at end of file
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java
index 244d708..dcbfdb4 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java
@@ -718,13 +718,14 @@ public class ComponentEditActivity extends BaseActivity {
         LayerView layerView = new LayerView(this);
         layerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         layerView.setCRS(crs);
         mMvMap.addLayer(layerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(12);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 }
\ No newline at end of file
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java
index ceacfb8..c5df432 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java
@@ -2,6 +2,8 @@ package com.tengshisoft.gridmodule.incident.activitys.locus;
 
 import android.app.ProgressDialog;
 import android.graphics.Color;
+import android.graphics.DashPathEffect;
+import android.graphics.Paint;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -20,10 +22,14 @@ import com.gyf.immersionbar.ImmersionBar;
 import com.hjq.toast.ToastUtils;
 import com.supermap.imobilelite.maps.CoordinateReferenceSystem;
 import com.supermap.imobilelite.maps.LayerView;
+import com.supermap.imobilelite.maps.LineOverlay;
 import com.supermap.imobilelite.maps.Point2D;
+import com.supermap.imobilelite.maps.PolygonOverlay;
 import com.tengshisoft.commonmodule.adapters.LocusStepAdapter;
+import com.tengshisoft.commonmodule.beans.DrawMapLineBean;
 import com.tengshisoft.commonmodule.beans.LocationPointBean;
 import com.tengshisoft.commonmodule.beans.LocusTextBean;
+import com.tengshisoft.commonmodule.beans.UserGridList;
 import com.tengshisoft.commonmodule.nets.GridApis;
 import com.tengshisoft.gismap.TouchMapView;
 import com.tengshisoft.gridmodule.R;
@@ -107,6 +113,7 @@ public class WorkLocusActivity extends BaseActivity {
     private int mCurrentShowType = 1;//1是地图  2是文本
     private LocusStepAdapter mAdapter;
     private ProgressDialog mProgressDialog;
+    private List<UserGridList> mGridLists;
 
     @Override
     protected int setLayoutId() {
@@ -165,6 +172,7 @@ public class WorkLocusActivity extends BaseActivity {
                 .error(R.drawable.ic_user_default)
                 .placeholder(R.drawable.ic_user_default))
             .into(mIvUserIcon);
+        getUserGrid();
         getLocusList();
     }
 
@@ -189,6 +197,74 @@ public class WorkLocusActivity extends BaseActivity {
         }
     }
 
+    private void getUserGrid() {
+        RetrofitManager.getInstance()
+            .create(GridApis.class)
+            .getUserGrid(UserLgUtils.getUserId(), UserLgUtils.getToken())
+            .compose(RxTransformer.getTransformer())
+            .subscribe(new Observer<List<UserGridList>>() {
+                @Override
+                public void onSubscribe(@NonNull Disposable d) {
+
+                }
+
+                @Override
+                public void onNext(@NonNull List<UserGridList> userGridLists) {
+                    if (userGridLists.size() > 0) {
+                        //画网格
+                        mGridLists = userGridLists;
+                        drawGridToMap(userGridLists);
+                    }
+                }
+
+                @Override
+                public void onError(@NonNull Throwable e) {
+                    e.printStackTrace();
+                }
+
+                @Override
+                public void onComplete() {
+
+                }
+            });
+    }
+
+    /**
+     * 绘制网格
+     */
+    private void drawGridToMap(List<UserGridList> userGridLists) {
+        for (int i = 0; i < userGridLists.size(); i++) {
+            UserGridList grid = userGridLists.get(i);
+            LogUtils.e(grid.getPointArray().size());
+            if (grid.getPointArray() != null && grid.getPointArray().size() > 0) {
+                //透明度 40
+                PolygonOverlay polygonOverlay = new PolygonOverlay(getPolygonPaint(Color.parseColor(grid.getFillColor())));
+                List<Point2D> point2DS = new ArrayList<>();
+                for (int j = 0; j < grid.getPointArray().size(); j++) {
+                    UserGridList.PointArrayBean bean = grid.getPointArray().get(j);
+                    point2DS.add(new Point2D(Double.parseDouble(bean.getLng()), Double.parseDouble(bean.getLat())));
+                }
+                UserGridList.PointArrayBean bean = grid.getPointArray().get(0);
+                point2DS.add(new Point2D(Double.parseDouble(bean.getLng()), Double.parseDouble(bean.getLat())));
+                LogUtils.e(point2DS.size());
+                polygonOverlay.setData(point2DS);
+                mMvMap.getOverlays().add(polygonOverlay);
+            }
+        }
+        mMvMap.invalidate();
+    }
+
+    public static Paint getPolygonPaint(int color) {
+        Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        int a = Math.min(255, Math.max(0, (int) (0.4 * 255))) << 24;
+        int rgb = 0x00ffffff & color;
+        paint.setColor(a + rgb);
+        paint.setStyle(Paint.Style.FILL_AND_STROKE);
+        paint.setStrokeWidth(2);
+        paint.setAntiAlias(true);
+        return paint;
+    }
+
     /**
      * 初始化地图
      */
@@ -196,14 +272,14 @@ public class WorkLocusActivity extends BaseActivity {
         mBaseLayerView = new LayerView(this);
         mBaseLayerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         mBaseLayerView.setCRS(crs);
         mMvMap.addLayer(mBaseLayerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(6);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
-
+        mMvMap.invalidate();
     }
 
 
@@ -250,7 +326,7 @@ public class WorkLocusActivity extends BaseActivity {
                 public void onNext(@NonNull List<LocationPointBean> locationPointBeans) {
                     dialog.dismiss();
                     if (locationPointBeans.size() > 0) {
-//                        drawLineToMap(locationPointBeans);
+                        drawLineToMap(locationPointBeans);
                         parserLocationPoint(locationPointBeans);
                     } else {
                         ToastUtils.show("当前选择时间段内无轨迹");
@@ -271,108 +347,124 @@ public class WorkLocusActivity extends BaseActivity {
     }
 
 
-    //    private void drawLineToMap(List<LocationPointBean> mBeas) {
-//        //清除之前的
-//        if (mBeas.size() > 2) {
-//            Collections.sort(mBeas);
-//            List<LocationPointBean> mTempBeans = new ArrayList<>(mBeas);
-//            Observable.just(mTempBeans)
-//                .map(mineLocationBeans -> {
-//                    //坐标集合
-//                    //颜色集合
-//                    List<DrawMapLineBean> lineDatas = new ArrayList<>();
-//                    for (int i = 0; i < mineLocationBeans.size(); i++) {
-//                        if (i != mineLocationBeans.size() - 1) {
-//                            //TODO 12:移动  13:等待  14:异常
-//                            DrawMapLineBean bean = new DrawMapLineBean();
-//                            //第一个
-//                            LocationPointBean preBean = mineLocationBeans.get(i);
-//                            //下一点
-//                            LocationPointBean nextBean = mineLocationBeans.get(i + 1);
-//                            long timeSpan = TimeUtils.getTimeSpan(nextBean.getGmtCreate(), preBean.getGmtCreate(), TimeConstants.SEC);
-//                            LatLng preLatlng = new LatLng(Double.parseDouble(preBean.getUserLat()), Double.parseDouble(preBean.getUserLng()));
-//                            LatLng nextLatlng = new LatLng(Double.parseDouble(nextBean.getUserLat()), Double.parseDouble(nextBean.getUserLng()));
-//                            //TODO 1、距离
-//                            double distance = DistanceUtil.getDistance(preLatlng, nextLatlng);
-//                            if (timeSpan < 600) {
-//                                //在线
-//                                if (distance / timeSpan > 20) {
-//                                    //TODO 速度大于20/s异常
-//                                    bean.setOnePoint(preLatlng);
-//                                    bean.setTwoPoint(nextLatlng);
-//                                    bean.setType(14);
-//                                    bean.setLineColor(Integer.valueOf(Color.RED));
-//                                } else if (distance / timeSpan <= 0.5) {
-//                                    //TODO 速度小于0.5m/s等待
-//                                    bean.setOnePoint(preLatlng);
-//                                    bean.setTwoPoint(nextLatlng);
-//                                    bean.setType(13);
-//                                    bean.setLineColor(Integer.valueOf(Color.YELLOW));
-//                                } else {
-//                                    //TODO 移动 绿色
-//                                    bean.setOnePoint(preLatlng);
-//                                    bean.setTwoPoint(nextLatlng);
-//                                    bean.setType(12);
-//                                    bean.setLineColor(Integer.valueOf(Color.parseColor("#218868")));
-//                                }
-//                            } else {
-//                                //TODO 失联
-//                                bean.setOnePoint(preLatlng);
-//                                bean.setTwoPoint(nextLatlng);
-//                                bean.setType(12);
-//                                bean.setLineColor(Integer.valueOf(Color.GRAY));
-//                            }
-//                            lineDatas.add(bean);
-//                        }
-//                    }
-//                    return lineDatas;
-//                })
-//                .subscribeOn(Schedulers.io())
-//                .observeOn(AndroidSchedulers.mainThread())
-//                .subscribe(new Observer<List<DrawMapLineBean>>() {
-//                    @Override
-//                    public void onSubscribe(Disposable d) {
-//
-//                    }
-//
-//                    @Override
-//                    public void onNext(List<DrawMapLineBean> o) {
-//                        mBaiduMap.clear();
-//                        if (o != null && o.size() > 0) {
-//                            for (int i = 0; i < o.size(); i++) {
-//                                List<LatLng> points = new ArrayList<>();
-//                                points.add(o.get(i).getOnePoint());
-//                                points.add(o.get(i).getTwoPoint());
-//                                OverlayOptions ooPolyline11 = new PolylineOptions()
-//                                    .width(10)
-//                                    .dottedLine(false)
-//                                    .color(o.get(i).getLineColor())
-//                                    .points(points);
-//                                mBaiduMap.addOverlay(ooPolyline11);
-//                            }
-//                            moveMapToCenter(new LatLng(o.get(0).getOnePoint().latitude, o.get(0).getOnePoint().longitude), 14);
-//                        }
-////                           TODO 电子围栏
-////                           if (mPenLineBeans != null && mPenLineBeans.size() > 0) {
-////                                drawPenToMap(mPenLineBeans);
-////                            }
-//                    }
-//
-//                    @Override
-//                    public void onError(Throwable e) {
-//                        e.printStackTrace();
-//                    }
-//
-//                    @Override
-//                    public void onComplete() {
-//
-//                    }
-//                });
-//        }
-//    }
-//
-//
+    private void drawLineToMap(List<LocationPointBean> mBeas) {
+        //清除之前的
+        if (mBeas.size() > 2) {
+            Collections.sort(mBeas);
+            List<LocationPointBean> mTempBeans = new ArrayList<>(mBeas);
+            Observable.just(mTempBeans)
+                .map(mineLocationBeans -> {
+                    //坐标集合
+                    //颜色集合
+                    List<DrawMapLineBean> lineDatas = new ArrayList<>();
+                    for (int i = 0; i < mineLocationBeans.size(); i++) {
+                        if (i != mineLocationBeans.size() - 1) {
+                            //TODO 12:移动  13:等待  14:异常
+                            DrawMapLineBean bean = new DrawMapLineBean();
+                            //第一个
+                            LocationPointBean preBean = mineLocationBeans.get(i);
+                            //下一点
+                            LocationPointBean nextBean = mineLocationBeans.get(i + 1);
+                            long timeSpan = TimeUtils.getTimeSpan(nextBean.getGmtCreate(), preBean.getGmtCreate(), TimeConstants.SEC);
+                            Point2D preLatlng = new Point2D(Double.parseDouble(preBean.getUserLng()), Double.parseDouble(preBean.getUserLat()));
+                            Point2D nextLatlng = new Point2D(Double.parseDouble(nextBean.getUserLng()), Double.parseDouble(nextBean.getUserLat()));
+                            double distance = PointUtils.getDistance(Double.parseDouble(preBean.getUserLat()), Double.parseDouble(preBean.getUserLng()), Double.parseDouble(nextBean.getUserLat()), Double.parseDouble(nextBean.getUserLng()));
+                            //TODO 1、距离
+                            if (timeSpan < 600) {
+                                //在线
+                                if (distance / timeSpan > 20) {
+                                    //TODO 速度大于20/s异常
+                                    bean.setOnePoint(preLatlng);
+                                    bean.setTwoPoint(nextLatlng);
+                                    bean.setType(14);
+                                    bean.setLineColor(Integer.valueOf(Color.RED));
+                                    bean.setEffect(true);
+                                } else if (distance / timeSpan <= 0.5) {
+                                    //TODO 速度小于0.5m/s等待
+                                    bean.setOnePoint(preLatlng);
+                                    bean.setTwoPoint(nextLatlng);
+                                    bean.setType(13);
+                                    bean.setLineColor(Integer.valueOf(Color.YELLOW));
+                                    bean.setEffect(false);
+                                } else {
+                                    //TODO 移动 绿色
+                                    bean.setOnePoint(preLatlng);
+                                    bean.setTwoPoint(nextLatlng);
+                                    bean.setType(12);
+                                    bean.setLineColor(Integer.valueOf(Color.parseColor("#218868")));
+                                    bean.setEffect(false);
+                                }
+                            } else {
+                                //TODO 失联
+                                bean.setOnePoint(preLatlng);
+                                bean.setTwoPoint(nextLatlng);
+                                bean.setType(12);
+                                bean.setLineColor(Integer.valueOf(Color.GRAY));
+                                bean.setEffect(true);
+                            }
+                            lineDatas.add(bean);
+                        }
+                    }
+                    return lineDatas;
+                })
+                .compose(RxTransformer.getTransformer())
+                .subscribe(new Observer<List<DrawMapLineBean>>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
 
+                    }
+
+                    @Override
+                    public void onNext(List<DrawMapLineBean> o) {
+                        mMvMap.getOverlays().clear();
+                        if (o != null && o.size() > 0) {
+                            for (int i = 0; i < o.size(); i++) {
+                                LineOverlay overlay = new LineOverlay(getLinePaint(o.get(i).getLineColor(), o.get(i).isEffect()));
+                                List<Point2D> points = new ArrayList<>();
+                                points.add(o.get(i).getOnePoint());
+                                points.add(o.get(i).getTwoPoint());
+                                overlay.setData(points);
+                                overlay.setKey("line");
+                                mMvMap.getOverlays().add(overlay);
+                            }
+                            mMvMap.getController().setCenter(o.get(0).getOnePoint());
+                            mMvMap.getController().setZoom(12);
+                            mMvMap.invalidate();
+                        }
+                        //TODO 电子围栏
+                        if (mGridLists != null && mGridLists.size() > 0) {
+                            drawGridToMap(mGridLists);
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        e.printStackTrace();
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+        }
+    }
+
+
+    /**
+     * 绘线风格
+     */
+    public static Paint getLinePaint(int color, boolean isEffect) {
+        Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        paint.setColor(color);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(5);
+        paint.setAntiAlias(true);
+        if (isEffect) {
+            paint.setPathEffect(new DashPathEffect(new float[]{15, 5}, 5));
+        }
+        return paint;
+    }
 
     /**
      * 解析文本数据
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java
index 139c006..f67c1de 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java
@@ -464,13 +464,14 @@ public class NonPublicOrgDetailActivity extends BaseActivity {
         LayerView layerView = new LayerView(this);
         layerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         layerView.setCRS(crs);
         mMvMap.addLayer(layerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(12);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 }
\ No newline at end of file
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java
index 3c55a30..0b7fe6b 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java
@@ -292,14 +292,15 @@ public class SocialOrgDetailActivity extends BaseActivity {
         LayerView layerView = new LayerView(this);
         layerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         layerView.setCRS(crs);
         mMvMap.addLayer(layerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(12);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     /**
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java
index f3fa31d..867537c 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java
@@ -1,5 +1,6 @@
 package com.tengshisoft.gridmodule.incident.activitys.schools;
 
+import android.animation.TypeEvaluator;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.Color;
@@ -101,6 +102,8 @@ public class SchoolManageAddActivity extends BaseActivity {
     TouchMapView mMvMap;
     @BindView(R2.id.tv_grid)
     TextView mTvGrid;
+    @BindView(R2.id.tv_belong_area)
+    TextView mTvBelongArea;
     private Unbinder mBind;
     private String mId;
 
@@ -115,6 +118,9 @@ public class SchoolManageAddActivity extends BaseActivity {
     private @NonNull SchoolDetailBean mDetailBean;
     private DefaultItemizedOverlay mItemizedOverlay;
     private AreaGridListBean.RowsBean mSelGridBean;
+    private String mSelBelongCode;
+    private String mSelBelongId;
+    private String mSelBelongName;
 
     @Override
     protected int setLayoutId() {
@@ -155,7 +161,8 @@ public class SchoolManageAddActivity extends BaseActivity {
      * 初始化视图
      */
     private void initViews() {
-        mTvArea.setOnClickListener(v -> onShowArea());
+        mTvArea.setOnClickListener(v -> onShowArea(1));
+        mTvBelongArea.setOnClickListener(v -> onShowArea(2));
         mTvAddressSel.setOnClickListener(v -> ARouter.getInstance()
             .build(PathConfig.PATH_MODULE_MAP_SEL_POINT)
             .navigation(mActivity, 16));
@@ -275,10 +282,14 @@ public class SchoolManageAddActivity extends BaseActivity {
             ToastUtils.show("请输入学校名称");
             return false;
         }
-        if (TextUtils.isEmpty(mSelAreaCode)) {
+        if (TextUtils.isEmpty(mSelBelongCode)) {
             ToastUtils.show("请选择学校所属行政区域");
             return false;
         }
+        if (TextUtils.isEmpty(mSelAreaCode)) {
+            ToastUtils.show("请选择所在区域");
+            return false;
+        }
         if (mSelGridBean == null) {
             ToastUtils.show("请选择所在网格");
             return false;
@@ -353,9 +364,14 @@ public class SchoolManageAddActivity extends BaseActivity {
         SaveSchoolBean bean = new SaveSchoolBean();
         String name = mEtName.getText().toString().trim();
         bean.setSchoolName(name);
-        bean.setBelongDept(mSelAreaId);
-        bean.setBelongDeptCode(mSelAreaCode);
-        bean.setBelongDeptName(mSelAreaName);
+
+        bean.setBelongDept(mSelBelongId);
+        bean.setBelongDeptCode(mSelBelongCode);
+        bean.setBelongDeptName(mSelBelongName);
+
+        bean.setLocation(mSelAreaName);
+        bean.setLocationCode(mSelAreaCode);
+
         String address = mEtAddress.getText().toString().trim();
         bean.setSchoolAddress(address);
         bean.setRunningType(mSelType.getDataId());
@@ -458,10 +474,17 @@ public class SchoolManageAddActivity extends BaseActivity {
         refreshView(STATE_LOAD_SUCCESS);
         mEtName.setText(mDetailBean.getSchoolName());
 
-        mTvArea.setText(mDetailBean.getBelongDeptName());
-        mSelAreaCode = mDetailBean.getBelongDeptCode();
-        mSelAreaId = mDetailBean.getBelongDept();
-        mSelAreaName = mDetailBean.getBelongDeptName();
+        mTvArea.setText(mDetailBean.getLocation());
+
+        mSelAreaCode = mDetailBean.getLocationCode();
+        mSelAreaId = mDetailBean.getLocation();
+        mSelAreaName = mDetailBean.getLocation();
+
+        mSelBelongCode = mDetailBean.getBelongDeptCode();
+        mSelBelongId = mDetailBean.getBelongDept();
+        mSelBelongName = mDetailBean.getBelongDeptName();
+        mTvBelongArea.setText(mSelBelongName);
+
         mEtAddress.setText(mDetailBean.getSchoolAddress());
         mTvSchoolType.setText(mDetailBean.getRunningTypeName());
         mSelType = new DicBean();
@@ -498,16 +521,23 @@ public class SchoolManageAddActivity extends BaseActivity {
     /**
      * 显示地区选择
      */
-    private void onShowArea() {
+    private void onShowArea(int type) {
         AreaChooseDialog dialog = new AreaChooseDialog
             .DialogBuilder(mActivity)
             .setDefault(true)
             .build();
         dialog.addOnChoseListener((names, id, code) -> {
-            mSelAreaCode = code;
-            mSelAreaId = id;
-            mSelAreaName = names;
-            mTvArea.setText(names);
+            if (type == 1) {
+                mSelAreaCode = code;
+                mSelAreaId = id;
+                mSelAreaName = names;
+                mTvArea.setText(names);
+            } else {
+                mSelBelongCode = code;
+                mSelBelongId = id;
+                mSelBelongName = names;
+                mTvBelongArea.setText(mSelBelongName);
+            }
             dialog.dismiss();
         });
         dialog.show();
@@ -564,14 +594,15 @@ public class SchoolManageAddActivity extends BaseActivity {
         LayerView layerView = new LayerView(this);
         layerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         layerView.setCRS(crs);
         mMvMap.addLayer(layerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(12);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     @Override
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java
index 99d8a9d..93b2cec 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java
@@ -89,6 +89,8 @@ public class SchoolManageDetailActivity extends BaseActivity {
     TouchMapView mMvMap;
     @BindView(R2.id.tv_grid)
     TextView mTvGrid;
+    @BindView(R2.id.tv_grid_area)
+    TextView mTvGridArea;
     private Unbinder mBind;
     private String mId;
     private SchoolDetailBean mDetailBean;
@@ -233,6 +235,7 @@ public class SchoolManageDetailActivity extends BaseActivity {
         refreshView(STATE_LOAD_SUCCESS);
         mTvName.setText(mDetailBean.getSchoolName());
         mTvArea.setText(mDetailBean.getBelongDeptName());
+        mTvGridArea.setText(mDetailBean.getLocation());
         mTvAddress.setText(mDetailBean.getSchoolAddress());
         mTvSchoolType.setText(mDetailBean.getRunningTypeName());
         mTvAddressSel.setText(mDetailBean.getLatitude() + "-" + mDetailBean.getLongitude());
@@ -270,13 +273,14 @@ public class SchoolManageDetailActivity extends BaseActivity {
         LayerView layerView = new LayerView(this);
         layerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         layerView.setCRS(crs);
         mMvMap.addLayer(layerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(12);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 }
\ No newline at end of file
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java
index 05cbc88..0e3f3aa 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java
@@ -283,13 +283,14 @@ public class ExpressPoiDetailActivity extends BaseActivity {
         LayerView layerView = new LayerView(this);
         layerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         layerView.setCRS(crs);
         mMvMap.addLayer(layerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(12);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 }
\ No newline at end of file
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java
index 5902170..d4a71b9 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java
@@ -94,6 +94,8 @@ public class KeyAreaAddActivity extends BaseActivity {
     TextView mTvGrid;
     @BindView(R2.id.nsv_content)
     NestedScrollView mNsvContent;
+    @BindView(R2.id.tv_location)
+    TextView mTvLocation;
     private Unbinder mBind;
 
     private OptionsPickerView mExtrudePicker;
@@ -110,6 +112,8 @@ public class KeyAreaAddActivity extends BaseActivity {
     private String mSelAreaName;
     private String mSelAreaId;
     private AreaGridListBean.RowsBean mSelGridBean;
+    private Double mLat;
+    private Double mLng;
 
     @Override
     protected int setLayoutId() {
@@ -141,6 +145,9 @@ public class KeyAreaAddActivity extends BaseActivity {
         mTvExtrude.setOnClickListener(v -> onShowExtrude());
         mTvAreaType.setOnClickListener(v -> onShowAreaType());
         mTvAssess.setOnClickListener(v -> onShowAssess());
+        mTvLocation.setOnClickListener(v -> ARouter.getInstance()
+            .build(PathConfig.PATH_MODULE_MAP_SEL_POINT)
+            .navigation(mActivity, 16));
         mTvGrid.setOnClickListener(v -> {
             if (TextUtils.isEmpty(mSelAreaCode)) {
                 ToastUtils.show("请选择所在地区");
@@ -205,6 +212,12 @@ public class KeyAreaAddActivity extends BaseActivity {
                 mSelGridBean = (AreaGridListBean.RowsBean) data.getSerializableExtra("bean");
                 mTvGrid.setText(mSelGridBean.getGridName());
             }
+        } else if (requestCode == 16) {
+            if (resultCode == 22) {
+                mLat = data.getDoubleExtra("lat", -1);
+                mLng = data.getDoubleExtra("lng", -1);
+                mTvLocation.setText(mLat + "-" + mLng);
+            }
         }
     }
 
@@ -430,6 +443,10 @@ public class KeyAreaAddActivity extends BaseActivity {
         bean.setGrid(mSelGridBean.getGridId());
         String name = mEtName.getText().toString().trim();
         bean.setSecurityArea(name);
+
+        bean.setLatitude(mLat + "");
+        bean.setLongitude(mLng + "");
+
         String scope = mEtAreaScope.getText().toString().trim();
         bean.setInvolveAreaRange(scope);
         bean.setSecurityQuestion(mSelExtrude.getDataId());
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java
index 4164f74..762fba4 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java
@@ -79,6 +79,8 @@ public class KeyAreaDetailActivity extends BaseActivity {
     TextView mTvArea;
     @BindView(R2.id.tv_grid)
     TextView mTvGrid;
+    @BindView(R2.id.tv_location)
+    TextView mTvLocation;
     private Unbinder mBind;
     private String mId;
     private KeyAreaDetailBean mDetailBean;
@@ -223,6 +225,7 @@ public class KeyAreaDetailActivity extends BaseActivity {
         mTvArea.setText(mDetailBean.getLocation());
         mTvGrid.setText(mDetailBean.getGridName());
         mTvName.setText(mDetailBean.getSecurityArea());
+        mTvLocation.setText(mDetailBean.getLatitude() + "-" + mDetailBean.getLongitude());
         mTvExtrude.setText(mDetailBean.getSecurityQuestionName());
         mTvAreaType.setText(mDetailBean.getInvolveAreaTypeName());
         mTvAreaScope.setText(Html.fromHtml(mDetailBean.getInvolveAreaRange()));
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java
index c1a39d2..b22030f 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java
@@ -90,6 +90,8 @@ public class KeyAreaEditActivity extends BaseActivity {
     TextView mTvArea;
     @BindView(R2.id.tv_grid)
     TextView mTvGrid;
+    @BindView(R2.id.tv_location)
+    TextView mTvLocation;
 
 
     private SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -110,6 +112,8 @@ public class KeyAreaEditActivity extends BaseActivity {
     private String mSelAreaName;
     private String mSelAreaId;
     private AreaGridListBean.RowsBean mSelGridBean;
+    private Double mLat;
+    private Double mLng;
 
     @Override
     protected int setLayoutId() {
@@ -142,6 +146,9 @@ public class KeyAreaEditActivity extends BaseActivity {
         mTvExtrude.setOnClickListener(v -> onShowExtrude());
         mTvAreaType.setOnClickListener(v -> onShowAreaType());
         mTvAssess.setOnClickListener(v -> onShowAssess());
+        mTvLocation.setOnClickListener(v -> ARouter.getInstance()
+            .build(PathConfig.PATH_MODULE_MAP_SEL_POINT)
+            .navigation(mActivity, 16));
         mTvGrid.setOnClickListener(v -> {
             if (TextUtils.isEmpty(mSelAreaCode)) {
                 ToastUtils.show("请选择所在地区");
@@ -181,6 +188,12 @@ public class KeyAreaEditActivity extends BaseActivity {
                 mSelGridBean = (AreaGridListBean.RowsBean) data.getSerializableExtra("bean");
                 mTvGrid.setText(mSelGridBean.getGridName());
             }
+        } else if (requestCode == 16) {
+            if (resultCode == 22) {
+                mLat = data.getDoubleExtra("lat", -1);
+                mLng = data.getDoubleExtra("lng", -1);
+                mTvLocation.setText(mLat + "-" + mLng);
+            }
         }
     }
 
@@ -470,6 +483,9 @@ public class KeyAreaEditActivity extends BaseActivity {
         bean.setSecurityQuestionCode(mSelExtrude.getDataSummary());
         bean.setSecurityQuestionName(mSelExtrude.getDataName());
 
+        bean.setLatitude(mLat + "");
+        bean.setLongitude(mLng + "");
+
         bean.setInvolveAreaType(mSelAreaType.getDataId());
         bean.setInvolveAreaTypeCode(mSelAreaType.getDataSummary());
         bean.setInvolveAreaTypeName(mSelAreaType.getDataName());
@@ -525,6 +541,12 @@ public class KeyAreaEditActivity extends BaseActivity {
         mSelGridBean.setGridName(mDetailBean.getGridName());
         mTvGrid.setText(mDetailBean.getGridName());
         mTvArea.setText(mDetailBean.getLocation());
+        if (!TextUtils.isEmpty(mDetailBean.getLatitude())) {
+            mLat = Double.parseDouble(mDetailBean.getLatitude());
+            mLng = Double.parseDouble(mDetailBean.getLongitude());
+            mTvLocation.setText(mLat + "-" + mLng);
+        }
+
         mSelAreaType = new DicBean();
         mTvAreaType.setText(mDetailBean.getInvolveAreaTypeName());
         mSelAreaType.setDataSummary(mDetailBean.getInvolveAreaTypeCode());
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java
index 2d40325..fd52e62 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java
@@ -225,14 +225,15 @@ public class KeyPlaceDetailActivity extends BaseActivity {
         LayerView layerView = new LayerView(this);
         layerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         layerView.setCRS(crs);
         mMvMap.addLayer(layerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(12);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     @Override
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/InspectionPatrolActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/InspectionPatrolActivity.java
index 190c51f..9c02d91 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/InspectionPatrolActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/InspectionPatrolActivity.java
@@ -1,7 +1,7 @@
 package com.tengshisoft.gridmodule.incident.activitys.tasks;
 
 import android.content.Intent;
-import android.widget.TextView;
+import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -46,6 +46,7 @@ public class InspectionPatrolActivity extends BaseActivity {
     private Unbinder mBind;
     private List<BaseFragment> mFragments;
     private List<String> mTitles = Arrays.asList("待办巡查", "督办巡查", "预警巡查", "已办巡查");
+    private List<ConditionBean> mConditionBeans;
 
     @Override
     protected int setLayoutId() {
@@ -57,10 +58,15 @@ public class InspectionPatrolActivity extends BaseActivity {
     public void initData() {
         mBind = ButterKnife.bind(this);
         mTvBaseTitle.setText("巡查巡检");
+        mIvAppSearchIcon.setVisibility(View.VISIBLE);
+        mTvOptions.setVisibility(View.VISIBLE);
+        mTvSearchBack.setVisibility(View.GONE);
+        mTvOptions.setText("排序");
         refreshView(STATE_LOAD_SUCCESS);
         initViews();
     }
 
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -118,17 +124,66 @@ public class InspectionPatrolActivity extends BaseActivity {
         commonNavigator.setAdjustMode(true);
         mMiTabs.setNavigator(commonNavigator);
         UIUtil.bindViewPager2(mMiTabs, mVpContent, null);
+        mConditionBeans = new ArrayList<>();
+        ConditionBean bean1 = new ConditionBean();
+        bean1.setName("下派时间");
+        bean1.setId("orderDistributeTime");
+        ConditionBean bean2 = new ConditionBean();
+        bean2.setName("截止时间");
+        bean2.setId("orderDistributeDeadline");
+        ConditionBean bean3 = new ConditionBean();
+        bean3.setName("督查时间");
+        bean3.setId("orderSupervisionTime");
+        ConditionBean bean4 = new ConditionBean();
+        bean4.setName("区域");
+        bean4.setId("orderArea");
+        ConditionBean bean5 = new ConditionBean();
+        bean5.setName("预警时间");
+        bean5.setId("orderWarningTime");
+        mConditionBeans.add(bean1);
+        mConditionBeans.add(bean2);
+        mConditionBeans.add(bean3);
+        mConditionBeans.add(bean4);
+        mConditionBeans.add(bean5);
     }
 
 
+    /**
+     * 显示条件选择
+     */
+    private void showConditionPop() {
+        ConditionPopup popup = new ConditionPopup(this, mConditionBeans);
+        popup.addOnCheckChange((bean, ischeck) -> {
+            if (ischeck) {
+                mSelCondition = bean.getId();
+            } else {
+                mSelCondition = "";
+            }
+            doSearch();
+            popup.dismiss();
+        });
+        popup.showPopupWindow(mTvOptions);
+    }
+
     @Override
     protected void doShowOptions() {
+        showConditionPop();
+    }
 
+
+    private void doSearch() {
+        int currentItem = mVpContent.getCurrentItem();
+        BaseFragment fragment = mFragments.get(currentItem);
+        fragment.refreshContentView(mSelCondition, mEtAppSearchContent.getText().toString().trim());
     }
 
     @Override
     protected void clearSearch() {
-
+        mEtAppSearchContent.setText("");
+        mSelCondition = "";
+        int currentItem = mVpContent.getCurrentItem();
+        BaseFragment baseFragment = mFragments.get(currentItem);
+        baseFragment.refreshContentView("", "");
     }
 
     @Override
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskManageActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskManageActivity.java
index 68ad340..a0584bd 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskManageActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskManageActivity.java
@@ -1,7 +1,7 @@
 package com.tengshisoft.gridmodule.incident.activitys.tasks;
 
 import android.content.Intent;
-import android.widget.TextView;
+import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -24,11 +24,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -46,8 +42,6 @@ public class TaskManageActivity extends BaseActivity {
     MagicIndicator mMiTabs;
     @BindView(R2.id.vp_content)
     ViewPager2 mVpContent;
-    @BindView(R2.id.tv_condition)
-    TextView mTvCondition;
     private String mSelCondition;
     private Unbinder mBind;
     private List<BaseFragment> mFragments;
@@ -64,6 +58,10 @@ public class TaskManageActivity extends BaseActivity {
     public void initData() {
         mBind = ButterKnife.bind(this);
         mTvBaseTitle.setText("任务管理");
+        mIvAppSearchIcon.setVisibility(View.VISIBLE);
+        mTvOptions.setVisibility(View.VISIBLE);
+        mTvSearchBack.setVisibility(View.GONE);
+        mTvOptions.setText("排序");
         refreshView(STATE_LOAD_SUCCESS);
         initViews();
     }
@@ -82,6 +80,23 @@ public class TaskManageActivity extends BaseActivity {
         }
     }
 
+    /**
+     * 显示条件选择
+     */
+    private void showConditionPop() {
+        ConditionPopup popup = new ConditionPopup(this, mConditionBeans);
+        popup.addOnCheckChange((bean, ischeck) -> {
+            if (ischeck) {
+                mSelCondition = bean.getId();
+            } else {
+                mSelCondition = "";
+            }
+            doSearch();
+            popup.dismiss();
+        });
+        popup.showPopupWindow(mTvOptions);
+    }
+
     /**
      * 初始化视图
      */
@@ -126,34 +141,47 @@ public class TaskManageActivity extends BaseActivity {
         mMiTabs.setNavigator(commonNavigator);
         UIUtil.bindViewPager2(mMiTabs, mVpContent, null);
         mConditionBeans = new ArrayList<>();
-        mTvCondition.setOnClickListener(v -> showConditionPop());
-    }
-
-
-    /**
-     * 显示条件选择
-     */
-    private void showConditionPop() {
-        ConditionPopup popup = new ConditionPopup(this, mConditionBeans);
-        popup.addOnCheckChange((bean, ischeck) -> {
-            if (ischeck) {
-                mSelCondition = bean.getName();
-            } else {
-                mSelCondition = "";
-            }
-            popup.dismiss();
-        });
-        popup.showPopupWindow(mTvCondition);
+        ConditionBean bean1 = new ConditionBean();
+        bean1.setName("下派时间");
+        bean1.setId("orderDistributeTime");
+        ConditionBean bean2 = new ConditionBean();
+        bean2.setName("截止时间");
+        bean2.setId("orderDistributeDeadline");
+        ConditionBean bean3 = new ConditionBean();
+        bean3.setName("督查时间");
+        bean3.setId("orderSupervisionTime");
+        ConditionBean bean4 = new ConditionBean();
+        bean4.setName("区域");
+        bean4.setId("orderArea");
+        ConditionBean bean5 = new ConditionBean();
+        bean5.setName("预警时间");
+        bean5.setId("orderWarningTime");
+        mConditionBeans.add(bean1);
+        mConditionBeans.add(bean2);
+        mConditionBeans.add(bean3);
+        mConditionBeans.add(bean4);
+        mConditionBeans.add(bean5);
     }
 
     @Override
     protected void doShowOptions() {
+        showConditionPop();
+    }
 
+
+    private void doSearch() {
+        int currentItem = mVpContent.getCurrentItem();
+        BaseFragment fragment = mFragments.get(currentItem);
+        fragment.refreshContentView(mSelCondition, mEtAppSearchContent.getText().toString().trim());
     }
 
     @Override
     protected void clearSearch() {
-
+        mEtAppSearchContent.setText("");
+        mSelCondition = "";
+        int currentItem = mVpContent.getCurrentItem();
+        BaseFragment baseFragment = mFragments.get(currentItem);
+        baseFragment.refreshContentView("", "");
     }
 
     @Override
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java
index 15030b9..d943973 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java
@@ -60,9 +60,9 @@ public class TaskFragment extends BaseFragment {
     private String isWarning = "";//1 获取预警任务
     private String isSupervision = "";//1 获取督办任务
     private String mTaskType;
+    private String mOrder = "";
 
     @Override
-
     protected int getContentViewId() {
         return R.layout.fragment_task_list;
     }
@@ -240,9 +240,8 @@ public class TaskFragment extends BaseFragment {
         mCurrentPage = page;
         RetrofitManager.getInstance()
             .create(GridApis.class)
-            .getTaskListByType("已下派", mTaskType, mState, isWarning, isSupervision, type, page + "", UserLgUtils.getToken())
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
+            .getTaskListByType("已下派", mOrder, mTaskType, mState, isWarning, isSupervision, type, page + "", UserLgUtils.getToken())
+            .compose(RxTransformer.getTransformer())
             .subscribe(new Observer<TaskListBean>() {
                 @Override
                 public void onSubscribe(@NonNull Disposable d) {
@@ -296,6 +295,14 @@ public class TaskFragment extends BaseFragment {
             });
     }
 
+
+
+    @Override
+    public void refreshContentView(String... data) {
+        mOrder = data[0];
+        doRefresh();
+    }
+
     public void doRefresh() {
         refreshView();
     }
diff --git a/gridmodule/src/main/res/layout/activity_building_add.xml b/gridmodule/src/main/res/layout/activity_building_add.xml
index 5728001..df5dfae 100644
--- a/gridmodule/src/main/res/layout/activity_building_add.xml
+++ b/gridmodule/src/main/res/layout/activity_building_add.xml
@@ -78,6 +78,24 @@
                     android:hint="请选择楼宇类型" />
             </LinearLayout>
 
+            <LinearLayout style="@style/item_gray">
+
+                <ImageView
+                    style="@style/style_hint_star"
+                    android:visibility="visible" />
+
+                <TextView
+                    style="@style/item_title"
+                    android:text="经纬度" />
+
+                <View style="@style/vertical_line" />
+
+                <TextView
+                    android:id="@+id/tv_location"
+                    style="@style/sel_text_arrow"
+                    android:hint="请选择楼宇所在经纬度" />
+            </LinearLayout>
+
             <LinearLayout style="@style/item_gray">
 
                 <ImageView
diff --git a/gridmodule/src/main/res/layout/activity_building_detail.xml b/gridmodule/src/main/res/layout/activity_building_detail.xml
index d6b3de6..b44a921 100644
--- a/gridmodule/src/main/res/layout/activity_building_detail.xml
+++ b/gridmodule/src/main/res/layout/activity_building_detail.xml
@@ -127,6 +127,23 @@
                             style="@style/item_content" />
                     </LinearLayout>
 
+                    <LinearLayout style="@style/item_gray">
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:visibility="invisible" />
+
+                        <TextView
+                            style="@style/item_title"
+                            android:text="经纬度" />
+
+                        <View style="@style/vertical_line" />
+
+                        <TextView
+                            android:id="@+id/tv_location"
+                            style="@style/item_content" />
+                    </LinearLayout>
+
                     <LinearLayout style="@style/item_gray">
 
                         <ImageView
diff --git a/gridmodule/src/main/res/layout/activity_building_edit.xml b/gridmodule/src/main/res/layout/activity_building_edit.xml
index 5728001..12b9e5d 100644
--- a/gridmodule/src/main/res/layout/activity_building_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_building_edit.xml
@@ -77,6 +77,23 @@
                     style="@style/sel_text_arrow"
                     android:hint="请选择楼宇类型" />
             </LinearLayout>
+            <LinearLayout style="@style/item_gray">
+
+                <ImageView
+                    style="@style/style_hint_star"
+                    android:visibility="visible" />
+
+                <TextView
+                    style="@style/item_title"
+                    android:text="经纬度" />
+
+                <View style="@style/vertical_line" />
+
+                <TextView
+                    android:id="@+id/tv_location"
+                    style="@style/sel_text_arrow"
+                    android:hint="请选择楼宇所在经纬度" />
+            </LinearLayout>
 
             <LinearLayout style="@style/item_gray">
 
diff --git a/gridmodule/src/main/res/layout/activity_community_area_add.xml b/gridmodule/src/main/res/layout/activity_community_area_add.xml
index 54406c8..6778226 100644
--- a/gridmodule/src/main/res/layout/activity_community_area_add.xml
+++ b/gridmodule/src/main/res/layout/activity_community_area_add.xml
@@ -81,6 +81,22 @@
                     android:hint="请选择所在网格" />
             </LinearLayout>
 
+            <LinearLayout style="@style/item_gray">
+
+                <ImageView style="@style/style_hint_star" />
+
+                <TextView
+                    style="@style/item_title"
+                    android:text="所在坐标" />
+
+                <View style="@style/vertical_line" />
+
+                <TextView
+                    android:id="@+id/tv_location"
+                    style="@style/sel_text_arrow"
+                    android:hint="请选择所在坐标" />
+            </LinearLayout>
+
             <LinearLayout style="@style/item_gray">
 
                 <ImageView
diff --git a/gridmodule/src/main/res/layout/activity_community_area_detail.xml b/gridmodule/src/main/res/layout/activity_community_area_detail.xml
index a0d4cf2..ae1e88a 100644
--- a/gridmodule/src/main/res/layout/activity_community_area_detail.xml
+++ b/gridmodule/src/main/res/layout/activity_community_area_detail.xml
@@ -119,6 +119,20 @@
                             style="@style/item_content" />
                     </LinearLayout>
 
+                    <LinearLayout style="@style/item_gray">
+
+
+                        <TextView
+                            style="@style/item_title"
+                            android:text="所在坐标" />
+
+                        <View style="@style/vertical_line" />
+
+                        <TextView
+                            android:id="@+id/tv_location"
+                            style="@style/item_content" />
+                    </LinearLayout>
+
                     <LinearLayout style="@style/item_gray">
 
                         <TextView
diff --git a/gridmodule/src/main/res/layout/activity_community_area_edit.xml b/gridmodule/src/main/res/layout/activity_community_area_edit.xml
index 8d963ae..f2dc264 100644
--- a/gridmodule/src/main/res/layout/activity_community_area_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_community_area_edit.xml
@@ -79,6 +79,21 @@
                     style="@style/sel_text_arrow"
                     android:hint="请选择所在网格" />
             </LinearLayout>
+            <LinearLayout style="@style/item_gray">
+
+                <ImageView style="@style/style_hint_star" />
+
+                <TextView
+                    style="@style/item_title"
+                    android:text="所在坐标" />
+
+                <View style="@style/vertical_line" />
+
+                <TextView
+                    android:id="@+id/tv_location"
+                    style="@style/sel_text_arrow"
+                    android:hint="请选择所在坐标" />
+            </LinearLayout>
 
             <LinearLayout style="@style/item_gray">
 
diff --git a/gridmodule/src/main/res/layout/activity_key_area_add.xml b/gridmodule/src/main/res/layout/activity_key_area_add.xml
index 31f0786..865cb14 100644
--- a/gridmodule/src/main/res/layout/activity_key_area_add.xml
+++ b/gridmodule/src/main/res/layout/activity_key_area_add.xml
@@ -66,6 +66,24 @@
                     android:hint="请选择所在网格" />
             </LinearLayout>
 
+            <LinearLayout style="@style/item_gray">
+
+                <ImageView
+                    style="@style/style_hint_star"
+                    android:visibility="visible" />
+
+                <TextView
+                    style="@style/item_title"
+                    android:text="所在经纬度" />
+
+                <View style="@style/vertical_line" />
+
+                <TextView
+                    android:id="@+id/tv_location"
+                    style="@style/sel_text_arrow"
+                    android:hint="请选择所在经纬度" />
+            </LinearLayout>
+
             <LinearLayout style="@style/item_gray">
 
                 <ImageView
diff --git a/gridmodule/src/main/res/layout/activity_key_area_detail.xml b/gridmodule/src/main/res/layout/activity_key_area_detail.xml
index af6b8ab..88b53a1 100644
--- a/gridmodule/src/main/res/layout/activity_key_area_detail.xml
+++ b/gridmodule/src/main/res/layout/activity_key_area_detail.xml
@@ -102,6 +102,23 @@
                     style="@style/item_content" />
             </LinearLayout>
 
+            <LinearLayout style="@style/item_gray">
+
+                <ImageView
+                    style="@style/style_hint_star"
+                    android:visibility="invisible" />
+
+                <TextView
+                    style="@style/item_title"
+                    android:text="经纬度" />
+
+                <View style="@style/vertical_line" />
+
+                <TextView
+                    android:id="@+id/tv_location"
+                    style="@style/item_content" />
+            </LinearLayout>
+
             <LinearLayout style="@style/item_gray">
 
                 <ImageView
diff --git a/gridmodule/src/main/res/layout/activity_key_area_edit.xml b/gridmodule/src/main/res/layout/activity_key_area_edit.xml
index 31f0786..5291fa4 100644
--- a/gridmodule/src/main/res/layout/activity_key_area_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_key_area_edit.xml
@@ -66,6 +66,24 @@
                     android:hint="请选择所在网格" />
             </LinearLayout>
 
+            <LinearLayout style="@style/item_gray">
+
+                <ImageView
+                    style="@style/style_hint_star"
+                    android:visibility="visible" />
+
+                <TextView
+                    style="@style/item_title"
+                    android:text="经纬度" />
+
+                <View style="@style/vertical_line" />
+
+                <TextView
+                    android:id="@+id/tv_location"
+                    style="@style/sel_text_arrow"
+                    android:hint="请选择经纬度" />
+            </LinearLayout>
+
             <LinearLayout style="@style/item_gray">
 
                 <ImageView
diff --git a/gridmodule/src/main/res/layout/activity_school_manage_add.xml b/gridmodule/src/main/res/layout/activity_school_manage_add.xml
index 8a0e12f..4c30292 100644
--- a/gridmodule/src/main/res/layout/activity_school_manage_add.xml
+++ b/gridmodule/src/main/res/layout/activity_school_manage_add.xml
@@ -58,7 +58,6 @@
                             android:inputType="text" />
                     </LinearLayout>
 
-
                     <LinearLayout style="@style/item_gray">
 
                         <ImageView
@@ -71,10 +70,28 @@
 
                         <View style="@style/vertical_line" />
 
+                        <TextView
+                            android:id="@+id/tv_belong_area"
+                            style="@style/sel_text_arrow"
+                            android:hint="请选择学校所属主管教育行政部门" />
+                    </LinearLayout>
+
+                    <LinearLayout style="@style/item_gray">
+
+                        <ImageView
+                            style="@style/style_hint_star"
+                            android:visibility="visible" />
+
+                        <TextView
+                            style="@style/item_title"
+                            android:text="所在地" />
+
+                        <View style="@style/vertical_line" />
+
                         <TextView
                             android:id="@+id/tv_area"
                             style="@style/sel_text_arrow"
-                            android:hint="请选择学校所属行政区域" />
+                            android:hint="请选择学校所在地" />
                     </LinearLayout>
 
                     <LinearLayout style="@style/item_gray">
diff --git a/gridmodule/src/main/res/layout/activity_school_manage_detail.xml b/gridmodule/src/main/res/layout/activity_school_manage_detail.xml
index 0df1df5..a8c5d4f 100644
--- a/gridmodule/src/main/res/layout/activity_school_manage_detail.xml
+++ b/gridmodule/src/main/res/layout/activity_school_manage_detail.xml
@@ -106,6 +106,19 @@
                             style="@style/item_content" />
                     </LinearLayout>
 
+                    <LinearLayout style="@style/item_gray">
+
+
+                        <TextView
+                            style="@style/item_title"
+                            android:text="所在地" />
+
+                        <View style="@style/vertical_line" />
+
+                        <TextView
+                            android:id="@+id/tv_grid_area"
+                            style="@style/item_content" />
+                    </LinearLayout>
 
                     <LinearLayout style="@style/item_gray">
 
diff --git a/gridmodule/src/main/res/layout/activity_search_house_by_person.xml b/gridmodule/src/main/res/layout/activity_search_house_by_person.xml
index 02cf222..926d822 100644
--- a/gridmodule/src/main/res/layout/activity_search_house_by_person.xml
+++ b/gridmodule/src/main/res/layout/activity_search_house_by_person.xml
@@ -8,7 +8,6 @@
     android:orientation="vertical"
     tools:context=".incident.activitys.building.CommunityManageActivity">
 
-    <include layout="@layout/item_base_search" />
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/gridmodule/src/main/res/layout/activity_task_manage.xml b/gridmodule/src/main/res/layout/activity_task_manage.xml
index a89d971..9f93fbe 100644
--- a/gridmodule/src/main/res/layout/activity_task_manage.xml
+++ b/gridmodule/src/main/res/layout/activity_task_manage.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -8,31 +7,13 @@
     android:orientation="vertical"
     tools:context=".incident.activitys.tasks.TaskManageActivity">
 
-    <LinearLayout
+
+    <net.lucode.hackware.magicindicator.MagicIndicator
+        android:id="@+id/mi_tabs"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shp_bottom_shadow_white_no_radius"
-        android:orientation="horizontal">
+        android:layout_height="50dp"
+        android:background="@drawable/shp_bottom_shadow_white_no_radius" />
 
-        <net.lucode.hackware.magicindicator.MagicIndicator
-            android:id="@+id/mi_tabs"
-            android:layout_width="match_parent"
-            android:layout_height="40dp" />
-
-        <TextView
-            android:id="@+id/tv_condition"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:clickable="true"
-            android:drawableRight="@drawable/ic_arrow_down_circle"
-            android:elevation="12dp"
-            android:focusable="true"
-            android:gravity="center"
-            android:padding="5dp"
-            android:text="筛选"
-            android:textColor="@color/black"
-            android:visibility="gone" />
-    </LinearLayout>
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/vp_content"
diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java
index 5d3044d..8821dc9 100755
--- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java
+++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java
@@ -161,6 +161,7 @@ public class LoginActivity extends BaseActivity {
                 login();
             }
         }
+        setTouchDelegate(mIvClosePhone, 25);
         mIvClosePhone.setOnClickListener(v -> mEtUserPhone.setText(""));
         initDatabase();
     }
diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java
index 479828c..b23597c 100644
--- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java
+++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java
@@ -26,7 +26,6 @@ import com.tengshisoft.chatmodule.keeplive.KeepLiveManage;
 import com.tengshisoft.commonmodule.fragments.SmartConsultFragment;
 import com.tengshisoft.mainmodule.R;
 import com.tengshisoft.mainmodule.R2;
-import com.tengshisoft.modulemap.common.PointUtils;
 import com.tenlionsoft.baselib.app.BaseAppContext;
 import com.tenlionsoft.baselib.constant.BaseConfig;
 import com.tenlionsoft.baselib.constant.BroadcastConstant;
@@ -101,25 +100,15 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
         return R.layout.activity_main_tab;
     }
 
-    @Override
-    protected void doShowOptions() {
-
-    }
-
-    @Override
-    protected void clearSearch() {
-
-    }
-
-    @Override
-    protected void doSearchByTitle() {
-    }
 
     @Override
     public void initData() {
         ImmersionBar.with(this).init();
         mBind = ButterKnife.bind(this);
         refreshView(STATE_LOAD_SUCCESS);
+//        Double[] location84 = PointUtils.WGS84ToGCJ02(40.86203084729672, 111.75787075968162);
+//        LogUtils.e(location84[0] + "," + location84[1]);
+
         mFragments = new ArrayList<>();
         initContentView();
         startLocation();
@@ -348,7 +337,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
         mBnv.addItem(new BottomNavigationItem(R.drawable.sel_bottom_tab_activity, "网格"))
             .addItem(new BottomNavigationItem(R.drawable.sel_bottom_tab_activity, "部门"))
             .addItem(new BottomNavigationItem(R.drawable.sel_bottom_tab_place, "咨询"))
-            .addItem(new BottomNavigationItem(R.drawable.sel_bottom_tab_place, "中心"))
+            .addItem(new BottomNavigationItem(R.drawable.sel_bottom_tab_activity, "中心"))
             .addItem(new BottomNavigationItem(R.drawable.sel_bottom_tab_mine, "我的"))
             .setFirstSelectedPosition(0)
             .initialise();
@@ -693,4 +682,18 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
             finishTime = time;
         }
     }
+
+    @Override
+    protected void doShowOptions() {
+
+    }
+
+    @Override
+    protected void clearSearch() {
+
+    }
+
+    @Override
+    protected void doSearchByTitle() {
+    }
 }
\ No newline at end of file
diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java
index 46942f3..5528276 100755
--- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java
+++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java
@@ -17,9 +17,7 @@ import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
 import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
 import com.tenlionsoft.baselib.core.widget.base.BaseFragment;
 import com.tenlionsoft.baselib.core.widget.base.FunctionNumAdapter;
-import com.tenlionsoft.baselib.core.widget.views.CenterFuncDialogView;
 import com.tenlionsoft.baselib.core.widget.views.ChooseFuncDialogView;
-import com.tenlionsoft.baselib.utils.LogUtils;
 import com.tenlionsoft.baselib.utils.UserLgUtils;
 
 import org.jetbrains.annotations.NotNull;
@@ -85,40 +83,58 @@ public class GridMainFragment extends BaseFragment {
         "护路护线",
         "统计分析"};
     private int[] mBtnIds = new int[]{
+        R.drawable.ic_sign_in,
+        R.drawable.ic_house_person,
+        R.drawable.ic_contact_icon,
+        R.drawable.ic_work_locus,
         R.drawable.ic_case_report,
-        R.drawable.ic_case_report,
-        R.drawable.ic_case_record,
-        R.drawable.ic_case_record,
-        R.drawable.ic_case_record,
         R.drawable.ic_case_dispose,
-        R.drawable.ic_case_dispose,
-        R.drawable.ic_work_path,
-        R.drawable.ic_address_list,
-        R.drawable.ic_notify_ad,
-        R.drawable.ic_notify_ad,
-        R.drawable.ic_notify_ad,
-        R.drawable.ic_notify_ad,
-        R.drawable.ic_case_record,
-        R.drawable.ic_notify_ad,
-        R.drawable.ic_case_dispose,
-        R.drawable.ic_notify_ad,
-        R.drawable.ic_notify_ad,
-        R.drawable.ic_notify_ad,
-        R.drawable.ic_case_dispose,
-        R.drawable.ic_case_dispose
+        R.drawable.ic_case_check,
+        R.drawable.ic_school_manage,
+        R.drawable.ic_know_ledge,
+        R.drawable.ic_parts_manage,
+        R.drawable.ic_patrol_manage,
+        R.drawable.ic_task_manage,
+        R.drawable.ic_org_manage,
+        R.drawable.ic_car_manage,
+        R.drawable.ic_ems_manage,
+        R.drawable.ic_young_case_manage,
+        R.drawable.ic_homicide_manage,
+        R.drawable.ic_key_area,
+        R.drawable.ic_key_place,
+        R.drawable.ic_road_manage,
+        R.drawable.ic_statis_icon
     };
     private FunctionNumAdapter mNumAdapter;
-    private String[] mOrgsTitle = new String[]{"非公有制经济组织", "社会组织"};
+    private String[] mOrgsTitle = new String[]{
+        "非公有制经济组织",
+        "社会组织"};
     private int[] mOrgIds = new int[]{
-        com.tenlionsoft.baselib.R.drawable.ic_address_list,
-        com.tenlionsoft.baselib.R.drawable.ic_address_list};
-
-
-    private String[] mSecurityTitle = new String[]{"命案基本信息", "命案犯罪嫌疑人", "命案受害人"};
+        R.drawable.ic_dialog_nopublic,
+        R.drawable.ic_dialog_public_org};
+    private String[] mSecurityTitle = new String[]{
+        "命案基本信息",
+        "命案犯罪嫌疑人",
+        "命案受害人"};
     private int[] mSecurityIds = new int[]{
-        com.tenlionsoft.baselib.R.drawable.ic_address_list,
-        com.tenlionsoft.baselib.R.drawable.ic_address_list,
-        com.tenlionsoft.baselib.R.drawable.ic_address_list};
+        R.drawable.ic_homicide_manage,
+        R.drawable.ic_dialog_suspect,
+        R.drawable.ic_dialog_victim};
+    private String[] mHouseTitle = new String[]{
+        "小区管理",
+        "楼宇管理",
+        "房屋管理",
+        "社区管理",
+        "以人找房",
+        "人口库"};
+    private int[] mHouseIds = new int[]{
+        R.drawable.ic_dialog_xiaoqu,
+        R.drawable.ic_dialog_building,
+        R.drawable.ic_dialog_house,
+        R.drawable.ic_dialog_community,
+        R.drawable.ic_dialog_search_person,
+        R.drawable.ic_dialog_person_lib
+    };
     private Disposable mDisposable;
 
     @Override
@@ -145,10 +161,10 @@ public class GridMainFragment extends BaseFragment {
         mLlHistory.setOnClickListener(v -> ARouter.getInstance()
             .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_MINE_LIST)
             .navigation());
-
-//        mLlNotify.setOnClickListener(v -> ARouter.getInstance()
-//                .build(PathConfig.PATH_MODULE_GRID_ISSUE_NOTICE)
-//                .navigation());
+        /*=测试==*/
+        mLlNotify.setOnClickListener(v -> ARouter.getInstance()
+            .build(PathConfig.PATH_MODULE_COMMON_DEMO)
+            .navigation());
         mLlPlan.setOnClickListener(v -> ARouter.getInstance()
             .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DONE)
             .navigation());
@@ -430,72 +446,51 @@ public class GridMainFragment extends BaseFragment {
      * 显示人口
      */
     private void showCensusDialog() {
-        CenterFuncDialogView build = new CenterFuncDialogView.DialogBuilder(mActivity)
-            .setIscancelable(true)
-            .setIsBackCancelable(true)
-            .build();
-        build.addOnChoseListener(new CenterFuncDialogView.OnChoseListener() {
-            @Override
-            public void choseFile() {
-                build.dismiss();
-                //社区管理
-                ARouter.getInstance()
-                    .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_LIST)
-                    .withInt("type", 1)
-                    .navigation();
+        List<FuncBean> beans = new ArrayList<>();
+        for (int i = 0; i < mHouseTitle.length; i++) {
+            FuncBean bean = new FuncBean();
+            bean.setHintNum(0);
+            bean.setIconRes(mHouseIds[i]);
+            bean.setText(mHouseTitle[i]);
+            beans.add(bean);
+        }
+        FunctionNumAdapter adapter = new FunctionNumAdapter(mActivity, beans);
+        ChooseFuncDialogView dialogView = new ChooseFuncDialogView.DialogBuilder(mActivity).setAdapter(adapter).build();
+        dialogView.addOnChoseListener(bean2 -> {
+            switch (bean2.getText()) {
+                case "小区管理":
+                    ARouter.getInstance().build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_MANAGE).navigation();
+                    break;
+                case "楼宇管理":
+                    ARouter.getInstance()
+                        .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_BUILDING_LIST)
+                        .navigation();
+                    break;
+                case "房屋管理":
+                    ARouter.getInstance()
+                        .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_HOUSE_LIST)
+                        .navigation();
+                    break;
+                case "社区管理":
+                    ARouter.getInstance()
+                        .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_LIST)
+                        .withInt("type", 1)
+                        .navigation();
+                    break;
+                case "以人找房":
+                    ARouter.getInstance()
+                        .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_SEARCH_HOUSE_BY_PERSON)
+                        .navigation();
+                    break;
+                case "人口库":
+                    ARouter.getInstance()
+                        .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MAIN)
+                        .navigation();
+                    break;
             }
-
-            @Override
-            public void choseAlbum() {
-                //户籍人口
-                ARouter.getInstance()
-                    .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_BUILDING_LIST)
-                    .navigation();
-                build.dismiss();
-            }
-
-            @Override
-            public void choseShoot() {
-                //出租
-                ARouter.getInstance()
-                    .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_HOUSE_LIST)
-                    .navigation();
-                build.dismiss();
-            }
-
-            @Override
-            public void loginOut() {
-
-            }
-
-            @Override
-            public void changePwd() {
-                //房屋管理
-                ARouter.getInstance().build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_MANAGE).navigation();
-                build.dismiss();
-            }
-
-            //以人找房
-            @Override
-            public void searchPerson() {
-                build.dismiss();
-                ARouter.getInstance()
-                    .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_SEARCH_HOUSE_BY_PERSON)
-                    .navigation();
-            }
-
-            //以房找人
-            @Override
-            public void searchHouse() {
-                //人口库
-                build.dismiss();
-                ARouter.getInstance()
-                    .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MAIN)
-                    .navigation();
-            }
-
+            dialogView.dismiss();
         });
-        build.show();
+        dialogView.show();
     }
 
     /**
diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/LeaderMainFragment.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/LeaderMainFragment.java
index 3d599e3..2e5ca8e 100755
--- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/LeaderMainFragment.java
+++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/LeaderMainFragment.java
@@ -71,14 +71,13 @@ public class LeaderMainFragment extends BaseFragment {
         "归档事件",
         "知识库"};
     private int[] mBtnIds = new int[]{
-        R.drawable.ic_case_report,
-        R.drawable.ic_case_record,
-        R.drawable.ic_case_dispose,
-        R.drawable.ic_case_dispose,
-        R.drawable.ic_work_path,
-        R.drawable.ic_case_dispose,
-        R.drawable.ic_work_path,
-        R.drawable.ic_address_list};
+        R.drawable.ic_case_accept,
+        R.drawable.ic_case_dispatch,
+        R.drawable.ic_case_time_out,
+        R.drawable.ic_case_supervise,
+        R.drawable.ic_case_result,
+        R.drawable.ic_case_archives,
+        R.drawable.ic_know_ledge};
     private FunctionNumAdapter mNumAdapter;
     private Disposable mDisposable;
 
diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/SupervisionMainFragment.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/SupervisionMainFragment.java
index e0dc2e1..83b26a3 100755
--- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/SupervisionMainFragment.java
+++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/SupervisionMainFragment.java
@@ -21,7 +21,6 @@ import com.tenlionsoft.baselib.core.widget.base.BaseFragment;
 import com.tenlionsoft.baselib.core.widget.base.FunctionNumAdapter;
 import com.tenlionsoft.baselib.utils.UserLgUtils;
 
-import org.aspectj.lang.annotation.Around;
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -63,22 +62,27 @@ public class SupervisionMainFragment extends BaseFragment {
     LinearLayout mLlPlan;
     private Unbinder mBind;
     private List<FuncBean> mFuncs = new ArrayList<>();
-    private String[] mBtnStrs = new String[]{"事件受理", "事件派遣", "超时预警事件", "事件核查", "延期审核", "督办消息", "知识库", "统计分析"};
+    private String[] mBtnStrs = new String[]{"事件受理",
+        "事件派遣",
+        "超时预警事件",
+        "事件核查",
+        "延期审核",
+        "督办消息",
+        "知识库"};
     private int[] mBtnIds = new int[]{
-        R.drawable.ic_case_report,
-        R.drawable.ic_case_record,
-        R.drawable.ic_case_dispose,
-        R.drawable.ic_case_dispose,
-        R.drawable.ic_work_path,
-        R.drawable.ic_work_path,
-        R.drawable.ic_case_dispose,
-        R.drawable.ic_case_dispose};
+        R.drawable.ic_case_accept,
+        R.drawable.ic_case_dispatch,
+        R.drawable.ic_case_time_out,
+        R.drawable.ic_case_check,
+        R.drawable.ic_case_examine,
+        R.drawable.ic_case_supervise,
+        R.drawable.ic_know_ledge};
     private FunctionNumAdapter mNumAdapter;
     private Disposable mDisposable;
 
     @Override
     protected int getContentViewId() {
-        return R.layout.fragment_main_leader;
+        return R.layout.fragment_main_supervision;
     }
 
     @Override
diff --git a/mainmodule/src/main/res/drawable-xhdpi/app_logo.png b/mainmodule/src/main/res/drawable-xhdpi/app_logo.png
new file mode 100644
index 0000000..fd88f68
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/app_logo.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_car_manage.png b/mainmodule/src/main/res/drawable-xhdpi/ic_car_manage.png
new file mode 100644
index 0000000..6d4e5e8
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_car_manage.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_case_accept.png b/mainmodule/src/main/res/drawable-xhdpi/ic_case_accept.png
new file mode 100644
index 0000000..88a73b8
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_case_accept.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_case_archives.png b/mainmodule/src/main/res/drawable-xhdpi/ic_case_archives.png
new file mode 100644
index 0000000..7c10fe2
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_case_archives.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_case_check.png b/mainmodule/src/main/res/drawable-xhdpi/ic_case_check.png
new file mode 100644
index 0000000..593bf94
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_case_check.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_case_dispatch.png b/mainmodule/src/main/res/drawable-xhdpi/ic_case_dispatch.png
new file mode 100644
index 0000000..6385f92
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_case_dispatch.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_case_dispose.png b/mainmodule/src/main/res/drawable-xhdpi/ic_case_dispose.png
index f945fa1..f151910 100644
Binary files a/mainmodule/src/main/res/drawable-xhdpi/ic_case_dispose.png and b/mainmodule/src/main/res/drawable-xhdpi/ic_case_dispose.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_case_examine.png b/mainmodule/src/main/res/drawable-xhdpi/ic_case_examine.png
new file mode 100644
index 0000000..3e01251
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_case_examine.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_case_report.png b/mainmodule/src/main/res/drawable-xhdpi/ic_case_report.png
index 0e58892..5568cee 100644
Binary files a/mainmodule/src/main/res/drawable-xhdpi/ic_case_report.png and b/mainmodule/src/main/res/drawable-xhdpi/ic_case_report.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_case_result.png b/mainmodule/src/main/res/drawable-xhdpi/ic_case_result.png
new file mode 100644
index 0000000..e63cfad
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_case_result.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_case_supervise.png b/mainmodule/src/main/res/drawable-xhdpi/ic_case_supervise.png
new file mode 100644
index 0000000..074a3e6
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_case_supervise.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_case_time_out.png b/mainmodule/src/main/res/drawable-xhdpi/ic_case_time_out.png
new file mode 100644
index 0000000..6a961e4
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_case_time_out.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_contact_icon.png b/mainmodule/src/main/res/drawable-xhdpi/ic_contact_icon.png
new file mode 100644
index 0000000..7658ea3
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_contact_icon.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_building.png b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_building.png
new file mode 100644
index 0000000..816d323
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_building.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_community.png b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_community.png
new file mode 100644
index 0000000..166d573
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_community.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_house.png b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_house.png
new file mode 100644
index 0000000..ac3d8cb
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_house.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_nopublic.png b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_nopublic.png
new file mode 100644
index 0000000..a3a7ade
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_nopublic.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_person_lib.png b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_person_lib.png
new file mode 100644
index 0000000..d88d5fd
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_person_lib.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_public_org.png b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_public_org.png
new file mode 100644
index 0000000..addfcf7
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_public_org.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_search_person.png b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_search_person.png
new file mode 100644
index 0000000..4b1218b
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_search_person.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_suspect.png b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_suspect.png
new file mode 100644
index 0000000..f54e526
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_suspect.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_victim.png b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_victim.png
new file mode 100644
index 0000000..e26cc60
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_victim.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_xiaoqu.png b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_xiaoqu.png
new file mode 100644
index 0000000..e412b10
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_dialog_xiaoqu.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_ems_manage.png b/mainmodule/src/main/res/drawable-xhdpi/ic_ems_manage.png
new file mode 100644
index 0000000..1678d3c
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_ems_manage.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_grid_title.png b/mainmodule/src/main/res/drawable-xhdpi/ic_grid_title.png
index d69d44e..24981fd 100644
Binary files a/mainmodule/src/main/res/drawable-xhdpi/ic_grid_title.png and b/mainmodule/src/main/res/drawable-xhdpi/ic_grid_title.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_home_normal.png b/mainmodule/src/main/res/drawable-xhdpi/ic_home_normal.png
new file mode 100644
index 0000000..c2ab17d
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_home_normal.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_home_sel.png b/mainmodule/src/main/res/drawable-xhdpi/ic_home_sel.png
new file mode 100644
index 0000000..54d3a64
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_home_sel.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_homicide_manage.png b/mainmodule/src/main/res/drawable-xhdpi/ic_homicide_manage.png
new file mode 100644
index 0000000..5d7aec6
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_homicide_manage.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_house_person.png b/mainmodule/src/main/res/drawable-xhdpi/ic_house_person.png
new file mode 100644
index 0000000..b770cf8
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_house_person.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_key_area.png b/mainmodule/src/main/res/drawable-xhdpi/ic_key_area.png
new file mode 100644
index 0000000..675762a
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_key_area.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_key_place.png b/mainmodule/src/main/res/drawable-xhdpi/ic_key_place.png
new file mode 100644
index 0000000..37abd76
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_key_place.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_know_ledge.png b/mainmodule/src/main/res/drawable-xhdpi/ic_know_ledge.png
new file mode 100644
index 0000000..f70b7f8
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_know_ledge.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_mine_normal.png b/mainmodule/src/main/res/drawable-xhdpi/ic_mine_normal.png
index 3064035..c6900ea 100644
Binary files a/mainmodule/src/main/res/drawable-xhdpi/ic_mine_normal.png and b/mainmodule/src/main/res/drawable-xhdpi/ic_mine_normal.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_mine_sel.png b/mainmodule/src/main/res/drawable-xhdpi/ic_mine_sel.png
index 562846d..35bc663 100644
Binary files a/mainmodule/src/main/res/drawable-xhdpi/ic_mine_sel.png and b/mainmodule/src/main/res/drawable-xhdpi/ic_mine_sel.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_org_manage.png b/mainmodule/src/main/res/drawable-xhdpi/ic_org_manage.png
new file mode 100644
index 0000000..95a9ac6
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_org_manage.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_parts_manage.png b/mainmodule/src/main/res/drawable-xhdpi/ic_parts_manage.png
new file mode 100644
index 0000000..ae4efd9
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_parts_manage.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_patrol_manage.png b/mainmodule/src/main/res/drawable-xhdpi/ic_patrol_manage.png
new file mode 100644
index 0000000..1581daa
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_patrol_manage.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_refer_normal.png b/mainmodule/src/main/res/drawable-xhdpi/ic_refer_normal.png
new file mode 100644
index 0000000..5537418
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_refer_normal.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_refer_sel.png b/mainmodule/src/main/res/drawable-xhdpi/ic_refer_sel.png
new file mode 100644
index 0000000..3da8a7f
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_refer_sel.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_road_manage.png b/mainmodule/src/main/res/drawable-xhdpi/ic_road_manage.png
new file mode 100644
index 0000000..ee2e7ec
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_road_manage.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_school_manage.png b/mainmodule/src/main/res/drawable-xhdpi/ic_school_manage.png
new file mode 100644
index 0000000..1ca9cdc
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_school_manage.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_sign_in.png b/mainmodule/src/main/res/drawable-xhdpi/ic_sign_in.png
new file mode 100644
index 0000000..c9714c7
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_sign_in.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_statis_icon.png b/mainmodule/src/main/res/drawable-xhdpi/ic_statis_icon.png
new file mode 100644
index 0000000..e181724
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_statis_icon.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_task_manage.png b/mainmodule/src/main/res/drawable-xhdpi/ic_task_manage.png
new file mode 100644
index 0000000..6d34fd2
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_task_manage.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_work_locus.png b/mainmodule/src/main/res/drawable-xhdpi/ic_work_locus.png
new file mode 100644
index 0000000..46c65f5
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_work_locus.png differ
diff --git a/mainmodule/src/main/res/drawable-xhdpi/ic_young_case_manage.png b/mainmodule/src/main/res/drawable-xhdpi/ic_young_case_manage.png
new file mode 100644
index 0000000..deea257
Binary files /dev/null and b/mainmodule/src/main/res/drawable-xhdpi/ic_young_case_manage.png differ
diff --git a/mainmodule/src/main/res/drawable/sel_bottom_tab_activity.xml b/mainmodule/src/main/res/drawable/sel_bottom_tab_activity.xml
index f6da2f7..ea58ab8 100644
--- a/mainmodule/src/main/res/drawable/sel_bottom_tab_activity.xml
+++ b/mainmodule/src/main/res/drawable/sel_bottom_tab_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_activity_normal" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_activity_sel" android:state_selected="true" />
+    <item android:drawable="@drawable/ic_home_normal" android:state_selected="false" />
+    <item android:drawable="@drawable/ic_home_sel" android:state_selected="true" />
 </selector>
\ No newline at end of file
diff --git a/mainmodule/src/main/res/drawable/sel_bottom_tab_place.xml b/mainmodule/src/main/res/drawable/sel_bottom_tab_place.xml
index e1a3cf6..7b9ddb1 100644
--- a/mainmodule/src/main/res/drawable/sel_bottom_tab_place.xml
+++ b/mainmodule/src/main/res/drawable/sel_bottom_tab_place.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_place_normal" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_place_sel" android:state_selected="true" />
+    <item android:drawable="@drawable/ic_refer_normal" android:state_selected="false" />
+    <item android:drawable="@drawable/ic_refer_sel" android:state_selected="true" />
 </selector>
\ No newline at end of file
diff --git a/mainmodule/src/main/res/layout/activity_splash.xml b/mainmodule/src/main/res/layout/activity_splash.xml
index 706044e..54a8b75 100644
--- a/mainmodule/src/main/res/layout/activity_splash.xml
+++ b/mainmodule/src/main/res/layout/activity_splash.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_login">
+    android:background="@drawable/splash_bg">
 
 
     <TextView
diff --git a/mainmodule/src/main/res/layout/fragment_main_grid.xml b/mainmodule/src/main/res/layout/fragment_main_grid.xml
index f83c33b..4f5c57e 100644
--- a/mainmodule/src/main/res/layout/fragment_main_grid.xml
+++ b/mainmodule/src/main/res/layout/fragment_main_grid.xml
@@ -36,6 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
+                android:visibility="gone"
                 android:background="@drawable/shp_trans_item_bg"
                 android:orientation="vertical"
                 android:padding="8dp">
diff --git a/mainmodule/src/main/res/layout/fragment_main_leader.xml b/mainmodule/src/main/res/layout/fragment_main_leader.xml
index 237d4fe..cd3d049 100644
--- a/mainmodule/src/main/res/layout/fragment_main_leader.xml
+++ b/mainmodule/src/main/res/layout/fragment_main_leader.xml
@@ -35,6 +35,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
+                android:visibility="gone"
                 android:background="@drawable/shp_trans_item_bg"
                 android:orientation="vertical"
                 android:padding="8dp">
@@ -73,7 +74,7 @@
                 android:background="@drawable/shp_trans_item_bg"
                 android:orientation="vertical"
                 android:padding="8dp"
-                android:visibility="visible">
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/tv_history_num"
diff --git a/mainmodule/src/main/res/layout/fragment_main_supervision.xml b/mainmodule/src/main/res/layout/fragment_main_supervision.xml
index 905fc83..6d669ca 100644
--- a/mainmodule/src/main/res/layout/fragment_main_supervision.xml
+++ b/mainmodule/src/main/res/layout/fragment_main_supervision.xml
@@ -37,7 +37,8 @@
                 android:layout_margin="5dp"
                 android:background="@drawable/shp_trans_item_bg"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="8dp"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/tv_aviso_num"
@@ -73,7 +74,7 @@
                 android:background="@drawable/shp_trans_item_bg"
                 android:orientation="vertical"
                 android:padding="8dp"
-                android:visibility="visible">
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/tv_history_num"
@@ -129,7 +130,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:gravity="center"
-                    android:text="我的企业"
+                    android:text="已办事件"
                     android:textColor="@color/white"
                     android:textSize="12sp" />
             </LinearLayout>
diff --git a/modulemap/build.gradle b/modulemap/build.gradle
index 9362995..772ffd7 100644
--- a/modulemap/build.gradle
+++ b/modulemap/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.2.1'
     implementation project(':baselib')
-    implementation project(':GisMap')
+    implementation project(':gismapmodule')
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'//地图
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
diff --git a/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java b/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java
index 37d5b39..852cd27 100644
--- a/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java
+++ b/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java
@@ -112,11 +112,11 @@ public class SelPointActivity extends BaseActivity {
         mBaseLayerView = new LayerView(this);
         mBaseLayerView.setURL(PathConfig.BASE_LAYER);
         CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
-        crs.wkid = 4326;
+        crs.wkid = PathConfig.CRS;
         mBaseLayerView.setCRS(crs);
         mMvMap.addLayer(mBaseLayerView);
-        mMvMap.getController().setCenter(new Point2D(116.391468, 39.904491));
-        mMvMap.getController().setZoom(6);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
         mMvMap.setBuiltInZoomControls(false);//内置缩放控件
         mMvMap.setClickable(true);
         mMvMap.getOverlays().add(new TouchOverlay());
diff --git a/settings.gradle b/settings.gradle
index 01c829b..846fa0c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,4 +9,4 @@ include ':supervisionmodule'
 include ':commandmodule'
 include ':commonmodule'
 include ':moduleijkplayer'
-include ':GisMap'
+include ':gismapmodule'
diff --git a/supervisionmodule/build.gradle b/supervisionmodule/build.gradle
index 27cfa77..8ed7ed1 100644
--- a/supervisionmodule/build.gradle
+++ b/supervisionmodule/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     implementation project(':modulemap')
     implementation project(':commonmodule')
     implementation project(':moduleijkplayer')
+    implementation project(':gismapmodule')
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'//地图
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
diff --git a/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentAcceptDeptDetailActivity.java b/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentAcceptDeptDetailActivity.java
index 2f3f88a..cee8721 100644
--- a/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentAcceptDeptDetailActivity.java
+++ b/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentAcceptDeptDetailActivity.java
@@ -13,6 +13,11 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.google.gson.Gson;
 import com.hjq.toast.ToastUtils;
+import com.supermap.imobilelite.maps.CoordinateReferenceSystem;
+import com.supermap.imobilelite.maps.DefaultItemizedOverlay;
+import com.supermap.imobilelite.maps.LayerView;
+import com.supermap.imobilelite.maps.OverlayItem;
+import com.supermap.imobilelite.maps.Point2D;
 import com.tengshisoft.commonmodule.adapters.IncidentTagListAdapter;
 import com.tengshisoft.commonmodule.beans.AcceptSaveBean;
 import com.tengshisoft.commonmodule.beans.IncidentDetailBean;
@@ -21,6 +26,7 @@ import com.tengshisoft.commonmodule.beans.SuccessBean;
 import com.tengshisoft.commonmodule.beans.TagListBean;
 import com.tengshisoft.commonmodule.nets.DeptApis;
 import com.tengshisoft.commonmodule.nets.GridApis;
+import com.tengshisoft.gismap.TouchMapView;
 import com.tengshisoft.supervisionmodule.R;
 import com.tengshisoft.supervisionmodule.R2;
 import com.tenlionsoft.baselib.constant.PathConfig;
@@ -98,6 +104,8 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
     NestedScrollView mNsvContent;
     @BindView(R2.id.rlv_tags)
     RecyclerView mRlvTags;
+    @BindView(R2.id.mv_map)
+    TouchMapView mMvMap;
     private Unbinder mBind;
     private String mTaskId;
     private int mLevel;
@@ -168,6 +176,7 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
         mOperates.add(diffBean);
         mOperates.add(applyBean);
         mOperates.add(abolishBean);
+        initMap();
     }
 
     /**
@@ -226,6 +235,25 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
         intputView.show();
     }
 
+    private DefaultItemizedOverlay mItemizedOverlay;
+
+    private void initMap() {
+        Drawable marker = getResources().getDrawable(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker);
+        mItemizedOverlay = new DefaultItemizedOverlay(marker);
+        LayerView layerView = new LayerView(this);
+        layerView.setURL(PathConfig.BASE_LAYER);
+        CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
+        crs.wkid = PathConfig.CRS;
+        layerView.setCRS(crs);
+        mMvMap.addLayer(layerView);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
+        mMvMap.setBuiltInZoomControls(false);//内置缩放控件
+        mMvMap.setClickable(true);
+        mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
+    }
+
     /**
      * 标杆事件
      */
@@ -598,7 +626,11 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
         mTvContent.setText(b.getReportContent());
         double lat = Double.parseDouble(b.getReportLat());
         double lng = Double.parseDouble(b.getReportLng());
-
+        Point2D point = new Point2D(lng, lat);
+        mMvMap.getController().setCenter(point);
+        OverlayItem item = new OverlayItem(point, "", "");
+        mItemizedOverlay.addItem(item);
+        mMvMap.invalidate();
 
         if (!TextUtils.isEmpty(b.getReportPhotos())) {
             //有图片
diff --git a/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentCheckDeptDetailActivity.java b/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentCheckDeptDetailActivity.java
index 6c2f321..423616b 100644
--- a/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentCheckDeptDetailActivity.java
+++ b/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentCheckDeptDetailActivity.java
@@ -17,6 +17,11 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.google.gson.Gson;
 import com.hjq.toast.ToastUtils;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
+import com.supermap.imobilelite.maps.CoordinateReferenceSystem;
+import com.supermap.imobilelite.maps.DefaultItemizedOverlay;
+import com.supermap.imobilelite.maps.LayerView;
+import com.supermap.imobilelite.maps.OverlayItem;
+import com.supermap.imobilelite.maps.Point2D;
 import com.tengshisoft.commonmodule.adapters.IncidentTagListAdapter;
 import com.tengshisoft.commonmodule.beans.AcceptSaveBean;
 import com.tengshisoft.commonmodule.beans.DispatchDetailBean;
@@ -27,6 +32,7 @@ import com.tengshisoft.commonmodule.beans.SuccessBean;
 import com.tengshisoft.commonmodule.beans.TagListBean;
 import com.tengshisoft.commonmodule.nets.DeptApis;
 import com.tengshisoft.commonmodule.nets.GridApis;
+import com.tengshisoft.gismap.TouchMapView;
 import com.tengshisoft.supervisionmodule.R;
 import com.tengshisoft.supervisionmodule.R2;
 import com.tenlionsoft.baselib.constant.PathConfig;
@@ -145,6 +151,8 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
     TextView mTvDeferTime;
     @BindView(R2.id.ll_defer_time)
     LinearLayout mLlDeferTime;
+    @BindView(R2.id.mv_map)
+    TouchMapView mMvMap;
     private Unbinder mBind;
     private IncidentDetailBean mIncidentDetailBean;
     private String mReportId;
@@ -213,6 +221,26 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
         mOperates.add(warnBean);
         mOperates.add(collectBean);
         mOperates.add(diffBean);
+        initMap();
+    }
+
+    private DefaultItemizedOverlay mItemizedOverlay;
+
+    private void initMap() {
+        Drawable marker = getResources().getDrawable(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker);
+        mItemizedOverlay = new DefaultItemizedOverlay(marker);
+        LayerView layerView = new LayerView(this);
+        layerView.setURL(PathConfig.BASE_LAYER);
+        CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
+        crs.wkid = PathConfig.CRS;
+        layerView.setCRS(crs);
+        mMvMap.addLayer(layerView);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
+        mMvMap.setBuiltInZoomControls(false);//内置缩放控件
+        mMvMap.setClickable(true);
+        mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     /**
@@ -696,7 +724,11 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
         mTvContent.setText(mIncidentDetailBean.getReportContent());
         double lat = Double.parseDouble(mIncidentDetailBean.getReportLat());
         double lng = Double.parseDouble(mIncidentDetailBean.getReportLng());
-
+        Point2D point = new Point2D(lng, lat);
+        mMvMap.getController().setCenter(point);
+        OverlayItem item = new OverlayItem(point, "", "");
+        mItemizedOverlay.addItem(item);
+        mMvMap.invalidate();
 
         if (!TextUtils.isEmpty(mIncidentDetailBean.getReportPhotos())) {
             //有图片
diff --git a/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentDistributionDeptDetailActivity.java b/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentDistributionDeptDetailActivity.java
index c8bde8c..82650a6 100644
--- a/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentDistributionDeptDetailActivity.java
+++ b/supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentDistributionDeptDetailActivity.java
@@ -19,6 +19,11 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.bigkoo.pickerview.view.TimePickerView;
 import com.google.gson.Gson;
 import com.hjq.toast.ToastUtils;
+import com.supermap.imobilelite.maps.CoordinateReferenceSystem;
+import com.supermap.imobilelite.maps.DefaultItemizedOverlay;
+import com.supermap.imobilelite.maps.LayerView;
+import com.supermap.imobilelite.maps.OverlayItem;
+import com.supermap.imobilelite.maps.Point2D;
 import com.tengshisoft.commonmodule.adapters.IncidentTagListAdapter;
 import com.tengshisoft.commonmodule.beans.ChoosePersonListBean;
 import com.tengshisoft.commonmodule.beans.DepartmentListBean;
@@ -29,6 +34,7 @@ import com.tengshisoft.commonmodule.beans.SuccessBean;
 import com.tengshisoft.commonmodule.beans.TagListBean;
 import com.tengshisoft.commonmodule.nets.DeptApis;
 import com.tengshisoft.commonmodule.nets.GridApis;
+import com.tengshisoft.gismap.TouchMapView;
 import com.tengshisoft.supervisionmodule.R;
 import com.tengshisoft.supervisionmodule.R2;
 import com.tenlionsoft.baselib.constant.PathConfig;
@@ -117,6 +123,8 @@ public class IncidentDistributionDeptDetailActivity extends BaseActivity {
     Button mBtnSubmit;
     @BindView(R2.id.rlv_tags)
     RecyclerView mRlvTags;
+    @BindView(R2.id.mv_map)
+    TouchMapView mMvMap;
     private Unbinder mBind;
     //    private String mId;
     private String mTaskId;
@@ -215,6 +223,26 @@ public class IncidentDistributionDeptDetailActivity extends BaseActivity {
         mOperates.add(warnBean);
         mOperates.add(collectBean);
         mOperates.add(diffBean);
+        initMap();
+    }
+
+    private DefaultItemizedOverlay mItemizedOverlay;
+
+    private void initMap() {
+        Drawable marker = getResources().getDrawable(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker);
+        mItemizedOverlay = new DefaultItemizedOverlay(marker);
+        LayerView layerView = new LayerView(this);
+        layerView.setURL(PathConfig.BASE_LAYER);
+        CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
+        crs.wkid = PathConfig.CRS;
+        layerView.setCRS(crs);
+        mMvMap.addLayer(layerView);
+        mMvMap.getController().setCenter(new Point2D(PathConfig.DEFAULT_LNG, PathConfig.DEFAULT_LAT));
+        mMvMap.getController().setZoom(PathConfig.DEFAULT_ZOOM);
+        mMvMap.setBuiltInZoomControls(false);//内置缩放控件
+        mMvMap.setClickable(true);
+        mMvMap.getOverlays().add(mItemizedOverlay);
+        mMvMap.invalidate();
     }
 
     /**
@@ -262,12 +290,12 @@ public class IncidentDistributionDeptDetailActivity extends BaseActivity {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(new Observer<SuccessBean>() {
                 @Override
-                public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
+                public void onSubscribe(@NonNull Disposable d) {
 
                 }
 
                 @Override
-                public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) {
+                public void onNext(@NonNull SuccessBean successBean) {
                     dialog.dismiss();
                     ToastUtils.show("操作成功");
                     OperateBean bean1 = new OperateBean();
@@ -279,7 +307,7 @@ public class IncidentDistributionDeptDetailActivity extends BaseActivity {
                 }
 
                 @Override
-                public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
+                public void onError(@NonNull Throwable e) {
                     dialog.dismiss();
                     ExceptionHandler.handleException(e);
                 }
@@ -305,12 +333,12 @@ public class IncidentDistributionDeptDetailActivity extends BaseActivity {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(new Observer<SuccessBean>() {
                 @Override
-                public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
+                public void onSubscribe(@NonNull Disposable d) {
 
                 }
 
                 @Override
-                public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) {
+                public void onNext(@NonNull SuccessBean successBean) {
                     dialog.dismiss();
                     ToastUtils.show("操作成功");
                     OperateBean bean1 = new OperateBean();
@@ -322,7 +350,7 @@ public class IncidentDistributionDeptDetailActivity extends BaseActivity {
                 }
 
                 @Override
-                public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
+                public void onError(@NonNull Throwable e) {
                     dialog.dismiss();
                     ExceptionHandler.handleException(e);
                 }
@@ -348,12 +376,12 @@ public class IncidentDistributionDeptDetailActivity extends BaseActivity {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(new Observer<SuccessBean>() {
                 @Override
-                public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
+                public void onSubscribe(@NonNull Disposable d) {
 
                 }
 
                 @Override
-                public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) {
+                public void onNext(@NonNull SuccessBean successBean) {
                     dialog.dismiss();
                     ToastUtils.show("操作成功");
                     OperateBean bean1 = new OperateBean();
@@ -365,7 +393,7 @@ public class IncidentDistributionDeptDetailActivity extends BaseActivity {
                 }
 
                 @Override
-                public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
+                public void onError(@NonNull Throwable e) {
                     dialog.dismiss();
                     ExceptionHandler.handleException(e);
                 }
@@ -391,12 +419,12 @@ public class IncidentDistributionDeptDetailActivity extends BaseActivity {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(new Observer<SuccessBean>() {
                 @Override
-                public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
+                public void onSubscribe(@NonNull Disposable d) {
 
                 }
 
                 @Override
-                public void onNext(@io.reactivex.rxjava3.annotations.NonNull SuccessBean successBean) {
+                public void onNext(@NonNull SuccessBean successBean) {
                     dialog.dismiss();
                     ToastUtils.show("操作成功");
                     OperateBean bean1 = new OperateBean();
@@ -408,7 +436,7 @@ public class IncidentDistributionDeptDetailActivity extends BaseActivity {
                 }
 
                 @Override
-                public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
+                public void onError(@NonNull Throwable e) {
                     dialog.dismiss();
                     ExceptionHandler.handleException(e);
                 }
@@ -590,7 +618,11 @@ public class IncidentDistributionDeptDetailActivity extends BaseActivity {
         mTvContent.setText(b.getReportContent());
         double lat = Double.parseDouble(b.getReportLat());
         double lng = Double.parseDouble(b.getReportLng());
-
+        Point2D point = new Point2D(lng, lat);
+        mMvMap.getController().setCenter(point);
+        OverlayItem item = new OverlayItem(point, "", "");
+        mItemizedOverlay.addItem(item);
+        mMvMap.invalidate();
 
         if (!TextUtils.isEmpty(b.getReportPhotos())) {
             //有图片
diff --git a/supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml b/supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml
index d5cb33b..8de0b9a 100644
--- a/supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml
+++ b/supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml
@@ -190,6 +190,13 @@
                                 style="@style/item_content" />
                         </LinearLayout>
 
+                        <LinearLayout style="@style/item_gray_vertical_top">
+
+                            <com.tengshisoft.gismap.TouchMapView
+                                android:id="@+id/mv_map"
+                                android:layout_width="match_parent"
+                                android:layout_height="200dp" />
+                        </LinearLayout>
 
                         <LinearLayout style="@style/item_gray_vertical">
 
diff --git a/supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml b/supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml
index c352ce6..38208b8 100644
--- a/supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml
+++ b/supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml
@@ -196,6 +196,14 @@
                                     style="@style/item_content" />
                             </LinearLayout>
 
+                            <LinearLayout style="@style/item_gray_vertical_top">
+
+                                <com.tengshisoft.gismap.TouchMapView
+                                    android:id="@+id/mv_map"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="200dp" />
+                            </LinearLayout>
+
 
                             <LinearLayout style="@style/item_gray_vertical">
 
diff --git a/supervisionmodule/src/main/res/layout/activity_incident_distribution_detail.xml b/supervisionmodule/src/main/res/layout/activity_incident_distribution_detail.xml
index ed17ce5..934667f 100644
--- a/supervisionmodule/src/main/res/layout/activity_incident_distribution_detail.xml
+++ b/supervisionmodule/src/main/res/layout/activity_incident_distribution_detail.xml
@@ -189,6 +189,14 @@
                                 style="@style/item_content" />
                         </LinearLayout>
 
+                        <LinearLayout style="@style/item_gray_vertical_top">
+
+                            <com.tengshisoft.gismap.TouchMapView
+                                android:id="@+id/mv_map"
+                                android:layout_width="match_parent"
+                                android:layout_height="200dp" />
+                        </LinearLayout>
+
 
                         <LinearLayout style="@style/item_gray_vertical">