d

app/build.gradle

@@ -54,4 +54,6 @@ dependencies {
     implementation 'com.j256.ormlite:ormlite-core:5.1'
     implementation 'com.j256.ormlite:ormlite-android:5.1'
     implementation files('libs/eventbus-2.4.0.jar')
+    //三级联动选择
+    implementation 'com.contrarywind:Android-PickerView:3.2.6'
 }

app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <application
-        android:name="com.example.administrator.seven.BaseApplication"
+        android:name=".BaseApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -16,50 +16,52 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.example.administrator.seven.main.activity.Main2Activity"></activity>
+        <activity android:name=".main.kehu.activity.CustomerDetailActivity"></activity>
-        <!-- 开启页 -->
+        <activity android:name=".main.activity.Main2Activity" /> <!-- 开启页 -->
         <activity
-            android:name="com.example.administrator.seven.main.activity.SplashActivity"
+            android:name=".main.activity.SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/SplashTheme">
 
-<!--             <intent-filter>-->
+             <intent-filter>
-<!--             <action android:name="android.intent.action.MAIN"/>-->
+             <action android:name="android.intent.action.MAIN"/>
-<!--             <category android:name="android.intent.category.LAUNCHER"/>-->
+             <category android:name="android.intent.category.LAUNCHER"/>
-<!--             </intent-filter>-->
+             </intent-filter>
         </activity> <!-- 登录 -->
         <activity
-            android:name="com.example.administrator.seven.main.activity.LoginActivity"
+            android:name=".main.activity.LoginActivity"
             android:screenOrientation="portrait"
             android:theme="@style/LoginTheme" />
         <activity
-            android:name="com.example.administrator.seven.main.activity.LoginPasswordActivity"
+            android:name=".main.activity.LoginPasswordActivity"
             android:screenOrientation="portrait"
             android:theme="@style/LoginTheme" /> <!-- 注册 -->
         <!-- 找回密码 -->
         <activity
-            android:name="com.example.administrator.seven.main.activity.MainActivity"
+            android:name=".main.activity.MainActivity"
             android:screenOrientation="portrait">
-            <intent-filter>
+<!--            <intent-filter>-->
-                <action android:name="android.intent.action.MAIN" />
+<!--                <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="com.example.administrator.seven.view.webview.XfiveWebActivity" />
+        <activity android:name=".view.webview.XfiveWebActivity" />
         <activity
-            android:name="com.example.administrator.seven.main.activity.mine.MessageNoticeActivity"
+            android:name=".main.activity.mine.MessageNoticeActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.example.administrator.seven.main.activity.mine.InboundHistoryActivity"
+            android:name=".main.activity.mine.InboundHistoryActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.example.administrator.seven.main.activity.mine.OutboundHistoryActivity"
+            android:name=".main.activity.mine.OutboundHistoryActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.example.administrator.seven.main.kehu.activity.AllocationActivity"
+            android:name=".main.kehu.activity.AllocationActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".main.kehu.activity.DesignActivity"
             android:screenOrientation="portrait" />
-
-
     </application>
 
 </manifest>

app/src/main/java/com/example/administrator/seven/FHConfig.java

@@ -0,0 +1,23 @@
+package com.example.administrator.seven;
+
+/**
+ * 蜂狐配置参数
+ * Created by XiaoQiang on 2017/6/24.
+ */
+public class FHConfig {
+
+
+    /**
+     * 地区选择SHNG
+     */
+    public static String KEY_OPTIONS1= "options1";
+    /**
+     * 地区选择
+     */
+    public static String KEY_OPTIONS2= "options2";
+    /**
+     * 地区选择
+     */
+    public static String KEY_OPTIONS3= "options3";
+
+}

app/src/main/java/com/example/administrator/seven/main/kehu/Bean/CommitDesignModel.java

