点位修改

.idea/encodings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/app/src/main/assets/pointInfo.json" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/src/main/assets/pointInfo.json" charset="GBK" />
+  </component>
+</project>

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.zhilin.patrol"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 5
-        versionName "1.0.5"
+        versionCode 6
+        versionName "1.0.6"
         ndk {
 // 设置支持的SO库架构 注意如果是虚拟机使用的话需要吧x86加上去 否则无法运行的
             abiFilters 'armeabi'  //, ‘x86’, ‘armeabi-v7a’, ‘x86_64’, ‘arm64-v8a’}
@@ -66,6 +66,7 @@ dependencies {
     implementation files('libs/AMap.jar')
     implementation files('libs/pinyin4j-2.5.0.jar')
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'com.contrarywind:Android-PickerView:4.1.9'
 
 //    //3D地图so及jar
 //    implementation 'com.amap.api:3dmap:latest.integration'

app/src/main/assets/pointInfo.json

@@ -0,0 +1,2693 @@
+{
+    "returnCode": "1000",
+    "returnMsg": "请求成功!",
+    "infoList": [
+        {
+            "name": "江岸区",
+            "disCode": "201807131038513vrh0a",
+            "street": [
+                {
+                    "name": "四唯街道",
+                    "area": [
+                        "袁家社区",
+                        "塘新社区",
+                        "六合社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "花桥街",
+                    "area": [
+                        "大江园社区",
+                        "科苑社区",
+                        "花桥社区",
+                        "育才社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "劳动街",
+                    "area": [
+                        "公园社区",
+                        "国信苑社区",
+                        "惠中社区",
+                        "艺苑社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "球场街",
+                    "area": [
+                        "货捐社区",
+                        "球新社区",
+                        "安静社区",
+                        "同庆阁社区",
+                        "阳春阁社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "后湖街",
+                    "area": [
+                        "后湖苑社区",
+                        "海赋社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "二七街道",
+                    "area": [
+                        "香杉花园",
+                        "滨江苑一期",
+                        "长建社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "新村街",
+                    "area": [
+                        "新江岸社区",
+                        "黑泥湖社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "大智街道",
+                    "area": [
+                        "吉庆社区",
+                        "铭新社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "车站街道",
+                    "area": [
+                        "华清社区华清园",
+                        "华清社区",
+                        "三德社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "台北街道",
+                    "area": [
+                        "宝岛社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "西马街",
+                    "area": [
+                        "江北社区",
+                        "高雄社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "塔子湖街道",
+                    "area": [
+                        "跃进社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "一元街道",
+                    "area": [
+                        "三阳社区",
+                        "洞庭社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "永清街",
+                    "area": [
+                        "新天地社区",
+                        "仁义社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "丹水池街",
+                    "area": [
+                        "堤角社区",
+                        "汉黄社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "百步亭管委会",
+                    "area": [
+                        "三居委会",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "谌家矶街",
+                    "area": [
+                        "天兴花园社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "四唯街办事处",
+                    "area": [
+                        "五福社区",
+                        "袁家社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "胜利街",
+                    "area": [
+                        "执法委员会",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "五福路",
+                    "area": [
+                        "五福社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "一元街办事处",
+                    "area": [
+                        "扬子社区",
+                        "三阳社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "谌家矶街办事处",
+                    "area": [
+                        "谌家矶社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "西马街办事处",
+                    "area": [
+                        "江汉北路社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "球场街办事处",
+                    "area": [
+                        "同庆阁社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "花桥街办事处",
+                    "area": [
+                        "大江园社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "永清街办事处",
+                    "area": [
+                        "新天地社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "新村街办事处",
+                    "area": [
+                        "新江岸社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "台北街办事处",
+                    "area": [
+                        "宝岛社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "后湖街办事处",
+                    "area": [
+                        "海赋社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "车站街办事处",
+                    "area": [
+                        "华清社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "大智街办事处",
+                    "area": [
+                        "保成社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "江汉区",
+            "disCode": "20180713110330aixn47",
+            "street": [
+                {
+                    "name": "花水街",
+                    "area": [
+                        "花楼社区",
+                        "江汉关社区",
+                        "东民社区",
+                        "华中社区",
+                        "交通路社区",
+                        "老甫社区",
+                        "联保社区",
+                        "苗家社区",
+                        "前进社区",
+                        "永康社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "民意街",
+                    "area": [
+                        "多闻社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "常青街",
+                    "area": [
+                        "复兴社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "唐家墩街",
+                    "area": [
+                        "八古墩社区",
+                        "八古墩里社区",
+                        "工人新村社区",
+                        "唐蔡社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "北湖街",
+                    "area": [
+                        "横堤社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "万松街",
+                    "area": [
+                        "商一社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "民权街",
+                    "area": [
+                        "王家巷社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "新华街",
+                    "area": [
+                        "省运社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "汉兴街",
+                    "area": [
+                        "新松里社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "前进街",
+                    "area": [
+                        "燕马社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "满春街",
+                    "area": [
+                        "肖家社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "民族街",
+                    "area": [
+                        "和平社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "一元街道",
+                    "area": [
+                        "三阳社区",
+                        "洞庭社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "宗关街",
+                    "area": [
+                        "水厂社区",
+                        "宗关社区",
+                        "双墩社区",
+                        "发展社区",
+                        "井南社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "新华路",
+                    "area": [
+                        "马场角社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "花楼水塔街道",
+                    "area": [
+                        "华中社区",
+                        "交通路社区",
+                        "花楼社区",
+                        "老甫社区",
+                        "前进社区",
+                        "江汉关社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "万松街道",
+                    "area": [
+                        "凌云社区",
+                        "机场社区",
+                        "商务区第一社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "民意街道",
+                    "area": [
+                        "新舞台社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "唐家墩街道",
+                    "area": [
+                        "站东社区",
+                        "马场社区",
+                        "八古墩社区",
+                        "唐蔡社区",
+                        "工人新村社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "民权街道",
+                    "area": [
+                        "民生社区",
+                        "打铜社区",
+                        "王家巷社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "北湖街道",
+                    "area": [
+                        "正街社区",
+                        "德望社区",
+                        "妙三社区",
+                        "横堤社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "满春街道",
+                    "area": [
+                        "清芬社区",
+                        "肖家社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "新华街道",
+                    "area": [
+                        "省运社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "前进街道",
+                    "area": [
+                        "燕马社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "菱角湖路",
+                    "area": [
+                        "125街社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "硚口区",
+            "disCode": "201807131105432tuf60",
+            "street": [
+                {
+                    "name": "易家街",
+                    "area": [
+                        "舵落口社区",
+                        "工农社区",
+                        "工农路社区",
+                        "竹叶海社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "长丰街",
+                    "area": [
+                        "东风社区",
+                        "常码社区",
+                        "长丰社区",
+                        "正康社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "古田街",
+                    "area": [
+                        "古二社区",
+                        "汉口春天社区",
+                        "古画社区",
+                        "古田社区",
+                        "古雅社区",
+                        "军院社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "韩家街",
+                    "area": [
+                        "曾家社区",
+                        "综合社区",
+                        "公安社区",
+                        "简易社区",
+                        "南泥湾社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "宗关街",
+                    "area": [
+                        "水厂社区",
+                        "宗关社区",
+                        "双墩社区",
+                        "发展社区",
+                        "井南社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "汉中街",
+                    "area": [
+                        "汉中社区",
+                        "居仁社区",
+                        "牌楼社区",
+                        "马家社区",
+                        "万兴社区",
+                        "爱国社区",
+                        "军工社区",
+                        "兴隆社区",
+                        "劳动社区",
+                        "尚义社区",
+                        "长寿社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "汉水桥街",
+                    "area": [
+                        "汉水社区",
+                        "营北社区",
+                        "学苑社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "宝丰街",
+                    "area": [
+                        "公路社区",
+                        "空后社区",
+                        "同济医学院社区",
+                        "宝丰社区",
+                        "宝地社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "汉正街",
+                    "area": [
+                        "永茂社区",
+                        "旌德社区",
+                        "竹牌社区",
+                        "新安社区",
+                        "大新社区",
+                        "燕山社区",
+                        "多福社区",
+                        "共和社区",
+                        "存仁社区",
+                        "利济社区",
+                        "永宁社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "六角亭街",
+                    "area": [
+                        "顺道社区",
+                        "荣东社区",
+                        "学堂社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "荣华街",
+                    "area": [
+                        "幸乐社区",
+                        "中山社区",
+                        "荣西社区",
+                        "荣华社区",
+                        "友谊社区",
+                        "武胜社区",
+                        "我武胜社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "六角街",
+                    "area": [
+                        "民意社区",
+                        "慈善社区",
+                        "自治社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "韩家墩街道",
+                    "area": [
+                        "云鹤社区",
+                        "综合社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "长丰街道",
+                    "area": [
+                        "天顺园南社区",
+                        "紫润北社区",
+                        "长丰社区",
+                        "正康社区",
+                        "百泽社区",
+                        "园博北社区",
+                        "园博南社区",
+                        "紫润南社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "易家街道",
+                    "area": [
+                        "舵落口社区",
+                        "东华社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "古田街道",
+                    "area": [
+                        "罗家墩社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "武昌区",
+            "disCode": "2018071422344608hrkf",
+            "street": [
+                {
+                    "name": "水果湖街",
+                    "area": [
+                        "武重社区",
+                        "新建社区",
+                        "张家湾社区",
+                        "茶港社区",
+                        "洪山路社区",
+                        "岳家嘴社区",
+                        "青鱼嘴社区",
+                        "滨湖社区",
+                        "姚家岭社区",
+                        "东湖路社区",
+                        "北环路社区",
+                        "放鹰台社区",
+                        "徐东路社区",
+                        "东亭社区",
+                        "机安社区",
+                        "武铁社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "白沙洲街",
+                    "area": [
+                        "长江紫都社区",
+                        "万福林社区",
+                        "佳韵社区",
+                        "城南社区",
+                        "堤东社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "黄鹤楼街",
+                    "area": [
+                        "读书社区",
+                        "西厂口社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "粮道街",
+                    "area": [
+                        "东龙社区",
+                        "小东门社区",
+                        "中医社区",
+                        "花园山社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "积玉桥街",
+                    "area": [
+                        "金都蓝湾社区",
+                        "融侨华府社区",
+                        "汉成里社区",
+                        "尚隆苑社区",
+                        "凤凰城社区",
+                        "金地社区",
+                        "沙湖社区",
+                        "康乐里社区",
+                        "四清里社区",
+                        "新生里社区",
+                        "中山社区",
+                        "凤凰社区",
+                        "积玉桥街",
+                        "新河社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "珞珈山街",
+                    "area": [
+                        "水生村社区",
+                        "东湖村社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "南湖街",
+                    "area": [
+                        "都市桃源社区",
+                        "中央花园社区",
+                        "华锦社区",
+                        "宁松社区",
+                        "水域社区",
+                        "宝安社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "杨园街",
+                    "area": [
+                        "铁机路社区",
+                        "柴东社区",
+                        "电信社区",
+                        "纺器社区",
+                        "欧景苑社区",
+                        "四美塘社区",
+                        "余家头社区",
+                        "二桥社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "中南路街",
+                    "area": [
+                        "百瑞景社区",
+                        "小刘家湾社区",
+                        "莲溪寺社区",
+                        "洪山坊社区",
+                        "梅苑社区",
+                        "中建院社区",
+                        "付家坡社区",
+                        "公安厅社区",
+                        "静安社区",
+                        "下徐家湾社区",
+                        "长春社区",
+                        "群建社区",
+                        "宝通寺社区",
+                        "何家垅社区",
+                        "星星社区",
+                        "石牌岭社区",
+                        "涂家岭社区",
+                        "丁字桥社区",
+                        "晒湖社区",
+                        "新民主路",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "首义路街",
+                    "area": [
+                        "701社区",
+                        "武南村社区",
+                        "江零社区",
+                        "千家街社区",
+                        "719社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "紫阳街",
+                    "area": [
+                        "复兴路社区",
+                        "解放路社区",
+                        "保望堤社区",
+                        "保安社区",
+                        "歌笛湖社区",
+                        "梅隐寺社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "中华路街",
+                    "area": [
+                        "都府堤社区",
+                        "楚材社区",
+                        "户部巷社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "徐家棚街",
+                    "area": [
+                        "水岸星城社区",
+                        "国际城社区",
+                        "诚善里社区",
+                        "水岸国际社区",
+                        "油料所社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "堤东街",
+                    "area": [
+                        "堤东社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "黄鹤楼南路",
+                    "area": [
+                        "西厂口社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "恒安路",
+                    "area": [
+                        "宝安社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "石洞街",
+                    "area": [
+                        "白云社区",
+                        "建桥社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "团结大道",
+                    "area": [
+                        "国际城社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "纺器社区",
+                    "area": [
+                        "纺器社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "首义路",
+                    "area": [
+                        "江零社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "南湖路",
+                    "area": [
+                        "华锦社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "珞珈山路",
+                    "area": [
+                        "东湖村社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "东湖风景",
+                    "area": [
+                        "建强社区",
+                        "滨湖社区",
+                        "落雁社区",
+                        "先锋社区",
+                        "龚家岭社区",
+                        "鼓架社区",
+                        "磨山社区",
+                        "新磨山社区",
+                        "东湖路社区",
+                        "梨园社区",
+                        "东湖景园社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "中华路街办事处",
+                    "area": [
+                        "楚材社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "首义路街办事处",
+                    "area": [
+                        "千家街社区",
+                        "江零社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "珞珈山街道办事处",
+                    "area": [
+                        "东湖村社区",
+                        "工学部社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "粮道街办事处",
+                    "area": [
+                        "戈甲营社区",
+                        "小东门社区",
+                        "花园山社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "水果湖街道办事处",
+                    "area": [
+                        "洪山路社区",
+                        "放鹰台社区",
+                        "北环路社区",
+                        "张家湾社区",
+                        "黄鹂路社区（原新建社区）",
+                        "武重社区",
+                        "机安社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "中南路街街办事处",
+                    "area": [
+                        "中建院社区",
+                        "长春社区",
+                        "新民主路社区",
+                        "小刘家湾社区",
+                        "向阳社区（原静安上城社区）",
+                        "武锅东社区",
+                        "晒湖社区",
+                        "群建社区",
+                        "何家垅社区",
+                        "丁字桥社区",
+                        "梅苑社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "杨园街办事处",
+                    "area": [
+                        "纺器社区居委会",
+                        "四美塘社区居委会",
+                        "欧景苑社区居委会",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "南湖街道办事处",
+                    "area": [
+                        "都市桃源社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "积玉桥街办事处",
+                    "area": [
+                        "凤凰城社区居委会",
+                        "康乐里社区居委会",
+                        "汉成里社区居委会",
+                        "尚隆苑社区居委会",
+                        "金地花园社区居委会",
+                        "沙湖社区居委会",
+                        "新生里社区居委会",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "洪山区",
+            "disCode": "20180714223925jebsg3",
+            "street": [
+                {
+                    "name": "梨园街道",
+                    "area": [
+                        "省电社区",
+                        "东湖社区",
+                        "东山亭社区",
+                        "华电社区",
+                        "华腾园社区",
+                        "鹏程社区",
+                        "武铁佳苑社区",
+                        "新世纪社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "珞南街道",
+                    "area": [
+                        "丽岛社区",
+                        "七二二社区",
+                        "珞桂社区",
+                        "四眼井社区",
+                        "狮城名居社区",
+                        "劝业场社区",
+                        "理工大西社区",
+                        "黎明社区",
+                        "理工大东社区",
+                        "金桥社区",
+                        "广埠屯社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "洪山街",
+                    "area": [
+                        "大华社区",
+                        "保利心语西社区",
+                        "保利心语社区",
+                        "保利心语西区社区",
+                        "武昌府社区",
+                        "保利九里社区",
+                        "南湖雅园社区",
+                        "南湖名都社区",
+                        "南湖新城社区",
+                        "保利公馆社区",
+                        "北港社区",
+                        "金地社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "关山街",
+                    "area": [
+                        "纺大社区",
+                        "紫菘社区",
+                        "阳光社区",
+                        "紫崧社区",
+                        "保利社区",
+                        "汽发社区",
+                        "逸景华庭社区",
+                        "康居园社区",
+                        "关山口社区",
+                        "剑桥春天社区",
+                        "邮科院社区",
+                        "鲁磨路社区",
+                        "华科大社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "张家湾街",
+                    "area": [
+                        "列电社区",
+                        "金域天下社区",
+                        "复地悦城社区",
+                        "光霞社区",
+                        "建材社区",
+                        "长征社区",
+                        "农科院社区",
+                        "烽火社区",
+                        "湘龙鑫城社区",
+                        "毛坦社区",
+                        "张家湾社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "狮子山街",
+                    "area": [
+                        "712所小区",
+                        "玫瑰湾社区",
+                        "南湖山庄社区",
+                        "书城路社区",
+                        "珞珈雅苑社区",
+                        "珞狮路社区",
+                        "省农科院社区",
+                        "狮南社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "和平街",
+                    "area": [
+                        "爱家国际社区",
+                        "金鹤园社区",
+                        "铁机社区",
+                        "青城华府社区",
+                        "仁和社区",
+                        "盛世花园社区",
+                        "港东名居社区",
+                        "江南新天地社区",
+                        "华城广场社区",
+                        "徐东社区",
+                        "新绿美地社区",
+                        "保利城社区",
+                        "白马洲社区",
+                        "丽华苑社区",
+                        "武丰社区",
+                        "和平社区",
+                        "东湖城社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "卓刀泉街",
+                    "area": [
+                        "名都花园",
+                        "学雅芳邻",
+                        "名都社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "青菱街",
+                    "area": [
+                        "红霞社区",
+                        "建和社区",
+                        "园艺社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "九峰街",
+                    "area": [
+                        "生物创新城",
+                        "生物创新园",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "城乡工作办事处",
+                    "area": [
+                        "华侨城社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "卓刀泉",
+                    "area": [
+                        "学雅芳邻社区",
+                        "名都花园社区",
+                        "红星社区",
+                        "吴家湾社区",
+                        "709所社区",
+                        "\"高创 社区\"",
+                        "高创社区",
+                        "体院社区",
+                        "伏虎山社区",
+                        "虎泉社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "珞南街",
+                    "area": [
+                        "四眼井社区",
+                        "金桥社区",
+                        "劝业场社区",
+                        "广埠屯社区",
+                        "狮城名居社区",
+                        "理工大东社区",
+                        "理工大西社区",
+                        "722社区",
+                        "黎明社区",
+                        "华师社区",
+                        "尤李社区",
+                        "中建三局社区",
+                        "珞桂社区",
+                        "武珞社区",
+                        "武大测绘社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "梨园街",
+                    "area": [
+                        "东沙社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "八吉府街",
+                    "area": [
+                        "建设社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "钢花村街",
+                    "area": [
+                        "117社区",
+                        "118社区",
+                        "119社区",
+                        "120社区",
+                        "121社区",
+                        "南苑社区",
+                        "北苑社区",
+                        "青翠苑社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "东湖风景",
+                    "area": [
+                        "建强社区",
+                        "滨湖社区",
+                        "落雁社区",
+                        "先锋社区",
+                        "龚家岭社区",
+                        "鼓架社区",
+                        "磨山社区",
+                        "新磨山社区",
+                        "东湖路社区",
+                        "梨园社区",
+                        "东湖景园社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "关东街",
+                    "area": [
+                        "江南社区",
+                        "清水源社区",
+                        "八一社区",
+                        "清江社区",
+                        "龙城社区",
+                        "中谷苑社区",
+                        "湾郡社区",
+                        "梧桐苑社区",
+                        "万科社区",
+                        "现代森林小镇社区",
+                        "金地社区",
+                        "长山社区",
+                        "光谷社区",
+                        "当代社区",
+                        "格林东郡社区",
+                        "长城社区",
+                        "新世界社区",
+                        "保利时代社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "花山街",
+                    "area": [
+                        "碧桂园生态城",
+                        "联投花山郡",
+                        "梅园社区",
+                        "竹园社区",
+                        "兰园社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "九峰街道",
+                    "area": [
+                        "荣芳里社区",
+                        "仁尚里社区",
+                        "星光里社区",
+                        "华诚里社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "左岭街道",
+                    "area": [
+                        "朝阳社区",
+                        "星芯社区",
+                        "祥龙社区",
+                        "凤鸣社区",
+                        "测试",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "邾城街",
+                    "area": [
+                        "常新社区",
+                        "龙城社区",
+                        "红旗社区",
+                        "黄茂社区",
+                        "章林社区",
+                        "向阳社区",
+                        "向东社区",
+                        "光明社区",
+                        "章南社区",
+                        "凤凰台社区",
+                        "城南社区",
+                        "祥燕社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "和平街道",
+                    "area": [
+                        "仁和路社区",
+                        "金鹤园社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "卓刀泉街道",
+                    "area": [
+                        "学雅芳邻社区",
+                        "名都花园社区",
+                        "高创家园社区",
+                        "伏虎山社区",
+                        "709所社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "张家湾街道",
+                    "area": [
+                        "张家湾社区",
+                        "农科院社区",
+                        "毛坦社区",
+                        "金域天下社区",
+                        "湘龙鑫城社区",
+                        "烽火社区",
+                        "光霞社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "狮子山街道",
+                    "area": [
+                        "书城路社区",
+                        "玫瑰湾社区",
+                        "南湖山庄社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "青菱街道",
+                    "area": [
+                        "园艺社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "洪山街道",
+                    "area": [
+                        "武昌府社区",
+                        "金地格林城社区",
+                        "保利公馆社区",
+                        "保利心语西区社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "关山街道",
+                    "area": [
+                        "紫菘社区",
+                        "康居园社区",
+                        "邮科院社区",
+                        "鲁磨路社区",
+                        "华中科技大学社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "汉阳区",
+            "disCode": "20180714224432z9p595",
+            "street": [
+                {
+                    "name": "建桥街",
+                    "area": [
+                        "冰糖社区",
+                        "钟家村社区",
+                        "显正社区",
+                        "古楼社区",
+                        "大桥社区",
+                        "西大社区",
+                        "南城社区",
+                        "琴台社区",
+                        "青石社区",
+                        "归园社区",
+                        "白鹤社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "晴川街",
+                    "area": [
+                        "龙灯社区",
+                        "铁桥社区",
+                        "华园社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "江堤街",
+                    "area": [
+                        "墨水湖社区",
+                        "江博社区",
+                        "向阳社区",
+                        "向阳村社区",
+                        "汉博佳园社区",
+                        "丰收社区",
+                        "江欣苑社区",
+                        "江城明珠社区",
+                        "三里民居社区",
+                        "江腾社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "洲头街",
+                    "area": [
+                        "红建社区",
+                        "洲头社区",
+                        "向阳社区",
+                        "新五里社区",
+                        "怡畅园社区",
+                        "建港社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "鹦鹉街",
+                    "area": [
+                        "瓜堤社区",
+                        "锦绣长江社区",
+                        "杨泗社区",
+                        "夹河社区",
+                        "鹦鹉花园社区",
+                        "自力社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "五里墩街",
+                    "area": [
+                        "五福里社区",
+                        "五合里社区",
+                        "五春里社区",
+                        "五丰里社区",
+                        "五瑞里社区",
+                        "五琴里社区",
+                        "五麒里社区",
+                        "五墨里社区",
+                        "五麟里社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "琴断口街",
+                    "area": [
+                        "汇福园社区",
+                        "龙兴社区",
+                        "十里锦绣社区",
+                        "紫荆花社区",
+                        "龙祥社区",
+                        "七里晴川社区",
+                        "七里一村社区",
+                        "百灵社区",
+                        "星火社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "江汉二桥街",
+                    "area": [
+                        "桥东社区",
+                        "郭茨口社区",
+                        "玫东社区",
+                        "玫西社区",
+                        "水仙里社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "四新街",
+                    "area": [
+                        "澜菲溪岸社区",
+                        "梅林都汇社区",
+                        "太子观澜社区",
+                        "墨南湖畔社区",
+                        "总港西岸社区",
+                        "上太子溪社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "龙阳街",
+                    "area": [
+                        "龙阳湖社区",
+                        "陶家岭社区",
+                        "龙湖东岸社区",
+                        "陶园社区",
+                        "汉城社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "永丰街",
+                    "area": [
+                        "徐湾社区",
+                        "磨山社区",
+                        "黄金口岸社区",
+                        "燎原社区",
+                        "米粮社区",
+                        "惠民苑社区",
+                        "仙山社区",
+                        "玫瑰西苑社区",
+                        "玫瑰苑社区",
+                        "董家店社区",
+                        "汉沙社区",
+                        "汉琴社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "江汉二桥街道",
+                    "area": [
+                        "郭茨口社区",
+                        "桥东社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "四新街道",
+                    "area": [
+                        "澜菲溪岸社区",
+                        "墨南湖畔社区",
+                        "太子观澜社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "建桥街道",
+                    "area": [
+                        "钟家村社区",
+                        "琴台社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "鹦鹉街道",
+                    "area": [
+                        "锦绣长江社区",
+                        "杨泗社区",
+                        "钢管社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "五里墩街道",
+                    "area": [
+                        "五琴里社区",
+                        "五春里社区",
+                        "五丰里社区",
+                        "五湖里社区",
+                        "五麒里社区",
+                        "五瑞里社区",
+                        "五玉里社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "龙阳街道",
+                    "area": [
+                        "陶家岭社区",
+                        "龙阳湖社区",
+                        "汉城社区",
+                        "陶园社区",
+                        "芳草社区",
+                        "龙湖东岸社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "洲头街道",
+                    "area": [
+                        "建港社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "江堤街道",
+                    "area": [
+                        "江博社区",
+                        "墨水湖社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "琴断口街道",
+                    "area": [
+                        "百灵社区",
+                        "星火社区",
+                        "紫荆花社区",
+                        "七里一村社区",
+                        "十里景秀社区",
+                        "龙兴社区",
+                        "汇福园社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "永丰街道",
+                    "area": [
+                        "燎原社区",
+                        "董家店社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "晴川街道",
+                    "area": [
+                        "铁桥社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "青山区",
+            "disCode": "2018071715144880yv6v",
+            "street": [
+                {
+                    "name": "红钢城",
+                    "area": [
+                        "青扬社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "钢都花园",
+                    "area": [
+                        "122社区",
+                        "123社区",
+                        "125社区",
+                        "126社区",
+                        "园林社区",
+                        "绿景苑社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "厂前街",
+                    "area": [
+                        "青馨居社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "红卫路街",
+                    "area": [
+                        "翠园社区",
+                        "八大家花园社区",
+                        "才聚社区",
+                        "虹蔚社区",
+                        "才惠社区",
+                        "康苑社区",
+                        "和平社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "钢花新村街",
+                    "area": [
+                        "南苑社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "武东街",
+                    "area": [
+                        "陆鹞社区",
+                        "船机社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "工人村街",
+                    "area": [
+                        "青雅居社区",
+                        "青宜居社区",
+                        "青和居社区",
+                        "青康居社区",
+                        "青惠居社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "青山镇街",
+                    "area": [
+                        "石化社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "红钢城街",
+                    "area": [
+                        "临江港湾社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "白玉山街",
+                    "area": [
+                        "康寿社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "新沟桥街",
+                    "area": [
+                        "光明社区",
+                        "蒋家墩社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "冶金街",
+                    "area": [
+                        "南干渠社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "红卫街道",
+                    "area": [
+                        "碧园社区",
+                        "东兴社区",
+                        "三弓路社区",
+                        "聚友社区",
+                        "奥山滨江社区",
+                        "科大社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "钢花村街",
+                    "area": [
+                        "117社区",
+                        "118社区",
+                        "119社区",
+                        "120社区",
+                        "121社区",
+                        "南苑社区",
+                        "北苑社区",
+                        "青翠苑社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "钢都花园管理委员会",
+                    "area": [
+                        "123街社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "蔡甸区",
+            "disCode": "20180717155506yjtn6s",
+            "street": [
+                {
+                    "name": "沌阳街",
+                    "area": [
+                        "东风阳光城",
+                        "奥林社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "军山街",
+                    "area": [
+                        "蒲潭社区",
+                        "凤凰苑社区",
+                        "龙湖社区",
+                        "黄陵社区",
+                        "小军山社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "蔡甸街",
+                    "area": [
+                        "知音社区",
+                        "茂源社区",
+                        "罗家山社区",
+                        "跃进社区",
+                        "正街社区",
+                        "新福社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "蔡甸乡镇",
+                    "area": [
+                        "桐湖办事处",
+                        "索河街",
+                        "洪北管委会",
+                        "区农委",
+                        "蔡甸街",
+                        "玉贤街",
+                        "大集街",
+                        "永安街",
+                        "蔡经开奓山街",
+                        "奓山街",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "沌口街",
+                    "area": [
+                        "观澜社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "洪北管委会",
+                    "area": [
+                        "洪北管委会",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "和平街",
+                    "area": [
+                        "爱家国际社区",
+                        "金鹤园社区",
+                        "铁机社区",
+                        "青城华府社区",
+                        "仁和社区",
+                        "盛世花园社区",
+                        "港东名居社区",
+                        "江南新天地社区",
+                        "华城广场社区",
+                        "徐东社区",
+                        "新绿美地社区",
+                        "保利城社区",
+                        "白马洲社区",
+                        "丽华苑社区",
+                        "武丰社区",
+                        "和平社区",
+                        "东湖城社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "蔡经开奓山街",
+                    "area": [
+                        "海天社区",
+                        "听涛社区",
+                        "星光社区",
+                        "奓山新社区",
+                        "奓山老社区",
+                        "大东社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "大集街",
+                    "area": [
+                        "方兴社区",
+                        "莲溪社区",
+                        "钟陵社区",
+                        "西湾湖社区",
+                        "南湖社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "永安大街",
+                    "area": [
+                        "永安社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "永安街",
+                    "area": [
+                        "九真山社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "玉贤街",
+                    "area": [
+                        "玉贤社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "东西湖区",
+            "disCode": "20180717163157siibzs",
+            "street": [
+                {
+                    "name": "吴家山",
+                    "area": [
+                        "望丰社区",
+                        "额头湾社区",
+                        "开屏里社区",
+                        "田园社区",
+                        "吴南社区",
+                        "长青社区",
+                        "恒春里社区",
+                        "杏园社区",
+                        "吴兴社区",
+                        "梦佳里社区",
+                        "文家湾社区",
+                        "祁家山社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "将军路",
+                    "area": [
+                        "张家墩社区",
+                        "将花社区",
+                        "将北社区",
+                        "姑李路社区",
+                        "将军路社区",
+                        "马池墩社区",
+                        "银花社区",
+                        "梅花池社区",
+                        "熊家墩社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "金银湖街",
+                    "area": [
+                        "银湖社区",
+                        "花城社区",
+                        "金泰社区",
+                        "学府社区",
+                        "金湖社区",
+                        "丽水社区",
+                        "恋湖社区",
+                        "鑫桥社区",
+                        "严家渡社区",
+                        "园博社区",
+                        "碧海社区",
+                        "李家墩社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "径河街",
+                    "area": [
+                        "民田社区",
+                        "海景北社区",
+                        "稻香社区",
+                        "官塘角社区",
+                        "电犁社区",
+                        "金龙湾社区",
+                        "石家坡社区",
+                        "十字路社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "柏泉街",
+                    "area": [
+                        "新苑社区",
+                        "新港苑社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "走马岭街",
+                    "area": [
+                        "走集镇社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "长青街",
+                    "area": [
+                        "金鼎湾社区",
+                        "二雅社区",
+                        "红色物业",
+                        "兴达社区",
+                        "三民社区",
+                        "团结社区",
+                        "革新社区",
+                        "合兴里社区",
+                        "华星社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "新沟镇",
+                    "area": [
+                        "荷花社区",
+                        "新镇社区",
+                        "燕岭社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "东西湖乡镇",
+                    "area": [
+                        "辛安渡街",
+                        "东山街",
+                        "柏泉街",
+                        "慈惠街道",
+                        "新沟镇街",
+                        "径河街",
+                        "走马岭街",
+                        "长青街",
+                        "泾河街",
+                        "新沟镇",
+                        "东山",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "常青花园",
+                    "area": [
+                        "第一社区",
+                        "第二社区",
+                        "第三社区",
+                        "第六社区",
+                        "第五社区",
+                        "第四社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "一元街道",
+                    "area": [
+                        "三阳社区",
+                        "洞庭社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "辛安渡",
+                    "area": [
+                        "辛安渡红色物业",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "将军路街道",
+                    "area": [
+                        "将花社区",
+                        "张家墩社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "黄陂区",
+            "disCode": "2018071716534793vl0j",
+            "street": [
+                {
+                    "name": "前川街",
+                    "area": [
+                        "德兴社区",
+                        "新村社区",
+                        "康乐社区",
+                        "沙港社区",
+                        "潘家田社区",
+                        "油岗社区",
+                        "东寺社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "黄陂乡镇",
+                    "area": [
+                        "王家河街",
+                        "前川街",
+                        "罗汉寺街",
+                        "木兰乡",
+                        "长轩岭街",
+                        "蔡家榨街",
+                        "李家集街",
+                        "六指街",
+                        "祁家湾街",
+                        "姚家集街",
+                        "蔡店街",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "百秀街",
+                    "area": [
+                        "定远社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "横店街",
+                    "area": [
+                        "建国社区",
+                        "幸福社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "盘龙城",
+                    "area": [
+                        "恒达社区",
+                        "露甲山社区",
+                        "道贯泉社区",
+                        "日月社区",
+                        "阳光社区",
+                        "美景社区",
+                        "美好社区",
+                        "龙城社区",
+                        "颐景社区",
+                        "歌林社区",
+                        "纵横社区",
+                        "宋岗社区",
+                        "兴龙社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "丹水池街",
+                    "area": [
+                        "堤角社区",
+                        "汉黄社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "蔡甸街",
+                    "area": [
+                        "知音社区",
+                        "茂源社区",
+                        "罗家山社区",
+                        "跃进社区",
+                        "正街社区",
+                        "新福社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "蔡甸乡镇",
+                    "area": [
+                        "桐湖办事处",
+                        "索河街",
+                        "洪北管委会",
+                        "区农委",
+                        "蔡甸街",
+                        "玉贤街",
+                        "大集街",
+                        "永安街",
+                        "蔡经开奓山街",
+                        "奓山街",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "江夏区",
+            "disCode": "201807171656033lj8rs",
+            "street": [
+                {
+                    "name": "大花岭街",
+                    "area": [
+                        "十字岭社区",
+                        "金樱社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "纸坊街",
+                    "area": [
+                        "河头社区",
+                        "五里墩社区",
+                        "郭岭社区",
+                        "马山社区",
+                        "今城社区",
+                        "育才社区",
+                        "青龙山社区",
+                        "龙井社区",
+                        "林场社区",
+                        "幸福社区",
+                        "文苑社区",
+                        "花山社区",
+                        "站西社区",
+                        "职中社区",
+                        "北华社区",
+                        "新北路社区",
+                        "西港社区",
+                        "复江道社区",
+                        "秀山社区",
+                        "9603社区",
+                        "二公司社区",
+                        "宁港社区",
+                        "三潭社区",
+                        "宁安社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "豹澥街",
+                    "area": [
+                        "未来城产业园",
+                        "桃花源社区",
+                        "九龙湖社区1至4期",
+                        "未来科技城园区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "江夏乡镇",
+                    "area": [
+                        "五里界",
+                        "梁子湖风景区",
+                        "乌龙泉街道",
+                        "山坡街",
+                        "金口街",
+                        "安山街",
+                        "安山街道",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "大桥现代产业园",
+                    "area": [
+                        "十字岭社区",
+                        "大桥社区",
+                        "五里墩社区",
+                        "明星社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "庙山办事处",
+                    "area": [
+                        "汤逊湖社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "藏龙岛办事处",
+                    "area": [
+                        "长咀社区",
+                        "梁山头社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "滨湖街",
+                    "area": [
+                        "蔡王新村",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "佛祖岭街",
+                    "area": [
+                        "万科魅力之城社区",
+                        "凤凰社区",
+                        "佛祖岭B社区",
+                        "谷尚居社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "龙泉街",
+                    "area": [
+                        "龙泉社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "新洲区",
+            "disCode": "20180717170538jfhwev",
+            "street": [
+                {
+                    "name": "邾城街",
+                    "area": [
+                        "常新社区",
+                        "龙城社区",
+                        "红旗社区",
+                        "黄茂社区",
+                        "章林社区",
+                        "向阳社区",
+                        "向东社区",
+                        "光明社区",
+                        "章南社区",
+                        "凤凰台社区",
+                        "城南社区",
+                        "祥燕社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "阳逻街",
+                    "area": [
+                        "天琴湾社区",
+                        "商东社区",
+                        "蓝天社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "徐古街",
+                    "area": [
+                        "徐古社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "凤凰镇",
+                    "area": [
+                        "凤凰社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "辛冲街",
+                    "area": [
+                        "辛冲社区",
+                        "东城社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "区教育局",
+                    "area": [
+                        "常新社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "新洲乡镇",
+                    "area": [
+                        "凤凰镇",
+                        "徐古街",
+                        "辛冲街",
+                        "潘塘街",
+                        "涨渡湖街",
+                        "邾城街",
+                        "汪集街",
+                        "仓埠街",
+                        "双柳街",
+                        "道观河管委会",
+                        "旧街街",
+                        "三店街",
+                        "李集街",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "潘塘街",
+                    "area": [
+                        "紫荆社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "涨渡湖街",
+                    "area": [
+                        "沐家泾社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "旧街街",
+                    "area": [
+                        "火车站社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "道观河管委会",
+                    "area": [
+                        "道观社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "仓埠街",
+                    "area": [
+                        "靠山社区",
+                        "陶园社区",
+                        "周铺社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "汪集街",
+                    "area": [
+                        "荣升社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "三店街",
+                    "area": [
+                        "龙丘社区",
+                        "和平社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "双柳街",
+                    "area": [
+                        "水运社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "李集街",
+                    "area": [
+                        "张店社区",
+                        "李集社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "邾城街道",
+                    "area": [
+                        "常新社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "阳逻街道",
+                    "area": [
+                        "常乐社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "汉南区",
+            "disCode": "201808091059572wm2vv",
+            "street": [
+                {
+                    "name": "经开乡镇",
+                    "area": [
+                        "湘口街",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "东湖高新区",
+            "disCode": "2019121521114757jycy",
+            "street": [
+                {
+                    "name": "左岭街道",
+                    "area": [
+                        "朝阳社区",
+                        "星芯社区",
+                        "祥龙社区",
+                        "凤鸣社区",
+                        "测试",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "九峰街道",
+                    "area": [
+                        "荣芳里社区",
+                        "仁尚里社区",
+                        "星光里社区",
+                        "华诚里社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "花山街道",
+                    "area": [
+                        "兰园社区",
+                        "碧桂园社区",
+                        "联投花山郡",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "龙泉街道",
+                    "area": [
+                        "腾龙社区",
+                        "龙泉社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "关东街道",
+                    "area": [
+                        "关山社区",
+                        "新世界社区",
+                        "长山社区",
+                        "湾郡社区",
+                        "八一社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "佛祖岭街道",
+                    "area": [
+                        "谷尚居社区",
+                        "凤凰社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "豹澥街道",
+                    "area": [
+                        "九龙湖社区",
+                        "桃花源社区",
+                        "神墩桥社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "金牛区",
+            "disCode": "20191216142510e6k984",
+            "street": [
+                {
+                    "name": "蜀西路",
+                    "area": [
+                        "walnut",
+                        "wal",
+                        "1",
+                        "q",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "蜀汉路",
+                    "area": [
+                        "walnut",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "武侯区",
+            "disCode": "202001141424500o8dq0",
+            "street": [
+                {
+                    "name": "天府大道北段",
+                    "area": [
+                        "walnut",
+                        "天府社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "肖家河东一巷",
+                    "area": [
+                        "肖家河东一巷3号院",
+                        "肖家河",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "青羊区",
+            "disCode": "20200207104405n7gpwg",
+            "street": [
+                {
+                    "name": "光华西三路",
+                    "area": [
+                        "同瑞社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "光华北六路",
+                    "area": [
+                        "同瑞社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "郫都区",
+            "disCode": "20200208100845bx5pxk",
+            "street": [
+                {
+                    "name": "天河路",
+                    "area": [
+                        "111",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "东湖风景区",
+            "disCode": "20200219162437icgir1",
+            "street": [
+                {
+                    "name": "市政设施维修管理处",
+                    "area": [
+                        "建强社区",
+                        "梨园社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "东湖风景区",
+            "disCode": "20200219162437akivfa",
+            "street": [
+                {
+                    "name": "市政设施维修管理处",
+                    "area": [
+                        "建强社区",
+                        "梨园社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "武汉开发区（汉南区）",
+            "disCode": "20200219162441dx71ba",
+            "street": [
+                {
+                    "name": "沌口街",
+                    "area": [
+                        "观澜社区",
+                        "其他"
+                    ]
+                },
+                {
+                    "name": "军山街",
+                    "area": [
+                        "蒲潭社区",
+                        "凤凰苑社区",
+                        "龙湖社区",
+                        "黄陵社区",
+                        "小军山社区",
+                        "其他"
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "温江区",
+            "disCode": "202004211526188hutpv",
+            "street": [
+                {
+                    "name": "科惠路",
+                    "area": [
+                        "惠民社区",
+                        "其他"
+                    ]
+                }
+            ]
+        }
+    ]
+}

app/src/main/java/com/zhilin/patrol/bean/AddressAreaEntity.java

@@ -24,6 +24,7 @@ public class AddressAreaEntity extends BaseEntity<List<AddressAreaEntity.InfoLis
             this.street = street;
         }
 
+
         /*街道*/
         private String street;
 

app/src/main/java/com/zhilin/patrol/bean/PointInfoEntity.java

@@ -0,0 +1,86 @@
+package com.zhilin.patrol.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class PointInfoEntity extends BaseEntity<List<PointInfoEntity.InfoListBean>> implements Serializable {
+
+    public static class InfoListBean implements Serializable {
+
+        private String name;
+        private String disCode;
+
+        public String getDisCode() {
+            return disCode;
+        }
+
+        public void setDisCode(String disCode) {
+            this.disCode = disCode;
+        }
+
+        public List<StreetBean> getStreet() {
+            return street;
+        }
+
+        public void setStreet(List<StreetBean> street) {
+            this.street = street;
+        }
+
+        private List<StreetBean> street;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public List<StreetBean> getStreetList() {
+            return street;
+        }
+
+        public void setStreetList(List<StreetBean> street) {
+            this.street = street;
+        }
+
+        // 实现 IPickerViewData 接口，
+        // 这个用来显示在PickerView上面的字符串，
+        // PickerView会通过IPickerViewData获取getPickerViewText方法显示出来。
+
+        public String getPickerViewText() {
+            return this.name;
+        }
+
+
+        public static class StreetBean {
+
+            private String name;
+            private List<String> area;
+
+            public String getName() {
+                return name;
+            }
+
+            public void setName(String name) {
+                this.name = name;
+            }
+
+            public List<String> getArea() {
+                return area;
+            }
+
+            public void setArea(List<String> area) {
+                this.area = area;
+            }
+        }
+    }
+}
+
+
+
+
+
+
+
+

app/src/main/java/com/zhilin/patrol/http/HttpUrl.java

@@ -47,4 +47,8 @@ public class HttpUrl {
     public static final String IMAGEPNG_GET = DOMAIN_URL+"getImgPng";
     /** 添加点位*/
     public static final String ADDADDRESS_POST=DOMAIN_URL+"addAddress";
+
+    /** 获取行政区*/
+    public static final String FINDPOINT_POST=DOMAIN_URL+"findPoint";
+    /*  http://39.106.14.189:8081/index.php/ApiMobi/findPoint  获取区街道社区所有信息，assets下的json文件就是这个接口下获取的*/
 }

app/src/main/java/com/zhilin/patrol/tool/Compresser.java

@@ -1,5 +1,6 @@
 package com.zhilin.patrol.tool;
 
+import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
@@ -359,6 +360,7 @@ public class Compresser {
      * @param bitmap the image what be save   目标图片
      * @param size the file size of image   期望大小
      */
+    @SuppressLint("RestrictedApi")
     private File saveImage(String filePath, Bitmap bitmap, long size) throws IOException {
         checkNotNull(bitmap, TAG + "bitmap cannot be null");
 

app/src/main/java/com/zhilin/patrol/tool/GetJsonDataUtil.java

@@ -0,0 +1,43 @@
+package com.zhilin.patrol.tool;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class GetJsonDataUtil {
+    public String getJson(Context context, String fileName) {
+        StringBuilder stringBuilder = new StringBuilder();
+        try {
+            AssetManager assetManager = context.getAssets();
+            BufferedReader bf = new BufferedReader(new InputStreamReader(
+                    assetManager.open(fileName),"GBK"));
+            String line;
+            while ((line = bf.readLine()) != null) {
+                stringBuilder.append(line);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return stringBuilder.toString();
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

app/src/main/java/com/zhilin/patrol/ui/activity/InfoUploadActivity.java

@@ -6,6 +6,7 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.view.View;
+import android.view.WindowManager;
 
 import com.zhilin.patrol.R;
 import com.zhilin.patrol.adapter.FragmentAdapter;
@@ -22,6 +23,9 @@ public class InfoUploadActivity extends BaseActivity implements View.OnClickList
     TabLayout mTabLayout;
     @BindView(R.id.view_pager)
     ViewPager mViewPager;
+
+
+
     private ArrayList<String> mListTitle;
     private ArrayList<Fragment> mListFragment;
     private FragmentAdapter mAdapter;
@@ -38,6 +42,7 @@ public class InfoUploadActivity extends BaseActivity implements View.OnClickList
         setTitle("巡查点位问题上报");
 //        request();
         init();
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
     }
 
     private void init() {

app/src/main/java/com/zhilin/patrol/ui/fragment/PointRecordFragment.java

@@ -1,9 +1,11 @@
 package com.zhilin.patrol.ui.fragment;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
@@ -21,16 +23,22 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
+import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
+import com.bigkoo.pickerview.view.OptionsPickerView;
+import com.google.gson.Gson;
 import com.zhilin.patrol.R;
 import com.zhilin.patrol.bean.AddressAreaEntity;
 import com.zhilin.patrol.bean.LoginEntity;
 import com.zhilin.patrol.bean.MapLocationInfo;
 import com.zhilin.patrol.bean.PatrolFormEntity;
 import com.zhilin.patrol.bean.PointFormEntity;
+import com.zhilin.patrol.bean.PointInfoEntity;
 import com.zhilin.patrol.bean.QuestionKindEntity;
 import com.zhilin.patrol.http.HttpUrl;
 import com.zhilin.patrol.tool.CheckPermissionUtils;
 import com.zhilin.patrol.tool.DialogUtil;
+import com.zhilin.patrol.tool.GetJsonDataUtil;
 import com.zhilin.patrol.tool.IpUtils;
 import com.zhilin.patrol.tool.JsonUtils;
 import com.zhilin.patrol.tool.LocationUtils;
@@ -44,6 +52,8 @@ import com.zhilin.patrol.views.CustomProgressDialog;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.Callback;
 
+import org.json.JSONArray;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -63,17 +73,21 @@ public class PointRecordFragment extends Fragment {
     @BindView(R.id.et_content)
     EditText mRemarkEt;//备注
     @BindView(R.id.et_district)
-    EditText mDistrictEt;
+    TextView mDistrictEt;
     @BindView(R.id.et_stree)
-    EditText mStreeEt;
+    TextView mStreeEt;
     @BindView(R.id.tv_default_community)
     TextView mDefCommTv;
     @BindView(R.id.tv_actual_point)
     TextView mActualTv;
     @BindView(R.id.et_shequ)
-    EditText mShequEt;
+    TextView mShequEt;
     @BindView(R.id.et_community)
     EditText mCummEt;
+    @BindView(R.id.et_area)
+    EditText mAreaEt;
+    @BindView(R.id.ll_area)
+    LinearLayout llAreaEt;
     @BindView(R.id.tv_default_address)
     TextView mAddressTv;
     @BindView(R.id.tv_content_num)
@@ -94,6 +108,10 @@ public class PointRecordFragment extends Fragment {
     /** 附近小区集合 */
     private ArrayList mAddressAreaList;
     private LocationUtils mLocationUtils;
+    private List<PointInfoEntity.InfoListBean> infoList;
+    private List<String> options1Items=new ArrayList<>(); //区
+    private ArrayList<ArrayList<String>> options2Items = new ArrayList<>();//街道
+    private ArrayList<ArrayList<ArrayList<String>>> options3Items = new ArrayList<>();//社区
     private CustomProgressDialog mProgressDialog;
     /** 选中的小区 */
     private AddressAreaEntity.InfoListBean mListBean;
@@ -105,8 +123,11 @@ public class PointRecordFragment extends Fragment {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Bundle arguments = getArguments();
+
         mType = arguments.getInt(TYPE);
         Log.i("111","aaarrra"+mType);
+        initData();
+//        requestInfo();
     }
     @Nullable
     @Override
@@ -255,7 +276,6 @@ public class PointRecordFragment extends Fragment {
 //                    mDefCommTv.setText(addressdefault);
                     init();
                 }else{
-
                     Log.i(TAG,"默认小区地址");
                     mDefCommTv.setText(addressdefault+"   "+mindDistancenumber+"m");
                     mAddressTv.setText(mListBean.toStingTv());
@@ -263,7 +283,7 @@ public class PointRecordFragment extends Fragment {
                         mAddressTv.setVisibility(View.VISIBLE);
                     }
                     mShequEt.setText(mListBean.getArea());
-                    mDistrictEt.setText(mListBean.getDisName());
+                    mDistrictEt.setText(mListBean.getDisName()+"/"+mListBean.getStreet()+"/"+mListBean.getArea());
                     mStreeEt.setText(mListBean.getStreet());
 //                    mCummEt.setText(mListBean.getAddress());
                     init();
@@ -373,7 +393,7 @@ public class PointRecordFragment extends Fragment {
                 mAddressTv.setVisibility(View.VISIBLE);
             }
             mShequEt.setText(mListBean.getArea());
-            mDistrictEt.setText(mListBean.getDisName());
+            mDistrictEt.setText(mListBean.getDisName()+"/"+mListBean.getStreet()+"/"+mListBean.getArea());
             mStreeEt.setText(mListBean.getStreet());
         }
     }
@@ -405,60 +425,75 @@ public class PointRecordFragment extends Fragment {
                 Log.i("111","aaaa"+mMapLocationInfo.toStringTv());
                 mProgressDialog.dismiss();
 
-                mDistrictEt.setText(mMapLocationInfo.getDistrict());
-                mStreeEt.setText(mMapLocationInfo.getStreet());
+//                mDistrictEt.setText(mMapLocationInfo.getDistrict()+"/"+mMapLocationInfo.getStreet());
+//                mStreeEt.setText(mMapLocationInfo.getStreet());
         }
         else if(mType==2){
             mPointLayout.setVisibility(View.GONE);
             mActualTv.setText("新增点位信息：");
                 Log.i("111","aaaa"+mMapLocationInfo.toStringTv());
                 mProgressDialog.dismiss();
-                mDistrictEt.setText(mMapLocationInfo.getDistrict());
-                mStreeEt.setText(mMapLocationInfo.getStreet());
+//                mDistrictEt.setText(mMapLocationInfo.getDistrict()+"/"+mMapLocationInfo.getStreet());
+//                mStreeEt.setText(mMapLocationInfo.getStreet());
 
         }
 
     }
-    @OnClick({R.id.tv_default_community,R.id.btn_submit})
+    @SuppressLint("WrongConstant")
+    @OnClick({R.id.tv_default_community,R.id.btn_submit,R.id.et_district})//R.id.et_stree,R.id.et_shequ
     public void onClick(View view) {
         if (view.getId() == R.id.tv_default_community) {//选择小区
             Log.i("1","1");
             toAddressSelect();
         }
+        if(view.getId() ==R.id.et_district){//||view.getId() ==R.id.et_stree||view.getId() ==R.id.et_shequ
+            showPickerView();
+        }
         if (view.getId() == R.id.btn_submit) {//提交
             String cummEt = mCummEt.getText().toString().trim();
-            String shequEt=mShequEt.getText().toString().trim();
-            String streetEt=mStreeEt.getText().toString().trim();
+//            String shequEt=mShequEt.getText().toString().trim();
+//            String streetEt=mStreeEt.getText().toString().trim();
             String districtEt=mDistrictEt.getText().toString().trim();
+            String areaEt=mAreaEt.getText().toString().trim();
             if (TextUtils.isEmpty(districtEt)) {
-                Utils.showToast(getActivity(), "请输入区名");
+                Utils.showToast(getActivity(), "请选择区/街道/社区");
                 return;
             }
 
-            if (TextUtils.isEmpty(streetEt)) {
-                Utils.showToast(getActivity(), "请输入街道名");
-                return;
-            }
-            if (TextUtils.isEmpty(shequEt)) {
-                Utils.showToast(getActivity(), "请输入社区名");
-                return;
+//            if (TextUtils.isEmpty(shequEt)) {
+//                Utils.showToast(getActivity(), "请输入社区名");
+//                return;
+//            }
+            if(llAreaEt.getVisibility()!=8){//选了其他社区
+                if (TextUtils.isEmpty(areaEt)) {
+                    Utils.showToast(getActivity(), "请输入社区名");
+                    return;
+                }
             }
             if (TextUtils.isEmpty(cummEt)) {
                 Utils.showToast(getActivity(), "请输入小区名");
                 return;
             }
+
             postPoint();
         }
 
     }
     private void postPoint(){
         mProgressDialog.showDialog("正在提交...");
+        String areaText=mShequEt.getText().toString();
+        if (mShequEt.getText().toString().equals("其他")){
+            areaText=mAreaEt.getText().toString().trim();
+        }
+
         if(mType==1){
             OkHttpUtils.post()
                     .url(HttpUrl.ADDADDRESS_POST)
+                    //用户名，能看见谁提交的，备注，
+                    .addParams("userCode",mUserInfo.getUserCode())
                     .addParams("district", mListBean == null ? "" : mListBean.getDisName())
                     .addParams("street", mListBean == null ? "" : mListBean.getStreet())
-                    .addParams("area", mListBean == null ? "" : mListBean.getArea())
+                    .addParams("area", areaText+"")
                     .addParams("addrCode", mListBean == null ? "" : mListBean.getAddrCode())
                     .addParams("longitude", mMapLocationInfo.getLongitude() + "")
                     .addParams("latitude", mMapLocationInfo.getLatitude() + "")
@@ -494,9 +529,11 @@ public class PointRecordFragment extends Fragment {
         }else if(mType==2){
             OkHttpUtils.post()
                     .url(HttpUrl.ADDADDRESS_POST)
-                    .addParams("district", mDistrictEt.getText().toString().trim()+"")
-                    .addParams("street", mStreeEt.getText().toString().trim()+"")
-                    .addParams("area", mShequEt.getText().toString().trim()+"")
+                    ////用户名，能看见谁提交的，备注，
+                    .addParams("userCode",mUserInfo.getUserCode())
+                    .addParams("district", mListBean == null ? "" : mListBean.getDisName())
+                    .addParams("street", mListBean == null ? "" : mListBean.getStreet())
+                    .addParams("area", areaText+"")
                     .addParams("longitude", mMapLocationInfo.getLongitude() + "")
                     .addParams("latitude", mMapLocationInfo.getLatitude() + "")
                     .addParams("address", mCummEt.getText().toString().trim()+"")
@@ -539,4 +576,132 @@ public class PointRecordFragment extends Fragment {
         return fragment;
     }
 
+    private void requestInfo(){
+        OkHttpUtils.post()
+                .url(HttpUrl.FINDPOINT_POST)
+
+                .build().execute(new Callback<PointInfoEntity>() {
+            @Override
+            public PointInfoEntity parseNetworkResponse(Response response, int id) throws Exception {
+                String jsonStr = response.body().string();
+                return (PointInfoEntity) JsonUtils.parseJson2Obj(jsonStr, PointInfoEntity.class);
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+                mProgressDialog.dismiss();
+                DialogUtil.showNetFailDialog(getActivity());
+            }
+
+            @Override
+            public void onResponse(PointInfoEntity entity, int id) {
+                mProgressDialog.dismiss();
+                if (entity == null) {
+                    DialogUtil.showErrDialog(getActivity(), "返回信息为空");
+                    return;
+                }
+                if (!"1000".endsWith(entity.getReturnCode())) {
+                    DialogUtil.showErrDialog(getActivity(), entity.getReturnMsg());
+                    return;
+                }
+                infoList = entity.getInfoList();
+//                initData(infoList);
+            }
+        });
+    }
+
+//    private void initData(List<PointInfoEntity.InfoListBean> jsonBean) {
+
+    private void initData() {
+        /**
+         * 注意：assets 目录下的Json文件仅供参考，实际使用可自行替换文件
+         * 关键逻辑在于循环体
+         * */
+
+
+//        String JsonData = new GetJsonDataUtil().getJson(getActivity(), "pointInfo.json");//获取assets目录下的json文件数据
+//        ArrayList<PointInfoEntity.InfoListBean> jsonBean = parseData(JsonData);//用Gson 转成实体
+        String jsonStr = new GetJsonDataUtil().getJson(getActivity(), "pointInfo.json");
+
+        PointInfoEntity pointEntity = (PointInfoEntity) JsonUtils.parseJson2Obj(jsonStr, PointInfoEntity.class);//序列化
+        ArrayList<PointInfoEntity.InfoListBean> jsonBean = (ArrayList<PointInfoEntity.InfoListBean>) pointEntity.getInfoList();
+
+
+
+        /**
+         * 添加省份数据
+         * 注意：如果是添加的JavaBean实体，则实体类需要实现 IPickerViewData 接口，
+         * PickerView会通过getPickerViewText方法获取字符串显示出来。
+         */
+//        options1Items = jsonBean;//
+
+        for (int i = 0; i < jsonBean.size(); i++) {//遍历区
+            ArrayList<String> streetList = new ArrayList<>();//该区的街道列表（第二级）
+            ArrayList<ArrayList<String>> district_sheQuList = new ArrayList<>();//该区所有社区列表（第三级）
+            Log.i("111",jsonBean.get(i).getName()+"****-");
+
+            options1Items.add(jsonBean.get(i).getName());
+            for (int c = 0; c < jsonBean.get(i).getStreetList().size(); c++) {//遍历该区所有街道
+                String streetName = jsonBean.get(i).getStreetList().get(c).getName();
+                streetList.add(streetName);//添加街道
+                ArrayList<String> street_sheQuList = new ArrayList<>();//该街道所有社区列表
+
+                //如果无地区数据，建议添加空字符串，防止数据为null 导致三个选项长度不匹配造成崩溃
+                if (jsonBean.get(i).getStreetList().get(c).getArea() == null
+                        || jsonBean.get(i).getStreetList().get(c).getArea().size() == 0) {
+                    street_sheQuList.add("");
+                } else {
+                    street_sheQuList.addAll(jsonBean.get(i).getStreetList().get(c).getArea());
+                }
+                district_sheQuList.add(street_sheQuList);//添加该省所有地区数据
+            }
+            //添加城市数据
+            options2Items.add(streetList);
+            //添加地区数据
+            options3Items.add(district_sheQuList);
+        }
+
+
+    }
+    public ArrayList<PointInfoEntity.InfoListBean> parseData(String result) {//Gson 解析
+        ArrayList<PointInfoEntity.InfoListBean> detail = new ArrayList<>();
+        try {
+            JSONArray data = new JSONArray(result);
+            Gson gson = new Gson();
+            for (int i = 0; i < data.length(); i++) {
+                PointInfoEntity entity = gson.fromJson(data.optJSONObject(i).toString(), PointInfoEntity.class);
+                detail.add(entity.getInfoList().get(i));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return detail;
+    }
+    private void showPickerView() {
+        OptionsPickerView pvOptions = new OptionsPickerBuilder(getActivity(), new OnOptionsSelectListener() {
+            @Override
+            public void onOptionsSelect(int options1, int options2, int options3, View v) {
+                //返回的分别是三个级别的选中位置
+
+                mDistrictEt.setText(options1Items.get(options1)+"/"+options2Items.get(options1).get(options2)+"/"+options3Items.get(options1).get(options2).get(options3));
+                mStreeEt.setText(options2Items.get(options1).get(options2));
+                mShequEt.setText(options3Items.get(options1).get(options2).get(options3));
+                if (mShequEt.getText().toString().equals("其他")){
+                    llAreaEt.setVisibility(View.VISIBLE);
+                }else {
+                    llAreaEt.setVisibility(View.GONE);
+                }
+            }
+        })
+                .setTitleText("位置选择")
+                .setTitleBgColor(Color.WHITE)//设置标题的背景颜色
+                .setDividerColor(Color.BLACK)//设置分割线的颜色
+                .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+                .setContentTextSize(20)
+                .build();
+        pvOptions.setPicker(options1Items, options2Items, options3Items);//三级选择器
+        pvOptions.show();
+    }
+
+
 }

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+    <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+        <item>
+            <shape>
+                <solid android:color="@color/black" />
+            </shape>
+        </item>
+        <item
+            android:bottom="2dp"
+            android:left="2dp"
+            android:right="2dp">
+            <shape>
+                <solid android:color="#ffffff" />
+            </shape>
+        </item>
+    </layer-list>

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

@@ -455,7 +455,7 @@
                             android:layout_height="wrap_content"
                             android:layout_centerInParent="true"
                             android:layout_weight="1"
-                            android:drawableTop="@mipmap/ic_smart"
+                            android:drawableTop="@mipmap/ic_rechange"
                             android:drawablePadding="5dp"
                             android:gravity="center"
                             android:text="抽样任务"
@@ -496,7 +496,7 @@
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
                         android:layout_weight="1"
-                        android:drawableTop="@mipmap/ic_rechange"
+                        android:drawableTop="@mipmap/ic_smart"
                         android:drawablePadding="5dp"
                         android:gravity="center"
                         android:text="上月整改不通过任务"
@@ -531,7 +531,7 @@
                         android:drawableTop="@mipmap/ic_upload"
                         android:drawablePadding="5dp"
                         android:gravity="center"
-                        android:text="上报信息"
+                        android:text="点位修改"
                         android:textColor="@color/text_black"
                         android:textSize="@dimen/size_normal" />
                 </RelativeLayout>

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

@@ -83,6 +83,7 @@
                 android:layout_weight="1"
                 android:drawableRight="@mipmap/ic_right_arrow"
                 android:drawablePadding="5dp"
+                android:layout_marginRight="8dp"
                 android:gravity="right"
                 android:textColor="@color/text_dark_green"
                 android:textSize="14dp" />
@@ -107,7 +108,6 @@
                         android:visibility="gone"
                         android:textSize="@dimen/size_normal"/>
 
-
                 </LinearLayout>
             </LinearLayout>
 
@@ -133,22 +133,30 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="80dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_margin="8dp"
+                    android:layout_marginLeft="8dp"
                     android:gravity="center_vertical"
-                    android:text="区名："
+                    android:text="武汉市"
                     android:textColor="@color/color_login_text"
                     android:textSize="@dimen/size_normal"/>
+                <View
+                    android:layout_width="1dip"
+                    android:layout_height="40dp"
+                    android:layout_margin="4dp"
+                    android:layout_gravity="center"
+                    android:background="@color/black" />
 
-                <EditText
+                <TextView
                     android:id="@+id/et_district"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@null"
                     android:gravity="center_vertical|left"
-                    android:hint="请输入"
+                    android:hint="请选择 区/街道/社区"
+                    android:drawableRight="@mipmap/ic_right_arrow"
+                    android:layout_marginRight="8dp"
                     android:textSize="@dimen/size_normal"/>
 
             </LinearLayout>
@@ -160,6 +168,7 @@
                 android:layout_marginTop="30dp"
                 android:background="#F2F2F2"
                 android:gravity="center_vertical"
+                android:visibility="gone"
                 android:orientation="horizontal">
 
                 <TextView
@@ -171,14 +180,15 @@
                     android:textColor="@color/color_login_text"
                     android:textSize="@dimen/size_normal"/>
 
-                <EditText
+                <TextView
                     android:id="@+id/et_stree"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@null"
                     android:gravity="center_vertical|left"
-                    android:hint="请输入"
+                    android:layout_marginRight="8dp"
+                    android:hint=""
                     android:textSize="@dimen/size_normal"/>
 
             </LinearLayout>
@@ -190,7 +200,9 @@
                 android:layout_marginTop="30dp"
                 android:background="#F2F2F2"
                 android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:visibility="gone"
+                >
 
                 <TextView
                     android:layout_width="80dp"
@@ -201,17 +213,48 @@
                     android:textColor="@color/color_login_text"
                     android:textSize="@dimen/size_normal"/>
 
-                <EditText
+                <TextView
                     android:id="@+id/et_shequ"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@null"
                     android:gravity="center_vertical|left"
-                    android:hint="请输入"
+                    android:layout_marginRight="8dp"
+                    android:hint=""
                     android:textSize="@dimen/size_normal"/>
 
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/ll_area"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="200dp"
+                android:layout_marginRight="40dp"
+                android:layout_marginTop="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:background="@drawable/bg_black_conner"
+                android:visibility="gone">
+
+               <!-- <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_margin="1dp"
+                    android:gravity="center_vertical"
+                    android:text="社区:"
+                    android:textColor="@color/color_login_text"
+                    android:textSize="@dimen/size_normal"/>-->
+                <EditText
+                    android:id="@+id/et_area"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:hint="请输入社区名"
+                    android:background="@null"
+
+                    />
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"