d

2020-08-20 09:17:58 +08:00
parent 968c201e69
commit 5faba57ac4
60 changed files with 14882 additions and 193 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,6 +32,7 @@ dependencies {
    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
    //    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
    //    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'com.google.code.gson:gson:2.7'
    implementation 'com.hannesdorfmann.mosby3:mvp:3.0.0-alpha4'
    //RecyclerAdapter框架
    implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
@@ -55,5 +56,7 @@ dependencies {
    implementation 'com.j256.ormlite:ormlite-android:5.1'
    implementation files('libs/eventbus-2.4.0.jar')
    //三级联动选择
-    implementation 'com.contrarywind:Android-PickerView:3.2.6'
+   // implementation 'com.contrarywind:Android-PickerView:3.2.6'
+    implementation 'com.contrarywind:Android-PickerView:4.1.9'
+
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.example.administrator.seven">
-
    <uses-permission android:name="android.permission.INTERNET" /> <!-- 获取运营商信息，用于支持提供运营商信息相关的接口 -->
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 这个权限用于获取wifi的获取权限，wifi信息会用来进行网络定位 -->
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-
    <application
        android:name=".BaseApplication"
        android:allowBackup="true"
@@ -16,6 +14,15 @@
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/AppTheme">
+        <activity android:name="com.example.administrator.seven.main.kehu.activity.JsonDataActivity">
+                    <intent-filter>
+                        <action android:name="android.intent.action.MAIN" />
+
+                        <category android:name="android.intent.category.LAUNCHER" />
+                    </intent-filter>
+        </activity>
+
+
        <activity android:name=".main.kehu.activity.CustomerDetailActivity"></activity>
        <activity android:name=".main.activity.Main2Activity" /> <!-- 开启页 -->
        <activity
@@ -23,10 +30,10 @@
            android:screenOrientation="portrait"
            android:theme="@style/SplashTheme">

-             <intent-filter>
-             <action android:name="android.intent.action.MAIN"/>
-             <category android:name="android.intent.category.LAUNCHER"/>
-             </intent-filter>
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.MAIN"/>-->
+<!--                <category android:name="android.intent.category.LAUNCHER"/>-->
+<!--            </intent-filter>-->
        </activity> <!-- 登录 -->
        <activity
            android:name=".main.activity.LoginActivity"
@@ -40,11 +47,11 @@
        <activity
            android:name=".main.activity.MainActivity"
            android:screenOrientation="portrait">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
+            <!--            <intent-filter>-->
+            <!--                <action android:name="android.intent.action.MAIN" />-->

-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+            <!--                <category android:name="android.intent.category.LAUNCHER" />-->
+            <!--            </intent-filter>-->
        </activity>
        <activity android:name=".view.webview.XfiveWebActivity" />
        <activity
@@ -61,7 +68,14 @@
            android:screenOrientation="portrait" />
        <activity
            android:name=".main.kehu.activity.DesignActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait" >
+            <!--                                <intent-filter>-->
+            <!--                                    <action android:name="android.intent.action.MAIN" />-->
+
+            <!--                                    <category android:name="android.intent.category.LAUNCHER" />-->
+            <!--                                </intent-filter>-->
+        </activity>
+
    </application>

-</manifest>
+</manifest>
--- a/app/src/main/assets/city.json
+++ b/app/src/main/assets/city.json
--- a/app/src/main/java/com/example/administrator/seven/utils/GetJsonDataUtil.java
+++ b/app/src/main/java/com/example/administrator/seven/utils/GetJsonDataUtil.java
@@ -1,4 +1,4 @@
-package com.example.administrator.seven.utils;
+package com.example.administrator.seven;

 import android.content.Context;
 import android.content.res.AssetManager;
@@ -8,7 +8,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;

 /**
- * TODO<读取Json文件的工具类>
+ * <读取Json文件的工具类>
 *
 * @author: 小嵩
 * @date: 2017/3/16 16:22
@@ -18,7 +18,7 @@ import java.io.InputStreamReader;
 public class GetJsonDataUtil {


-    public String getJson(Context context, String fileName) {
+    public String getJson(Context context,String fileName) {

        StringBuilder stringBuilder = new StringBuilder();
        try {
--- a/app/src/main/java/com/example/administrator/seven/base/BaseActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/base/BaseActivity.java
@@ -6,11 +6,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import androidx.annotation.IdRes;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextPaint;
 import android.util.TypedValue;
 import android.view.View;
@@ -23,6 +18,12 @@ import com.example.administrator.seven.R;
 import com.example.administrator.seven.dialog.PersonnelDialogHelptwo;
 import com.example.administrator.seven.utils.StatusBarUtils;

+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+

 /**
 * 日期：2017.01.03
--- a/app/src/main/java/com/example/administrator/seven/base/BaseFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/base/BaseFragment.java
@@ -7,13 +7,13 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
-
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.Fragment;
-import androidx.core.content.ContextCompat;
 import android.text.TextPaint;
 import android.widget.TextView;

+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+
 /**
 * 项目名：erp
 * 包名：com.realize.erp.view.fragment
--- a/app/src/main/java/com/example/administrator/seven/base/BaseTreeActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/base/BaseTreeActivity.java
@@ -5,10 +5,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import androidx.annotation.IdRes;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -16,7 +12,6 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.Toast;

-
 import com.example.administrator.seven.R;
 import com.example.administrator.seven.dialog.LoadingDialogy;
 import com.example.administrator.seven.utils.StatusBarUtils;
@@ -24,6 +19,11 @@ import com.hannesdorfmann.mosby3.mvp.MvpActivity;
 import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
 import com.hannesdorfmann.mosby3.mvp.MvpView;

+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 /**
 * BaseTreeActivity
 * (๑• . •๑)
--- a/app/src/main/java/com/example/administrator/seven/base/BaseTreeFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/base/BaseTreeFragment.java
@@ -5,10 +5,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import androidx.annotation.IdRes;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
@@ -23,6 +19,11 @@ import com.hannesdorfmann.mosby3.mvp.MvpFragment;
 import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
 import com.hannesdorfmann.mosby3.mvp.MvpView;

+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 /**
 * BaseTreeFragment
 * (๑• . •๑)
--- a/app/src/main/java/com/example/administrator/seven/base/BaseTreeView.java
+++ b/app/src/main/java/com/example/administrator/seven/base/BaseTreeView.java
@@ -1,11 +1,12 @@
 package com.example.administrator.seven.base;

 import android.app.Activity;
-import androidx.annotation.StringRes;
-import androidx.annotation.UiThread;

 import com.hannesdorfmann.mosby3.mvp.MvpView;

+import androidx.annotation.StringRes;
+import androidx.annotation.UiThread;
+
 /**
 * BaseTreeView
 * (๑• . •๑)
--- a/app/src/main/java/com/example/administrator/seven/db/dao/DbRecordDao.java
+++ b/app/src/main/java/com/example/administrator/seven/db/dao/DbRecordDao.java
@@ -80,7 +80,7 @@ public class DbRecordDao {
        return false;
    }

-    public static List<DbRecordBeanData> queryInByCustom(String columnName,String columnValues){
+    public static List<DbRecordBeanData> queryInByCustom(String columnName, String columnValues){
        List<DbRecordBeanData> ormTables = new ArrayList<>();
        try {
            List<String> strings = Arrays.asList(columnValues.split(","));
--- a/app/src/main/java/com/example/administrator/seven/dialog/LoadingDialogy.java
+++ b/app/src/main/java/com/example/administrator/seven/dialog/LoadingDialogy.java
@@ -4,6 +4,7 @@ import android.app.Dialog;
 import android.content.Context;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+
 import com.example.administrator.seven.R;

 /**
--- a/app/src/main/java/com/example/administrator/seven/main/Fragment/MoFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/main/Fragment/MoFragment.java
@@ -4,9 +4,6 @@ import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -21,6 +18,10 @@ import com.example.administrator.seven.main.entity.Savaselect;

 import java.util.List;

+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+

@SuppressLint("ValidFragment")
 public abstract class MoFragment extends BaseFragment {
--- a/app/src/main/java/com/example/administrator/seven/main/Fragment/XikeInfoFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/main/Fragment/XikeInfoFragment.java
@@ -1,8 +1,6 @@
 package com.example.administrator.seven.main.Fragment;

 import android.annotation.SuppressLint;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,7 +9,6 @@ import android.widget.TextView;
 import com.example.administrator.seven.JsonUtils;
 import com.example.administrator.seven.R;
 import com.example.administrator.seven.main.adapter.mine.XikeInfoAdapter;
-import com.example.administrator.seven.main.entity.Savaselect;
 import com.example.administrator.seven.main.entity.XikeInfoBean;
 import com.example.administrator.seven.okgonet.NetApi;
 import com.example.administrator.seven.okgonet.Observer;
@@ -20,6 +17,9 @@ import com.lzy.okgo.model.Response;
 import java.util.ArrayList;
 import java.util.List;

+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
 * 惜客指数详情
 */
--- a/app/src/main/java/com/example/administrator/seven/main/activity/LoginActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/activity/LoginActivity.java
@@ -2,7 +2,6 @@ package com.example.administrator.seven.main.activity;

 import android.os.Bundle;
 import android.os.CountDownTimer;
-import androidx.annotation.NonNull;
 import android.text.Html;
 import android.view.View;
 import android.widget.Button;
@@ -15,6 +14,8 @@ import com.example.administrator.seven.base.BaseTreeActivity;
 import com.example.administrator.seven.main.activity.mvp.contract.LoginContract;
 import com.example.administrator.seven.main.activity.mvp.presenterImpl.LoginPresenterImpl;

+import androidx.annotation.NonNull;
+
 /**
 * LoginActivity
 * 类描述:登录页面
--- a/app/src/main/java/com/example/administrator/seven/main/activity/LoginPasswordActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/activity/LoginPasswordActivity.java
@@ -1,7 +1,6 @@
 package com.example.administrator.seven.main.activity;

 import android.os.CountDownTimer;
-import androidx.annotation.NonNull;
 import android.text.Html;
 import android.view.View;
 import android.widget.Button;
@@ -13,6 +12,8 @@ import com.example.administrator.seven.base.BaseTreeActivity;
 import com.example.administrator.seven.main.activity.mvp.contract.LoginPasswordContract;
 import com.example.administrator.seven.main.activity.mvp.presenterImpl.LoginPasswordPresenterImpl;

+import androidx.annotation.NonNull;
+
 /**
 * LoginActivity
 * 类描述:登录页面
--- a/app/src/main/java/com/example/administrator/seven/main/activity/Main2Activity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/activity/Main2Activity.java
@@ -5,7 +5,6 @@ import android.os.Bundle;
 import com.example.administrator.seven.R;
 import com.example.administrator.seven.base.BaseActivity;
 import com.example.administrator.seven.main.Fragment.XikeInfoFragment;
-import com.example.administrator.seven.main.entity.Savaselect;

 public class Main2Activity extends BaseActivity {

--- a/app/src/main/java/com/example/administrator/seven/main/activity/MainActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/activity/MainActivity.java
@@ -1,9 +1,6 @@
 package com.example.administrator.seven.main.activity;

 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -11,11 +8,14 @@ import android.widget.TextView;
 import com.example.administrator.seven.R;
 import com.example.administrator.seven.base.BaseActivity;
 import com.example.administrator.seven.main.kehu.TraceFragment;
-import com.example.administrator.seven.main.task.HomeFragment;
-import com.example.administrator.seven.main.find.MapFragment;
 import com.example.administrator.seven.main.my.MyFragment;
+import com.example.administrator.seven.main.task.HomeFragment;
 import com.example.administrator.seven.main.zhibo.SendFragment;

+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 public class MainActivity extends BaseActivity implements View.OnClickListener{

    /**
--- a/app/src/main/java/com/example/administrator/seven/main/activity/SplashActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/activity/SplashActivity.java
@@ -3,12 +3,14 @@ package com.example.administrator.seven.main.activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import androidx.annotation.Nullable;
 import android.view.KeyEvent;
 import android.view.WindowManager;
+
 import com.example.administrator.seven.base.BaseActivity;
 import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils;

+import androidx.annotation.Nullable;
+
 /**
 * SplashActivity
 * 类描述：启动页
--- a/app/src/main/java/com/example/administrator/seven/main/activity/mine/InboundHistoryActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/activity/mine/InboundHistoryActivity.java
@@ -1,8 +1,6 @@
 package com.example.administrator.seven.main.activity.mine;

 import android.os.Bundle;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -17,6 +15,9 @@ import com.example.administrator.seven.utils.SpaceItemDecoration;
 import java.util.ArrayList;
 import java.util.List;

+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class InboundHistoryActivity extends BaseActivity {

    private ImageView mIvBack;
--- a/app/src/main/java/com/example/administrator/seven/main/activity/mine/MessageNoticeActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/activity/mine/MessageNoticeActivity.java
@@ -1,8 +1,6 @@
 package com.example.administrator.seven.main.activity.mine;

 import android.os.Bundle;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -17,6 +15,9 @@ import com.example.administrator.seven.utils.SpaceItemDecoration;
 import java.util.ArrayList;
 import java.util.List;

+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class MessageNoticeActivity extends BaseActivity implements View.OnClickListener{


--- a/app/src/main/java/com/example/administrator/seven/main/activity/mine/OutboundHistoryActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/activity/mine/OutboundHistoryActivity.java
@@ -1,8 +1,6 @@
 package com.example.administrator.seven.main.activity.mine;

 import android.os.Bundle;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -17,6 +15,9 @@ import com.example.administrator.seven.utils.SpaceItemDecoration;
 import java.util.ArrayList;
 import java.util.List;

+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class OutboundHistoryActivity extends BaseActivity {

    private ImageView mIvBack;
--- a/app/src/main/java/com/example/administrator/seven/main/adapter/GuideViewPagerAdapter.java
+++ b/app/src/main/java/com/example/administrator/seven/main/adapter/GuideViewPagerAdapter.java
@@ -1,11 +1,13 @@
 package com.example.administrator.seven.main.adapter;

 import android.content.Context;
-import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
+
 import java.util.List;

+import androidx.viewpager.widget.PagerAdapter;
+
 /**
 * 引导页适配器
 */
--- a/app/src/main/java/com/example/administrator/seven/main/find/MapFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/main/find/MapFragment.java
@@ -2,5 +2,5 @@ package com.example.administrator.seven.main.find;

 import com.example.administrator.seven.base.BaseFragment;

-public class MapFragment extends BaseFragment{
+public class MapFragment extends BaseFragment {
 }
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/JsonBean.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/JsonBean.java
@@ -2,7 +2,8 @@ package com.example.administrator.seven.main.kehu.Bean;



-import com.bigkoo.pickerview.model.IPickerViewData;
+
+import com.contrarywind.interfaces.IPickerViewData;

 import java.util.List;

--- a/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/JsonBeantwo.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/JsonBeantwo.java
@@ -0,0 +1,119 @@
+package com.example.administrator.seven.main.kehu.Bean;
+
+
+
+import com.contrarywind.interfaces.IPickerViewData;
+
+import java.util.List;
+
+/**
+ * TODO<json数据源>
+ *
+ * @author: 小嵩
+ * @date: 2017/3/16 15:36
+ */
+
+public class JsonBeantwo implements IPickerViewData {
+
+
+    /**
+     * areaId : 110000
+     * areaName : 北京市
+     * cities : [{"areaId":"110000","areaName":"北京市","counties":[{"areaId":"110101","areaName":"东城区"},{"areaId":"110102","areaName":"西城区"},{"areaId":"110105","areaName":"朝阳区"},{"areaId":"110106","areaName":"丰台区"},{"areaId":"110107","areaName":"石景山区"},{"areaId":"110108","areaName":"海淀区"},{"areaId":"110109","areaName":"门头沟区"},{"areaId":"110111","areaName":"房山区"},{"areaId":"110112","areaName":"通州区"},{"areaId":"110113","areaName":"顺义区"},{"areaId":"110114","areaName":"昌平区"},{"areaId":"110115","areaName":"大兴区"},{"areaId":"110116","areaName":"怀柔区"},{"areaId":"110117","areaName":"平谷区"},{"areaId":"110228","areaName":"密云县"},{"areaId":"110229","areaName":"延庆县"}]}]
+     */
+
+    private String areaId;
+    private String areaName;
+    private List<CitiesBean> cities;
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    public List<CitiesBean> getCities() {
+        return cities;
+    }
+
+    public void setCities(List<CitiesBean> cities) {
+        this.cities = cities;
+    }
+
+    @Override
+    public String getPickerViewText() {
+        return this.areaName+","+this.areaId;
+    }
+
+    public static class CitiesBean {
+        /**
+         * areaId : 110000
+         * areaName : 北京市
+         * counties : [{"areaId":"110101","areaName":"东城区"},{"areaId":"110102","areaName":"西城区"},{"areaId":"110105","areaName":"朝阳区"},{"areaId":"110106","areaName":"丰台区"},{"areaId":"110107","areaName":"石景山区"},{"areaId":"110108","areaName":"海淀区"},{"areaId":"110109","areaName":"门头沟区"},{"areaId":"110111","areaName":"房山区"},{"areaId":"110112","areaName":"通州区"},{"areaId":"110113","areaName":"顺义区"},{"areaId":"110114","areaName":"昌平区"},{"areaId":"110115","areaName":"大兴区"},{"areaId":"110116","areaName":"怀柔区"},{"areaId":"110117","areaName":"平谷区"},{"areaId":"110228","areaName":"密云县"},{"areaId":"110229","areaName":"延庆县"}]
+         */
+
+        private String areaId;
+        private String areaName;
+        private List<CountiesBean> counties;
+
+        public String getAreaId() {
+            return areaId;
+        }
+
+        public void setAreaId(String areaId) {
+            this.areaId = areaId;
+        }
+
+        public String getAreaName() {
+            return areaName;
+        }
+
+        public void setAreaName(String areaName) {
+            this.areaName = areaName;
+        }
+
+        public List<CountiesBean> getCounties() {
+            return counties;
+        }
+
+        public void setCounties(List<CountiesBean> counties) {
+            this.counties = counties;
+        }
+
+        public static class CountiesBean {
+            /**
+             * areaId : 110101
+             * areaName : 东城区
+             */
+
+            private String areaId;
+            private String areaName;
+
+            public String getAreaId() {
+                return areaId;
+            }
+
+            public void setAreaId(String areaId) {
+                this.areaId = areaId;
+            }
+
+            public String getAreaName() {
+                return areaName;
+            }
+
+            public void setAreaName(String areaName) {
+                this.areaName = areaName;
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/customerDetailBean.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/customerDetailBean.java
@@ -7,7 +7,7 @@ import com.example.administrator.seven.test.BaseModel;
 * Author:  jianbo
 * Description:
 */
-public class customerDetailBean extends BaseModel{
+public class customerDetailBean extends BaseModel {

    /**
     * result : {"msg":"成功","data":{"address":"陕西省西安市未央区某某路","headimg":"localhost/upload/2020081115530962805.jpg","phone":"18831913290","name":"demo","wechat":"wangyuxin283425757","source":"1","style_id":"1","decoration":"1","style_name":"北欧","budget":"120"},"success":0}
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/CustomerFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/CustomerFragment.java
@@ -1,12 +1,10 @@
 package com.example.administrator.seven.main.kehu;

-import android.content.Intent;
 import android.widget.Toast;

 import com.example.administrator.seven.JsonUtils;
 import com.example.administrator.seven.R;
 import com.example.administrator.seven.dialog.BaseTipsDialog;
-import com.example.administrator.seven.main.activity.LoginPasswordActivity;
 import com.example.administrator.seven.main.kehu.Bean.CustomerListBean;
 import com.example.administrator.seven.main.kehu.Dialog.CusOperationDialog;
 import com.example.administrator.seven.main.kehu.activity.ShowAty;
@@ -16,7 +14,6 @@ import com.example.administrator.seven.okgonet.Observer;
 import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils;
 import com.lzy.okgo.model.Response;

-import java.util.ArrayList;
 import java.util.List;

 import androidx.recyclerview.widget.LinearLayoutManager;
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/DealFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/DealFragment.java
@@ -1,8 +1,6 @@
 package com.example.administrator.seven.main.kehu;

 import com.example.administrator.seven.JsonUtils;
-import com.example.administrator.seven.main.adapter.mine.XikeInfoAdapter;
-import com.example.administrator.seven.main.entity.XikeInfoBean;
 import com.example.administrator.seven.main.kehu.Bean.orderListBean;
 import com.example.administrator.seven.main.kehu.adapter.DeaListAdapter;
 import com.example.administrator.seven.okgonet.NetApi;
@@ -10,7 +8,6 @@ import com.example.administrator.seven.okgonet.Observer;
 import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils;
 import com.lzy.okgo.model.Response;

-import java.util.ArrayList;
 import java.util.List;

 import androidx.recyclerview.widget.LinearLayoutManager;
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/MobanFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/MobanFragment.java
@@ -18,7 +18,6 @@ import com.example.administrator.seven.main.entity.Savaselect;

 import java.util.List;

-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

--- a/app/src/main/java/com/example/administrator/seven/main/kehu/activity/CustomerDetailActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/activity/CustomerDetailActivity.java
@@ -1,9 +1,6 @@
 package com.example.administrator.seven.main.kehu.activity;

 import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;

 import com.example.administrator.seven.R;
@@ -11,8 +8,6 @@ import com.example.administrator.seven.base.BaseActivity;
 import com.example.administrator.seven.widget.CircleImageView;
 import com.example.administrator.seven.widget.TitleBar;

-import androidx.appcompat.app.AppCompatActivity;
-
 /**
 * 客户详情
 */
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/activity/DesignActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/activity/DesignActivity.java
@@ -1,4 +1,4 @@
-package com.example.administrator.seven.main.kehu.activity;
+package com.example.administrator.seven.main.kehu.activity;//package com.example.administrator.seven.main.kehu.activity;

 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -8,24 +8,23 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
 import android.view.View;
-import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;

-import com.bigkoo.pickerview.OptionsPickerView;
-import com.example.administrator.seven.FHConfig;
+import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
+import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
+import com.bigkoo.pickerview.view.OptionsPickerView;
+import com.example.administrator.seven.GetJsonDataUtil;
 import com.example.administrator.seven.R;
 import com.example.administrator.seven.base.BaseTreeActivity;
 import com.example.administrator.seven.db.DbRecordBeanData;
 import com.example.administrator.seven.main.kehu.Bean.CommitDesignModel;
-import com.example.administrator.seven.main.kehu.Bean.JsonBean;
+import com.example.administrator.seven.main.kehu.Bean.JsonBeantwo;
 import com.example.administrator.seven.main.kehu.Bean.PhotoeditorBean;
 import com.example.administrator.seven.main.kehu.activity.mvp.contract.CommitDesignContract;
 import com.example.administrator.seven.main.kehu.activity.mvp.presenter.CommitDesignPresenter;
 import com.example.administrator.seven.main.kehu.adapter.DesignAdapter;
-import com.example.administrator.seven.utils.GetJsonDataUtil;
-import com.example.administrator.seven.utils.SPUtils;
 import com.example.administrator.seven.utils.ToastUtils;
-import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils;
 import com.example.administrator.seven.widget.TitleBar;
 import com.google.gson.Gson;

@@ -41,17 +40,20 @@ import androidx.recyclerview.widget.RecyclerView;
 public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View, CommitDesignPresenter> implements CommitDesignContract.View,
        View.OnClickListener {
    private TitleBar mTitleBar;
-    private int options1, options2, options3;
-    private boolean isLoaded = true;//省市区选择状态
-    private ArrayList<JsonBean> options1Items = new ArrayList<>();
+    private List<JsonBeantwo> options1Items = new ArrayList<>();
+    private List<JsonBeantwo> options1Itemids = new ArrayList<>();
    private ArrayList<ArrayList<String>> options2Items = new ArrayList<>();
-    private ArrayList<ArrayList<ArrayList<String>>> options3Items = new ArrayList<>();
-    private String mActivityType, userType, checkType, isEdit = "0", orderId, orderNum, userPhone, paymentpaper = "", isFocus = "0", province = "", city = "", area = "",
-            orderType, visitor_id, returnnum = "", uid, checkTypetb, unique_only = "", phone, userName = "";
+    private ArrayList<ArrayList<String>> options2Itemids = new ArrayList<>();
+    private Thread thread;
    private static final int MSG_LOAD_DATA = 0x0001;
    private static final int MSG_LOAD_SUCCESS = 0x0002;
    private static final int MSG_LOAD_FAILED = 0x0003;
-    private Thread thread;
+
+    private static boolean isLoaded = false;
+
+    private String mActivityType, userType, checkType, isEdit = "0", orderId, orderNum, userPhone, paymentpaper = "", isFocus = "0", province = "", city = "", area = "",
+            orderType, visitor_id, returnnum = "", uid, checkTypetb, unique_only = "", phone, userName = "";
+
    private List<DbRecordBeanData> dataBean;

    private TextView btn_add;
@@ -104,9 +106,7 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,

            @Override
            public void address() {
-                options1 = (int) SPUtils.getSp(DesignActivity.this, FHConfig.KEY_OPTIONS1, 0);
-                options2 = (int) SPUtils.getSp(DesignActivity.this, FHConfig.KEY_OPTIONS2, 0);
-                options3 = (int) SPUtils.getSp(DesignActivity.this, FHConfig.KEY_OPTIONS3, 0);
+
                if (isLoaded) {
                    showPickerView();
                } else {
@@ -118,7 +118,7 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,

    @Override
    public void onsuccress() {
-    //    finish();
+        //    finish();
    }

    @Override
@@ -206,36 +206,14 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,
    }


-    /**
-     * 省市区选择弹框
-     */
-    private void showPickerView() {// 弹出选择器
-        OptionsPickerView pvOptions = new OptionsPickerView.Builder(DesignActivity.this, new OptionsPickerView.OnOptionsSelectListener() {
-            @Override
-            public void onOptionsSelect(int options1, int options2, int options3, View v) {
-                //返回的分别是三个级别的选中位置
-                province = options1Items.get(options1).getPickerViewText();
-                city = options2Items.get(options1).get(options2);
-                area = options3Items.get(options1).get(options2).get(options3);
-                //  mEtReceiveCollect.setText(province + city + area);
-                SPUtils.setSP(DesignActivity.this, FHConfig.KEY_OPTIONS1, options1);
-                SPUtils.setSP(DesignActivity.this, FHConfig.KEY_OPTIONS2, options2);
-                SPUtils.setSP(DesignActivity.this, FHConfig.KEY_OPTIONS3, options3);
-            }
-        }).setTitleText("").setDividerColor(Color.BLACK).setTextColorCenter(Color.BLACK) //设置选中项文字颜色
-                .setContentTextSize(20)
-                .setSelectOptions(options1, options2, options3)
-                .build();
-        pvOptions.setPicker(options1Items, options2Items, options3Items);//三级选择器
-        pvOptions.show();
-    }
-
    @SuppressLint("HandlerLeak")
    private Handler mHandler = new Handler() {
        public void handleMessage(Message msg) {
            switch (msg.what) {
                case MSG_LOAD_DATA:
                    if (thread == null) {//如果已创建就不再重新创建子线程了
+
+                        Toast.makeText(DesignActivity.this, "Begin Parse Data", Toast.LENGTH_SHORT).show();
                        thread = new Thread(new Runnable() {
                            @Override
                            public void run() {
@@ -246,60 +224,108 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,
                        thread.start();
                    }
                    break;
+
                case MSG_LOAD_SUCCESS:
+                    Toast.makeText(DesignActivity.this, "Parse Succeed", Toast.LENGTH_SHORT).show();
                    isLoaded = true;
                    break;
+
                case MSG_LOAD_FAILED:
-//                    Toast.makeText(NewOrderActivity.this, "Parse Failed", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(DesignActivity.this, "Parse Failed", Toast.LENGTH_SHORT).show();
                    break;
            }
        }
    };

+
+    private void showPickerView() {// 弹出选择器
+
+        OptionsPickerView pvOptions = new OptionsPickerBuilder(this, new OnOptionsSelectListener() {
+            @Override
+            public void onOptionsSelect(int options1, int options2, int options3, View v) {
+                //返回的分别是三个级别的选中位置
+                String opt1tx = options1Items.size() > 0 ?
+                        options1Items.get(options1).getPickerViewText() : "";
+
+                String opt2tx = options2Items.size() > 0
+                        && options2Items.get(options1).size() > 0 ?
+                        options2Items.get(options1).get(options2) : "";
+
+                String opt1txx = options1Items.size() > 0 ?
+                        options1Items.get(options1).getAreaId() : "";
+
+                String opt2idtx = options2Itemids.size() > 0
+                        && options2Itemids.get(options1).size() > 0 ?
+                        options2Itemids.get(options1).get(options2) : "";
+                String tx = opt1tx + opt2tx +opt1txx+","+opt2idtx ;
+                Toast.makeText(DesignActivity.this, tx, Toast.LENGTH_SHORT).show();
+            }
+        })
+
+                .setTitleText("城市选择")
+                .setDividerColor(Color.BLACK)
+                .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+                .setContentTextSize(20)
+                .build();
+
+        pvOptions.setPicker(options1Items, options2Items);//三级选择器
+        pvOptions.show();
+    }
+
    private void initJsonData() {//解析数据
+
        /**
         * 注意：assets 目录下的Json文件仅供参考，实际使用可自行替换文件
         * 关键逻辑在于循环体
+         *
         * */
-        String JsonData = new GetJsonDataUtil().getJson(this, "province.json");//获取assets目录下的json文件数据
-        ArrayList<JsonBean> jsonBean = parseData(JsonData);//用Gson 转成实体
+        String JsonData = new GetJsonDataUtil().getJson(this, "city.json");//获取assets目录下的json文件数据
+
+        ArrayList<JsonBeantwo> jsonBean = parseData(JsonData);//用Gson 转成实体
+
        /**
         * 添加省份数据
+         *
         * 注意：如果是添加的JavaBean实体，则实体类需要实现 IPickerViewData 接口，
         * PickerView会通过getPickerViewText方法获取字符串显示出来。
         */
        options1Items = jsonBean;
+        options1Itemids = jsonBean;
+
        for (int i = 0; i < jsonBean.size(); i++) {//遍历省份
-            ArrayList<String> CityList = new ArrayList<>();//该省的城市列表（第二级）
-            ArrayList<ArrayList<String>> Province_AreaList = new ArrayList<>();//该省的所有地区列表（第三极）
-            for (int c = 0; c < jsonBean.get(i).getCityList().size(); c++) {//遍历该省份的所有城市
-                String CityName = jsonBean.get(i).getCityList().get(c).getName();
-                CityList.add(CityName);//添加城市
-                ArrayList<String> City_AreaList = new ArrayList<>();//该城市的所有地区列表
-                //如果无地区数据，建议添加空字符串，防止数据为null 导致三个选项长度不匹配造成崩溃
-                if (jsonBean.get(i).getCityList().get(c).getArea() == null
-                        || jsonBean.get(i).getCityList().get(c).getArea().size() == 0) {
-                    City_AreaList.add("");
-                } else {
-                    City_AreaList.addAll(jsonBean.get(i).getCityList().get(c).getArea());
-                }
-                Province_AreaList.add(City_AreaList);//添加该省所有地区数据
+            ArrayList<String> cityList = new ArrayList<>();//该省的城市列表（第二级）
+            ArrayList<String> cityidList = new ArrayList<>();//该省的城市列表（第二级id）
+            ArrayList<ArrayList<String>> province_AreaList = new ArrayList<>();//该省的所有地区列表（第三极）
+
+            for (int c = 0; c < jsonBean.get(i).getCities().size(); c++) {//遍历该省份的所有城市
+                String cityName = jsonBean.get(i).getCities().get(c).getAreaName();
+                String areaId = jsonBean.get(i).getCities().get(c).getAreaId();
+                cityList.add(cityName);//添加城市
+                cityidList.add(areaId);
+
            }
-            //添加城市数据
-            options2Items.add(CityList);
-            //添加地区数据
-            options3Items.add(Province_AreaList);
+            /**
+             * 添加城市数据
+             */
+            options2Items.add(cityList);
+            options2Itemids.add(cityidList);
+
        }
+
+
+
        mHandler.sendEmptyMessage(MSG_LOAD_SUCCESS);
+
    }

-    public ArrayList<JsonBean> parseData(String result) {//Gson 解析
-        ArrayList<JsonBean> detail = new ArrayList<>();
+
+    public ArrayList<JsonBeantwo> parseData(String result) {//Gson 解析
+        ArrayList<JsonBeantwo> detail = new ArrayList<>();
        try {
            JSONArray data = new JSONArray(result);
            Gson gson = new Gson();
            for (int i = 0; i < data.length(); i++) {
-                JsonBean entity = gson.fromJson(data.optJSONObject(i).toString(), JsonBean.class);
+                JsonBeantwo entity = gson.fromJson(data.optJSONObject(i).toString(), JsonBeantwo.class);
                detail.add(entity);
            }
        } catch (Exception e) {
@@ -309,4 +335,12 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,
        return detail;
    }

+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mHandler != null) {
+            mHandler.removeCallbacksAndMessages(null);
+        }
+    }
 }
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/activity/JsonDataActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/activity/JsonDataActivity.java
@@ -0,0 +1,213 @@
+package com.example.administrator.seven.main.kehu.activity;
+
+import android.annotation.SuppressLint;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.View;
+import android.widget.Toast;
+
+import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
+import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
+import com.bigkoo.pickerview.view.OptionsPickerView;
+import com.example.administrator.seven.GetJsonDataUtil;
+import com.example.administrator.seven.R;
+import com.example.administrator.seven.main.kehu.Bean.JsonBeantwo;
+import com.google.gson.Gson;
+
+import org.json.JSONArray;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+/**
+ * 解析省市区数据示例
+ *
+ * @author 小嵩
+ * @date 2017-3-16
+ */
+public class JsonDataActivity extends AppCompatActivity implements View.OnClickListener {
+
+
+    private List<JsonBeantwo> options1Items = new ArrayList<>();
+    private List<JsonBeantwo> options1Itemids = new ArrayList<>();
+    private ArrayList<ArrayList<String>> options2Items = new ArrayList<>();
+    private ArrayList<ArrayList<String>> options2Itemids = new ArrayList<>();
+    private Thread thread;
+    private static final int MSG_LOAD_DATA = 0x0001;
+    private static final int MSG_LOAD_SUCCESS = 0x0002;
+    private static final int MSG_LOAD_FAILED = 0x0003;
+
+    private static boolean isLoaded = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_json_data);
+        initView();
+    }
+
+    @SuppressLint("HandlerLeak")
+    private Handler mHandler = new Handler() {
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_LOAD_DATA:
+                    if (thread == null) {//如果已创建就不再重新创建子线程了
+
+                        Toast.makeText(JsonDataActivity.this, "Begin Parse Data", Toast.LENGTH_SHORT).show();
+                        thread = new Thread(new Runnable() {
+                            @Override
+                            public void run() {
+                                // 子线程中解析省市区数据
+                                initJsonData();
+                            }
+                        });
+                        thread.start();
+                    }
+                    break;
+
+                case MSG_LOAD_SUCCESS:
+                    Toast.makeText(JsonDataActivity.this, "Parse Succeed", Toast.LENGTH_SHORT).show();
+                    isLoaded = true;
+                    break;
+
+                case MSG_LOAD_FAILED:
+                    Toast.makeText(JsonDataActivity.this, "Parse Failed", Toast.LENGTH_SHORT).show();
+                    break;
+            }
+        }
+    };
+
+    private void initView() {
+        findViewById(R.id.btn_data).setOnClickListener(this);
+        findViewById(R.id.btn_show).setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.btn_data:
+                mHandler.sendEmptyMessage(MSG_LOAD_DATA);
+                break;
+            case R.id.btn_show:
+                if (isLoaded) {
+                    showPickerView();
+                } else {
+                    Toast.makeText(JsonDataActivity.this, "Please waiting until the data is parsed", Toast.LENGTH_SHORT).show();
+                }
+                break;
+        }
+    }
+
+
+    private void showPickerView() {// 弹出选择器
+
+        OptionsPickerView pvOptions = new OptionsPickerBuilder(this, new OnOptionsSelectListener() {
+            @Override
+            public void onOptionsSelect(int options1, int options2, int options3, View v) {
+                //返回的分别是三个级别的选中位置
+                String opt1tx = options1Items.size() > 0 ?
+                        options1Items.get(options1).getPickerViewText() : "";
+
+                String opt2tx = options2Items.size() > 0
+                        && options2Items.get(options1).size() > 0 ?
+                        options2Items.get(options1).get(options2) : "";
+
+                String opt1txx = options1Items.size() > 0 ?
+                        options1Items.get(options1).getAreaId() : "";
+
+                String opt2idtx = options2Itemids.size() > 0
+                        && options2Itemids.get(options1).size() > 0 ?
+                        options2Itemids.get(options1).get(options2) : "";
+                String tx = opt1tx + opt2tx +opt1txx+","+opt2idtx ;
+                Toast.makeText(JsonDataActivity.this, tx, Toast.LENGTH_SHORT).show();
+
+
+            }
+        })
+
+                .setTitleText("城市选择")
+                .setDividerColor(Color.BLACK)
+                .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+                .setContentTextSize(20)
+                .build();
+
+        pvOptions.setPicker(options1Items, options2Items);//三级选择器
+        pvOptions.show();
+    }
+
+    private void initJsonData() {//解析数据
+
+        /**
+         * 注意：assets 目录下的Json文件仅供参考，实际使用可自行替换文件
+         * 关键逻辑在于循环体
+         *
+         * */
+        String JsonData = new GetJsonDataUtil().getJson(this, "city.json");//获取assets目录下的json文件数据
+
+        ArrayList<JsonBeantwo> jsonBean = parseData(JsonData);//用Gson 转成实体
+
+        /**
+         * 添加省份数据
+         *
+         * 注意：如果是添加的JavaBean实体，则实体类需要实现 IPickerViewData 接口，
+         * PickerView会通过getPickerViewText方法获取字符串显示出来。
+         */
+        options1Items = jsonBean;
+        options1Itemids = jsonBean;
+
+        for (int i = 0; i < jsonBean.size(); i++) {//遍历省份
+            ArrayList<String> cityList = new ArrayList<>();//该省的城市列表（第二级）
+            ArrayList<String> cityidList = new ArrayList<>();//该省的城市列表（第二级id）
+            ArrayList<ArrayList<String>> province_AreaList = new ArrayList<>();//该省的所有地区列表（第三极）
+
+            for (int c = 0; c < jsonBean.get(i).getCities().size(); c++) {//遍历该省份的所有城市
+                String cityName = jsonBean.get(i).getCities().get(c).getAreaName();
+                String areaId = jsonBean.get(i).getCities().get(c).getAreaId();
+                cityList.add(cityName);//添加城市
+                cityidList.add(areaId);
+
+            }
+            /**
+             * 添加城市数据
+             */
+            options2Items.add(cityList);
+            options2Itemids.add(cityidList);
+
+        }
+
+
+
+        mHandler.sendEmptyMessage(MSG_LOAD_SUCCESS);
+
+    }
+
+
+    public ArrayList<JsonBeantwo> parseData(String result) {//Gson 解析
+        ArrayList<JsonBeantwo> detail = new ArrayList<>();
+        try {
+            JSONArray data = new JSONArray(result);
+            Gson gson = new Gson();
+            for (int i = 0; i < data.length(); i++) {
+                JsonBeantwo entity = gson.fromJson(data.optJSONObject(i).toString(), JsonBeantwo.class);
+                detail.add(entity);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            mHandler.sendEmptyMessage(MSG_LOAD_FAILED);
+        }
+        return detail;
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mHandler != null) {
+            mHandler.removeCallbacksAndMessages(null);
+        }
+    }
+}
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/activity/ShowAty.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/activity/ShowAty.java
@@ -16,12 +16,12 @@ public class ShowAty {
     * 选择调拨店铺
     */
    public static void AllocationSelectActivity(Context ctx, List<DbRecordBeanData> mShowListtwo) {
-    //    Intent i = new Intent(ctx, AllocationSelectActivity.class);
        Intent i = new Intent(ctx, DesignActivity.class);
        Bundle bundle = new Bundle();
        bundle.putSerializable("dataBean", (Serializable) mShowListtwo);
        i.putExtras(bundle);
        ctx.startActivity(i);
+
    }

    /**
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/activity/mvp/model/CommitDesignModeltwo.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/activity/mvp/model/CommitDesignModeltwo.java
@@ -1,22 +1,12 @@
 package com.example.administrator.seven.main.kehu.activity.mvp.model;

-import android.util.Log;
-
-import com.example.administrator.seven.JsonUtils;
-import com.example.administrator.seven.db.DbRecordBeanData;
 import com.example.administrator.seven.main.kehu.Bean.CommitDesignModel;
 import com.example.administrator.seven.main.kehu.Bean.PhotoeditorBean;
-import com.example.administrator.seven.main.kehu.Bean.customerFPListBean;
 import com.example.administrator.seven.main.kehu.activity.mvp.contract.CommitDesignContract;
 import com.example.administrator.seven.network.ApiCallBack;
 import com.example.administrator.seven.network.http.ApiUtils;
 import com.example.administrator.seven.network.http.ResponseBean;
-import com.example.administrator.seven.okgonet.NetApi;
-import com.example.administrator.seven.okgonet.Observer;
 import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils;
-import com.lzy.okgo.model.Response;
-
-import java.util.List;

 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/adapter/CusListAdapter.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/adapter/CusListAdapter.java
@@ -8,7 +8,6 @@ import android.widget.TextView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.example.administrator.seven.R;
-import com.example.administrator.seven.main.entity.XikeInfoBean;
 import com.example.administrator.seven.main.kehu.Bean.CustomerListBean;
 import com.example.administrator.seven.utils.WidgetTools;

--- a/app/src/main/java/com/example/administrator/seven/main/kehu/adapter/DesignAdapter.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/adapter/DesignAdapter.java
@@ -8,7 +8,6 @@ import android.widget.TextView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.example.administrator.seven.R;
-import com.example.administrator.seven.main.entity.XikeInfoBean;
 import com.example.administrator.seven.main.kehu.Bean.PhotoeditorBean;

 import java.util.List;
--- a/app/src/main/java/com/example/administrator/seven/main/my/MyFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/main/my/MyFragment.java
@@ -2,9 +2,6 @@ package com.example.administrator.seven.main.my;


 import android.content.Intent;
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -23,6 +20,10 @@ import com.example.administrator.seven.widget.CircleImageView;
 import com.example.administrator.seven.widget.ItemView;
 import com.tencent.mm.opensdk.openapi.IWXAPI;

+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+

 /**
 * MyFragment
--- a/app/src/main/java/com/example/administrator/seven/main/zhibo/SendFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/main/zhibo/SendFragment.java
@@ -9,7 +9,7 @@ import android.widget.TextView;
 import com.example.administrator.seven.R;
 import com.example.administrator.seven.base.BaseFragment;

-public class SendFragment extends BaseFragment{
+public class SendFragment extends BaseFragment {

    private View mContentView;
    private TextView titleTv;
--- a/app/src/main/java/com/example/administrator/seven/okgonet/NetApi.java
+++ b/app/src/main/java/com/example/administrator/seven/okgonet/NetApi.java
@@ -62,7 +62,7 @@ public class NetApi {
    /**
     * 分配列表
     */
-    public Observable<Response> fpList(final String uid,final String search) {
+    public Observable<Response> fpList(final String uid, final String search) {

        return new Observable<Response>() {
            @Override
@@ -107,7 +107,7 @@ public class NetApi {
    /**
     * 客户列表
     */
-    public Observable<Response> customerList(final String uid,final String search) {
+    public Observable<Response> customerList(final String uid, final String search) {

        return new Observable<Response>() {
            @Override
@@ -153,7 +153,7 @@ public class NetApi {
    /**
     * 成交列表
     */
-    public Observable<Response> orderList(final String uid,final String search) {
+    public Observable<Response> orderList(final String uid, final String search) {

        return new Observable<Response>() {
            @Override
@@ -286,7 +286,7 @@ public class NetApi {
    /**
     * 确认分配device/AppCustomer/sureFP
     */
-    public Observable<Response> sureFP(final String uid,final String content) {
+    public Observable<Response> sureFP(final String uid, final String content) {

        return new Observable<Response>() {
            @Override
--- a/app/src/main/java/com/example/administrator/seven/test/BaseFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/test/BaseFragment.java
@@ -6,16 +6,17 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
-import androidx.annotation.IdRes;
-import androidx.annotation.StringRes;
-import androidx.fragment.app.Fragment;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.util.Log;
 import android.util.TypedValue;
 import android.widget.Toast;

 import com.example.administrator.seven.R;

+import androidx.annotation.IdRes;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+

 /**
 * 日期：2017.01.03
--- a/app/src/main/java/com/example/administrator/seven/test/BaseRecyclerViewAdapter.java
+++ b/app/src/main/java/com/example/administrator/seven/test/BaseRecyclerViewAdapter.java
@@ -1,17 +1,17 @@
 package com.example.administrator.seven.test;

 import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;

-
 import com.example.administrator.seven.R;

 import java.util.List;

+import androidx.recyclerview.widget.RecyclerView;
+
 /**
 * Created by Administrator on 2016/12/26.
 * <p>
--- a/app/src/main/java/com/example/administrator/seven/test/InviteMessageAdapter.java
+++ b/app/src/main/java/com/example/administrator/seven/test/InviteMessageAdapter.java
@@ -1,18 +1,18 @@
 package com.example.administrator.seven.test;

 import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;

-
 import com.example.administrator.seven.R;

 import java.util.List;

+import androidx.recyclerview.widget.RecyclerView;
+

 /**
 * Created by: xudiwei
--- a/app/src/main/java/com/example/administrator/seven/test/RLListPager.java
+++ b/app/src/main/java/com/example/administrator/seven/test/RLListPager.java
@@ -1,9 +1,6 @@
 package com.example.administrator.seven.test;

 import android.content.Context;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.ViewGroup;
@@ -11,6 +8,10 @@ import android.widget.FrameLayout;

 import com.example.administrator.seven.R;

+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+

 /**
 * 日期：2017.01.21
--- a/app/src/main/java/com/example/administrator/seven/utils/SpaceItemDecoration.java
+++ b/app/src/main/java/com/example/administrator/seven/utils/SpaceItemDecoration.java
@@ -2,9 +2,10 @@ package com.example.administrator.seven.utils;

 import android.graphics.Canvas;
 import android.graphics.Rect;
+import android.view.View;
+
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;

 public class SpaceItemDecoration extends RecyclerView.ItemDecoration {

--- a/app/src/main/java/com/example/administrator/seven/utils/ToastUtils.java
+++ b/app/src/main/java/com/example/administrator/seven/utils/ToastUtils.java
@@ -10,6 +10,7 @@ import android.widget.Toast;

 import com.example.administrator.seven.R;

+
 /**
 * Created by gh0st on 2017/1/17.
 * 吐司工具类
--- a/app/src/main/java/com/example/administrator/seven/utils/checkVersionsUtils/ProfileSpUtils.java
+++ b/app/src/main/java/com/example/administrator/seven/utils/checkVersionsUtils/ProfileSpUtils.java
@@ -5,8 +5,6 @@ import android.content.SharedPreferences;
 import android.text.TextUtils;

 import com.example.administrator.seven.main.entity.LoginBean;
-import com.example.administrator.seven.main.entity.mine.TreeUserEntity;
-import com.example.administrator.seven.main.entity.mine.UserHeadEntity;
 import com.google.gson.Gson;

 /**
@@ -162,7 +160,7 @@ public class ProfileSpUtils {
     *
     * @return SP存储的用户资料
     */
-    public LoginBean  getUserProfie() {
+    public LoginBean getUserProfie() {
        String userStr = sharedPreferences.getString(KEY_USER, "");
        if (TextUtils.isEmpty(userStr)) {
            return new LoginBean();
@@ -182,3 +180,4 @@ public class ProfileSpUtils {

    }
 }
+
--- a/app/src/main/java/com/example/administrator/seven/view/StatusBarView.java
+++ b/app/src/main/java/com/example/administrator/seven/view/StatusBarView.java
@@ -3,10 +3,11 @@ package com.example.administrator.seven.view;
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Build;
-import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;

+import androidx.annotation.Nullable;
+
 /**
 * Time:  2020/8/12
 * Author:  jianbo
--- a/app/src/main/java/com/example/administrator/seven/widget/CircleImageView.java
+++ b/app/src/main/java/com/example/administrator/seven/widget/CircleImageView.java
@@ -16,12 +16,13 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import androidx.annotation.ColorRes;
-import androidx.annotation.DrawableRes;
 import android.util.AttributeSet;

 import com.example.administrator.seven.R;

+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+
 /**
 *
 * 自定义圆形用户头像
--- a/app/src/main/java/com/example/administrator/seven/widget/ItemView.java
+++ b/app/src/main/java/com/example/administrator/seven/widget/ItemView.java
@@ -2,9 +2,6 @@ package com.example.administrator.seven.widget;

 import android.content.Context;
 import android.content.res.TypedArray;
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,6 +11,10 @@ import android.widget.TextView;

 import com.example.administrator.seven.R;

+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
 * ItemView
 * (๑• . •๑)
--- a/app/src/main/java/com/example/administrator/seven/widget/TitleBar.java
+++ b/app/src/main/java/com/example/administrator/seven/widget/TitleBar.java
@@ -1,10 +1,6 @@
 package com.example.administrator.seven.widget;

 import android.content.Context;
-import androidx.annotation.ColorRes;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.StringRes;
-import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
@@ -14,6 +10,11 @@ import android.widget.TextView;

 import com.example.administrator.seven.R;

+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+

 /**
 * Created by Administrator on 2016/12/23.
@@ -94,8 +95,8 @@ public class TitleBar extends RelativeLayout implements View.OnClickListener {
     * 设置暗黑模式
     */
    public void setDarkTheme() {
-        mRootView.findViewById(R.id.rl_main).setBackgroundColor(ContextCompat.getColor(getContext(),R.color.colorLightBlack));
-        mTvtitle.setTextColor(ContextCompat.getColor(getContext(),R.color.colorWhile));
+        mRootView.findViewById(R.id.rl_main).setBackgroundColor(ContextCompat.getColor(getContext(), R.color.colorLightBlack));
+        mTvtitle.setTextColor(ContextCompat.getColor(getContext(), R.color.colorWhile));
        mIvLeftBtn.setImageResource(R.mipmap.nav_white_back);
    }

--- a/app/src/main/java/com/example/administrator/seven/wxapi/WXPayEntryActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/wxapi/WXPayEntryActivity.java
@@ -3,7 +3,6 @@ package com.example.administrator.seven.wxapi;

 import android.content.Intent;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
 import android.widget.TextView;

 import com.example.administrator.seven.base.BaseActivity;
@@ -12,6 +11,8 @@ import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;

+import androidx.annotation.Nullable;
+

 /**
 * 微信支付回调页
--- a/app/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/app/src/main/res/drawable-hdpi/ic_launcher.png
--- a/app/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/app/src/main/res/drawable-mdpi/ic_launcher.png
--- a/app/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/app/src/main/res/drawable-xhdpi/ic_launcher.png
--- a/app/src/main/res/drawable-xhdpi/to_down.png
+++ b/app/src/main/res/drawable-xhdpi/to_down.png
--- a/app/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
--- a/app/src/main/res/layout/activity_json_data.xml
+++ b/app/src/main/res/layout/activity_json_data.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/activity_json_data"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center"
+   >
+
+    <Button
+        android:id="@+id/btn_data"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="sdfsdfsdf"/>
+
+    <Button
+        android:id="@+id/btn_show"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="werfwerwer"
+       />
+
+</LinearLayout>
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -0,0 +1,17 @@
+<resources>
+
+    <string name="picker_custom_lunar">LunarTimePicker</string>
+
+    <string name="picker_time">TimePicker</string>
+    <string name="picker_province">OptionsPicker</string>
+
+    <string name="picker_custom_time">CustomLayoutTimePicker</string>
+    <string name="picker_custom_province">CustomLayoutOptionsPicker</string>
+    <string name="picker_custom_parent">CustomParentView</string>
+
+    <string name="picker_non_linkage">OptionsPicker(Non-Linkage)</string>
+    <string name="picker_json_parse_sample">AreaDataParseSample</string>
+
+    <string name="picker_text_parse">Parse Data</string>
+    <string name="picker_text_show">Show OptionsPicker</string>
+</resources>
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
--- a/build.gradle
+++ b/build.gradle
@@ -9,9 +9,6 @@ buildscript {
    dependencies {
        classpath 'com.android.tools.build:gradle:3.5.0'

-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
    }
 }