@@ -0,0 +1,57 @@
+package com.example.administrator.seven.main.kehu.Bean;
+
+import com.example.administrator.seven.test.BaseModel;
+
+public class CommitDesignModel extends BaseModel {
+
+
+    /**
+     * result : {"msg":"提交成功","success":0}
+     * status : 0
+     */
+
+    private ResultBean result;
+    private int status;
+
+    public ResultBean getResult() {
+        return result;
+    }
+
+    public void setResult(ResultBean result) {
+        this.result = result;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public static class ResultBean {
+        /**
+         * msg : 提交成功
+         * success : 0
+         */
+
+        private String msg;
+        private int success;
+
+        public String getMsg() {
+            return msg;
+        }
+
+        public void setMsg(String msg) {
+            this.msg = msg;
+        }
+
+        public int getSuccess() {
+            return success;
+        }
+
+        public void setSuccess(int success) {
+            this.success = success;
+        }
+    }
+}

app/src/main/java/com/example/administrator/seven/main/kehu/Bean/JsonBean.java

@@ -0,0 +1,77 @@
+package com.example.administrator.seven.main.kehu.Bean;
+
+
+
+import com.bigkoo.pickerview.model.IPickerViewData;
+
+import java.util.List;
+
+/**
+ * TODO<json数据源>
+ *
+ * @author: 小嵩
+ * @date: 2017/3/16 15:36
+ */
+
+public class JsonBean implements IPickerViewData {
+
+
+    /**
+     * name : 省份
+     * city : [{"name":"北京市","area":["东城区","西城区","崇文区","宣武区","朝阳区"]}]
+     */
+
+    private String name;
+    private List<CityBean> city;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<CityBean> getCityList() {
+        return city;
+    }
+
+    public void setCityList(List<CityBean> city) {
+        this.city = city;
+    }
+
+    // 实现 IPickerViewData 接口，
+    // 这个用来显示在PickerView上面的字符串，
+    // PickerView会通过IPickerViewData获取getPickerViewText方法显示出来。
+    @Override
+    public String getPickerViewText() {
+        return this.name;
+    }
+
+
+    public static class CityBean {
+        /**
+         * name : 城市
+         * area : ["东城区","西城区","崇文区","昌平区"]
+         */
+
+        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/example/administrator/seven/main/kehu/Bean/LocalMedia.java

@@ -0,0 +1,218 @@
+package com.example.administrator.seven.main.kehu.Bean;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+
+/**
+ * author：luck
+ * project：PictureSelector
+ * package：com.luck.picture.lib.entity
+ * describe：for PictureSelector media entity.
+ * email：893855882@qq.com
+ * data：2017/5/24
+ */
+
+public class LocalMedia implements Parcelable {
+    private String path;
+    private String compressPath;
+    private String cutPath;
+    private long duration;
+    private boolean isChecked;
+    private boolean isCut;
+    public int position;
+    private int num;
+    private int mimeType;
+    private String pictureType;
+    private boolean compressed;
+    private int width;
+    private int height;
+
+    public LocalMedia() {
+
+    }
+
+    public LocalMedia(String path, long duration, int mimeType, String pictureType) {
+        this.path = path;
+        this.duration = duration;
+        this.mimeType = mimeType;
+        this.pictureType = pictureType;
+    }
+
+    public LocalMedia(String path, long duration, int mimeType, String pictureType, int width, int height) {
+        this.path = path;
+        this.duration = duration;
+        this.mimeType = mimeType;
+        this.pictureType = pictureType;
+        this.width = width;
+        this.height = height;
+    }
+
+    public LocalMedia(String path, long duration,
+                      boolean isChecked, int position, int num, int mimeType) {
+        this.path = path;
+        this.duration = duration;
+        this.isChecked = isChecked;
+        this.position = position;
+        this.num = num;
+        this.mimeType = mimeType;
+    }
+
+    public String getPictureType() {
+        if (TextUtils.isEmpty(pictureType)) {
+            pictureType = "image/jpeg";
+        }
+        return pictureType;
+    }
+
+    public void setPictureType(String pictureType) {
+        this.pictureType = pictureType;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getCompressPath() {
+        return compressPath;
+    }
+
+    public void setCompressPath(String compressPath) {
+        this.compressPath = compressPath;
+    }
+
+    public String getCutPath() {
+        return cutPath;
+    }
+
+    public void setCutPath(String cutPath) {
+        this.cutPath = cutPath;
+    }
+
+    public long getDuration() {
+        return duration;
+    }
+
+    public void setDuration(long duration) {
+        this.duration = duration;
+    }
+
+
+    public boolean isChecked() {
+        return isChecked;
+    }
+
+    public void setChecked(boolean checked) {
+        isChecked = checked;
+    }
+
+    public boolean isCut() {
+        return isCut;
+    }
+
+    public void setCut(boolean cut) {
+        isCut = cut;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public void setPosition(int position) {
+        this.position = position;
+    }
+
+    public int getNum() {
+        return num;
+    }
+
+    public void setNum(int num) {
+        this.num = num;
+    }
+
+    public int getMimeType() {
+        return mimeType;
+    }
+
+    public void setMimeType(int mimeType) {
+        this.mimeType = mimeType;
+    }
+
+    public boolean isCompressed() {
+        return compressed;
+    }
+
+    public void setCompressed(boolean compressed) {
+        this.compressed = compressed;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.path);
+        dest.writeString(this.compressPath);
+        dest.writeString(this.cutPath);
+        dest.writeLong(this.duration);
+        dest.writeByte(this.isChecked ? (byte) 1 : (byte) 0);
+        dest.writeByte(this.isCut ? (byte) 1 : (byte) 0);
+        dest.writeInt(this.position);
+        dest.writeInt(this.num);
+        dest.writeInt(this.mimeType);
+        dest.writeString(this.pictureType);
+        dest.writeByte(this.compressed ? (byte) 1 : (byte) 0);
+        dest.writeInt(this.width);
+        dest.writeInt(this.height);
+    }
+
+    protected LocalMedia(Parcel in) {
+        this.path = in.readString();
+        this.compressPath = in.readString();
+        this.cutPath = in.readString();
+        this.duration = in.readLong();
+        this.isChecked = in.readByte() != 0;
+        this.isCut = in.readByte() != 0;
+        this.position = in.readInt();
+        this.num = in.readInt();
+        this.mimeType = in.readInt();
+        this.pictureType = in.readString();
+        this.compressed = in.readByte() != 0;
+        this.width = in.readInt();
+        this.height = in.readInt();
+    }
+
+    public static final Creator<LocalMedia> CREATOR = new Creator<LocalMedia>() {
+        @Override
+        public LocalMedia createFromParcel(Parcel source) {
+            return new LocalMedia(source);
+        }
+
+        @Override
+        public LocalMedia[] newArray(int size) {
+            return new LocalMedia[size];
+        }
+    };
+}

app/src/main/java/com/example/administrator/seven/main/kehu/Bean/PhotoeditorBean.java

@@ -0,0 +1,48 @@
+package com.example.administrator.seven.main.kehu.Bean;
+
+/**
+ * Time:  2020/8/18
+ * Author:  jianbo
+ * Description:
+ */
+public class PhotoeditorBean {
+
+
+    private String city;
+    private String customer_id;
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCustomer_id() {
+        return customer_id;
+    }
+
+    public void setCustomer_id(String customer_id) {
+        this.customer_id = customer_id;
+    }
+
+    public String getIndustry_id() {
+        return industry_id;
+    }
+
+    public void setIndustry_id(String industry_id) {
+        this.industry_id = industry_id;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    private String industry_id;
+    private String province;
+}

app/src/main/java/com/example/administrator/seven/main/kehu/Bean/WorkDetailModel.java

@@ -0,0 +1,324 @@
+package com.example.administrator.seven.main.kehu.Bean;
+
+import com.example.administrator.seven.test.BaseModel;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class WorkDetailModel extends BaseModel implements Serializable {
+
+
+    /**
+     * status : 0
+     * result : {"success":0,"msg":"获取成功","data":{"workid":"10af479c179dd7a1d23782624d861872","housename":"西安万科翡翠国宾","custorhead":"","custorname":"张笑妹","custorphone":"13575542727","house_img":"http://www.fenghoo.com.cn:88/file.php?img=vr__2019__12__19__2019121910503152324.jpg","house_img_cloud":"","housearea":"100","vr_styleid":"1,2","worktype":"1","budget":"20000","decorate":"2","remark":"出彩出差错错错","vrstyle":"[{\"styleid\":\"1\",\"stylename\":\"日式风格\",\"styleimg\":\"http:\\/\\/www.fenghoo.cn\\/templates\\/fenghu\\/img\\/photo_icon.png\"},{\"styleid\":\"2\",\"stylename\":\"北欧风格\",\"styleimg\":\"http:\\/\\/www.fenghoo.cn\\/templates\\/fenghu\\/img\\/photo_icon.png\"}]","decorate_img":["http://www.fenghoo.com.cn:88/file.php?img=vr__2019__12__19__10af479c179dd7a1d23782624d861872__2019121910503163605.jpg","http://www.fenghoo.com.cn:88/file.php?img=vr__2019__12__19__43651f74c3832e2f403a37d5138487b2__2019121910524819500.jpg"]}}
+     */
+
+    private int status;
+    private ResultBean result;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public ResultBean getResult() {
+        return result;
+    }
+
+    public void setResult(ResultBean result) {
+        this.result = result;
+    }
+
+    public static class ResultBean implements Serializable{
+        /**
+         * success : 0
+         * msg : 获取成功
+         * data : {"workid":"10af479c179dd7a1d23782624d861872","housename":"西安万科翡翠国宾","custorhead":"","custorname":"张笑妹","custorphone":"13575542727","house_img":"http://www.fenghoo.com.cn:88/file.php?img=vr__2019__12__19__2019121910503152324.jpg","house_img_cloud":"","housearea":"100","vr_styleid":"1,2","worktype":"1","budget":"20000","decorate":"2","remark":"出彩出差错错错","vrstyle":"[{\"styleid\":\"1\",\"stylename\":\"日式风格\",\"styleimg\":\"http:\\/\\/www.fenghoo.cn\\/templates\\/fenghu\\/img\\/photo_icon.png\"},{\"styleid\":\"2\",\"stylename\":\"北欧风格\",\"styleimg\":\"http:\\/\\/www.fenghoo.cn\\/templates\\/fenghu\\/img\\/photo_icon.png\"}]","decorate_img":["http://www.fenghoo.com.cn:88/file.php?img=vr__2019__12__19__10af479c179dd7a1d23782624d861872__2019121910503163605.jpg","http://www.fenghoo.com.cn:88/file.php?img=vr__2019__12__19__43651f74c3832e2f403a37d5138487b2__2019121910524819500.jpg"]}
+         */
+
+        private int success;
+        private String msg;
+        private DataBean data;
+
+        public int getSuccess() {
+            return success;
+        }
+
+        public void setSuccess(int success) {
+            this.success = success;
+        }
+
+        public String getMsg() {
+            return msg;
+        }
+
+        public void setMsg(String msg) {
+            this.msg = msg;
+        }
+
+        public DataBean getData() {
+            return data;
+        }
+
+        public void setData(DataBean data) {
+            this.data = data;
+        }
+
+        public static class DataBean implements Serializable {
+            /**
+             * workid : 10af479c179dd7a1d23782624d861872
+             * housename : 西安万科翡翠国宾
+             * custorhead :
+             * custorname : 张笑妹
+             * custorphone : 13575542727
+             * house_img : http://www.fenghoo.com.cn:88/file.php?img=vr__2019__12__19__2019121910503152324.jpg
+             * house_img_cloud :
+             * housearea : 100
+             * vr_styleid : 1,2
+             * worktype : 1
+             * budget : 20000
+             * decorate : 2
+             * remark : 出彩出差错错错
+             * vrstyle : [{"styleid":"1","stylename":"日式风格","styleimg":"http:\/\/www.fenghoo.cn\/templates\/fenghu\/img\/photo_icon.png"},{"styleid":"2","stylename":"北欧风格","styleimg":"http:\/\/www.fenghoo.cn\/templates\/fenghu\/img\/photo_icon.png"}]
+             * decorate_img : ["http://www.fenghoo.com.cn:88/file.php?img=vr__2019__12__19__10af479c179dd7a1d23782624d861872__2019121910503163605.jpg","http://www.fenghoo.com.cn:88/file.php?img=vr__2019__12__19__43651f74c3832e2f403a37d5138487b2__2019121910524819500.jpg"]
+             */
+
+            private String workid;//
+            private String housename;//
+            private String custorhead;//
+            private String custorname;//
+            private String custorphone;//
+            private String house_img;//
+            private String house_img_cloud;//
+            private String housearea;//
+            private String vr_styleid;
+            private String worktype;
+            private String budget;//
+            private String decorate;//
+            private String remark;//
+            private List<Bean>  vrstyle;//
+            private List<String> decorate_img;//
+            private String design_name;//
+            private String design_uid;//
+            private String vr_choosestyle;
+            private String project_id;
+
+            private String is_robone;//
+
+            public String getIs_robone() {
+                return is_robone;
+            }
+
+            public void setIs_robone(String is_robone) {
+                this.is_robone = is_robone;
+            }
+
+            public String getVr_choosestyle() {
+                return vr_choosestyle;
+            }
+
+            public void setVr_choosestyle(String vr_choosestyle) {
+                this.vr_choosestyle = vr_choosestyle;
+            }
+
+            public String getProject_id() {
+                return project_id;
+            }
+
+            public void setProject_id(String project_id) {
+                this.project_id = project_id;
+            }
+
+            public String getDesign_uid() {
+                return design_uid;
+            }
+
+            public void setDesign_uid(String design_uid) {
+                this.design_uid = design_uid;
+            }
+
+            public String getDesign_name() {
+                return design_name;
+            }
+
+            public void setDesign_name(String design_name) {
+                this.design_name = design_name;
+            }
+
+            public String getWorkid() {
+                return workid;
+            }
+
+            public void setWorkid(String workid) {
+                this.workid = workid;
+            }
+
+            public String getHousename() {
+                return housename;
+            }
+
+            public void setHousename(String housename) {
+                this.housename = housename;
+            }
+
+            public String getCustorhead() {
+                return custorhead;
+            }
+
+            public void setCustorhead(String custorhead) {
+                this.custorhead = custorhead;
+            }
+
+            public String getCustorname() {
+                return custorname;
+            }
+
+            public void setCustorname(String custorname) {
+                this.custorname = custorname;
+            }
+
+            public String getCustorphone() {
+                return custorphone;
+            }
+
+            public void setCustorphone(String custorphone) {
+                this.custorphone = custorphone;
+            }
+
+            public String getHouse_img() {
+                return house_img;
+            }
+
+            public void setHouse_img(String house_img) {
+                this.house_img = house_img;
+            }
+
+            public String getHouse_img_cloud() {
+                return house_img_cloud;
+            }
+
+            public void setHouse_img_cloud(String house_img_cloud) {
+                this.house_img_cloud = house_img_cloud;
+            }
+
+            public String getHousearea() {
+                return housearea;
+            }
+
+            public void setHousearea(String housearea) {
+                this.housearea = housearea;
+            }
+
+            public String getVr_styleid() {
+                return vr_styleid;
+            }
+
+            public void setVr_styleid(String vr_styleid) {
+                this.vr_styleid = vr_styleid;
+            }
+
+            public String getWorktype() {
+                return worktype;
+            }
+
+            public void setWorktype(String worktype) {
+                this.worktype = worktype;
+            }
+
+            public String getBudget() {
+                return budget;
+            }
+
+            public void setBudget(String budget) {
+                this.budget = budget;
+            }
+
+            public String getDecorate() {
+                return decorate;
+            }
+
+            public void setDecorate(String decorate) {
+                this.decorate = decorate;
+            }
+
+            public String getRemark() {
+                return remark;
+            }
+
+            public void setRemark(String remark) {
+                this.remark = remark;
+            }
+
+            public List<Bean> getVrstyle() {
+                return vrstyle;
+            }
+
+            public void setVrstyle(List<Bean> vrstyle) {
+                this.vrstyle = vrstyle;
+            }
+
+            public List<String> getDecorate_img() {
+                return decorate_img;
+            }
+
+            public void setDecorate_img(List<String> decorate_img) {
+                this.decorate_img = decorate_img;
+            }
+
+
+            public static class Bean implements Serializable{
+                /**
+                 * styleid : 1
+                 * stylename : 日式风格
+                 * styleimg : http://www.fenghoo.cn/templates/fenghu/img/photo_icon.png
+                 */
+
+                private String styleid;
+                private String stylename;
+                private String styleimg;
+
+                private boolean isCheck = false;//选中风格
+
+                public boolean isCheck() {
+                    return isCheck;
+                }
+
+                public void setCheck(boolean check) {
+                    isCheck = check;
+                }
+
+                public String getStyleid() {
+                    return styleid;
+                }
+
+                public void setStyleid(String styleid) {
+                    this.styleid = styleid;
+                }
+
+                public String getStylename() {
+                    return stylename;
+                }
+
+                public void setStylename(String stylename) {
+                    this.stylename = stylename;
+                }
+
+                public String getStyleimg() {
+                    return styleimg;
+                }
+
+                public void setStyleimg(String styleimg) {
+                    this.styleimg = styleimg;
+                }
+            }
+
+        }
+
+
+
+
+    }
+}

app/src/main/java/com/example/administrator/seven/main/kehu/Bean/customerDetailBean.java

@@ -0,0 +1,177 @@
+package com.example.administrator.seven.main.kehu.Bean;
+
+import com.example.administrator.seven.test.BaseModel;
+
+/**
+ * Time:  2020/8/17
+ * Author:  jianbo
+ * Description:
+ */
+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}
+     * status : 0
+     */
+
+    private ResultBean result;
+    private int status;
+
+    public ResultBean getResult() {
+        return result;
+    }
+
+    public void setResult(ResultBean result) {
+        this.result = result;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public static class ResultBean {
+        /**
+         * 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
+         */
+
+        private String msg;
+        private DataBean data;
+        private int success;
+
+        public String getMsg() {
+            return msg;
+        }
+
+        public void setMsg(String msg) {
+            this.msg = msg;
+        }
+
+        public DataBean getData() {
+            return data;
+        }
+
+        public void setData(DataBean data) {
+            this.data = data;
+        }
+
+        public int getSuccess() {
+            return success;
+        }
+
+        public void setSuccess(int success) {
+            this.success = success;
+        }
+
+        public static class DataBean {
+            /**
+             * address : 陕西省西安市未央区某某路
+             * headimg : localhost/upload/2020081115530962805.jpg
+             * phone : 18831913290
+             * name : demo
+             * wechat : wangyuxin283425757
+             * source : 1
+             * style_id : 1
+             * decoration : 1
+             * style_name : 北欧
+             * budget : 120
+             */
+
+            private String address;
+            private String headimg;
+            private String phone;
+            private String name;
+            private String wechat;
+            private String source;
+            private String style_id;
+            private String decoration;
+            private String style_name;
+            private String budget;
+
+            public String getAddress() {
+                return address;
+            }
+
+            public void setAddress(String address) {
+                this.address = address;
+            }
+
+            public String getHeadimg() {
+                return headimg;
+            }
+
+            public void setHeadimg(String headimg) {
+                this.headimg = headimg;
+            }
+
+            public String getPhone() {
+                return phone;
+            }
+
+            public void setPhone(String phone) {
+                this.phone = phone;
+            }
+
+            public String getName() {
+                return name;
+            }
+
+            public void setName(String name) {
+                this.name = name;
+            }
+
+            public String getWechat() {
+                return wechat;
+            }
+
+            public void setWechat(String wechat) {
+                this.wechat = wechat;
+            }
+
+            public String getSource() {
+                return source;
+            }
+
+            public void setSource(String source) {
+                this.source = source;
+            }
+
+            public String getStyle_id() {
+                return style_id;
+            }
+
+            public void setStyle_id(String style_id) {
+                this.style_id = style_id;
+            }
+
+            public String getDecoration() {
+                return decoration;
+            }
+
+            public void setDecoration(String decoration) {
+                this.decoration = decoration;
+            }
+
+            public String getStyle_name() {
+                return style_name;
+            }
+
+            public void setStyle_name(String style_name) {
+                this.style_name = style_name;
+            }
+
+            public String getBudget() {
+                return budget;
+            }
+
+            public void setBudget(String budget) {
+                this.budget = budget;
+            }
+        }
+    }
+}

app/src/main/java/com/example/administrator/seven/main/kehu/Bean/orderListBean.java

@@ -0,0 +1,139 @@
+package com.example.administrator.seven.main.kehu.Bean;
+
+import com.example.administrator.seven.test.BaseModel;
+
+import java.util.List;
+
+/**
+ * Time:  2020/8/18
+ * Author:  jianbo
+ * Description:
+ */
+public class orderListBean extends BaseModel {
+
+    /**
+     * result : {"msg":"获取成功","data":[{"headimg":"localhost/upload/2020081115530962805.jpg","phone":"18831913290","name":"demo","wechat":"wangyuxin283425757","order_num":"1","customer_id":"ae0c5199fdf564f90796aec09482b85d"}],"success":0}
+     * status : 0
+     */
+
+    private ResultBean result;
+    private int status;
+
+    public ResultBean getResult() {
+        return result;
+    }
+
+    public void setResult(ResultBean result) {
+        this.result = result;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public static class ResultBean {
+        /**
+         * msg : 获取成功
+         * data : [{"headimg":"localhost/upload/2020081115530962805.jpg","phone":"18831913290","name":"demo","wechat":"wangyuxin283425757","order_num":"1","customer_id":"ae0c5199fdf564f90796aec09482b85d"}]
+         * success : 0
+         */
+
+        private String msg;
+        private int success;
+        private List<DataBean> data;
+
+        public String getMsg() {
+            return msg;
+        }
+
+        public void setMsg(String msg) {
+            this.msg = msg;
+        }
+
+        public int getSuccess() {
+            return success;
+        }
+
+        public void setSuccess(int success) {
+            this.success = success;
+        }
+
+        public List<DataBean> getData() {
+            return data;
+        }
+
+        public void setData(List<DataBean> data) {
+            this.data = data;
+        }
+
+        public static class DataBean {
+            /**
+             * headimg : localhost/upload/2020081115530962805.jpg
+             * phone : 18831913290
+             * name : demo
+             * wechat : wangyuxin283425757
+             * order_num : 1
+             * customer_id : ae0c5199fdf564f90796aec09482b85d
+             */
+
+            private String headimg;
+            private String phone;
+            private String name;
+            private String wechat;
+            private String order_num;
+            private String customer_id;
+
+            public String getHeadimg() {
+                return headimg;
+            }
+
+            public void setHeadimg(String headimg) {
+                this.headimg = headimg;
+            }
+
+            public String getPhone() {
+                return phone;
+            }
+
+            public void setPhone(String phone) {
+                this.phone = phone;
+            }
+
+            public String getName() {
+                return name;
+            }
+
+            public void setName(String name) {
+                this.name = name;
+            }
+
+            public String getWechat() {
+                return wechat;
+            }
+
+            public void setWechat(String wechat) {
+                this.wechat = wechat;
+            }
+
+            public String getOrder_num() {
+                return order_num;
+            }
+
+            public void setOrder_num(String order_num) {
+                this.order_num = order_num;
+            }
+
+            public String getCustomer_id() {
+                return customer_id;
+            }
+
+            public void setCustomer_id(String customer_id) {
+                this.customer_id = customer_id;
+            }
+        }
+    }
+}

app/src/main/java/com/example/administrator/seven/main/kehu/Bean/uploadImgBean.java

@@ -0,0 +1,66 @@
+package com.example.administrator.seven.main.kehu.Bean;
+
+import com.example.administrator.seven.test.BaseModel;
+
+public class uploadImgBean extends BaseModel {
+
+    /**
+     * status : 0
+     * result : {"success":0,"img":"http://www.fenghoo.com.cn:88/file.php?img=vr__2019__12__31__2019123117282518691.jpg","msg":"成功"}
+     */
+
+    private int status;
+    private ResultBean result;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public ResultBean getResult() {
+        return result;
+    }
+
+    public void setResult(ResultBean result) {
+        this.result = result;
+    }
+
+    public static class ResultBean {
+        /**
+         * success : 0
+         * img : http://www.fenghoo.com.cn:88/file.php?img=vr__2019__12__31__2019123117282518691.jpg
+         * msg : 成功
+         */
+
+        private int success;
+        private String img;
+        private String msg;
+
+        public int getSuccess() {
+            return success;
+        }
+
+        public void setSuccess(int success) {
+            this.success = success;
+        }
+
+        public String getImg() {
+            return img;
+        }
+
+        public void setImg(String img) {
+            this.img = img;
+        }
+
+        public String getMsg() {
+            return msg;
+        }
+
+        public void setMsg(String msg) {
+            this.msg = msg;
+        }
+    }
+}

app/src/main/java/com/example/administrator/seven/main/kehu/CustomerFragment.java

@@ -9,6 +9,7 @@ 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;
 import com.example.administrator.seven.main.kehu.adapter.CusListAdapter;
 import com.example.administrator.seven.okgonet.NetApi;
 import com.example.administrator.seven.okgonet.Observer;
@@ -52,13 +53,7 @@ public class CustomerFragment extends MobanFragment {
                     }
 
                     @Override
-                    public void kaidanonClick() {//信息完善
+                    public void kaidanonClick() {//删除客户
-
-                    }
-
-                    //删除客户
-                    @Override
-                    public void uploadAvatar() {
                         new BaseTipsDialog().showDownloadDialog(getActivity(), "确认删除该客户吗？", "确定", new BaseTipsDialog.ClickListener() {
                             @Override
                             public void confirm() {
@@ -72,35 +67,47 @@ public class CustomerFragment extends MobanFragment {
                         });
                     }
 
+                    //信息完善
+                    @Override
+                    public void uploadAvatar() {
+
+                    }
+
                 }).show();
             }
+
+            @Override
+            public void enterCusDetail(CustomerListBean.ResultBean.DataBean item) {
+                //进入客户详情
+                ShowAty.CustomerDetailActivity(getActivity(),item);
+            }
         });
     }
 
     @Override
     public void requestData() {
-//        new NetApi().customerList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(),"").subscribe(new Observer<Response>() {
+        new NetApi().customerList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(),"").subscribe(new Observer<Response>() {
-//            @Override
+            @Override
-//            public void onNext(Response response) {
+            public void onNext(Response response) {
-//                String body = (String) response.body();
+                String body = (String) response.body();
-//                CustomerListBean.ResultBean result = JsonUtils.fromJson(body, CustomerListBean.class).getResult();
+                CustomerListBean.ResultBean result = JsonUtils.fromJson(body, CustomerListBean.class).getResult();
-//                mSwl.setRefreshing(false);
+                mSwl.setRefreshing(false);
-//                if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
+                if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
 
-                   // List<CustomerListBean.ResultBean.DataBean> data = result.getData();
+                    List<CustomerListBean.ResultBean.DataBean> data = result.getData();
-                    List<CustomerListBean.ResultBean.DataBean> data = new ArrayList<CustomerListBean.ResultBean.DataBean>();
+//                    List<CustomerListBean.ResultBean.DataBean> data = new ArrayList<CustomerListBean.ResultBean.DataBean>();
-                    for (int i = 0; i < 20; i++)
+//                    for (int i = 0; i < 20; i++)
-                    {
+//                    {
-                        CustomerListBean.ResultBean.DataBean dataBean = new CustomerListBean.ResultBean.DataBean();
+//                        CustomerListBean.ResultBean.DataBean dataBean = new CustomerListBean.ResultBean.DataBean();
-                        dataBean.setName("小斐");
+//                        dataBean.setName("小斐");
-                        dataBean.setPhone("15862656263");
+//                        dataBean.setPhone("15862656263");
-                        dataBean.setSource_name("添加客户");
+//                        dataBean.setSource_name("添加客户");
-                        dataBean.setWechat("weixin");
+//                        dataBean.setWechat("weixin");
-                        dataBean.setHeadimg("");
+//                        dataBean.setHeadimg("");
-                        dataBean.setSource("1");
+//                        dataBean.setSource("1");
-                        dataBean.setType("old");
+//                        dataBean.setType("old");
-                        data.add(dataBean);
+//                        data.add(dataBean);
-                    }
+//                    }
 
                     if (data.size() == 0) {
                         markingtwoAdapter.setEmptyView(notDataView);
@@ -111,19 +118,19 @@ public class CustomerFragment extends MobanFragment {
                     } else {
                         setData(false, data);
                     }
-//                } else {
+                } else {
-//                    setData(true, null);
+                    setData(true, null);
-//                    markingtwoAdapter.setEmptyView(notDataView);
+                    markingtwoAdapter.setEmptyView(notDataView);
-//                    mSwl.setRefreshing(false);
+                    mSwl.setRefreshing(false);
-//                }
+                }
-//            }
+            }
-//            @Override
+            @Override
-//            public void onError(Exception e) {
+            public void onError(Exception e) {
-//                e.printStackTrace();
+                e.printStackTrace();
-//                markingtwoAdapter.setEmptyView(errorView);
+                markingtwoAdapter.setEmptyView(errorView);
-//                mSwl.setRefreshing(false);
+                mSwl.setRefreshing(false);
-//            }
+            }
-//        });
+        });
 
     }
     @Override

app/src/main/java/com/example/administrator/seven/main/kehu/DealFragment.java

@@ -3,9 +3,11 @@ 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;
 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;
@@ -38,29 +40,18 @@ public class DealFragment extends MobanFragment {
 
     @Override
     public void requestData() {
-        new NetApi().xikeInfo("b886798bdce09746a787651013f2c6e6").subscribe(new Observer<Response>() {
+        new NetApi().orderList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(),"").subscribe(new Observer<Response>() {
             @Override
             public void onNext(Response response) {
                 String body = (String) response.body();
-                XikeInfoBean.ResultBean esdv = JsonUtils.fromJson(body, XikeInfoBean.class).getResult();
+                orderListBean.ResultBean result = JsonUtils.fromJson(body, orderListBean.class).getResult();
                 mSwl.setRefreshing(false);
-                if (esdv != null && String.valueOf(esdv.getSuccess()).equals("0")) {
+                if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
 
-                    //    List<XikeInfoBean.ResultBean.DataBean> data = esdv.getData();
+                        List<orderListBean.ResultBean.DataBean> data = result.getData();
-
-
-                    List<XikeInfoBean.ResultBean.DataBean> data = new ArrayList<XikeInfoBean.ResultBean.DataBean>();
-                    for (int i = 0; i < 20; i++)
-                    {
-                        XikeInfoBean.ResultBean.DataBean dataBean = new XikeInfoBean.ResultBean.DataBean();
-                        dataBean.setTime("2020-07-01 12:00:00");
-                        dataBean.setXike_num("+89.00");
-                        dataBean.setXike_remark("收益账户转入");
-                        data.add(dataBean);
-                    }
 
                     if (data.size() == 0) {
-                        //markingtwoAdapter.setEmptyView(notDataView);
+                        markingtwoAdapter.setEmptyView(notDataView);
                         return;
                     }
                     if (mNextRequestPage == 1) {

app/src/main/java/com/example/administrator/seven/main/kehu/DistriFragment.java

@@ -5,6 +5,7 @@ import com.example.administrator.seven.main.kehu.Bean.FpListBean;
 import com.example.administrator.seven.main.kehu.adapter.DisListAdapter;
 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;
@@ -35,7 +36,7 @@ public class DistriFragment extends MobanFragment {
 
     @Override
     public void requestData() {
-        new NetApi().fpList("b886798bdce09746a787651013f2c6e6","").subscribe(new Observer<Response>() {
+        new NetApi().fpList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(),"").subscribe(new Observer<Response>() {
             @Override
             public void onNext(Response response) {
                 String body = (String) response.body();

app/src/main/java/com/example/administrator/seven/main/kehu/activity/AllocationActivity.java

@@ -3,7 +3,6 @@ package com.example.administrator.seven.main.kehu.activity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.widget.AutoCompleteTextView;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -13,14 +12,13 @@ import com.example.administrator.seven.R;
 import com.example.administrator.seven.base.BaseActivity;
 import com.example.administrator.seven.db.DbRecordBeanData;
 import com.example.administrator.seven.db.dao.DbRecordDao;
-import com.example.administrator.seven.main.kehu.Bean.CustomerListBean;
 import com.example.administrator.seven.main.kehu.Bean.WxuSerinfo;
 import com.example.administrator.seven.main.kehu.Bean.customerFPListBean;
 import com.example.administrator.seven.main.kehu.Bean.fenpeisuccess;
 import com.example.administrator.seven.main.kehu.adapter.AllocationAdapter;
 import com.example.administrator.seven.okgonet.NetApi;
 import com.example.administrator.seven.okgonet.Observer;
-import com.example.administrator.seven.utils.AbStrUtil;
+import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils;
 import com.lzy.okgo.model.Response;
 
 import java.util.ArrayList;
@@ -119,25 +117,25 @@ public class AllocationActivity extends BaseActivity implements View.OnClickList
     }
 
     public void getData(String times) {
-//        new NetApi().customerFPList("b886798bdce09746a787651013f2c6e6").subscribe(new Observer<Response>() {
+        new NetApi().customerFPList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()).subscribe(new Observer<Response>() {
-//            @Override
+            @Override
-//            public void onNext(Response response) {
+            public void onNext(Response response) {
-//                String body = (String) response.body();
+                String body = (String) response.body();
-//                customerFPListBean.ResultBean result = JsonUtils.fromJson(body, customerFPListBean.class).getResult();
+                customerFPListBean.ResultBean result = JsonUtils.fromJson(body, customerFPListBean.class).getResult();
-//                if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
+                if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
-                 //   List<customerFPListBean.ResultBean.DataBean> data = result.getData();
+                    List<customerFPListBean.ResultBean.DataBean> data = result.getData();
 
 
-                    List<customerFPListBean.ResultBean.DataBean> data = new ArrayList<customerFPListBean.ResultBean.DataBean>();
+//                    List<customerFPListBean.ResultBean.DataBean> data = new ArrayList<customerFPListBean.ResultBean.DataBean>();
-                    for (int i = 0; i < 20; i++)
+//                    for (int i = 0; i < 20; i++)
-                    {
+//                    {
-                        customerFPListBean.ResultBean.DataBean dataBean = new customerFPListBean.ResultBean.DataBean();
+//                        customerFPListBean.ResultBean.DataBean dataBean = new customerFPListBean.ResultBean.DataBean();
-                        dataBean.setName("小斐");
+//                        dataBean.setName("小斐");
-                        dataBean.setPhone("15862656263");
+//                        dataBean.setPhone("15862656263");
-                        dataBean.setWechat("weixin");
+//                        dataBean.setWechat("weixin");
-                        dataBean.setHeadimg("");
+//                        dataBean.setHeadimg("");
-                        data.add(dataBean);
+//                        data.add(dataBean);
-                    }
+//                    }
 
                     //存入数据库
                     for (int i = 0; i < data.size(); i++) {
@@ -161,14 +159,14 @@ public class AllocationActivity extends BaseActivity implements View.OnClickList
                     dbRecordBeanData = dbRecordDao.queryAll();
                     Log.e("数据的个数==", dbRecordBeanData.size()+"");
                     setData(dbRecordBeanData);
-//                }
+                }
-//            }
+            }
-//            @Override
+            @Override
-//            public void onError(Exception e) {
+            public void onError(Exception e) {
-//                e.printStackTrace();
+                e.printStackTrace();
-//
+
-//            }
+            }
-//        });
+        });
     }
 
     private void setEvent() {

app/src/main/java/com/example/administrator/seven/main/kehu/activity/CustomerDetailActivity.java

@@ -0,0 +1,80 @@
+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;
+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;
+
+/**
+ * 客户详情
+ */
+public class CustomerDetailActivity extends BaseActivity {
+
+    private TitleBar mTitleBar;
+    private CircleImageView mIvDraUserHeads;
+    /**
+     * 姓名：－－
+     */
+    private TextView mTvDraUserName;
+    /**
+     * 电话：— —
+     */
+    private TextView mTvDarUserPhone;
+    /**
+     * 家装阶段：
+     */
+    private TextView mTvDraInfo01;
+    /**
+     * 毛胚
+     */
+    private TextView mTvDraInfo02;
+    /**
+     * 风格
+     */
+    private TextView mTvDraInfo03;
+    /**
+     * 美式
+     */
+    private TextView mTvDraInfo04;
+    /**
+     * 预算
+     */
+    private TextView mTvDraInfo05;
+    /**
+     * 10万
+     */
+    private TextView mTvDraInfo06;
+    private String namephone;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_customer_detail);
+        namephone = getIntent().getStringExtra("namephone");
+        initView();
+        initNormalBack();
+    }
+
+    private void initView() {
+        mTitleBar = (TitleBar) findViewById(R.id.title_bar);
+        mTitleBar.setTitle(namephone);
+        mIvDraUserHeads = (CircleImageView) findViewById(R.id.iv_dra_user_heads);
+        mTvDraUserName = (TextView) findViewById(R.id.tv_dra_user_name);
+        mTvDarUserPhone = (TextView) findViewById(R.id.tv_dar_user_phone);
+        mTvDraInfo01 = (TextView) findViewById(R.id.tv_dra_info01);
+        mTvDraInfo02 = (TextView) findViewById(R.id.tv_dra_info02);
+        mTvDraInfo03 = (TextView) findViewById(R.id.tv_dra_info03);
+        mTvDraInfo04 = (TextView) findViewById(R.id.tv_dra_info04);
+        mTvDraInfo05 = (TextView) findViewById(R.id.tv_dra_info05);
+        mTvDraInfo06 = (TextView) findViewById(R.id.tv_dra_info06);
+    }
+
+}

app/src/main/java/com/example/administrator/seven/main/kehu/activity/DesignActivity.java

@@ -0,0 +1,312 @@
+package com.example.administrator.seven.main.kehu.activity;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Color;
+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 com.bigkoo.pickerview.OptionsPickerView;
+import com.example.administrator.seven.FHConfig;
+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.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;
+
+import org.json.JSONArray;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+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 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 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 List<DbRecordBeanData> dataBean;
+
+    private TextView btn_add;
+    private RecyclerView mLabelRvList;
+    private DesignAdapter adapter;
+    private List<PhotoeditorBean> photoeditor=new ArrayList<>();
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_design;
+    }
+
+    @Override
+    protected void initView() {
+        mTitleBar = (TitleBar) findViewById(R.id.title_bar);
+        mTitleBar.setTitle("客户分配");
+        btn_add = (TextView) findViewById(R.id.btn_add);
+
+        //第一部分的数据
+        mLabelRvList = (RecyclerView) findViewById(R.id.label_rv_list);
+
+
+    }
+
+
+    @Override
+    protected void initData() {
+        mHandler.sendEmptyMessage(MSG_LOAD_DATA);//省市区选择器
+        dataBean = (List<DbRecordBeanData>) getIntent().getSerializableExtra("dataBean");
+        PhotoeditorBean photoeditorBean = new PhotoeditorBean();
+        photoeditorBean.setCity("");
+        photoeditorBean.setCustomer_id("");
+        photoeditorBean.setIndustry_id("");
+        photoeditorBean.setProvince("");
+        photoeditor.add(photoeditorBean);
+        initRecyclerView();
+        adapter.notifyDataSetChanged();
+    }
+
+    private void initRecyclerView() {
+        adapter = new DesignAdapter(mContext, photoeditor);
+        LinearLayoutManager manager = new LinearLayoutManager(this);
+        mLabelRvList.setLayoutManager(manager);
+        mLabelRvList.setAdapter(adapter);
+        adapter.operationListenner(new DesignAdapter.DesignItemviewOnClickListener() {
+            @Override
+            public void fphangye() {
+
+            }
+
+            @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 {
+                }
+            }
+        });
+    }
+
+
+    @Override
+    public void onsuccress() {
+    //    finish();
+    }
+
+    @Override
+    protected void initEvent() {
+        btn_add.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.rl_left://返回
+                finish();
+                break;
+            case R.id.btn_commit://添加图文编辑
+                for (int i = 0; i < photoeditor.size(); i++) {
+                    if (TextUtils.isEmpty(photoeditor.get(i).getIndustry_id()) || photoeditor.get(i).getIndustry_id().equals("")) {
+                        ToastUtils.showToast(DesignActivity.this, "请选择行业");
+                        return;
+                    }
+                    if (TextUtils.isEmpty(photoeditor.get(i).getProvince()) || photoeditor.get(i).getProvince().equals("")) {
+                        ToastUtils.showToast(DesignActivity.this, "请选择省");
+                        return;
+                    }
+                    if (TextUtils.isEmpty(photoeditor.get(i).getCity()) || photoeditor.get(i).getCity().equals("")) {
+                        ToastUtils.showToast(DesignActivity.this, "请选择市");
+                        return;
+                    }
+
+                }
+
+                Gson gson = new Gson();
+                String strtext = gson.toJson(photoeditor);
+                getPresenter().commitdesign(strtext);
+                break;
+            case R.id.btn_add://添加图文编辑
+                PhotoeditorBean photoeditorBean = new PhotoeditorBean();
+                photoeditorBean.setCity("");
+                photoeditorBean.setCustomer_id("");
+                photoeditorBean.setIndustry_id("");
+                photoeditorBean.setProvince("");
+                photoeditor.add(photoeditorBean);
+                adapter.notifyDataSetChanged();
+                int size = photoeditor.size();
+                mLabelRvList.scrollToPosition(size); // 将ListView定位到最后一行
+                break;
+
+        }
+    }
+
+    @Override
+    public Context getContext() {
+        return DesignActivity.this;
+    }
+
+    @Override
+    public Activity getActivity() {
+        return DesignActivity.this;
+    }
+
+    @Override
+    public void commitdesign(CommitDesignModel commitDesignModel) {
+
+    }
+
+    @Override
+    public void progress() {
+        showProgressDialog("加载中...");
+    }
+
+    @Override
+    public void hideProgress() {
+        dismissProgressDialog();
+    }
+
+    @NonNull
+    @Override
+    public CommitDesignPresenter createPresenter() {
+        return new CommitDesignPresenter();
+    }
+
+
+    @Override
+    public void toastThreadSafe(String msg) {
+
+    }
+
+
+    /**
+     * 省市区选择弹框
+     */
+    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) {//如果已创建就不再重新创建子线程了
+                        thread = new Thread(new Runnable() {
+                            @Override
+                            public void run() {
+                                // 子线程中解析省市区数据
+                                initJsonData();
+                            }
+                        });
+                        thread.start();
+                    }
+                    break;
+                case MSG_LOAD_SUCCESS:
+                    isLoaded = true;
+                    break;
+                case MSG_LOAD_FAILED:
+//                    Toast.makeText(NewOrderActivity.this, "Parse Failed", Toast.LENGTH_SHORT).show();
+                    break;
+            }
+        }
+    };
+
+    private void initJsonData() {//解析数据
+        /**
+         * 注意：assets 目录下的Json文件仅供参考，实际使用可自行替换文件
+         * 关键逻辑在于循环体
+         * */
+        String JsonData = new GetJsonDataUtil().getJson(this, "province.json");//获取assets目录下的json文件数据
+        ArrayList<JsonBean> jsonBean = parseData(JsonData);//用Gson 转成实体
+        /**
+         * 添加省份数据
+         * 注意：如果是添加的JavaBean实体，则实体类需要实现 IPickerViewData 接口，
+         * PickerView会通过getPickerViewText方法获取字符串显示出来。
+         */
+        options1Items = 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);//添加该省所有地区数据
+            }
+            //添加城市数据
+            options2Items.add(CityList);
+            //添加地区数据
+            options3Items.add(Province_AreaList);
+        }
+        mHandler.sendEmptyMessage(MSG_LOAD_SUCCESS);
+    }
+
+    public ArrayList<JsonBean> parseData(String result) {//Gson 解析
+        ArrayList<JsonBean> 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);
+                detail.add(entity);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            mHandler.sendEmptyMessage(MSG_LOAD_FAILED);
+        }
+        return detail;
+    }
+
+}

