From 441081398e7c5d895f2a945a85485b00bd3152f3 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Sat, 29 Aug 2020 17:34:29 +0800
Subject: [PATCH] d

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../seven/main/activity/MainActivity.java     |  3 +-
 .../seven/main/find/adapter/AwemeAdapter.java |  2 --
 .../seven/main/find/ui/CommentFragment.java   |  7 +---
 .../seven/main/find/ui/FindFragmenttwo.java   |  2 +-
 .../main/find/ui/PrivateletterFragment.java   | 10 ++++--
 .../kehu/activity/AddCustDialogActivity.java  |  2 +-
 .../kehu/activity/AddCustomerActivity.java    |  2 +-
 .../main/kehu/activity/BudgetActivity.java    |  2 --
 .../kehu/activity/FpOrderInfoActivitytwo.java |  1 -
 .../main/kehu/{ => activity}/MoActivity.java  |  2 +-
 .../main/kehu/activity/StyleActivity.java     |  2 --
 .../main/kehu/adapter/CusListAdapter.java     | 12 +++++++
 .../kehu/{ui => fragment}/AddCusFragment.java |  3 +-
 .../kehu/{ => fragment}/CustomerFragment.java | 32 +++++++------------
 .../kehu/{ => fragment}/DealFragment.java     |  2 +-
 .../kehu/{ => fragment}/DistriFragment.java   |  2 +-
 .../kehu/{ => fragment}/MobanFragment.java    |  8 +----
 .../kehu/{ => fragment}/TraceFragment.java    |  6 ++--
 app/src/main/res/layout/cuslist_item.xml      | 18 ++++++++---
 20 files changed, 59 insertions(+), 61 deletions(-)
 rename app/src/main/java/com/fenghoo/seven/main/kehu/{ => activity}/MoActivity.java (98%)
 rename app/src/main/java/com/fenghoo/seven/main/kehu/{ui => fragment}/AddCusFragment.java (99%)
 rename app/src/main/java/com/fenghoo/seven/main/kehu/{ => fragment}/CustomerFragment.java (79%)
 rename app/src/main/java/com/fenghoo/seven/main/kehu/{ => fragment}/DealFragment.java (98%)
 rename app/src/main/java/com/fenghoo/seven/main/kehu/{ => fragment}/DistriFragment.java (98%)
 rename app/src/main/java/com/fenghoo/seven/main/kehu/{ => fragment}/MobanFragment.java (95%)
 rename app/src/main/java/com/fenghoo/seven/main/kehu/{ => fragment}/TraceFragment.java (98%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 884e659..f013164 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
         android:theme="@style/AppTheme">
         <activity android:name=".main.kehu.activity.FpOrderInfoActivitytwo"></activity>
         <activity android:name=".main.kehu.activity.FpOrderInfoActivity"></activity>
-        <activity android:name=".main.kehu.MoActivity" />
+        <activity android:name=".main.kehu.activity.MoActivity" />
         <activity android:name=".main.activity.ForgetPasActivity" />
         <activity android:name=".main.activity.ModifyPasActivity" />
         <activity android:name=".main.find.ConversationActivity" />
diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java
index 2ec0116..f5594c8 100644
--- a/app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java
@@ -1,6 +1,5 @@
 package com.fenghoo.seven.main.activity;
 
-import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.RelativeLayout;
@@ -9,7 +8,7 @@ import android.widget.TextView;
 import com.fenghoo.seven.R;
 import com.fenghoo.seven.base.BaseActivity;
 import com.fenghoo.seven.main.find.FindFragment;
-import com.fenghoo.seven.main.kehu.TraceFragment;
+import com.fenghoo.seven.main.kehu.fragment.TraceFragment;
 import com.fenghoo.seven.main.my.MyFragment;
 import com.fenghoo.seven.main.task.HomeFragment;
 import com.fenghoo.seven.main.zhibo.LivebroFragment;
diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/AwemeAdapter.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/AwemeAdapter.java
index 0994c99..e16ccdb 100644
--- a/app/src/main/java/com/fenghoo/seven/main/find/adapter/AwemeAdapter.java
+++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/AwemeAdapter.java
@@ -48,8 +48,6 @@ public class AwemeAdapter extends BaseQuickAdapter<awemeBean.ResultBean.DataBean
                 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
diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java
index 5974fa3..86d5ba2 100644
--- a/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java
@@ -1,17 +1,12 @@
 package com.fenghoo.seven.main.find.ui;
 
-import android.widget.Toast;
-
 import com.fenghoo.seven.JsonUtils;
 import com.fenghoo.seven.R;
-import com.fenghoo.seven.dialog.BaseTipsDialog;
 import com.fenghoo.seven.main.find.adapter.CommentAdapter;
 import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
-import com.fenghoo.seven.main.kehu.Dialog.CusOperationDialog;
 import com.fenghoo.seven.main.kehu.Dialog.RreplyDialog;
-import com.fenghoo.seven.main.kehu.MobanFragment;
+import com.fenghoo.seven.main.kehu.fragment.MobanFragment;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
-import com.fenghoo.seven.main.kehu.adapter.CusListAdapter;
 import com.fenghoo.seven.okgonet.NetApi;
 import com.fenghoo.seven.okgonet.Observer;
 import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java
index ce772b3..69600a3 100644
--- a/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java
+++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java
@@ -3,7 +3,7 @@ package com.fenghoo.seven.main.find.ui;
 import com.fenghoo.seven.JsonUtils;
 import com.fenghoo.seven.main.find.adapter.PrivateletAdapter;
 import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
-import com.fenghoo.seven.main.kehu.MobanFragment;
+import com.fenghoo.seven.main.kehu.fragment.MobanFragment;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
 import com.fenghoo.seven.okgonet.NetApi;
 import com.fenghoo.seven.okgonet.Observer;
diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java
index 0192584..75e3a65 100644
--- a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java
@@ -3,11 +3,11 @@ package com.fenghoo.seven.main.find.ui;
 import android.view.View;
 import android.widget.TextView;
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.fenghoo.seven.JsonUtils;
-import com.fenghoo.seven.R;
 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.fragment.MobanFragment;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
 import com.fenghoo.seven.okgonet.HttpConstants;
 import com.fenghoo.seven.okgonet.NetApi;
@@ -36,6 +36,12 @@ public class PrivateletterFragment extends MobanFragment {
     public void initAdapter() {
         mMarkingFragmentRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         AwemeAdapter markingtwoAdapter = new AwemeAdapter(mContext, null);
+        markingtwoAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                loadMore();
+            }
+        });
         getAdpter(markingtwoAdapter);
         mMarkingFragmentRecyclerView.setAdapter(markingtwoAdapter);
         markingtwoAdapter.operationListenner(new AwemeAdapter.OnViewClickListener() {
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java
index b7294d1..baa5164 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java
@@ -9,7 +9,7 @@ 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.main.kehu.fragment.AddCusFragment;
 import com.fenghoo.seven.utils.StatusBarUtil;
 import com.fenghoo.seven.widget.TitleBar;
 
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java
index 3a272b4..bf944f6 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java
@@ -6,7 +6,7 @@ import android.view.View;
 
 import com.fenghoo.seven.R;
 import com.fenghoo.seven.base.BaseActivity;
-import com.fenghoo.seven.main.kehu.ui.AddCusFragment;
+import com.fenghoo.seven.main.kehu.fragment.AddCusFragment;
 import com.fenghoo.seven.widget.TitleBar;
 
 /**
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/BudgetActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/BudgetActivity.java
index e286aee..8fba7f6 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/BudgetActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/BudgetActivity.java
@@ -8,9 +8,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.FirstEvent;
 import com.fenghoo.seven.main.kehu.Bean.SecondEvent;
-import com.fenghoo.seven.main.kehu.MoActivity;
 import com.fenghoo.seven.utils.WidgetTools;
 import com.fenghoo.seven.widget.TitleBar;
 
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java
index 8176a0b..03dd194 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java
@@ -7,7 +7,6 @@ import com.fenghoo.seven.R;
 import com.fenghoo.seven.main.find.adapter.FpOrderInfoAdapter;
 import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
 import com.fenghoo.seven.main.kehu.Dialog.RreplyDialog;
-import com.fenghoo.seven.main.kehu.MoActivity;
 import com.fenghoo.seven.okgonet.NetApi;
 import com.fenghoo.seven.okgonet.Observer;
 import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/MoActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/MoActivity.java
similarity index 98%
rename from app/src/main/java/com/fenghoo/seven/main/kehu/MoActivity.java
rename to app/src/main/java/com/fenghoo/seven/main/kehu/activity/MoActivity.java
index ab1c80e..8e31fd9 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/MoActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/MoActivity.java
@@ -1,4 +1,4 @@
-package com.fenghoo.seven.main.kehu;
+package com.fenghoo.seven.main.kehu.activity;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java
index 9dc4db4..82bcc82 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java
@@ -7,8 +7,6 @@ import com.fenghoo.seven.R;
 import com.fenghoo.seven.main.find.adapter.StyleAdapter;
 import com.fenghoo.seven.main.find.entity.StyleBean;
 import com.fenghoo.seven.main.kehu.Bean.FirstEvent;
-import com.fenghoo.seven.main.kehu.Bean.WxuSerinfo;
-import com.fenghoo.seven.main.kehu.MoActivity;
 import com.fenghoo.seven.okgonet.NetApi;
 import com.fenghoo.seven.okgonet.Observer;
 import com.fenghoo.seven.widget.TitleBar;
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/CusListAdapter.java b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/CusListAdapter.java
index cfe69c0..de3e18c 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/CusListAdapter.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/CusListAdapter.java
@@ -9,7 +9,9 @@ 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.GlideTools;
 import com.fenghoo.seven.utils.WidgetTools;
+import com.fenghoo.seven.widget.CircleImageView;
 
 import java.util.List;
 
@@ -25,9 +27,19 @@ public class CusListAdapter extends BaseQuickAdapter<CustomerListBean.ResultBean
 
     @Override
     protected void convert(final BaseViewHolder helper, final CustomerListBean.ResultBean.DataBean item) {
+        WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_source_name), "", item.getSource_name());
         WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_name), "", item.getName());
         WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_phone), "", item.getPhone());
         WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_watch), "", item.getWechat());
+        CircleImageView iv_dea_avatar = helper.getView(R.id.iv_dea_avatar);
+        GlideTools.init(mContext).displaypic(iv_dea_avatar, item.getHeadimg(), R.mipmap.icon_default_head);
+        TextView tv_cus_01 = helper.getView(R.id.tv_cus_01);
+        String type = item.getType();
+        if(type.equals("old")){
+            tv_cus_01.setVisibility(View.INVISIBLE);
+        }else {
+            tv_cus_01.setVisibility(View.VISIBLE);
+        }
         TextView tv_cuslist_caozuo = (TextView)helper.getView(R.id.tv_cuslist_caozuo);
         tv_cuslist_caozuo.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/ui/AddCusFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java
similarity index 99%
rename from app/src/main/java/com/fenghoo/seven/main/kehu/ui/AddCusFragment.java
rename to app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java
index 359d895..63f2823 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/ui/AddCusFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java
@@ -1,4 +1,4 @@
-package com.fenghoo.seven.main.kehu.ui;
+package com.fenghoo.seven.main.kehu.fragment;
 
 import android.Manifest;
 import android.content.Intent;
@@ -22,7 +22,6 @@ import com.fenghoo.seven.main.kehu.Bean.FirstEvent;
 import com.fenghoo.seven.main.kehu.Bean.LabelBean;
 import com.fenghoo.seven.main.kehu.Bean.SecondEvent;
 import com.fenghoo.seven.main.kehu.Bean.addCustomerBean;
-import com.fenghoo.seven.main.kehu.MobanFragment;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
 import com.fenghoo.seven.main.kehu.adapter.AddCusAdapter;
 import com.fenghoo.seven.okgonet.NetApi;
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/CustomerFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java
similarity index 79%
rename from app/src/main/java/com/fenghoo/seven/main/kehu/CustomerFragment.java
rename to app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java
index d922cc1..5cd1693 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/CustomerFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java
@@ -1,4 +1,4 @@
-package com.fenghoo.seven.main.kehu;
+package com.fenghoo.seven.main.kehu.fragment;
 
 import android.widget.Toast;
 
@@ -9,9 +9,11 @@ import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
 import com.fenghoo.seven.main.kehu.Dialog.CusOperationDialog;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
 import com.fenghoo.seven.main.kehu.adapter.CusListAdapter;
+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 java.util.List;
@@ -86,7 +88,11 @@ public class CustomerFragment 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("search", "");
+    //    paramsPost.put("page", mNextRequestPage);
+        new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_customerList).subscribe(new Observer<Response>() {
             @Override
             public void onNext(Response response) {
                 String body = (String) response.body();
@@ -95,25 +101,11 @@ public class CustomerFragment extends MobanFragment {
                 if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
 
                     List<CustomerListBean.ResultBean.DataBean> data = result.getData();
-//                    List<CustomerListBean.ResultBean.DataBean> data = new ArrayList<CustomerListBean.ResultBean.DataBean>();
-//                    for (int i = 0; i < 20; i++)
-//                    {
-//                        CustomerListBean.ResultBean.DataBean dataBean = new CustomerListBean.ResultBean.DataBean();
-//                        dataBean.setName("小斐");
-//                        dataBean.setPhone("15862656263");
-//                        dataBean.setSource_name("添加客户");
-//                        dataBean.setWechat("weixin");
-//                        dataBean.setHeadimg("");
-//                        dataBean.setSource("1");
-//                        dataBean.setType("old");
-//                        data.add(dataBean);
-//                    }
-
-                    if (data.size() == 0) {
-                        markingtwoAdapter.setEmptyView(notDataView);
-                        return;
-                    }
                     if (mNextRequestPage == 1) {
+                        if (data.size() == 0) {
+                            markingtwoAdapter.setEmptyView(notDataView);
+                            return;
+                        }
                         setData(true, data);
                     } else {
                         setData(false, data);
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/DealFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java
similarity index 98%
rename from app/src/main/java/com/fenghoo/seven/main/kehu/DealFragment.java
rename to app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java
index 673d90c..a2cbe43 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/DealFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java
@@ -1,4 +1,4 @@
-package com.fenghoo.seven.main.kehu;
+package com.fenghoo.seven.main.kehu.fragment;
 
 import com.fenghoo.seven.JsonUtils;
 import com.fenghoo.seven.main.kehu.Bean.orderListBean;
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/DistriFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java
similarity index 98%
rename from app/src/main/java/com/fenghoo/seven/main/kehu/DistriFragment.java
rename to app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java
index 666d921..c2e3869 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/DistriFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java
@@ -1,4 +1,4 @@
-package com.fenghoo.seven.main.kehu;
+package com.fenghoo.seven.main.kehu.fragment;
 
 import com.fenghoo.seven.JsonUtils;
 import com.fenghoo.seven.main.kehu.Bean.FpListBean;
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/MobanFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/MobanFragment.java
similarity index 95%
rename from app/src/main/java/com/fenghoo/seven/main/kehu/MobanFragment.java
rename to app/src/main/java/com/fenghoo/seven/main/kehu/fragment/MobanFragment.java
index a027c53..86f2a69 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/MobanFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/MobanFragment.java
@@ -1,4 +1,4 @@
-package com.fenghoo.seven.main.kehu;
+package com.fenghoo.seven.main.kehu.fragment;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -106,12 +106,6 @@ 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();
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/TraceFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java
similarity index 98%
rename from app/src/main/java/com/fenghoo/seven/main/kehu/TraceFragment.java
rename to app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java
index 1bca5a5..03f5a85 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/TraceFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java
@@ -1,4 +1,4 @@
-package com.fenghoo.seven.main.kehu;
+package com.fenghoo.seven.main.kehu.fragment;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -27,9 +27,7 @@ import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
 /**
- * 功能：追踪模块
- * Created by jianbo .
- * on 2017/8/31.
+ * 功能：客户列表
  */
 
 @SuppressLint("ValidFragment")
diff --git a/app/src/main/res/layout/cuslist_item.xml b/app/src/main/res/layout/cuslist_item.xml
index 190db2b..22d0436 100644
--- a/app/src/main/res/layout/cuslist_item.xml
+++ b/app/src/main/res/layout/cuslist_item.xml
@@ -7,6 +7,7 @@
 <RelativeLayout
     android:id="@+id/rl_cus_01"
     android:layout_width="match_parent"
+    android:background="@color/colorWhite"
     android:layout_height="24dp">
     <TextView
         android:id="@+id/tv_cus_01"
@@ -18,6 +19,7 @@
         />
     <TextView
         android:layout_toRightOf="@+id/tv_cus_01"
+        android:id="@+id/tv_source_name"
         android:layout_width="wrap_content"
         android:layout_height="17dp"
         android:layout_marginLeft="10dp"
@@ -51,7 +53,7 @@
 
     <TextView
         android:id="@+id/tv_dea_name"
-        android:layout_width="59dp"
+        android:layout_width="wrap_content"
         android:layout_height="21dp"
         android:layout_marginLeft="13.5dp"
         android:layout_marginTop="19.5dp"
@@ -60,12 +62,20 @@
         android:textColor="#ff333333"
         android:textSize="15sp"
         />
-
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="22dp"
+        android:layout_marginLeft="4dp"
+        android:layout_toRightOf="@+id/tv_dea_name"
+        android:text=" • "
+        />
     <TextView
         android:id="@+id/tv_dea_phone"
-        android:layout_width="67dp"
+        android:layout_width="wrap_content"
         android:layout_height="16dp"
-        android:layout_marginTop="19.5dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="22dp"
         android:layout_toRightOf="@+id/tv_dea_name"
         android:text="18971614151"
         android:textColor="#ff333333"