d

app/src/main/java/com/fenghoo/seven/main/activity/common/http/api/API.java

@@ -42,6 +42,7 @@ public class API {
      */
     public static class Config {
         private static final String TEST_DOMAIN = "http://192.168.1.3/device/";
+     //   private static final String TEST_DOMAIN = "http://106.53.92.2/device/";
         private static final String RElEASE_DOMAIN = "http://cloud.bmob.cn";
         private static final String TEST_APP_ID = "e90928398db0130b0d6d21da7bde357e";
         private static final String RELEASE_APP_ID = "e90928398db0130b0d6d21da7bde357e";

app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java

@@ -14,12 +14,11 @@ import com.fenghoo.seven.JsonUtils;
 import com.fenghoo.seven.R;
 import com.fenghoo.seven.base.BaseFragment;
 import com.fenghoo.seven.main.find.ui.PrivateletterFragment;
-import com.fenghoo.seven.main.kehu.Bean.industryBean;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBean;
 import com.fenghoo.seven.main.kehu.Dialog.HangyeSelectDialog;
 import com.fenghoo.seven.okgonet.HttpConstants;
 import com.fenghoo.seven.okgonet.NetApi;
 import com.fenghoo.seven.okgonet.Observer;
-import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
 import com.lzy.okgo.model.HttpParams;
 import com.lzy.okgo.model.Response;
 import com.zaaach.citypicker.CityPicker;
@@ -43,7 +42,7 @@ public class PriLetFragment extends BaseFragment {
     private TextView left_tvtwo;
     private TextView marking_fragment_title;
     private PrivateletterFragment privateletterFragment;
-    private List<industryBean.ResultBean.DataBean> industryData;
+    private List<IndustryBean.ResultBean.DataBean> industryData;
     private TextView marking_fragment;
 
     private List<HotCity> hotCities;
@@ -78,10 +77,10 @@ public class PriLetFragment extends BaseFragment {
             @Override
             public void onNext(Response response) {
                 String body = (String) response.body();
-                industryBean.ResultBean result = JsonUtils.fromJson(body, industryBean.class).getResult();
+                IndustryBean.ResultBean result = JsonUtils.fromJson(body, IndustryBean.class).getResult();
                 if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
                     industryData = result.getData();
-                    industryBean.ResultBean.DataBean dataBean = new industryBean.ResultBean.DataBean();
+                    IndustryBean.ResultBean.DataBean dataBean = new IndustryBean.ResultBean.DataBean();
                     dataBean.setIndustry("全部");
                     dataBean.setIndustry_id("");
                     industryData.add(0,dataBean);

app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FpListBean.java

@@ -2,6 +2,7 @@ package com.fenghoo.seven.main.kehu.Bean;
 
 import com.fenghoo.seven.test.BaseModel;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -35,7 +36,7 @@ public class FpListBean extends BaseModel {
         this.status = status;
     }
 
-    public static class ResultBean {
+    public static class ResultBean implements Serializable{
         /**
          * msg : 获取成功
          * data : [{"headimg":"localhost/upload/2020081115530962805.jpg","fp_num":"2","phone":"18831913290","name":"demo","wechat":"wangyuxin283425757","industry":[{"industry":"家具","type":"0","customer_id":"ae0c5199fdf564f90796aec09482b85d"}],"customer_id":"ae0c5199fdf564f90796aec09482b85d"}]
@@ -70,7 +71,7 @@ public class FpListBean extends BaseModel {
             this.data = data;
         }
 
-        public static class DataBean {
+        public static class DataBean implements Serializable {
             /**
              * headimg : localhost/upload/2020081115530962805.jpg
              * fp_num : 2
@@ -155,7 +156,7 @@ public class FpListBean extends BaseModel {
                 this.industry = industry;
             }
 
-            public static class IndustryBean {
+            public static class IndustryBean implements Serializable{
                 /**
                  * industry : 家具
                  * type : 0
@@ -163,6 +164,16 @@ public class FpListBean extends BaseModel {
                  */
 
                 private String industry;
+
+                public String getIndustry_id() {
+                    return industry_id;
+                }
+
+                public void setIndustry_id(String industry_id) {
+                    this.industry_id = industry_id;
+                }
+
+                private String industry_id;
                 private String type;
                 private String customer_id;
 

app/src/main/java/com/fenghoo/seven/main/kehu/Bean/IndustryBean.java

@@ -5,11 +5,12 @@ import com.fenghoo.seven.test.BaseModel;
 import java.util.List;
 
 /**
- * Time:  2020/8/20
+ * Time:  2020/8/17
  * Author:  jianbo
  * Description:
  */
-public class industryBean extends BaseModel {
+public class IndustryBean extends BaseModel {
+
 
     /**
      * result : {"msg":"成功","data":[{"industry_id":"1","industry":"家具"}],"success":0}

app/src/main/java/com/fenghoo/seven/main/kehu/Bean/IndustryBeantwo.java

@@ -0,0 +1,75 @@
+package com.fenghoo.seven.main.kehu.Bean;
+
+import com.fenghoo.seven.test.BaseModel;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Time:  2020/8/17
+ * Author:  jianbo
+ * Description:
+ */
+public class IndustryBeantwo extends BaseModel {
+
+        /**
+         * msg : 成功
+         * data : [{"industry_id":"1","industry":"家具"}]
+         * 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 implements Serializable {
+            /**
+             * industry_id : 1
+             * industry : 家具
+             */
+
+            private String industry_id;
+            private String industry;
+
+            public String getIndustry_id() {
+                return industry_id;
+            }
+
+            public void setIndustry_id(String industry_id) {
+                this.industry_id = industry_id;
+            }
+
+            public String getIndustry() {
+                return industry;
+            }
+
+            public void setIndustry(String industry) {
+                this.industry = industry;
+            }
+
+    }
+}

app/src/main/java/com/fenghoo/seven/main/kehu/Bean/orderListBean.java

@@ -2,6 +2,7 @@ package com.fenghoo.seven.main.kehu.Bean;
 
 import com.fenghoo.seven.test.BaseModel;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -86,7 +87,61 @@ public class orderListBean extends BaseModel {
             private String wechat;
             private String order_num;
             private String customer_id;
+            private List<IndustryBean> industry;
 
+            public List<IndustryBean> getIndustry() {
+                return industry;
+            }
+
+            public void setIndustry(List<IndustryBean> industry) {
+                this.industry = industry;
+            }
+
+            public static class IndustryBean implements Serializable {
+                /**
+                 * industry : 家具
+                 * type : 0
+                 * customer_id : ae0c5199fdf564f90796aec09482b85d
+                 */
+
+                private String industry;
+
+                public String getIndustry_id() {
+                    return industry_id;
+                }
+
+                public void setIndustry_id(String industry_id) {
+                    this.industry_id = industry_id;
+                }
+
+                private String industry_id;
+                private String type;
+                private String customer_id;
+
+                public String getIndustry() {
+                    return industry;
+                }
+
+                public void setIndustry(String industry) {
+                    this.industry = industry;
+                }
+
+                public String getType() {
+                    return type;
+                }
+
+                public void setType(String type) {
+                    this.type = type;
+                }
+
+                public String getCustomer_id() {
+                    return customer_id;
+                }
+
+                public void setCustomer_id(String customer_id) {
+                    this.customer_id = customer_id;
+                }
+            }
             public String getAddress() {
                 return address;
             }

app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/HangyeSelectDialog.java

@@ -13,7 +13,7 @@ import android.widget.TextView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.fenghoo.seven.R;
-import com.fenghoo.seven.main.kehu.Bean.industryBean;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBean;
 import com.fenghoo.seven.utils.WidgetTools;
 
 import java.util.List;
@@ -27,14 +27,14 @@ public class HangyeSelectDialog extends Dialog implements View.OnClickListener {
     private OnCloseListener listener;
     private RecyclerView reply_rcey;
     private TextView tv_cancel;
-    private List<industryBean.ResultBean.DataBean> industryData;
+    private List<IndustryBean.ResultBean.DataBean> industryData;
 
     public HangyeSelectDialog(Context context) {
         super(context);
         this.mContext = context;
     }
 
-    public HangyeSelectDialog(Context context, int themeResId, List<industryBean.ResultBean.DataBean> industryData, OnCloseListener listener) {
+    public HangyeSelectDialog(Context context, int themeResId, List<IndustryBean.ResultBean.DataBean> industryData, OnCloseListener listener) {
         super(context, themeResId);
         this.mContext = context;
         this.listener = listener;
@@ -63,9 +63,9 @@ public class HangyeSelectDialog extends Dialog implements View.OnClickListener {
         reply_rcey = (RecyclerView) findViewById(R.id.reply_rcey);
         LinearLayoutManager manager = new LinearLayoutManager(mContext);
         reply_rcey.setLayoutManager(manager);
-        reply_rcey.setAdapter(new BaseQuickAdapter<industryBean.ResultBean.DataBean, BaseViewHolder>(R.layout.item_hangyeselect_dialog, industryData) {
+        reply_rcey.setAdapter(new BaseQuickAdapter<IndustryBean.ResultBean.DataBean, BaseViewHolder>(R.layout.item_hangyeselect_dialog, industryData) {
             @Override
-            protected void convert(final BaseViewHolder helper, final industryBean.ResultBean.DataBean item) {
+            protected void convert(final BaseViewHolder helper, final IndustryBean.ResultBean.DataBean item) {
                 WidgetTools.setTextfive((TextView) helper.getView(R.id.img_modify), "", item.getIndustry());
                 RelativeLayout reply_dialog_rl = helper.getView(R.id.reply_dialog_rl);
                 reply_dialog_rl.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/HangyeSelectDialogtwo.java

@@ -0,0 +1,102 @@
+package com.fenghoo.seven.main.kehu.Dialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.fenghoo.seven.R;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBean;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBeantwo;
+import com.fenghoo.seven.utils.WidgetTools;
+
+import java.util.List;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class HangyeSelectDialogtwo extends Dialog implements View.OnClickListener {
+
+    private Context mContext;
+    private OnCloseListener listener;
+    private RecyclerView reply_rcey;
+    private TextView tv_cancel;
+    private List<IndustryBeantwo.DataBean> industryData;
+
+    public HangyeSelectDialogtwo(Context context) {
+        super(context);
+        this.mContext = context;
+    }
+
+    public HangyeSelectDialogtwo(Context context, int themeResId, List<IndustryBeantwo.DataBean> industryData, OnCloseListener listener) {
+        super(context, themeResId);
+        this.mContext = context;
+        this.listener = listener;
+        this.industryData = industryData;
+
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.hangselect_dialog);
+        setCanceledOnTouchOutside(true);
+        Window window = getWindow();
+        window.getDecorView().setPadding(0, 0, 0, 0);
+        WindowManager.LayoutParams layoutParams = window.getAttributes();
+        layoutParams.width = WindowManager.LayoutParams.MATCH_PARENT;
+        layoutParams.horizontalMargin = 0;
+        window.setAttributes(layoutParams);
+        window.setGravity(Gravity.BOTTOM);
+        initView();
+    }
+
+    private void initView() {
+        tv_cancel = (TextView) findViewById(R.id.tv_cancel);
+        tv_cancel.setOnClickListener(this);
+        reply_rcey = (RecyclerView) findViewById(R.id.reply_rcey);
+        LinearLayoutManager manager = new LinearLayoutManager(mContext);
+        reply_rcey.setLayoutManager(manager);
+        reply_rcey.setAdapter(new BaseQuickAdapter<IndustryBeantwo.DataBean, BaseViewHolder>(R.layout.item_hangyeselect_dialog, industryData) {
+            @Override
+            protected void convert(final BaseViewHolder helper, final IndustryBeantwo.DataBean item) {
+                WidgetTools.setTextfive((TextView) helper.getView(R.id.img_modify), "", item.getIndustry());
+                RelativeLayout reply_dialog_rl = helper.getView(R.id.reply_dialog_rl);
+                reply_dialog_rl.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        listener.uploadAvatar(item.getIndustry_id(),item.getIndustry());
+                        dismiss();
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.tv_cancel:
+                dismiss();
+                break;
+        }
+    }
+
+    public interface OnCloseListener {
+
+        /**
+         * @description  列表选择的内容
+         * @param
+         * @return
+         */
+        void uploadAvatar(String item, String industry);
+
+    }
+}

app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java

@@ -78,8 +78,8 @@ public class AllocationActivity extends BaseActivity implements View.OnClickList
         mIvLeft.setVisibility(View.VISIBLE);
         mTvCenter.setVisibility(View.VISIBLE);
         RightTv.setVisibility(View.VISIBLE);
-        mTvCenter.setText("客户调拨");
+        mTvCenter.setText("客户分配");
-        RightTv.setText("调拨");
+        RightTv.setText("分配");
 
     }
 
@@ -99,7 +99,7 @@ public class AllocationActivity extends BaseActivity implements View.OnClickList
                         numtwo+=1;
                     }
                 }
-                RightTv.setText("调拨("+numtwo+")");
+                RightTv.setText("分配("+numtwo+")");
 
             }
 

app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java

@@ -15,7 +15,6 @@ import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
 import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
@@ -27,7 +26,7 @@ import com.fenghoo.seven.base.BaseTreeActivity;
 import com.fenghoo.seven.db.DbRecordBeanData;
 import com.fenghoo.seven.main.kehu.Bean.JsonBeantwo;
 import com.fenghoo.seven.main.kehu.Bean.PhotoeditorBean;
-import com.fenghoo.seven.main.kehu.Bean.industryBean;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBean;
 import com.fenghoo.seven.main.kehu.activity.mvp.contract.CommitDesignContract;
 import com.fenghoo.seven.main.kehu.activity.mvp.presenter.CommitDesignPresenter;
 import com.fenghoo.seven.main.kehu.adapter.DesignAdapter;
@@ -72,7 +71,7 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,
     private RelativeLayout rl_des;
     private DesignAdapter adapter;
     private List<PhotoeditorBean> photoeditor = new ArrayList<>();
-    private List<industryBean.ResultBean.DataBean> industryData;
+    private List<IndustryBean.ResultBean.DataBean> industryData;
     private ArrayList<String> dingdanTypeList = new ArrayList<>();
 
     @Override
@@ -97,7 +96,7 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,
             @Override
             public void onNext(Response response) {
                 String body = (String) response.body();
-                industryBean.ResultBean result = JsonUtils.fromJson(body, industryBean.class).getResult();
+                IndustryBean.ResultBean result = JsonUtils.fromJson(body, IndustryBean.class).getResult();
                 if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
                     industryData = result.getData();
                 }

app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java

@@ -11,9 +11,9 @@ import com.fenghoo.seven.base.BaseActivity;
 import com.fenghoo.seven.main.find.entity.Markquestionsone;
 import com.fenghoo.seven.main.find.entity.markquestions;
 import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBeantwo;
 import com.fenghoo.seven.main.kehu.Bean.fpOrderInfoBean;
-import com.fenghoo.seven.main.kehu.Bean.industryBean;
+import com.fenghoo.seven.main.kehu.Dialog.HangyeSelectDialogtwo;
-import com.fenghoo.seven.main.kehu.Dialog.HangyeSelectDialog;
 import com.fenghoo.seven.main.kehu.adapter.FpOrderInfoAdaptertwo;
 import com.fenghoo.seven.okgonet.HttpConstants;
 import com.fenghoo.seven.okgonet.NetApi;
@@ -37,48 +37,31 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis
     private Markquestionsone markquestionsone;
     private String customer_id;
     private String name,headimg,wechat,address;
-    private List<industryBean.ResultBean.DataBean> industryData;
+    private List<IndustryBeantwo.DataBean> industryData;
+    private IndustryBeantwo dataBean;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         contentView = LayoutInflater.from(this).inflate(R.layout.activity_refactor_marking_detail, null);
+        setContentView(contentView);
         customer_id = getIntent().getStringExtra("customer_id");
         name = getIntent().getStringExtra("name");
         headimg = getIntent().getStringExtra("headimg");
         wechat = getIntent().getStringExtra("wechat");
         address = getIntent().getStringExtra("address");
-        setContentView(contentView);
+        dataBean = (IndustryBeantwo) getIntent().getSerializableExtra("dataBean");
         initView();
         //第一部分的数据
         markquestionsone = new Markquestionsone();
         markquestionsone.setHeadimg(headimg);
         markquestionsone.setWechat(wechat);
         markquestionsone.setAddress(address);
-        //获得行业数据
+        industryData = dataBean.getData();
-        //  getPresenter().getindustry();
+        IndustryBeantwo.DataBean dataBean = industryData.get(0);
-        final HttpParams paramsPost = new HttpParams();
+        markquestionsone.setIndustry(dataBean.getIndustry());
-        new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_industry).subscribe(new Observer<Response>() {
+        String industry_id = dataBean.getIndustry_id();
-            @Override
+        fpOrderInfo(industry_id);
-            public void onNext(Response response) {
-                String body = (String) response.body();
-                industryBean.ResultBean result = JsonUtils.fromJson(body, industryBean.class).getResult();
-                if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
-                    industryData = result.getData();
-                    industryBean.ResultBean.DataBean dataBean = industryData.get(0);
-                    markquestionsone.setIndustry(dataBean.getIndustry());
-                    String industry_id = dataBean.getIndustry_id();
-                    fpOrderInfo(industry_id);
-                }
-            }
-
-            @Override
-            public void onError(Exception e) {
-                e.printStackTrace();
-
-            }
-        });
-
     }
     private void initView() {
         mTitleBar = (TitleBar) findViewById(R.id.title_bar);
@@ -136,7 +119,7 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis
             @Override
             public void industry(TextView marking_fragment_title, int postion, Markquestionsone markquestionson) {
 
-                new HangyeSelectDialog(FpOrderInfoActivity.this, R.style.dialog,industryData, new HangyeSelectDialog.OnCloseListener() {
+                new HangyeSelectDialogtwo(FpOrderInfoActivity.this, R.style.dialog,industryData, new HangyeSelectDialogtwo.OnCloseListener() {
                     @Override
                     public void uploadAvatar(String industry_id,String industry) {
                         markquestionsone.setIndustry(industry);

app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java

@@ -13,12 +13,12 @@ import com.fenghoo.seven.main.find.CommentActivity;
 import com.fenghoo.seven.main.find.ConversationActivity;
 import com.fenghoo.seven.main.find.MainActivitytwot;
 import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBean;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBeantwo;
 
 import java.io.Serializable;
 import java.util.List;
 
-import mlxy.utils.S;
-
 public class ShowAty {
 
     /**
@@ -30,7 +30,6 @@ public class ShowAty {
         bundle.putSerializable("dataBean", (Serializable) mShowListtwo);
         i.putExtras(bundle);
         ctx.startActivity(i);
-
     }
 
     /**
@@ -115,13 +114,16 @@ public class ShowAty {
      * @param
      * @return
      */
-    public static void FpOrderInfoActivity(Context ctx, String customer_id, String name, String headimg,String wechat,String address) {
+    public static void FpOrderInfoActivity(Context ctx, String customer_id, String name, String headimg, String wechat, String address, IndustryBeantwo industryData) {
         Intent i = new Intent(ctx, FpOrderInfoActivity.class);
         i.putExtra("customer_id",customer_id);
         i.putExtra("name",name);
         i.putExtra("headimg",headimg);
         i.putExtra("wechat",wechat);
         i.putExtra("address",address);
+        Bundle bundle = new Bundle();
+        bundle.putSerializable("dataBean", industryData);
+        i.putExtras(bundle);
         ctx.startActivity(i);
     }
 

app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DisListAdapter.java

@@ -78,11 +78,6 @@ public class DisListAdapter extends BaseQuickAdapter<FpListBean.ResultBean.DataB
     }
 
     public interface OnViewClickListener{
-
-        void operation(FpListBean.ResultBean.DataBean item);
-
-
         void enterCusDetail(FpListBean.ResultBean.DataBean item);
-
     }
 }

app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java

@@ -6,6 +6,9 @@ import android.widget.FrameLayout;
 
 import com.fenghoo.seven.JsonUtils;
 import com.fenghoo.seven.main.find.entity.ThreeEvent;
+import com.fenghoo.seven.main.kehu.Bean.FpListBean;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBean;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBeantwo;
 import com.fenghoo.seven.main.kehu.Bean.orderListBean;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
 import com.fenghoo.seven.main.kehu.adapter.DeaListAdapter;
@@ -16,6 +19,7 @@ import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
 import com.lzy.okgo.model.HttpParams;
 import com.lzy.okgo.model.Response;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -53,7 +57,19 @@ public class DealFragment extends MobanFragment {
             @Override
             public void enterCusDetail(orderListBean.ResultBean.DataBean item) {
                 //进入分配/成交列表详情
-                ShowAty.FpOrderInfoActivity(getActivity(),item.getCustomer_id(),item.getName()+item.getPhone(),item.getHeadimg(),item.getWechat(),item.getAddress());
+                List<orderListBean.ResultBean.DataBean.IndustryBean> industry = item.getIndustry();
+                IndustryBeantwo industryBean = new IndustryBeantwo();
+                List<IndustryBeantwo.DataBean> dataBeans = new ArrayList<>();
+                for(int i=0;i<industry.size();i++){
+                    orderListBean.ResultBean.DataBean.IndustryBean industryBean1 = industry.get(i);
+                    IndustryBeantwo.DataBean dataBean = new IndustryBeantwo.DataBean();
+                    dataBean.setIndustry(industryBean1.getIndustry());
+                    dataBean.setIndustry_id(industryBean1.getIndustry_id());
+                    dataBeans.add(dataBean);
+                }
+                industryBean.setData(dataBeans);
+                ShowAty.FpOrderInfoActivity(getActivity(),item.getCustomer_id(),item.getName()+item.getPhone(),item.getHeadimg(),item.getWechat(),item.getAddress(),industryBean);
+              //  JumpUtils.gotoActivity(getActivity(), FpOrderInfoActivity.class, false, "dataBean", item);
             }
         });
     }

app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java

@@ -7,6 +7,8 @@ import android.widget.FrameLayout;
 import com.fenghoo.seven.JsonUtils;
 import com.fenghoo.seven.main.find.entity.ThreeEvent;
 import com.fenghoo.seven.main.kehu.Bean.FpListBean;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBean;
+import com.fenghoo.seven.main.kehu.Bean.IndustryBeantwo;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
 import com.fenghoo.seven.main.kehu.adapter.DisListAdapter;
 import com.fenghoo.seven.okgonet.HttpConstants;
@@ -16,6 +18,7 @@ import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
 import com.lzy.okgo.model.HttpParams;
 import com.lzy.okgo.model.Response;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -44,15 +47,22 @@ public class DistriFragment extends MobanFragment {
         getAdpter(markingtwoAdapter);
         mMarkingFragmentRecyclerView.setAdapter(markingtwoAdapter);
         markingtwoAdapter.operationListenner(new DisListAdapter.OnViewClickListener() {
-            @Override
-            public void operation(final FpListBean.ResultBean.DataBean item) {
-
-            }
-
             @Override
             public void enterCusDetail(FpListBean.ResultBean.DataBean item) {
                 //进入分配/成交列表详情
-                ShowAty.FpOrderInfoActivity(getActivity(),item.getCustomer_id(),item.getName()+item.getPhone(),item.getHeadimg(),item.getWechat(),item.getAddress());
+                List<FpListBean.ResultBean.DataBean.IndustryBean> industry = item.getIndustry();
+                IndustryBeantwo industryBean = new IndustryBeantwo();
+                List<IndustryBeantwo.DataBean> dataBeans = new ArrayList<>();
+                for(int i=0;i<industry.size();i++){
+                    FpListBean.ResultBean.DataBean.IndustryBean industryBean1 = industry.get(i);
+                    IndustryBeantwo.DataBean dataBean = new IndustryBeantwo.DataBean();
+                    dataBean.setIndustry(industryBean1.getIndustry());
+                    dataBean.setIndustry_id(industryBean1.getIndustry_id());
+                    dataBeans.add(dataBean);
+                }
+                industryBean.setData(dataBeans);
+                ShowAty.FpOrderInfoActivity(getActivity(),item.getCustomer_id(),item.getName()+item.getPhone(),item.getHeadimg(),item.getWechat(),item.getAddress(),industryBean);
+               // JumpUtils.gotoActivity(getActivity(), FpOrderInfoActivity.class, false, "dataBean", item);
             }
         });
     }
@@ -75,7 +85,12 @@ public class DistriFragment extends MobanFragment {
         final HttpParams paramsPost = new HttpParams();
         paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
         paramsPost.put("search", search);
-        new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_fpList).subscribe(new Observer<Response>() {
+        requesetData(paramsPost,HttpConstants.URi_device_AppCustomer_fpList);
+
+    }
+
+    private void requesetData(HttpParams paramsPost,String uri) {
+        new NetApi().getPostData(paramsPost, uri).subscribe(new Observer<Response>() {
             @Override
             public void onNext(Response response) {
                 String body = (String) response.body();
@@ -109,12 +124,11 @@ public class DistriFragment extends MobanFragment {
                 mSwl.setRefreshing(false);
             }
         });
-
     }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
     }
-
 }
 

app/src/main/java/com/fenghoo/seven/main/kehu/fragment/MobanFragment.java

@@ -156,6 +156,7 @@ public abstract class MobanFragment extends BaseFragment {
         this.markingtwoAdapter=markingtwoAdapter;
     }
 
+
     @Override
     public void onDestroy() {
         super.onDestroy();

app/src/main/java/com/fenghoo/seven/network/http/MyApi.java

@@ -24,6 +24,7 @@ public class MyApi {
 
 
     public static String URiBase = "http://192.168.1.3/device/";// 7月7
+  //  public static String URiBase = "http://106.53.92.2/device/";// 7月7
 
     /**
      * 网络接口前缀

app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java

@@ -10,10 +10,9 @@ package com.fenghoo.seven.okgonet;
  */
 public class HttpConstants {
 
-
-  //  public static String URiBase = "http://www.fenghoo.com.cn";// 蜂狐商户版线上
-
     public static String URiBase = "http://192.168.1.3";// 7月7
+  //  public static String URiBase = "http://106.53.92.2";// 7月7
+
 
 
     /**

app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java

@@ -56,8 +56,6 @@ public class NetApi {
         };
 
     }
-
-
     public Observable<Response> addCustomer(final String uid, final String headimg, final String name, final String phone, final String wechat, final String address, final String decoration, final String style_id, final String budget, final String source, final String customer_id) {
 
         return new Observable<Response>() {

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

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

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

@@ -55,11 +55,11 @@
                 android:gravity="center"
                 android:paddingLeft="7dp"
                 android:paddingRight="7dp"
-                android:background="@drawable/shape_allocation_tv"
+                android:background="@drawable/shape_allocation_tvv"
                 android:layout_marginRight="15dp"
                 android:textColor="@color/hui"
                 android:textSize="14sp"
-                android:text="调拨（2）" />
+                android:text="分配（2）" />
 
         </RelativeLayout>