app/src/main/java/com/example/administrator/seven/main/kehu/activity/ShowAty.java

@@ -2,9 +2,12 @@ package com.example.administrator.seven.main.kehu.activity;
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 
 import com.example.administrator.seven.db.DbRecordBeanData;
+import com.example.administrator.seven.main.kehu.Bean.CustomerListBean;
 
+import java.io.Serializable;
 import java.util.List;
 
 public class ShowAty {
@@ -13,11 +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, AllocationSelectActivity.class);
-//        Bundle bundle = new Bundle();
+        Intent i = new Intent(ctx, DesignActivity.class);
-//        bundle.putSerializable("dataBean", (Serializable) mShowListtwo);
+        Bundle bundle = new Bundle();
-//        i.putExtras(bundle);
+        bundle.putSerializable("dataBean", (Serializable) mShowListtwo);
-//        ctx.startActivity(i);
+        i.putExtras(bundle);
+        ctx.startActivity(i);
     }
 
     /**
@@ -28,4 +32,14 @@ public class ShowAty {
         ctx.startActivity(i);
     }
 
+
+    /**
+     * 客户详情
+     */
+    public static void CustomerDetailActivity(Context ctx, CustomerListBean.ResultBean.DataBean item) {
+        Intent i = new Intent(ctx, CustomerDetailActivity.class);
+        i.putExtra("namephone",item.getName()+item.getPhone());
+        ctx.startActivity(i);
+    }
+
 }

