d

app/src/main/AndroidManifest.xml

@@ -104,11 +104,16 @@
             android:screenOrientation="portrait" />
         <activity android:name=".main.kehu.activity.AddCustomerActivity"
             android:screenOrientation="portrait" />
+        <activity android:name=".main.kehu.activity.AddCustDialogActivity"
+            android:theme="@style/dialogstyle"
+            android:configChanges="orientation|screenSize"
+            android:screenOrientation="portrait" />
+
+
         <activity android:name=".main.kehu.activity.StyleActivity"
             android:screenOrientation="portrait" />
         <activity android:name=".main.kehu.activity.BudgetActivity"
             android:screenOrientation="portrait" />
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.fenghoo.seven.fileprovider"

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

@@ -26,7 +26,6 @@ public class FindFragment extends BaseFragment {
     private RelativeLayout dianpubuju;
     private LinearLayout dianyuanbuju;
     private TextView marking_fragment;
-    private FloatingActionButton floatingActionButton;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -50,14 +49,6 @@ public class FindFragment extends BaseFragment {
     }
 
     private void initView(View mContentView) {
-        floatingActionButton = (FloatingActionButton)view.findViewById(R.id.floatingActionButton);
-        floatingActionButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                //进入添加客户和完善信息
-                ShowAty.AddCustomerActivity(getActivity(),"","");
-            }
-        });
         marking_fragment = (TextView)view.findViewById(R.id.marking_fragment);
         dianpubuju = (RelativeLayout)view.findViewById(R.id.dianpubuju);
         dianyuanbuju = (LinearLayout)view.findViewById(R.id.dianyuanbuju);

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