app/src/main/java/com/example/administrator/seven/main/kehu/activity/mvp/BaseMenDianView.java

@@ -0,0 +1,79 @@
+package com.example.administrator.seven.main.kehu.activity.mvp;
+
+import android.app.Activity;
+
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+
+import androidx.annotation.StringRes;
+import androidx.annotation.UiThread;
+
+/**
+ * BaseMenDianView
+ * (๑• . •๑)
+ * 类描述:基础View接口
+ * Created by RenJianBo on 2018/9/10 17:23
+ */
+
+public interface BaseMenDianView extends MvpView {
+
+    /**
+     * 显示加载中对话框
+     */
+    @UiThread
+
+     void showProgressDialog(String dialogMessage);
+
+    /**
+     * 隐藏加载中对话框
+     */
+    @UiThread
+
+    void dismissProgressDialog();
+
+
+    /**
+     * toast
+     *
+     * @param msg 吐丝的内容
+     */
+    void toast(String msg);
+
+    /**
+     * toast
+     *
+     * @param ids 吐丝的内容的字符串ids
+     */
+    void toast(@StringRes int ids);
+
+
+    /**
+     * 线程安全的toast
+     *
+     * @param msg 消息内容
+     */
+    @UiThread
+    void toastThreadSafe(final String msg);
+
+    /**
+     * 线程安全的toast
+     *
+     * @param ids 消息内容
+     */
+    @UiThread
+    void toastThreadSafe(@StringRes final int ids);
+
+    /**
+     * 开启一个Activity
+     *
+     * @param clz 需要开启的Activity
+     */
+    void startActivity(Class<? extends Activity> clz);
+
+    /**
+     * 开启一个Activity,并finish掉当前的Activity
+     *
+     * @param clz 消息内容
+     */
+    void startActivityAndFinishSelf(Class<? extends Activity> clz);
+
+}

app/src/main/java/com/example/administrator/seven/main/kehu/activity/mvp/contract/CommitDesignContract.java

@@ -0,0 +1,46 @@
+package com.example.administrator.seven.main.kehu.activity.mvp.contract;
+
+import android.app.Activity;
+import android.content.Context;
+
+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.activity.mvp.BaseMenDianView;
+import com.example.administrator.seven.network.ApiCallBack;
+
+
+public interface CommitDesignContract {
+    interface Model {
+
+        //详细信息
+        void commitdesign(String content,
+                          final ApiCallBack<CommitDesignModel> callBack);
+
+
+
+        void worksReedit(String uid, String workid, String project_id, final ApiCallBack<PhotoeditorBean> callBack);//重新编辑
+
+    }
+
+    interface View extends BaseMenDianView {
+
+        Context getContext();
+
+        Activity getActivity();
+
+        void commitdesign(CommitDesignModel commitDesignModel);
+
+        void progress();
+
+        void hideProgress();
+
+        void onsuccress();
+
+    }
+
+    interface Presenter {
+
+        void commitdesign(String uid);//提交方案设计
+
+    }
+}

app/src/main/java/com/example/administrator/seven/main/kehu/activity/mvp/model/CommitDesignModeltwo.java

@@ -0,0 +1,55 @@
+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;
+import io.reactivex.functions.Consumer;
+import io.reactivex.schedulers.Schedulers;
+
+public class CommitDesignModeltwo implements CommitDesignContract.Model {
+
+
+    @Override
+    public void commitdesign(String content,  final ApiCallBack<CommitDesignModel> callBack) {
+        ApiUtils.getApi()
+                .sureFP(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(), content)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseBean>() {
+                    @Override
+                    public void accept(@NonNull ResponseBean responseBean) throws Exception {
+                        callBack.onResponse(responseBean);
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(@NonNull Throwable throwable) throws Exception {
+                        callBack.onFailure(throwable);
+                    }
+                });
+    }
+
+
+    @Override
+    public void worksReedit(String uid, String workid, String project_id, final ApiCallBack<PhotoeditorBean> callBack) {
+
+        PhotoeditorBean worksReeditBean = new PhotoeditorBean();
+        //callBack.onResponse(worksReeditBean);
+    }
+}