@@ -6,10 +6,19 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
+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.Dialog.HangyeSelectDialog;
+import com.fenghoo.seven.okgonet.NetApi;
+import com.fenghoo.seven.okgonet.Observer;
+import com.lzy.okgo.model.Response;
+
+import java.util.List;
 
 /**
  * 视频评论（页面）
@@ -19,7 +28,10 @@ public class PriLetFragment extends BaseFragment {
     Context mContext;
     View view;
     private RelativeLayout rl_privateletter;
-
+    private TextView left_tvtwo;
+    private TextView marking_fragment_title;
+    private PrivateletterFragment privateletterFragment;
+    private List<industryBean.ResultBean.DataBean> industryData;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -37,14 +49,48 @@ public class PriLetFragment extends BaseFragment {
             return view;
         }
         view = inflater.inflate(R.layout.findfragment, container, false);
-        getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.containerr,new PrivateletterFragment()).commit();
         initView(view);
+        new NetApi().industry().subscribe(new Observer<Response>() {
+            @Override
+            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 = new industryBean.ResultBean.DataBean();
+                    dataBean.setIndustry("全部");
+                    dataBean.setIndustry_id("");
+                    industryData.add(0,dataBean);
+                    privateletterFragment = new PrivateletterFragment(left_tvtwo);
+                    getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.containerr,privateletterFragment).commit();
+                }
+            }
+            @Override
+            public void onError(Exception e) {
+                e.printStackTrace();
+
+            }
+        });
         return view;
     }
 
     private void initView(View mContentView) {
         rl_privateletter = (RelativeLayout)view.findViewById(R.id.rl_privateletter);
-
+        left_tvtwo = (TextView)view.findViewById(R.id.left_tvtwo);
+        marking_fragment_title = (TextView)view.findViewById(R.id.marking_fragment_title);
+        marking_fragment_title.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                new HangyeSelectDialog(getActivity(), R.style.dialog, industryData, new HangyeSelectDialog.OnCloseListener() {
+                    @Override
+                    public void uploadAvatar(String industry_id, String industry) {
+                        marking_fragment_title.setText(industry);
+                        //刷新抖音列表数据
+                        privateletterFragment.onRefresh(industry_id);
+                    }
+                }).show();
+            }
+        });
     }
 
     interface ClickCallback {
@@ -59,5 +105,4 @@ public class PriLetFragment extends BaseFragment {
             }
         });
     }
-
 }

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

@@ -7,6 +7,7 @@ import android.text.TextWatcher;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
+import android.widget.TextView;
 
 import com.fenghoo.seven.R;
 import com.fenghoo.seven.base.BaseTreeFragment;
@@ -14,7 +15,9 @@ import com.fenghoo.seven.main.find.adapter.QuestionsAdapter;
 import com.fenghoo.seven.main.find.entity.QuestionsEntity;
 import com.fenghoo.seven.main.find.mvp.contract.QuestionsContract;
 import com.fenghoo.seven.main.find.mvp.presenter.QuestionsPresenterImpl;
+import com.fenghoo.seven.main.kehu.activity.ShowAty;
 import com.fenghoo.seven.widget.PastEditText;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,6 +41,7 @@ public class QuestionsFragment extends BaseTreeFragment<QuestionsContract.View,
     private RecyclerView mRecyclerView;
     private QuestionsAdapter mAdapter;
     private LinearLayoutManager mLayoutManager;
+    private TextView floatingActionButton;
 
     @Override
     public void widgetClick(View v) {
@@ -52,6 +56,15 @@ public class QuestionsFragment extends BaseTreeFragment<QuestionsContract.View,
 
     @Override
     protected void initView(View view) {
+
+        floatingActionButton = (TextView)view.findViewById(R.id.floatingActionButton);
+        floatingActionButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //进入添加客户和完善信息
+                ShowAty.AddCustDialogActivity(getActivity(),"","");
+            }
+        });
         btnSend = (Button) view.findViewById(R.id.btn_send);
         pastEditText = (PastEditText) view.findViewById(R.id.et_msg);
         mRecyclerView = (RecyclerView) view.findViewById(R.id.rcv);

app/src/main/java/com/fenghoo/seven/main/find/adapter/AwemeAdapter.java

@@ -0,0 +1,80 @@
+package com.fenghoo.seven.main.find.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+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.awemeBean;
+import com.fenghoo.seven.utils.AbStrUtil;
+import com.fenghoo.seven.utils.GlideTools;
+import com.fenghoo.seven.utils.WidgetTools;
+import com.fenghoo.seven.widget.CircleImageView;
+
+import java.util.List;
+
+
+public class AwemeAdapter extends BaseQuickAdapter<awemeBean.ResultBean.DataBean, BaseViewHolder> {
+    Context mcontext;
+    OnViewClickListener onViewClickListener;
+
+    public AwemeAdapter(Context context, List list) {
+        super(R.layout.findlist_item, list);
+        this.mcontext = context;
+    }
+
+    @Override
+    protected void convert(final BaseViewHolder helper, final awemeBean.ResultBean.DataBean item) {
+        WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_name), "", item.getNick_name());
+        ImageView iv_dea_avatar = helper.getView(R.id.iv_dea_avatar);
+        GlideTools.init(mContext).displaypic(iv_dea_avatar, item.getCover(), R.mipmap.icon_default_empty);
+        CircleImageView ima_dea_watch = helper.getView(R.id.ima_dea_watch);
+        GlideTools.init(mContext).displaypic(ima_dea_watch, item.getNick_img(), R.mipmap.icon_default_head);
+        WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_aweme_title), "", item.getTitle());
+        WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_aweme_time), "", item.getCreate_time());
+        TextView left_tvtwo = helper.getView(R.id.left_tvtwo);
+        String comment_num = item.getComment_num();
+            if(AbStrUtil.isEmpty(comment_num)){
+                left_tvtwo.setVisibility(View.INVISIBLE);
+            }else {
+                if(comment_num.equals("0")){
+                    left_tvtwo.setVisibility(View.INVISIBLE);
+                }else {
+                left_tvtwo.setVisibility(View.VISIBLE);
+                WidgetTools.setTextfive((TextView) helper.getView(R.id.left_tvtwo), "", item.getComment_num());}
+            }
+
+
+
+        RelativeLayout tv_cuslist_caozuo = (RelativeLayout)helper.getView(R.id.tv_cuslist_caozuo);
+        tv_cuslist_caozuo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //查看评论
+                onViewClickListener.enterCusDetail(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){
+        this.onViewClickListener  = onViewClickListener;
+    }
+
+    public interface OnViewClickListener{
+
+        void enterCusDetail(awemeBean.ResultBean.DataBean item);
+
+    }
+
+}

app/src/main/java/com/fenghoo/seven/main/find/adapter/FindListAdapter.java

@@ -1,59 +0,0 @@
-package com.fenghoo.seven.main.find.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.fenghoo.seven.R;
-import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
-import com.fenghoo.seven.utils.WidgetTools;
-
-import java.util.List;
-
-
-public class FindListAdapter extends BaseQuickAdapter<CustomerListBean.ResultBean.DataBean, BaseViewHolder> {
-    Context mcontext;
-    OnViewClickListener onViewClickListener;
-
-    public FindListAdapter(Context context, List list) {
-        super(R.layout.findlist_item, list);
-        this.mcontext = context;
-    }
-
-    @Override
-    protected void convert(final BaseViewHolder helper, final CustomerListBean.ResultBean.DataBean item) {
-        WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_name), "", item.getName());
-        RelativeLayout tv_cuslist_caozuo = (RelativeLayout)helper.getView(R.id.tv_cuslist_caozuo);
-        tv_cuslist_caozuo.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-            }
-        });
-        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){
-        this.onViewClickListener  = onViewClickListener;
-    }
-
-    public interface OnViewClickListener{
-
-
-
-
-        void enterCusDetail(CustomerListBean.ResultBean.DataBean item);
-
-    }
-
-}

app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java

@@ -1,19 +1,21 @@
 package com.fenghoo.seven.main.find.ui;
 
-import android.widget.Toast;
+import android.view.View;
+import android.widget.TextView;
 
 import com.fenghoo.seven.JsonUtils;
 import com.fenghoo.seven.R;
-import com.fenghoo.seven.dialog.BaseTipsDialog;
-import com.fenghoo.seven.main.find.adapter.FindListAdapter;
-import com.fenghoo.seven.main.find.adapter.PrivateletAdapter;
-import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
-import com.fenghoo.seven.main.kehu.Dialog.CusOperationDialog;
+import com.fenghoo.seven.main.find.adapter.AwemeAdapter;
+import com.fenghoo.seven.main.kehu.Bean.awemeBean;
 import com.fenghoo.seven.main.kehu.MobanFragment;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
+import com.fenghoo.seven.okgonet.HttpConstants;
 import com.fenghoo.seven.okgonet.NetApi;
 import com.fenghoo.seven.okgonet.Observer;
+import com.fenghoo.seven.utils.AbStrUtil;
+import com.fenghoo.seven.utils.WidgetTools;
 import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
+import com.lzy.okgo.model.HttpParams;
 import com.lzy.okgo.model.Response;
 
 import java.util.List;
@@ -24,21 +26,21 @@ import androidx.recyclerview.widget.LinearLayoutManager;
  * 视频评论（列表）
  */
 public class PrivateletterFragment extends MobanFragment {
-
-
-    public PrivateletterFragment() {
+    TextView left_tvtwo;
+    private String industry_id="";
+    public PrivateletterFragment(TextView left_tvtwo) {
         super();
-
+        this.left_tvtwo=left_tvtwo;
     }
     @Override
     public void initAdapter() {
         mMarkingFragmentRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
-        FindListAdapter markingtwoAdapter = new FindListAdapter(mContext, null);
+        AwemeAdapter markingtwoAdapter = new AwemeAdapter(mContext, null);
         getAdpter(markingtwoAdapter);
         mMarkingFragmentRecyclerView.setAdapter(markingtwoAdapter);
-        markingtwoAdapter.operationListenner(new FindListAdapter.OnViewClickListener() {
+        markingtwoAdapter.operationListenner(new AwemeAdapter.OnViewClickListener() {
             @Override
-            public void enterCusDetail(CustomerListBean.ResultBean.DataBean item) {
+            public void enterCusDetail(awemeBean.ResultBean.DataBean item) {
                 //进入查看评论
                 ShowAty.CommentActivity(getActivity(),20);
             }
@@ -47,20 +49,34 @@ public class PrivateletterFragment extends MobanFragment {
 
     @Override
     public void requestData() {
-        new NetApi().customerList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(),"").subscribe(new Observer<Response>() {
+        final HttpParams paramsPost = new HttpParams();
+        paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
+        paramsPost.put("city", "");
+        paramsPost.put("industry_id", industry_id);
+        paramsPost.put("page", mNextRequestPage);
+        new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppDouyin_aweme).subscribe(new Observer<Response>() {
             @Override
             public void onNext(Response response) {
                 String body = (String) response.body();
-                CustomerListBean.ResultBean result = JsonUtils.fromJson(body, CustomerListBean.class).getResult();
+                awemeBean.ResultBean result = JsonUtils.fromJson(body, awemeBean.class).getResult();
                 mSwl.setRefreshing(false);
                 if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
-
-                    List<CustomerListBean.ResultBean.DataBean> data = result.getData();
-                    if (data.size() == 0) {
-                        markingtwoAdapter.setEmptyView(notDataView);
-                        return;
+                    String read_num = result.getRead_num();
+                    if(AbStrUtil.isEmpty(read_num)){
+                        left_tvtwo.setVisibility(View.INVISIBLE);
+                    }else {
+                        if(read_num.equals("0")){
+                            left_tvtwo.setVisibility(View.INVISIBLE);
+                        }else {
+                            left_tvtwo.setVisibility(View.VISIBLE);
+                            WidgetTools.setTextfive(left_tvtwo, "", read_num);}
                     }
+                    List<awemeBean.ResultBean.DataBean> data = result.getData();
                     if (mNextRequestPage == 1) {
+                        if (data.size() == 0) {
+                            markingtwoAdapter.setEmptyView(notDataView);
+                            return;
+                        }
                         setData(true, data);
                     } else {
                         setData(false, data);
@@ -78,8 +94,13 @@ public class PrivateletterFragment extends MobanFragment {
                 mSwl.setRefreshing(false);
             }
         });
-
     }
+
+    public void onRefresh(String industry_id){
+        this.industry_id=industry_id;
+        requestData();
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();

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

@@ -0,0 +1,180 @@
+package com.fenghoo.seven.main.kehu.Bean;
+
+import com.fenghoo.seven.test.BaseModel;
+
+import java.util.List;
+
+/**
+ * Time:  2020/8/17
+ * Author:  jianbo
+ * Description:
+ */
+public class awemeBean extends BaseModel {
+
+
+    /**
+     * result : {"msg":"成功","read_num":"0","data":[{"cover":"","comment_num":"1","aweme_id":"1","create_time":"2020-08-25 15:17:40","nick_name":"抖音昵称","nick_img":"抖音头像","short_id":"抖音id","title":"此处显示视频标题","dy_uid":"1"}],"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 : 成功
+         * read_num : 0
+         * data : [{"cover":"","comment_num":"1","aweme_id":"1","create_time":"2020-08-25 15:17:40","nick_name":"抖音昵称","nick_img":"抖音头像","short_id":"抖音id","title":"此处显示视频标题","dy_uid":"1"}]
+         * success : 0
+         */
+
+        private String msg;
+        private String read_num;
+        private int success;
+        private List<DataBean> data;
+
+        public String getMsg() {
+            return msg;
+        }
+
+        public void setMsg(String msg) {
+            this.msg = msg;
+        }
+
+        public String getRead_num() {
+            return read_num;
+        }
+
+        public void setRead_num(String read_num) {
+            this.read_num = read_num;
+        }
+
+        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 {
+            /**
+             * cover :
+             * comment_num : 1
+             * aweme_id : 1
+             * create_time : 2020-08-25 15:17:40
+             * nick_name : 抖音昵称
+             * nick_img : 抖音头像
+             * short_id : 抖音id
+             * title : 此处显示视频标题
+             * dy_uid : 1
+             */
+
+            private String cover;
+            private String comment_num;
+            private String aweme_id;
+            private String create_time;
+            private String nick_name;
+            private String nick_img;
+            private String short_id;
+            private String title;
+            private String dy_uid;
+
+            public String getCover() {
+                return cover;
+            }
+
+            public void setCover(String cover) {
+                this.cover = cover;
+            }
+
+            public String getComment_num() {
+                return comment_num;
+            }
+
+            public void setComment_num(String comment_num) {
+                this.comment_num = comment_num;
+            }
+
+            public String getAweme_id() {
+                return aweme_id;
+            }
+
+            public void setAweme_id(String aweme_id) {
+                this.aweme_id = aweme_id;
+            }
+
+            public String getCreate_time() {
+                return create_time;
+            }
+
+            public void setCreate_time(String create_time) {
+                this.create_time = create_time;
+            }
+
+            public String getNick_name() {
+                return nick_name;
+            }
+
+            public void setNick_name(String nick_name) {
+                this.nick_name = nick_name;
+            }
+
+            public String getNick_img() {
+                return nick_img;
+            }
+
+            public void setNick_img(String nick_img) {
+                this.nick_img = nick_img;
+            }
+
+            public String getShort_id() {
+                return short_id;
+            }
+
+            public void setShort_id(String short_id) {
+                this.short_id = short_id;
+            }
+
+            public String getTitle() {
+                return title;
+            }
+
+            public void setTitle(String title) {
+                this.title = title;
+            }
+
+            public String getDy_uid() {
+                return dy_uid;
+            }
+
+            public void setDy_uid(String dy_uid) {
+                this.dy_uid = dy_uid;
+            }
+        }
+    }
+}

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

@@ -2,9 +2,7 @@ package com.fenghoo.seven.main.kehu;
 
 import com.fenghoo.seven.JsonUtils;
 import com.fenghoo.seven.main.kehu.Bean.FpListBean;
-import com.fenghoo.seven.main.kehu.Bean.orderListBean;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
-import com.fenghoo.seven.main.kehu.adapter.DeaListAdapter;
 import com.fenghoo.seven.main.kehu.adapter.DisListAdapter;
 import com.fenghoo.seven.okgonet.NetApi;
 import com.fenghoo.seven.okgonet.Observer;

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

@@ -10,6 +10,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.fenghoo.seven.R;
@@ -22,7 +23,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 
-@SuppressLint("ValidFragment")
 public abstract class MobanFragment extends BaseFragment {
     public static final String ARG_PAGE = "ARG_PAGE";
     private boolean IS_LOADED = false;
@@ -41,13 +41,8 @@ public abstract class MobanFragment extends BaseFragment {
         }
 
     };
-    public Savaselect savaselectbean;
-    private RelativeLayout rl_top;
-    private RelativeLayout layTop_left_tv;
 
-    public MobanFragment() {
-
-    }
+    public MobanFragment() { }
     public BaseQuickAdapter markingtwoAdapter;
     public void sendMessage() {
         Message message = handler.obtainMessage();
@@ -111,6 +106,12 @@ public abstract class MobanFragment extends BaseFragment {
 
     public void requesdata() {
         initAdapter();
+        markingtwoAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                loadMore();
+            }
+        });
         initRefreshLayout();
         mSwl.setRefreshing(true);
         refresh();
@@ -156,14 +157,12 @@ public abstract class MobanFragment extends BaseFragment {
         }
     }
 
-
     public abstract void requestData();
 
     public void getAdpter(BaseQuickAdapter markingtwoAdapter){
         this.markingtwoAdapter=markingtwoAdapter;
     }
 
-
     @Override
     public void onDestroy() {
         super.onDestroy();

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

@@ -0,0 +1,63 @@
+package com.fenghoo.seven.main.kehu.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.fenghoo.seven.R;
+import com.fenghoo.seven.base.BaseActivity;
+import com.fenghoo.seven.main.kehu.ui.AddCusFragment;
+import com.fenghoo.seven.utils.StatusBarUtil;
+import com.fenghoo.seven.widget.TitleBar;
+
+/**
+ *添加客户和完善信息
+ */
+public class AddCustDialogActivity extends BaseActivity {
+    private static int REQUEST_CODE_CHOOSE = 100;
+    private AddCusFragment addCusFragment;
+    private TitleBar mTitleBar;
+    private String customer_id="";
+    private String source="";
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add_cust_dia);
+        StatusBarUtil.transparencyBar(this); //设置状态栏全透明
+        StatusBarUtil.StatusBarLightMode(this); //设置白底黑字
+        customer_id = getIntent().getStringExtra("customer_id");
+        source = getIntent().getStringExtra("source");
+        addCusFragment = new AddCusFragment(customer_id,source);
+        getSupportFragmentManager().beginTransaction().replace(R.id.containerrr,addCusFragment).commit();
+
+        findViewById(R.id.btn_comit).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                addCusFragment.comit();
+            }
+        });
+
+
+//窗口对齐屏幕宽度
+        Window win = this.getWindow();
+        win.getDecorView().setPadding(0, 0, 0, 0);
+        WindowManager.LayoutParams lp = win.getAttributes();
+        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        lp.gravity = Gravity.TOP;//设置对话框置顶显示
+        win.setAttributes(lp);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_CODE_CHOOSE && resultCode == RESULT_OK) {
+            addCusFragment.Result(data);
+        }
+    }
+}

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

@@ -15,9 +15,11 @@ import com.fenghoo.seven.main.kehu.Bean.fpOrderInfoBean;
 import com.fenghoo.seven.main.kehu.Bean.industryBean;
 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;
 import com.fenghoo.seven.okgonet.Observer;
 import com.fenghoo.seven.widget.TitleBar;
+import com.lzy.okgo.model.HttpParams;
 import com.lzy.okgo.model.Response;
 
 import java.util.List;
@@ -89,7 +91,10 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis
      * @return
      */
     private void fpOrderInfo(String industry_id) {
-        new NetApi().fpOrderInfo(customer_id,industry_id).subscribe(new Observer<Response>() {
+        final HttpParams paramsPost = new HttpParams();
+        paramsPost.put("customer_id", customer_id);
+        paramsPost.put("industry_id", industry_id);
+        new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_fpOrderInfo).subscribe(new Observer<Response>() {
             @Override
             public void onNext(Response response) {
                 String body = (String) response.body();
@@ -111,7 +116,6 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis
 
 
     private void initRecyclerView(final List<fpOrderInfoBean.ResultBean.DataBean> data) {
-
         adapter = new FpOrderInfoAdaptertwo(this, data, markquestionsone);
         LinearLayoutManager manager = new LinearLayoutManager(this);
         mLabelRvList.setLayoutManager(manager);

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

@@ -131,6 +131,17 @@ public class ShowAty {
         i.putExtra("source",source);
         ctx.startActivity(i);
     }
+    /**
+     * @description  添加客户和完善信息(对话框形式)
+     * @param
+     * @return
+     */
+    public static void AddCustDialogActivity(Context ctx,String customer_id,String source) {
+        Intent i = new Intent(ctx, AddCustDialogActivity.class);
+        i.putExtra("customer_id",customer_id);
+        i.putExtra("source",source);
+        ctx.startActivity(i);
+    }
 
 
     public static void StyleActivity(Context ctx) {

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

@@ -17,376 +17,9 @@ public class HttpConstants {
 
 
     /**
-     * 蜂狐商户版
+     * 七月七
      */
 
-    /**
-     * 账号密码登录
-     */
-    public static String URi_device_DevLogin_accountPwd = URiBase + "/device/DevLogin/accountPwd";
-
-    /**
-     * 获取验证码
-     */
-    public static String URi_device_DevSendSMS_send = URiBase + "/device/DevSendSMS/send";
-
-    /**
-     * 手机号登录登录接口
-     */
-    public static String Uri_device_SendSMS_checkCode = URiBase + "/device/SendSMS/checkCode";
-    /**
-     * 手机号验证码登录
-     */
-    public static String Uri_device_DevSendSMS_checkCode = URiBase + "/device/DevSendSMS/checkCode";
-    /**
-     * 找回密码
-     */
-    public static String URi_device_DevLogin_changePwd = URiBase + "/device/DevLogin/changePwd";
-    /**
-     * 订单—订单审核和审核完成接口
-     */
-    public static String Uri_device_DevOrder_checkOrderInfo = URiBase + "/device/DevOrder/checkOrderInfo";
-
-    /**
-     * 退换货—退货单待审核和审核完成
-     */
-    public static String Uri_device_DevOrder_checkReturnInfo = URiBase + "/device/DevStock/checkReturnInfo";
-
-    /**
-     * 查询是否绑定摄像头
-     */
-    public static String URi_is_bind_camera = URiBase + "/device/DevLogin/checkCamera";
-
-    /**
-     * 打标：获取打标问题
-     */
-    public static String URi_get_marking_requestion = URiBase + "/device/DevMark/getMarkProblem";
-
-    /**
-     * 打标：提交标签
-     */
-    public static String URi_commit_tag = URiBase + "/device/DevMark/submitMarkInfo";
-    /**
-     * 打标：黑名单提交记录
-     */
-    public static String URi_DevJoinGood_BlackList = URiBase + "/device/DevJoinGood/BlackList";
-    /**
-     * 获取雷达图数据
-     */
-    public static String Uri_device_DevMark_styleRadar = URiBase + "/device/DevMark/styleRadar";
-    /**
-     * 订单—搜索手机号
-     */
-    public static String Uri_device_DevOrder_SearchPhone = URiBase + "/device/DevOrder/searchPhone";
-    /**
-     * 订单—搜索手机号
-     */
-    public static String Uri_device_DevOrder_GetOrderNum = URiBase + "/device/DevOrder/getOrderNum";
-    /**
-     * 订单—获取店铺
-     */
-    public static String Uri_device_DevOrder_GetStoreName = URiBase + "/device/DevOrder/getStoreInfo";
-    /**
-     * 退换货—退货单提交页面
-     */
-    public static String Uri_device_DevOrder_ReturnGoods = URiBase + "/device/DevStock/returnGoods";
-
-    /**
-     * 退货—退货单转开订单
-     */
-    public static String Uri_device_DevOrder_OrderChangeGood = URiBase + "/device/DevStock/OrderChangeGood";
-
-    /**
-     * 退换货—退货单详细信息
-     */
-    public static String Uri_device_DevOrder_ReturnOrderDetail = URiBase + "/device/DevStock/ReturnOrderDetail";
-    /**
-     * 退换货—审核通过和审核驳回---店长
-     */
-    public static String Uri_device_DevOrder_ReturnOrderPass = URiBase + "/device/DevStock/ReturnOrderPass";
-
-    /**
-     * 退换货—退换单提交审核
-     */
-    public static String Uri_device_DevOrder_SubmitReturnAudit = URiBase + "/device/DevStock/submitReturnAudit";
-    /**
-     * 订单—分享订单获取奖励
-     */
-    public static String Uri_device_DevOrder_GetOrderAward = URiBase + "/device/DevOrder/getOrderAward";
-    /**
-     * 订单—订单详细信息接口
-     */
-    public static String Uri_device_DevOrder_OrderDetail = URiBase + "/device/DevOrder/orderDetail";
-    /**
-     * 退货—历史退货单
-     */
-    public static String Uri_device_DevOrder_HistoryReturnOrder = URiBase + "/device/DevStock/HistoryReturnOrder";
-    /**
-     * 订单—新建订单接口
-     */
-    public static String Uri_device_DevOrder_CreatOrder = URiBase + "/device/DevOrder/creatOrder";
-    /**
-     * 订单—保存订单的详细信息
-     */
-    public static String Uri_device_DevOrder_GetSaveInfomation = URiBase + "/device/DevOrder/getSaveInfomation";
-    /**
-     * 订单--草稿箱
-     */
-    public static String Uri_device_DevOrder_GetSaveRecord = URiBase + "/device/DevOrder/getSaveRecord";
-    /**
-     * 库存查询—品牌查询
-     */
-    public static String Uri_device_DevStock_GetStockFind = URiBase + "/device/DevStock/getStockFind";
-    /**
-     * 库存查询—预定商品订单
-     */
-    public static String Uri_device_DevStock_GetStockOrderGoods = URiBase + "/device/DevStock/getStockOrderGoods";
-    /**
-     * 订单—新建订单接口
-     */
-    public static String Uri_device_DevOrder_AddGoods = URiBase + "/device/DevOrder/addGoods";
-    /**
-     * 打标：关联
-     */
-    public static String Uri_device_DevMark_relationVsitor = URiBase + "/device/DevMark/relationVsitor";
-    /**
-     * 打标：关联历史
-     */
-    public static String Uri_device_DevMark_relationHistory = URiBase + "/device/DevMark/relationHistory";
-    /**
-     * 打标：我的客户-更改状态
-     */
-    public static String URi_device_DevOrder_updatetime = URiBase + "/device/DevMark/updatetime";
-    /**
-     * 订单--保存订单
-     */
-    public static String URi_device_DevOrder_GetBaveInfo = URiBase + "/device/DevOrder/getBaveInfo";//submitAudit
-    /**
-     * 订单—提交审核
-     */
-    public static String URi_device_DevOrder_submitAudit = URiBase + "/device/DevOrder/submitAudit";//submitAudit
-
-    /**
-     * 订单—审核通过或审核驳回--店长
-     */
-    public static String URi_device_DevOrder_orderPass = URiBase + "/device/DevOrder/orderPass";
-    /**
-     * 订单--获取历史凭证
-     */
-    public static String URi_device_DevOrder_getHistoryProof = URiBase + "/device/DevOrder/getHistoryProof";
-    /**
-     * 我的--绑定摄像头
-     */
-    public static String URi_device_Bind_Camera = URiBase + "/device/DevLogin/bindCamera";
-    /**
-     * 微信登录
-     */
-    public static String URi_device_DevLogin_wechatLogin = URiBase + "/device/DevLogin/wechatLogin";
-    /**
-     * 退出登录
-     */
-    public static String URi_device_DevLogin_exitLogin = URiBase + "/device/DevLogin/exitLogin";
-    /**
-     * 微信绑定手机号
-     */
-    public static String URi_device_DevLogin_BlindPhone = URiBase + "/device/DevLogin/bindPhone";
-
-    /**
-     * 获取用户基本信息
-     */
-    public static String URi_user_Base_Msg = URiBase + "/device/DevMark/visitorInfo";
-    /**
-     * 获取打标详细信息
-     */
-    public static String URi_marking_detail_msg = URiBase + "/device/DevMark/markDetails";
-    /**
-     * 成交报备详细信息
-     */
-    public static String URi_device_DevMark_orderDetails = URiBase + "/device/DevMark/orderDetails";
-//    /**
-//     * 打标：确认关联
-//     */
-//    public static String URi_marking_confirm_relevance = URiBase + "/device/DevMark/sureRelation";
-
-    /**
-     * 打标：进店记录搜索
-     */
-    public static String URi_marking_enter_store_search = URiBase + "/device/DevMark/searchHistory";
-    /**
-     * 我的页面：登录人信息
-     */
-    public static String URi_logged_msg = URiBase + "/device/DevLogin/loginInfomation";
-    /**
-     * 我的客户--筛选店员名称
-     */
-    public static String URi_DevMark_screenfVisitor = URiBase + "/device/DevMark/screenfVisitor";
-    /**
-     * 我的：提现
-     */
-    public static String URi_withdrawal = URiBase + "/device/DevLogin/withDrawal";
-    /**
-     * 我的：微信提现
-     */
-    public static String URi_WECHAT_MONEY = URiBase + "/device/DevLogin/wechatTX";
-    /**
-     * 我的:收支明细
-     */
-    public static String URi_detial_discraption = URiBase + "/device/DevLogin/paymentDetail";
-    /**
-     * 我的:退回账户余额
-     */
-    public static String URi_back_account_balance = URiBase + "/device/DevLogin/returnBalance";
-
-    /**
-     * 打标：获取今日打标及未打标的顾客信息  全部客户
-     */
-    public static String URi_device_DevMark_showVisitor = URiBase + "/device/DevMark/showVisitor";
-
-    /**
-     * 我的页面—名单管理
-     */
-    public static String URi_get_from_manager = URiBase + "/device/DevClient/CustormList";
-
-    /**
-     * 客户分配---待分配客户列表
-     */
-    public static String URi_get_from_waitingAssigned = URiBase + "/device/DevClient/waitingAssigned";
-
-    /**
-     * 客户分配--店员列表
-     */
-    public static String URi_get_from_assignUser = URiBase + "/device/DevClient/assignUser";
-
-    /**
-     * 我的页面—名单管理--移出
-     */
-    public static String URi_get_from_manager_remove = URiBase + "/device/DevClient/RemoverCustorm";
-    /**
-     * 我的页面—获取当前版本号
-     */
-    public static String URi_Device_DevLogin_NowVersion = URiBase + "/device/DevLogin/NowVersion";
-
-    /**
-     * 我的页面—同一个人所属店铺
-     */
-    public static String URi_Device_DevClient_AllStore = URiBase + "/device/DevClient/AllStore";
-    /**
-     * 我的页面—切换店铺
-     */
-    public static String URi_Device_DevClient_SwitchStore = URiBase + "/device/DevClient/SwitchStore";
-    /**
-     * 上传头像
-     */
-    public static String URi_Device_Device_UploadImg = URiBase + "/device/DevClient/UploadImg";
-    /**
-     * 上传二维码
-     */
-    public static String URi_Device_DevLogin_uplCode = URiBase + "/device/DevLogin/uplCode";
-    /**
-     * 请求摄像头参数
-     */
-    public static String URi_device_DevJoinGood_GetCameraInfo = URiBase + "/device/DevJoinGood/GetCameraInfo";
-
-    /**
-     * 消息通知
-     */
-    public static String Uri_device_DevOrder_Devclient_MessgaeNotice = URiBase + "/device/DevClient/MessageNotice";
-    /**
-     * 删除消息
-     */
-    public static String Uri_device_DevOrder_Devclient_DeleteMessage = URiBase + "/device/DevClient/DeleteMessage";
-
-    /**
-     * 标为已读消息
-     */
-    public static String Uri_device_DevOrder_Devclient_ReadMessage = URiBase + "/device/DevClient/ReadMessage";
-    /**
-     * 我的客户(筛选)
-     */
-    public static String Uri_device_DevMark_myselfVisitor = URiBase + "/device/DevMark/myselfVisitor";
-
-    /**
-     * 引流客户(筛选)
-     */
-    public static String Uri_device_DevFission_fissionClient = URiBase + "/device/DevFission/fissionClient";
-    /**
-     * 云推荐列表
-     */
-    public static String Uri_device_DevFission_wxcloundinfo = URiBase + "/device/DevFission/WxCloudInfo";
-    /**
-     * 设计师推荐列表
-     */
-    public static String Uri_device_DevTool_designerList = URiBase + "/device/DevTool/designerList";
-    /**
-     * 转介 -- 批量转介 -- 选择转介客户 （跟踪中、已流失、已成交客户）
-     */
-    public static String Uri_device_DevRefer_myTrackCustomer = URiBase + "/device/DevRefer/myTrackCustomer";
-
-    /**
-     * 老带新列表
-     */
-    public static String Uri_device_DevTool_ldxList = URiBase + "/device/DevTool/ldxList";
-    /**
-     * 转介 -- 推荐客户
-     */
-    public static String Uri_device_DevRefer_RoundVidInfo = URiBase + "/device/DevRefer/roundVidInfo";
-    /**
-     * 云推荐 -- 开通
-     */
-    public static String Uri_device_DevFission_wxptOpen = URiBase + "/device/DevFission/wxptOpen";
-
-    /**
-     * 某条标为已读消息
-     */
-    public static String Uri_device_DevOrder_Devclient_OneReadMessage = URiBase + "/device/DevClient/OneReadMessage";
-    /**
-     * 获取登录者所有店铺信息
-     */
-    public static String Uri_device_DevOperat_getStore = URiBase + "/device/DevOperat/getStore";
-    /**
-     * 获取店铺的员工名称
-     */
-    public static String Uri_device_DevPersonOperat_getPersonal = URiBase + "/device/DevPersonOperat/getPersonal";
-    /**
-     * 店铺运营各项指标信息
-     */
-    public static String Uri_device_DevOperat_getOperatIndices = URiBase + "/device/DevOperat/getOperatIndices";
-    /**
-     * 个人业务指标
-     */
-    public static String Uri_device_DevPersonOperat_getPerTarget = URiBase + "/device/DevPersonOperat/getPerTarget";
-
-    /**
-     * 分享业务指标
-     */
-    public static String Uri_device_DevPersonOperat_getForword = URiBase + "/device/DevJoinGood/getForword";
-
-    /**
-     * 分享总结统计
-     */
-    public static String Uri_device_DevPersonOperat_getData = URiBase + "/device/DevJoinGood/shareData";
-
-
-    /**
-     * 1.2.5版本获取标签问题和打标内容
-     */
-    public static String Uri_device_DevMark_getMarkQuestions = URiBase + "/device/DevMark/getMarkQuestions";
-
-    /**
-     * 补打上传头像
-     */
-    public static String Uri_device_DevMark_updateHeadImg = URiBase + "/device/DevMark/updateHeadImg";
-
-    /**
-     * jc修改visitor_id后，返回正确的访客id
-     */
-    public static String Uri_device_DevMark_trueVisitor = URiBase + "/device/DevMark/trueVisitor";
-
-    /**
-     * 我的客户跟踪历史
-     */
-    public static String URi_device_DevMark_trackhistory = URiBase + "/device/DevMark/trackhistory";
-
     /**
      * 惜客指数详情
      */
@@ -442,6 +75,10 @@ public class HttpConstants {
      */
     public static String URi_device_AppCustomer_addCustomer = URiBase + "/device/AppCustomer/addCustomer";
 
+    /**
+     * 抖音视频
+     */
+    public static String URi_device_AppDouyin_aweme = URiBase + "/device/AppDouyin/aweme";
 
 }
 

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

@@ -4,6 +4,7 @@ package com.fenghoo.seven.okgonet;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.convert.StringConvert;
+import com.lzy.okgo.model.HttpParams;
 import com.lzy.okgo.model.Response;
 import com.lzy.okrx2.adapter.ObservableResponse;
 
@@ -14,6 +15,51 @@ import io.reactivex.schedulers.Schedulers;
 
 public class NetApi {
 
+//    final HttpParams paramsPost = new HttpParams();
+//        paramsPost.put("customer_id", customer_id);
+//        paramsPost.put("industry_id", industry_id);
+    /**
+     * @description 简单的封装OkGo
+     */
+    public Observable<Response> getPostData(final HttpParams paramsPost,final String uri) {
+        return new Observable<Response>() {
+            @Override
+            public void subscribe(final Observer<Response> observer) {
+                OkGo.<String>post(uri)
+                        .params(paramsPost)
+                        .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() {
+
+                            }
+                        });
+            }
+        };
+
+    }
+
     /**
      * 惜客指数详情
      */
@@ -372,58 +418,6 @@ public class NetApi {
 
     }
 
-
-
-    /**
-     * @description 分配/成交列表详情
-     * @param customer_id 客户id
-     * @return industry_id 行业id
-     */
-    public Observable<Response> fpOrderInfo(final String customer_id, final String industry_id) {
-
-        return new Observable<Response>() {
-            @Override
-            public void subscribe(final Observer<Response> observer) {
-
-                OkGo.<String>post(HttpConstants.URi_device_AppCustomer_fpOrderInfo)
-                        .params("customer_id", customer_id)
-                        .params("industry_id", industry_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() {
-
-                            }
-                        });
-            }
-        };
-
-    }
-
-
-
-
     /**
      * style
      */

app/src/main/res/anim/scale_in.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromAlpha="0.0"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toAlpha="1.0" />

app/src/main/res/anim/scale_out.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromAlpha="1.0"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toAlpha="0.0" />

app/src/main/res/drawable/shape_addcustomer.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="#ffffffff" />
+    <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" />
+</shape>

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

@@ -0,0 +1,32 @@
+<?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="@drawable/shape_addcustomer"
+    android:layout_marginTop="70dp"
+    xmlns:omi="http://schemas.android.com/apk/res-auto">
+
+
+    <FrameLayout
+        android:layout_marginTop="12dp"
+        android:id="@+id/containerrr"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+
+     >
+
+    </FrameLayout>
+
+    <Button
+        android:id="@+id/btn_comit"
+        android:layout_width="300dp"
+        android:layout_height="44dp"
+        android:layout_gravity="center_horizontal"
+        android:background="@drawable/button_pass_bg"
+        android:text="完成"
+        android:layout_marginTop="560dp"
+        android:textColor="@color/colorWhite"
+        android:layout_centerHorizontal="true"
+        />
+</RelativeLayout>

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

@@ -21,6 +21,7 @@
             android:drawableRight="@mipmap/marking_down_pic"
             android:drawablePadding="6dp"
             android:text="全国"
+            android:visibility="invisible"
             android:textColor="#ff333333"
             android:textSize="14sp" />
 
@@ -31,7 +32,7 @@
             android:layout_centerInParent="true"
             android:drawableRight="@mipmap/marking_down_pic"
             android:drawablePadding="6dp"
-            android:text="家居"
+            android:text="全部"
             android:textColor="#ff333333"
             android:textSize="14sp" />
 
@@ -84,14 +85,4 @@
         android:layout_below="@+id/titlebar">
     </FrameLayout>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floatingActionButton"
-        android:layout_width="37dp"
-        android:layout_height="37dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="5dp"
-        android:layout_marginBottom="10dp"
-        android:clickable="true"
-        app:srcCompat="@drawable/bg_faxian" />
 </RelativeLayout>

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

@@ -23,14 +23,13 @@
         android:src="@mipmap/icon_default_empty"
         />
 
-    <ImageView
+    <com.fenghoo.seven.widget.CircleImageView
         android:id="@+id/ima_dea_watch"
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_toRightOf="@+id/iv_dea_avatar"
         android:layout_marginLeft="12dp"
         android:layout_marginTop="7.5dp"
-        android:background="@mipmap/ic_launcher"
         />
     <TextView
         android:id="@+id/tv_dea_name"
@@ -46,6 +45,7 @@
 
 
     <TextView
+        android:id="@+id/tv_aweme_title"
         android:layout_width="wrap_content"
         android:layout_height="33dp"
         android:text="此处显示视频标题/此处显示视频标题/此处显示视
@@ -59,6 +59,7 @@
         android:layout_toRightOf="@+id/iv_dea_avatar"
         />
     <TextView
+        android:id="@+id/tv_aweme_time"
         android:layout_width="wrap_content"
         android:layout_height="15dp"
         android:text="2020-07-01 "

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

@@ -1,14 +1,16 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-                 tools:context="com.fenghoo.seven.main.find.QuestionsFragment">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    tools:context="com.fenghoo.seven.main.find.QuestionsFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rcv"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="45dp"
         android:layout_weight="1"/>
 
     <View
@@ -16,39 +18,74 @@
         android:layout_height="0.5dp"
         android:background="@color/bg_gray"/>
 
-    <LinearLayout
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/rl_tv_uploadAvatar"
         android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@color/colorWhile"
-        android:gravity="center_vertical"
+        android:layout_height="200dp"
+        android:layout_gravity="bottom"
+        android:layout_alignParentBottom="true"
         android:orientation="horizontal">
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/reply_rcey"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:layout_alignParentBottom="true"
+            android:background="@color/colorWhile"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
-        <com.fenghoo.seven.widget.PastEditText
-            android:id="@+id/et_msg"
-            android:layout_width="0dp"
-            android:layout_height="36dp"
-            android:layout_marginLeft="13dp"
-            android:layout_weight="1.0"
-            android:background="@drawable/drawable_edit_normal"
-            android:gravity="left|center"
-            android:hint="请输入新消息"
-            android:imeOptions="flagNoExtractUi"
-            android:lineSpacingExtra="3dp"
-            android:maxHeight="100dp"
-            android:minHeight="40dp"
-            android:padding="5dp"
-            android:textColor="#1e1e1e"
-            android:textColorHint="#b4b4b4"
-            android:textSize="16sp"/>
+            <ImageView
+                android:id="@+id/reply_ima"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="17.5dp"
+                android:background="@mipmap/icon_reply_sty"
+                />
 
-        <Button
-            android:id="@+id/btn_send"
-            android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:layout_margin="10dp"
-            android:background="@drawable/selector_btn_green_bg"
-            android:text="发  送"
-            android:textColor="@color/colorWhile"
-            android:textSize="13sp"/>
-    </LinearLayout>
-</LinearLayout>
+            <com.fenghoo.seven.widget.PastEditText
+                android:id="@+id/et_msg"
+                android:layout_width="0dp"
+                android:layout_height="36dp"
+                android:layout_marginLeft="13dp"
+                android:layout_weight="1.0"
+                android:background="@drawable/drawable_edit_normal"
+                android:gravity="left|center"
+                android:hint="请输入新消息"
+                android:imeOptions="flagNoExtractUi"
+                android:lineSpacingExtra="3dp"
+                android:maxHeight="100dp"
+                android:minHeight="40dp"
+                android:padding="5dp"
+                android:textColor="#1e1e1e"
+                android:textColorHint="#b4b4b4"
+                android:textSize="16sp"/>
+
+            <Button
+                android:id="@+id/btn_send"
+                android:layout_width="wrap_content"
+                android:layout_height="36dp"
+                android:layout_margin="10dp"
+                android:background="@drawable/selector_btn_green_bg"
+                android:text="发  送"
+                android:textColor="@color/colorWhile"
+                android:textSize="13sp"/>
+        </LinearLayout>
+
+    </RelativeLayout>
+    <TextView
+        android:id="@+id/floatingActionButton"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="5dp"
+        android:layout_marginBottom="60dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:clickable="true"
+        android:background="@mipmap/icon_fudong"
+        />
+
+</RelativeLayout>

app/src/main/res/values/colors.xml

@@ -8,6 +8,7 @@
     <color name="ffb1b1b1">#ffb1b1b1</color>
     <color name="colorhui">#999999</color>
     <color name="colorWhite">#ffffff</color>
+    <color name="black_overlay">#66000000</color>
     <color name="light">#CCCCCC</color>
     <color name="colorGreen">#67c729</color>
     <color name="colorGreenLight">#a3da7e</color>

app/src/main/res/values/styles.xml

@@ -100,6 +100,11 @@
         <item name="android:backgroundDimAmount">0.6</item>
     </style>
 
+    <style name="Transparent" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
 
     <!--ItemView 自定义属性-->
     <declare-styleable name="ItemView">
@@ -109,6 +114,41 @@
         <attr name="icon" format="reference"/>
     </declare-styleable>
 
+    <style name="DialogRight"  >
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">true</item>//是否半透明
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFrame">@null</item>                Dialog的windowFrame框为无
+        <item name="android:windowContentOverlay">@null</item>       是否有覆盖
+        <item name="android:backgroundDimEnabled">true</item>        背景是否模糊显示
+    </style>
+    <style name="Anim_scale" parent="@android:style/Animation.Activity">
+        <item name="android:activityOpenEnterAnimation">@anim/scale_in</item>
+        <item name="android:activityOpenExitAnimation">@anim/scale_out</item>
+        <item name="android:activityCloseEnterAnimation">@anim/scale_in</item>
+        <item name="android:activityCloseExitAnimation">@anim/scale_out</item>
+    </style>
+
+
+    <style name="dialogstyle">
+        <!--设置dialog的背景-->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <!--设置Dialog的windowFrame框为无-->
+        <item name="android:windowFrame">@null</item>
+        <!--设置无标题-->
+        <item name="android:windowNoTitle">true</item>
+        <!--是否浮现在activity之上-->
+        <item name="android:windowIsFloating">true</item>
+        <!--是否半透明-->
+        <item name="android:windowIsTranslucent">true</item>
+        <!--设置窗口内容不覆盖-->
+        <item name="android:windowContentOverlay">@null</item>
+        <!--设置动画，在这里使用让它继承系统的Animation.Dialog-->
+<!--        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>-->
+        <!--背景是否模糊显示-->
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+
 
     <!--ItemView 自定义属性-->
     <declare-styleable name="ItemProView">