app/src/main/java/com/example/administrator/seven/main/kehu/activity/mvp/presenter/CommitDesignPresenter.java

@@ -0,0 +1,36 @@
+package com.example.administrator.seven.main.kehu.activity.mvp.presenter;
+
+import com.example.administrator.seven.main.kehu.Bean.CommitDesignModel;
+import com.example.administrator.seven.main.kehu.activity.mvp.contract.CommitDesignContract;
+import com.example.administrator.seven.main.kehu.activity.mvp.model.CommitDesignModeltwo;
+import com.example.administrator.seven.network.ApiCallBack;
+import com.example.administrator.seven.utils.ToastUtils;
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+
+
+public class CommitDesignPresenter extends MvpBasePresenter<CommitDesignContract.View> implements CommitDesignContract.Presenter {
+
+    private CommitDesignModeltwo mModel;
+
+    public CommitDesignPresenter() {
+        mModel = new CommitDesignModeltwo();
+    }
+
+    @Override
+    public void commitdesign(String content) {
+        mModel.commitdesign(content, new ApiCallBack<CommitDesignModel>() {
+            @Override
+            protected void onSuccess(CommitDesignModel responseData, String message) {
+                if (responseData.getResult().getSuccess() == 0) {
+                    ToastUtils.showToast(getView().getContext(), responseData.getResult().getMsg());
+                    getView().getActivity().finish();
+                }
+            }
+
+            @Override
+            protected void onFailure(String error) {
+                ToastUtils.showToast(getView().getContext(), "数据异常");
+            }
+        });
+    }
+}

app/src/main/java/com/example/administrator/seven/main/kehu/adapter/CusListAdapter.java

@@ -2,6 +2,7 @@ package com.example.administrator.seven.main.kehu.adapter;
 
 import android.content.Context;
 import android.view.View;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -35,6 +36,14 @@ public class CusListAdapter extends BaseQuickAdapter<CustomerListBean.ResultBean
                 onViewClickListener.operation(item);
             }
         });
+        RelativeLayout yichengjhiao_rv = (RelativeLayout)helper.getView(R.id.yichengjhiao_rv);
+        yichengjhiao_rv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onViewClickListener.enterCusDetail(item);
+            }
+        });
+
     }
 
     public void operationListenner(OnViewClickListener onViewClickListener){
@@ -45,6 +54,9 @@ public class CusListAdapter extends BaseQuickAdapter<CustomerListBean.ResultBean
 
         void operation(CustomerListBean.ResultBean.DataBean item);
 
+
+        void enterCusDetail(CustomerListBean.ResultBean.DataBean item);
+
     }
 
 }

app/src/main/java/com/example/administrator/seven/main/kehu/adapter/DesignAdapter.java

@@ -0,0 +1,59 @@
+package com.example.administrator.seven.main.kehu.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.RelativeLayout;
+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;
+
+/**
+ * 创建者：任剑波
+ * 创建时间：2018/1/18   15:09
+ * 描述：打标页面的数据适配器
+ */
+
+public class DesignAdapter extends BaseQuickAdapter<PhotoeditorBean, BaseViewHolder> {
+    Context mcontext;
+    DesignItemviewOnClickListener onViewClickListener;
+    public DesignAdapter(Context context, List list) {
+        super(R.layout.activity_design_two, list);
+        this.mcontext = context;
+    }
+    @Override
+    protected void convert(final BaseViewHolder helper, final PhotoeditorBean item) {
+        RelativeLayout rl_dingdan_type = (RelativeLayout)helper.getView(R.id.rl_dingdan_type);
+        TextView et_receive_collect = (TextView)helper.getView(R.id.et_receive_collect);
+        rl_dingdan_type.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onViewClickListener.fphangye();
+            }
+        });
+        et_receive_collect.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onViewClickListener.address();
+            }
+        });
+    }
+
+
+    public void operationListenner(DesignItemviewOnClickListener onViewClickListener){
+        this.onViewClickListener  = onViewClickListener;
+    }
+
+    public interface DesignItemviewOnClickListener {
+
+        void fphangye();
+        void address();
+
+
+    }
+}

app/src/main/java/com/example/administrator/seven/main/kehu/adapter/VrStyleAdapter.java

@@ -0,0 +1,73 @@
+package com.example.administrator.seven.main.kehu.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.example.administrator.seven.R;
+import com.example.administrator.seven.main.kehu.Bean.WorkDetailModel;
+
+import java.util.List;
+
+public class VrStyleAdapter extends BaseAdapter {
+
+    private Context mContext;
+    LayoutInflater inflater;
+    private List<WorkDetailModel.ResultBean.DataBean.Bean> mPinpaiList;
+
+
+    public VrStyleAdapter(Context mContext, List<WorkDetailModel.ResultBean.DataBean.Bean> mPinpaiList){
+        this.mContext = mContext;
+        this.mPinpaiList = mPinpaiList;
+        inflater = LayoutInflater.from(mContext);//1
+
+
+    }
+
+    @Override
+    public int getCount() {
+        if(mPinpaiList.size()==0){
+            return 0;
+        }else{
+            return mPinpaiList.size();
+        }
+
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return mPinpaiList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup viewGroup) {
+        Holder hoder = null;
+        if (convertView == null) {
+            // 获取list_item布局文件的视图
+            convertView = inflater.inflate(R.layout.order_type_dialog_view, null);
+            hoder = new Holder();
+            // 获取控件对象
+            hoder.tv = (TextView) convertView.findViewById(R.id.tv_text);
+            convertView.setTag(hoder);
+        } else {
+            hoder = (Holder) convertView.getTag();
+        }
+        //设置数据
+        hoder.tv.setText(mPinpaiList.get(position).getStylename());
+        return convertView;
+    }
+    private class Holder{
+        TextView tv;
+        LinearLayout layout;
+    }
+
+    }

app/src/main/java/com/example/administrator/seven/main/task/HomeFragment.java

@@ -9,15 +9,6 @@ import android.widget.TextView;
 import com.example.administrator.seven.R;
 import com.example.administrator.seven.base.BaseFragment;
 
-
-/**
- * 项目名：jiajiesong
- * 包名：com.example.administrator.newjiajiesone.main.activity.mvp.Fragment
- * 文件名：HomeFragment
- * 创建者：mengjuan
- * 创建时间：2018/11/1
- * 描述：TODO
- */
 public class HomeFragment extends BaseFragment {
 
     private View mContentView;

app/src/main/java/com/example/administrator/seven/network/http/MyApi.java

@@ -114,8 +114,21 @@ public class MyApi {
                 , @Field("sex") String sex
                 , @Field("union_id") String union_id);
 
+
+
+        /**
+         * 账号密码登录
+         *
+         * @param uid    登录员工的uid
+         * @param content 分配内容[{"customer_id":"客户1","industry_id":"家具id","province":"610000","city":"610100"},{"customer_id":"客户1","industry_id":"建材id","province":"610000","city":"610100"},{"customer_id":"客户2","industry_id":"家具id","province":"610000","city":"610100"},{"customer_id":"客户2","industry_id":"建材id","province":"610000","city":"610100"}]
+         * @return
+         */
+        @POST("AppCustomer/sureFP")
+        // @POST("/device/DevLogin/accountPwd")
+        @FormUrlEncoded
+        Observable<ResponseBean<LoginBean>> sureFP(@Field("uid") String uid
+                , @Field("content") String content);
+
     }
 
-
-
 }

app/src/main/java/com/example/administrator/seven/okgonet/HttpConstants.java

@@ -399,16 +399,28 @@ public class HttpConstants {
 
 
     /**
-     * 分配列表
+     * 客户列表
      */
     public static String URi_device_AppCustomer_customerList = URiBase + "/device/AppCustomer/customerList";
+    /**
+     * 成交列表
+     */
+    public static String URi_device_AppCustomer_orderList = URiBase + "/device/AppCustomer/orderList";
 
     /**
      * 客户分配
      */
     public static String URi_device_AppCustomer_customerFPList = URiBase + "/device/AppCustomer/customerFPList";
 
+    /**
+     * 客户详情
+     */
+    public static String URi_device_AppCustomer_customerDetail = URiBase + "/device/AppCustomer/customerDetail";
 
+    /**
+     * 确认分配
+     */
+    public static String URi_device_AppCustomer_sureFP = URiBase + "/device/AppCustomer/sureFP";
 }
 
 

app/src/main/java/com/example/administrator/seven/okgonet/NetApi.java

@@ -150,6 +150,51 @@ public class NetApi {
     }
 
 
+    /**
+     * 成交列表
+     */
+    public Observable<Response> orderList(final String uid,final String search) {
+
+        return new Observable<Response>() {
+            @Override
+            public void subscribe(final Observer<Response> observer) {
+
+                OkGo.<String>post(HttpConstants.URi_device_AppCustomer_orderList)//
+                        .params("uid", uid)
+                        .params("search", search)
+                        .converter(new StringConvert())//
+                        .cacheMode(CacheMode.NO_CACHE)  //无缓存模式 CacheMode.NO_CACHE
+                        .adapt(new ObservableResponse<String>())//
+                        .subscribeOn(Schedulers.io())//
+                        .observeOn(AndroidSchedulers.mainThread())//
+                        .subscribe(new io.reactivex.Observer<Response<String>>() {
+
+                            @Override
+                            public void onSubscribe(@NonNull Disposable d) {
+                                //   addDisposable(d);
+                            }
+
+                            @Override
+                            public void onNext(@NonNull Response<String> response) {
+                                observer.onNext(response);
+                            }
+
+                            @Override
+                            public void onError(@NonNull Throwable e) {
+                                e.printStackTrace();
+
+                            }
+
+                            @Override
+                            public void onComplete() {
+
+                            }
+                        });
+            }
+        };
+
+    }
+
     /**
      * 客户分配
      */
@@ -194,6 +239,93 @@ public class NetApi {
 
     }
 
+    /**
+     * 客户详情
+     */
+    public Observable<Response> customerDetail(final String customer_id) {
 
+        return new Observable<Response>() {
+            @Override
+            public void subscribe(final Observer<Response> observer) {
+
+                OkGo.<String>post(HttpConstants.URi_device_AppCustomer_customerDetail)//
+                        .params("customer_id", customer_id)
+                        .converter(new StringConvert())//
+                        .cacheMode(CacheMode.NO_CACHE)  //无缓存模式 CacheMode.NO_CACHE
+                        .adapt(new ObservableResponse<String>())//
+                        .subscribeOn(Schedulers.io())//
+                        .observeOn(AndroidSchedulers.mainThread())//
+                        .subscribe(new io.reactivex.Observer<Response<String>>() {
+
+                            @Override
+                            public void onSubscribe(@NonNull Disposable d) {
+                                //   addDisposable(d);
+                            }
+
+                            @Override
+                            public void onNext(@NonNull Response<String> response) {
+                                observer.onNext(response);
+                            }
+
+                            @Override
+                            public void onError(@NonNull Throwable e) {
+                                e.printStackTrace();
+
+                            }
+
+                            @Override
+                            public void onComplete() {
+
+                            }
+                        });
+            }
+        };
+
+    }
+
+    /**
+     * 确认分配device/AppCustomer/sureFP
+     */
+    public Observable<Response> sureFP(final String uid,final String content) {
+
+        return new Observable<Response>() {
+            @Override
+            public void subscribe(final Observer<Response> observer) {
+
+                OkGo.<String>post(HttpConstants.URi_device_AppCustomer_sureFP)//
+                        .params("uid", uid)
+                        .params("content", content)
+                        .converter(new StringConvert())//
+                        .cacheMode(CacheMode.NO_CACHE)  //无缓存模式 CacheMode.NO_CACHE
+                        .adapt(new ObservableResponse<String>())//
+                        .subscribeOn(Schedulers.io())//
+                        .observeOn(AndroidSchedulers.mainThread())//
+                        .subscribe(new io.reactivex.Observer<Response<String>>() {
+
+                            @Override
+                            public void onSubscribe(@NonNull Disposable d) {
+                                //   addDisposable(d);
+                            }
+
+                            @Override
+                            public void onNext(@NonNull Response<String> response) {
+                                observer.onNext(response);
+                            }
+
+                            @Override
+                            public void onError(@NonNull Throwable e) {
+                                e.printStackTrace();
+
+                            }
+
+                            @Override
+                            public void onComplete() {
+
+                            }
+                        });
+            }
+        };
+
+    }
 
 }

app/src/main/java/com/example/administrator/seven/utils/GetJsonDataUtil.java

@@ -0,0 +1,38 @@
+package com.example.administrator.seven.utils;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * TODO<读取Json文件的工具类>
+ *
+ * @author: 小嵩
+ * @date: 2017/3/16 16:22
+
+ */
+
+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)));
+            String line;
+            while ((line = bf.readLine()) != null) {
+                stringBuilder.append(line);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return stringBuilder.toString();
+    }
+}
+

app/src/main/java/com/example/administrator/seven/utils/SPUtils.java

@@ -0,0 +1,76 @@
+/*
+ *   Copyright (C)  2016 android@19code.com
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+package com.example.administrator.seven.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+
+/**
+ * Create by h4de5ing 2016/5/7 007
+ * SharedPreferences工具
+ *
+ */
+public class SPUtils {
+
+    public static void setSP(Context context, String key, Object object) {
+        String type = object.getClass().getSimpleName();
+        String packageName = context.getPackageName();
+        SharedPreferences sp = context.getSharedPreferences(packageName, Context.MODE_PRIVATE);
+        Editor edit = sp.edit();
+        if ("String".equals(type)) {
+            edit.putString(key, (String) object);
+        } else if ("Integer".equals(type)) {
+            edit.putInt(key, (Integer) object);
+        } else if ("Boolean".equals(type)) {
+            edit.putBoolean(key, (Boolean) object);
+        } else if ("Float".equals(type)) {
+            edit.putFloat(key, (Float) object);
+        } else if ("Long".equals(type)) {
+            edit.putLong(key, (Long) object);
+        }
+        edit.apply();
+    }
+
+    public static Object getSp(Context context, String key, Object defaultObject) {
+        String type = defaultObject.getClass().getSimpleName();
+        String packageName = context.getPackageName();
+        SharedPreferences sp = context.getSharedPreferences(packageName, Context.MODE_PRIVATE);
+        if ("String".equals(type)) {
+            return sp.getString(key, (String) defaultObject);
+        } else if ("Integer".equals(type)) {
+            return sp.getInt(key, (Integer) defaultObject);
+        } else if ("Boolean".equals(type)) {
+            return sp.getBoolean(key, (Boolean) defaultObject);
+        } else if ("Float".equals(type)) {
+            return sp.getFloat(key, (Float) defaultObject);
+        } else if ("Long".equals(type)) {
+            return sp.getLong(key, (Long) defaultObject);
+        }
+        return null;
+    }
+
+    public static void cleanAllSP(Context context) {
+        String packageName = context.getPackageName();
+        SharedPreferences sp = context.getSharedPreferences(packageName, Context.MODE_PRIVATE);
+        Editor editor = sp.edit();
+        editor.clear();
+        editor.apply();
+    }
+
+
+}

app/src/main/java/com/example/administrator/seven/utils/ToastUtils.java

@@ -0,0 +1,57 @@
+package com.example.administrator.seven.utils;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.example.administrator.seven.R;
+
+/**
+ * Created by gh0st on 2017/1/17.
+ * 吐司工具类
+ */
+
+public class ToastUtils {
+    private static Toast mToast;
+    private static String message;
+    private static TextView mTextView;
+
+
+    public static void showToast1(Context context, String string) {
+        Toast.makeText(context , string , Toast.LENGTH_SHORT).show();
+    }
+    public static void showToast(Context context, int string) {
+        Toast.makeText(context , string , Toast.LENGTH_SHORT).show();
+    }
+
+    public static void showToast(Context context, String message) {
+        //加载Toast布局
+        View toastRoot = LayoutInflater.from(context).inflate(R.layout.toast, null);
+        //初始化布局控件
+        mTextView = (TextView) toastRoot.findViewById(R.id.message);
+//        mImageView = (ImageView) toastRoot.findViewById(R.id.imageView);
+        //为控件设置属性
+        mTextView.setText(message);
+//        mImageView.setImageResource(R.mipmap.ic_launcher);
+        //Toast的初始化
+        Toast toastStart = new Toast(context);
+        //获取屏幕高度
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        int height = wm.getDefaultDisplay().getHeight();
+        //Toast的Y坐标是屏幕高度的1/3，不会出现不适配的问题
+        toastStart.setGravity(Gravity.BOTTOM, 0, height / 3);
+        toastStart.setDuration(Toast.LENGTH_LONG);
+        toastStart.setView(toastRoot);
+        toastStart.show();
+    }
+
+
+
+
+
+
+}

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ffffff" />
+
+    <corners
+        android:bottomLeftRadius="5dp"
+        android:bottomRightRadius="5dp"
+        android:topLeftRadius="5dp"
+        android:topRightRadius="5dp" />
+</shape>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#21211d" />
+    <corners android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"
+        android:bottomLeftRadius="10dp"/>
+</shape>

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

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ffffff"
+    >
+
+    <com.example.administrator.seven.widget.TitleBar
+        android:id="@+id/title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="56dp"
+        android:background="#f3f3f3"
+        android:orientation="vertical">
+
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="12dp"
+            android:background="@drawable/bg_markingxinxi">
+
+            <com.example.administrator.seven.widget.CircleImageView
+                android:id="@+id/iv_dra_user_heads"
+                android:layout_width="83dp"
+                android:layout_height="83dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="11.5dp"
+                android:layout_marginBottom="11.5dp"
+                android:layout_marginRight="20dp"
+                android:src="@mipmap/icon_default_head" />
+
+
+            <LinearLayout
+                android:id="@+id/sdfsdfsdfsdf"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/iv_dra_user_heads"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/tv_dra_user_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:layout_toRightOf="@+id/iv_dra_user_heads"
+                    android:text="姓名：－－"
+                    android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/tv_dar_user_phone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_user_name"
+                    android:layout_marginTop="15dp"
+                    android:layout_toRightOf="@+id/iv_user_heads"
+                    android:text="电话：— —"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:layout_marginTop="7dp"
+            android:background="@color/colorWhite"
+            >
+            <TextView
+                android:id="@+id/tv_dra_info01"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_marginLeft="16.5dp"
+                android:layout_centerVertical="true"
+                android:text="家装阶段："
+                android:textColor="#ff000000"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_dra_info02"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="16.5dp"
+                android:layout_centerVertical="true"
+                android:text="毛胚"
+                android:textColor="#ff000000"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:layout_marginTop="7dp"
+            android:background="@color/colorWhite"
+            >
+            <TextView
+                android:id="@+id/tv_dra_info03"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_marginLeft="16.5dp"
+                android:layout_centerVertical="true"
+                android:text="风格"
+                android:textColor="#ff000000"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_dra_info04"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="16.5dp"
+                android:layout_centerVertical="true"
+                android:text="美式"
+                android:textColor="#ff000000"
+                android:textSize="14sp" />
+        </RelativeLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:layout_marginTop="7dp"
+            android:background="@color/colorWhite"
+            >
+            <TextView
+                android:id="@+id/tv_dra_info05"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_marginLeft="16.5dp"
+                android:layout_centerVertical="true"
+                android:text="预算"
+                android:textColor="#ff000000"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_dra_info06"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="16.5dp"
+                android:layout_centerVertical="true"
+                android:text="10万"
+                android:textColor="#ff000000"
+                android:textSize="14sp" />
+        </RelativeLayout>
+    </LinearLayout>
+</RelativeLayout>
+
+
+
+
+

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

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorWhite"
+    >
+    <com.example.administrator.seven.widget.TitleBar
+        android:id="@+id/title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <RelativeLayout
+        android:id="@+id/rl_des"
+        android:layout_width="wrap_content"
+        android:layout_below="@+id/title_bar"
+        android:layout_centerHorizontal="true"
+        android:background="#ffffff"
+        android:layout_height="50dp">
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_centerVertical="true"
+            android:src="@mipmap/icon_add_des"
+            />
+        <TextView
+            android:id="@+id/btn_add"
+            android:layout_toRightOf="@+id/image"
+            android:layout_marginLeft="15dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#ffffff"
+            android:text="添加分配"
+            android:textColor="#ff404040"
+            android:paddingTop="14dp"
+            android:paddingBottom="14dp"
+            android:textSize="15sp"
+            />
+
+    </RelativeLayout>
+
+    <View
+        android:layout_below="@+id/rl_des"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dimen_4"
+        android:background="#f5f5f5"
+        />
+
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/label_rv_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="106dp"
+           />
+
+
+    <Button
+        android:id="@+id/btn_commit"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_alignParentBottom="true"
+        android:text="确定分配"
+        android:textColor="#ff404040"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        android:layout_marginBottom="12dp"
+        android:background="@drawable/button_pass_bg"
+        android:paddingTop="14dp"
+        android:paddingBottom="14dp"
+        android:textSize="15sp"
+        />
+
+</RelativeLayout>

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

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorWhite"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="订单类型:"
+            android:textColor="@color/black"
+            android:textSize="@dimen/marking_13_sp" />
+
+        <RelativeLayout
+            android:id="@+id/rl_dingdan_type"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true">
+
+                <TextView
+                    android:id="@+id/tv_dingdan_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginLeft="10dp"
+                    android:hint="请选择行业"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    android:textColor="@color/colorBlack"
+                    android:textSize="@dimen/marking_13_sp" />
+
+            </RelativeLayout>
+
+
+            <ImageView
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="10dp"
+                android:src="@drawable/marking_zhaikai" />
+
+        </RelativeLayout>
+
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/ll_address"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center_vertical"
+                android:text="收货地址："
+                android:textColor="@color/black"
+                android:textSize="@dimen/marking_13_sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/et_receive_collect"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="9.5"
+                    android:hint="请选择省市区"
+                    android:paddingLeft="5dp"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+</LinearLayout>
+

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

@@ -8,11 +8,13 @@
         layout="@layout/title_layout"/>
 
     <LinearLayout
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dimen_200"
         android:background="@mipmap/home_imageview"/>
 
     <TextView
+        android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/colorWhite"
@@ -25,6 +27,7 @@
         android:background="@color/color_303030"/>
 
     <LinearLayout
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
@@ -153,6 +156,7 @@
     </LinearLayout>
 
     <LinearLayout
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tv_text"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="8dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:textSize="@dimen/marking_13_sp"
+    android:textColor="@color/black">
+
+
+</TextView>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center"
+    android:background="@drawable/toast_bg">
+
+
+    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:shadowColor="#bbfcd603"
+        android:shadowRadius="1.5"
+        android:textColor="@color/colorWhite" />
+</LinearLayout>