d

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

@@ -7,17 +7,32 @@ import android.text.TextWatcher;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
+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.JsonUtils;
 import com.fenghoo.seven.R;
 import com.fenghoo.seven.base.BaseTreeFragment;
 import com.fenghoo.seven.main.find.adapter.QuestionsAdapter;
 import com.fenghoo.seven.main.find.entity.QuestionsEntity;
+import com.fenghoo.seven.main.find.entity.commonWordsBean;
+import com.fenghoo.seven.main.find.entity.privateListBean;
 import com.fenghoo.seven.main.find.mvp.contract.QuestionsContract;
 import com.fenghoo.seven.main.find.mvp.presenter.QuestionsPresenterImpl;
+import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
 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.WidgetTools;
+import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
 import com.fenghoo.seven.widget.PastEditText;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.lzy.okgo.model.HttpParams;
+import com.lzy.okgo.model.Response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,6 +57,10 @@ public class QuestionsFragment extends BaseTreeFragment<QuestionsContract.View,
     private QuestionsAdapter mAdapter;
     private LinearLayoutManager mLayoutManager;
     private TextView floatingActionButton;
+    private ImageView reply_ima;
+    private RecyclerView reply_rcey;
+    private boolean flag=false;
+    private List<commonWordsBean.ResultBean.DataBean> data;
 
     @Override
     public void widgetClick(View v) {
@@ -72,6 +91,63 @@ public class QuestionsFragment extends BaseTreeFragment<QuestionsContract.View,
         mRecyclerView.setLayoutManager(mLayoutManager);
         mAdapter = new QuestionsAdapter(mContext, null, false);
         mRecyclerView.setAdapter(mAdapter);
+        reply_ima = (ImageView)view.findViewById(R.id.reply_ima);
+        reply_rcey = (RecyclerView)view.findViewById(R.id.reply_rcey);
+        reply_ima.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(flag){
+                    reply_rcey.setVisibility(View.GONE);
+                    flag=false;
+                }else {
+                    reply_rcey.setVisibility(View.VISIBLE);
+                    flag=true;
+                }
+            }
+        });
+//        ArrayList<String> objects = new ArrayList<>();
+//        objects.add("常用语1");
+//        objects.add("常用语2");
+//        objects.add("常用语3");
+        if(flag){
+            reply_rcey.setVisibility(View.VISIBLE);
+        }else {
+            reply_rcey.setVisibility(View.GONE);
+        }
+        LinearLayoutManager manager = new LinearLayoutManager(mContext);
+        reply_rcey.setLayoutManager(manager);
+        final HttpParams paramsPost = new HttpParams();
+        paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
+        new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppDouyin_commonWords).subscribe(new Observer<Response>() {
+            @Override
+            public void onNext(Response response) {
+                String body = (String) response.body();
+                commonWordsBean.ResultBean result = JsonUtils.fromJson(body, commonWordsBean.class).getResult();
+                if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
+                    data = result.getData();
+                    reply_rcey.setAdapter(new BaseQuickAdapter<commonWordsBean.ResultBean.DataBean, BaseViewHolder>(R.layout.item_reply_dialog, data) {
+                        @Override
+                        protected void convert(final BaseViewHolder helper, final commonWordsBean.ResultBean.DataBean item) {
+                            WidgetTools.setTextfive((TextView) helper.getView(R.id.img_modify), "", helper.getAdapterPosition()+1+"."+item.getContent());
+                            RelativeLayout reply_dialog_rl = helper.getView(R.id.reply_dialog_rl);
+                            reply_dialog_rl.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View view) {
+                                    pastEditText.setText(item.getContent());
+                                    reply_rcey.setVisibility(View.GONE);
+                                    flag=false;
+                                }
+                            });
+                        }
+                    });
+                }
+            }
+            @Override
+            public void onError(Exception e) {
+                e.printStackTrace();
+            }
+        });
+
     }
 
     @Override

app/src/main/java/com/fenghoo/seven/main/find/entity/ThreeEvent.java

@@ -0,0 +1,24 @@
+package com.fenghoo.seven.main.find.entity;
+
+/**
+ * Time:  2020/8/28
+ * Author:  jianbo
+ * Description:
+ */
+public class ThreeEvent {
+    private String pagetype;
+    private String search;
+
+    public ThreeEvent(String msg,String searchh) {
+        // TODO Auto-generated constructor stub
+        pagetype = msg;
+        search = searchh;
+
+    }
+    public String getPagetype(){
+        return pagetype;
+    }
+    public String getSearch(){
+        return search;
+    }
+}

app/src/main/java/com/fenghoo/seven/main/find/entity/commonWordsBean.java

@@ -0,0 +1,99 @@
+package com.fenghoo.seven.main.find.entity;
+
+import com.fenghoo.seven.test.BaseModel;
+
+import java.util.List;
+
+/**
+ * Time:  2020/8/31
+ * Author:  jianbo
+ * Description:
+ */
+public class commonWordsBean extends BaseModel {
+
+    /**
+     * result : {"msg":"成功","data":[{"id":"1","content":"常用语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 : 成功
+         * data : [{"id":"1","content":"常用语1"}]
+         * 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 {
+            /**
+             * id : 1
+             * content : 常用语1
+             */
+
+            private String id;
+            private String content;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public String getContent() {
+                return content;
+            }
+
+            public void setContent(String content) {
+                this.content = content;
+            }
+        }
+    }
+}

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

@@ -15,11 +15,20 @@ import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.fenghoo.seven.JsonUtils;
 import com.fenghoo.seven.R;
+import com.fenghoo.seven.main.find.entity.commonWordsBean;
+import com.fenghoo.seven.okgonet.HttpConstants;
+import com.fenghoo.seven.okgonet.NetApi;
+import com.fenghoo.seven.okgonet.Observer;
 import com.fenghoo.seven.utils.StringUtils;
 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.ArrayList;
+import java.util.List;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -71,10 +80,10 @@ public class RreplyDialog extends Dialog implements View.OnClickListener {
 
 
 
-        ArrayList<String> objects = new ArrayList<>();
+//        ArrayList<String> objects = new ArrayList<>();
-        objects.add("常用语1");
+//        objects.add("常用语1");
-        objects.add("常用语2");
+//        objects.add("常用语2");
-        objects.add("常用语3");
+//        objects.add("常用语3");
         reply_rcey = (RecyclerView) findViewById(R.id.reply_rcey);
         if(flag){
             reply_rcey.setVisibility(View.VISIBLE);
@@ -83,19 +92,38 @@ public class RreplyDialog extends Dialog implements View.OnClickListener {
         }
         LinearLayoutManager manager = new LinearLayoutManager(mContext);
         reply_rcey.setLayoutManager(manager);
-        reply_rcey.setAdapter(new BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_reply_dialog, objects) {
+
+
+        final HttpParams paramsPost = new HttpParams();
+        paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
+        new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppDouyin_commonWords).subscribe(new Observer<Response>() {
             @Override
-            protected void convert(final BaseViewHolder helper, final String item) {
+            public void onNext(Response response) {
-                WidgetTools.setTextfive((TextView) helper.getView(R.id.img_modify), "", helper.getAdapterPosition()+1+"."+item);
+                String body = (String) response.body();
-                RelativeLayout reply_dialog_rl = helper.getView(R.id.reply_dialog_rl);
+                commonWordsBean.ResultBean result = JsonUtils.fromJson(body, commonWordsBean.class).getResult();
-                reply_dialog_rl.setOnClickListener(new View.OnClickListener() {
+                if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
-                    @Override
+                    List<commonWordsBean.ResultBean.DataBean> data = result.getData();
-                    public void onClick(View view) {
+                    reply_rcey.setAdapter(new BaseQuickAdapter<commonWordsBean.ResultBean.DataBean, BaseViewHolder>(R.layout.item_reply_dialog, data) {
-                        reply_etSearchh.setText(item);
+                        @Override
-                    }
+                        protected void convert(final BaseViewHolder helper, final commonWordsBean.ResultBean.DataBean item) {
-                });
+                            WidgetTools.setTextfive((TextView) helper.getView(R.id.img_modify), "", helper.getAdapterPosition()+1+"."+item.getContent());
+                            RelativeLayout reply_dialog_rl = helper.getView(R.id.reply_dialog_rl);
+                            reply_dialog_rl.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View view) {
+                                    reply_etSearchh.setText(item.getContent());
+                                }
+                            });
+                        }
+                    });
+                }
+            }
+            @Override
+            public void onError(Exception e) {
+                e.printStackTrace();
             }
         });
+
     }
 
     @Override

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

@@ -9,6 +9,8 @@ import android.widget.TextView;
 
 import com.fenghoo.seven.R;
 import com.fenghoo.seven.base.BaseActivity;
+import com.fenghoo.seven.main.find.entity.ThreeEvent;
+import com.fenghoo.seven.main.kehu.Bean.SecondEvent;
 import com.fenghoo.seven.main.kehu.adapter.SearchAdapter;
 import com.fenghoo.seven.utils.BaseAdapter;
 import com.fenghoo.seven.utils.LocatData;
@@ -16,6 +18,8 @@ import com.fenghoo.seven.utils.ToastUtils;
 import com.fenghoo.seven.widget.ListViewForScrollView;
 import java.util.ArrayList;
 
+import de.greenrobot.event.EventBus;
+
 public class SearchActivity extends BaseActivity implements View.OnClickListener {
     EditText etSearch;
     TextView tvCancel;
@@ -25,11 +29,14 @@ public class SearchActivity extends BaseActivity implements View.OnClickListener
     boolean isGoods = false;
     private TextView mTvCancel;
     private RelativeLayout bt_sousuo_ditu;
+    private String pagetype;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.ac_search);
+        pagetype = getIntent().getStringExtra("pagetype");
+        pagetype = getIntent().getStringExtra("pagetype");
         initView();
         initNormalBack();
 
@@ -37,6 +44,13 @@ public class SearchActivity extends BaseActivity implements View.OnClickListener
 
     private void initView() {
      //   mTitleBar = (TitleBar) findViewById(R.id.title_bar);
+        RelativeLayout  retrieve_back = (RelativeLayout) findViewById(R.id.retrieve_back);
+        retrieve_back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
         etSearch = (EditText) findViewById(R.id.etSearchh);
         tvCancel = (TextView) findViewById(R.id.tvCancel);
         tvCancel.setOnClickListener(this);
@@ -58,7 +72,8 @@ public class SearchActivity extends BaseActivity implements View.OnClickListener
             @Override
             public void onItemEvent(Object data, int flag, int position) {
                 // TODO Auto-generated method stub
-
+                EventBus.getDefault().post(new ThreeEvent(pagetype,(String) data));
+                finish();
             }
         });
         lvItem.setAdapter(mAdapter);
@@ -72,13 +87,14 @@ public class SearchActivity extends BaseActivity implements View.OnClickListener
         switch (v.getId()) {
             case R.id.bt_sousuo_ditu: //取消
                 String seachStr = etSearch.getText().toString().trim();
-                if (!TextUtils.isEmpty(seachStr)) {
+              //  if (!TextUtils.isEmpty(seachStr)) {
                     //保存数据
                     LocatData.Init().addGood(seachStr);
-//                        finish();
+                    EventBus.getDefault().post(new ThreeEvent(pagetype,seachStr));
-                } else {
+                                            finish();
-                    ToastUtils.showToast(SearchActivity.this,"搜索条件不能为空!");
+//                } else {
-                }
+//                    ToastUtils.showToast(SearchActivity.this,"搜索条件不能为空!");
+//                }
                 finish();
                 break;
             case R.id.tvCancel: //取消

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

@@ -44,8 +44,10 @@ public class ShowAty {
     /**
      *  搜索
      */
-    public static void SearchActivity(Context ctx) {
+    public static void SearchActivity(Context ctx,String pagetype,String search) {
         Intent i = new Intent(ctx, SearchActivity.class);
+        i.putExtra("pagetype",pagetype);
+        i.putExtra("search",search);
         ctx.startActivity(i);
     }
 

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

@@ -1,9 +1,12 @@
 package com.fenghoo.seven.main.kehu.fragment;
 
+import android.util.Log;
+
 import com.fenghoo.seven.JsonUtils;
 import com.fenghoo.seven.R;
 import com.fenghoo.seven.base.BaseBean;
 import com.fenghoo.seven.dialog.BaseTipsDialog;
+import com.fenghoo.seven.main.find.entity.ThreeEvent;
 import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
 import com.fenghoo.seven.main.kehu.Dialog.CusOperationDialog;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
@@ -19,6 +22,7 @@ import com.lzy.okgo.model.Response;
 import java.util.List;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
+import de.greenrobot.event.EventBus;
 
 /**
  * 客户列表
@@ -27,9 +31,12 @@ public class CustomerFragment extends MobanFragment {
 
     private static int mSerial = 0;
     private int mTabPos = 0;
+    private String search="";
+
     public CustomerFragment(int serial) {
         super();
         mSerial = serial;
+        EventBus.getDefault().register(this);
     }
     public void setTabPos(int mTabPos) {
         this.mTabPos = mTabPos;
@@ -87,11 +94,24 @@ public class CustomerFragment extends MobanFragment {
         });
     }
 
+    public void onEvent(ThreeEvent event) {
+        if (null != event ) {
+            String pagetype = event.getPagetype();
+            Log.e("刷新页面==",pagetype);
+            if(pagetype.equals("0")){
+
+                search = event.getSearch();
+                IS_LOADED=false;
+                sendMessage();
+            }
+        }
+    }
+
     @Override
     public void requestData() {
         final HttpParams paramsPost = new HttpParams();
         paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
-        paramsPost.put("search", "");
+        paramsPost.put("search", search);
         new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_customerList).subscribe(new Observer<Response>() {
             @Override
             public void onNext(Response response) {

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

@@ -1,6 +1,9 @@
 package com.fenghoo.seven.main.kehu.fragment;
 
+import android.util.Log;
+
 import com.fenghoo.seven.JsonUtils;
+import com.fenghoo.seven.main.find.entity.ThreeEvent;
 import com.fenghoo.seven.main.kehu.Bean.orderListBean;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
 import com.fenghoo.seven.main.kehu.adapter.DeaListAdapter;
@@ -14,6 +17,7 @@ import com.lzy.okgo.model.Response;
 import java.util.List;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
+import de.greenrobot.event.EventBus;
 
 /**
  * 成交列表
@@ -23,9 +27,11 @@ public class DealFragment extends MobanFragment {
 
     private static int mSerial = 0;
     private int mTabPos = 0;
+    private String search;
     public DealFragment(int serial) {
         super();
         mSerial = serial;
+        EventBus.getDefault().register(this);
     }
     public void setTabPos(int mTabPos) {
         this.mTabPos = mTabPos;
@@ -50,11 +56,23 @@ public class DealFragment extends MobanFragment {
         });
     }
 
+    public void onEvent(ThreeEvent event) {
+        if (null != event ) {
+            String pagetype = event.getPagetype();
+            Log.e("刷新页面==",pagetype);
+            if(pagetype.equals("2")){
+                search = event.getSearch();
+                IS_LOADED=false;
+                sendMessage();
+            }
+        }
+    }
+
     @Override
     public void requestData() {
         final HttpParams paramsPost = new HttpParams();
         paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
-        paramsPost.put("search", "");
+        paramsPost.put("search", search);
         new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_orderList).subscribe(new Observer<Response>() {
             @Override
             public void onNext(Response response) {

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

@@ -1,6 +1,9 @@
 package com.fenghoo.seven.main.kehu.fragment;
 
+import android.util.Log;
+
 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.activity.ShowAty;
 import com.fenghoo.seven.main.kehu.adapter.DisListAdapter;
@@ -14,6 +17,7 @@ import com.lzy.okgo.model.Response;
 import java.util.List;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
+import de.greenrobot.event.EventBus;
 
 /**
  * 分配列表
@@ -22,9 +26,11 @@ public class DistriFragment extends MobanFragment {
 
     private static int mSerial = 0;
     private int mTabPos = 0;
+    private String search;
     public DistriFragment(int serial) {
         super();
         mSerial = serial;
+        EventBus.getDefault().register(this);
     }
     public void setTabPos(int mTabPos) {
         this.mTabPos = mTabPos;
@@ -49,11 +55,23 @@ public class DistriFragment extends MobanFragment {
         });
     }
 
+    public void onEvent(ThreeEvent event) {
+        if (null != event ) {
+            String pagetype = event.getPagetype();
+            Log.e("刷新页面==",pagetype);
+            if(pagetype.equals("1")){
+                search = event.getSearch();
+                IS_LOADED=false;
+                sendMessage();
+            }
+        }
+    }
+
     @Override
     public void requestData() {
         final HttpParams paramsPost = new HttpParams();
         paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
-        paramsPost.put("search", "");
+        paramsPost.put("search", search);
         new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_fpList).subscribe(new Observer<Response>() {
             @Override
             public void onNext(Response response) {

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

@@ -21,11 +21,12 @@ import java.util.List;
 
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import de.greenrobot.event.EventBus;
 
 
 public abstract class MobanFragment extends BaseFragment {
     public static final String ARG_PAGE = "ARG_PAGE";
-    private boolean IS_LOADED = false;
+    public boolean IS_LOADED = false;
     private static int mSerial = 0;
     private boolean isFirst = true;
     @SuppressLint("HandlerLeak")
@@ -44,7 +45,8 @@ public abstract class MobanFragment extends BaseFragment {
 
     public MobanFragment() { }
     public BaseQuickAdapter markingtwoAdapter;
-    public void sendMessage() {
+    public void
+    sendMessage() {
         Message message = handler.obtainMessage();
         message.sendToTarget();
     }
@@ -160,7 +162,7 @@ public abstract class MobanFragment extends BaseFragment {
     @Override
     public void onDestroy() {
         super.onDestroy();
-
+        EventBus.getDefault().unregister(this);
     }
 
 }

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

@@ -41,6 +41,7 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
     private DistriFragment yiliushiFragment;
     private DealFragment yichengjiaoFragment;
     private Savaselect savaselect;
+    private String pagetype="0";
 
     @SuppressLint("HandlerLeak")
     private Handler handler = new Handler() {
@@ -71,13 +72,22 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
                         Log.i("TAG", "position:" + position);
                         if (position == 0) {
                             mBtSousuoDitu.setVisibility(View.VISIBLE);
+                            bt_fenpei.setVisibility(View.VISIBLE);
+                            pagetype="0";
                             ((CustomerFragment) myAdaptertwo.getItem(position)).sendMessage();
+                            bt_sousuo_two.setVisibility(View.GONE);
                         } else if (position == 1) {
                             mBtSousuoDitu.setVisibility(View.GONE);
+                            bt_fenpei.setVisibility(View.GONE);
+                            pagetype="1";
                             ((DistriFragment) myAdaptertwo.getItem(position)).sendMessage();
+                            bt_sousuo_two.setVisibility(View.VISIBLE);
                         } else {
                             mBtSousuoDitu.setVisibility(View.GONE);
+                            bt_fenpei.setVisibility(View.GONE);
+                            pagetype="2";
                             ((DealFragment) myAdaptertwo.getItem(position)).sendMessage();
+                            bt_sousuo_two.setVisibility(View.VISIBLE);
                         }
 
                     }
@@ -105,6 +115,8 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
     private RelativeLayout mEnterShopShai;
     private TextView enter_shop_shaixuan;
     private TextView mEnterShopTitle;
+    private RelativeLayout bt_fenpei;
+    private RelativeLayout bt_sousuo_two;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -124,22 +136,23 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
         View view = inflater.inflate(R.layout.fragment_kehu, container, false);
         viewPager = (ViewPager) view.findViewById(R.id.main_vp);
         tab = (TabLayout) view.findViewById(R.id.main_tab_layout);
+
         sendMessage();
         initView(view);
         return view;
     }
 
+
     private void initView(View view) {
         mBtSousuoDitu = (RelativeLayout) view.findViewById(R.id.bt_sousuo_ditu);
         mBtSousuoDitu.setOnClickListener(this);
+        bt_sousuo_two = (RelativeLayout) view.findViewById(R.id.bt_sousuo_two);
+        bt_sousuo_two.setOnClickListener(this);
         mTitlebar = (RelativeLayout) view.findViewById(R.id.titlebar);
         mTitlebar.setOnClickListener(this);
-        mEnterShopShai = (RelativeLayout) view.findViewById(R.id.enter_shop_shai);
-        mEnterShopShai.setOnClickListener(this);
         mEnterShopTitle = (TextView) view.findViewById(R.id.enter_shop_title);
         mEnterShopTitle.setOnClickListener(this);
-        enter_shop_shaixuan = (TextView) view.findViewById(R.id.enter_shop_shaixuan);
+        bt_fenpei = (RelativeLayout)view.findViewById(R.id.bt_fenpei);
-        RelativeLayout bt_fenpei = (RelativeLayout)view.findViewById(R.id.bt_fenpei);
         bt_fenpei.setOnClickListener(this);
     }
 
@@ -149,9 +162,10 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
             default:
                 break;
             case R.id.bt_sousuo_ditu:
-                ShowAty.SearchActivity(getActivity());
+                ShowAty.SearchActivity(getActivity(),pagetype,"");
                 break;
-            case R.id.enter_shop_shai:
+            case R.id.bt_sousuo_two:
+                ShowAty.SearchActivity(getActivity(),pagetype,"");
                 break;
             case R.id.bt_fenpei:
                 ShowAty.AllocationActivity(getActivity());
@@ -183,4 +197,5 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
 
     }
 
+
 }

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

@@ -89,6 +89,11 @@ public class HttpConstants {
      */
     public static String URi_device_AppCustomer_deleteCus = URiBase + "/device/AppCustomer/deleteCus";
 
+    /**
+     * 常用语
+     */
+    public static String URi_device_AppDouyin_commonWords = URiBase + "/device/AppDouyin/commonWords";
+
 }
 
 

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

@@ -40,39 +40,15 @@
                     android:text="客户"
                     android:textColor="@color/black"
                     android:textSize="18sp" />
-                <RelativeLayout
-                    android:id="@+id/enter_shop_shai"
-                    android:layout_width="160dp"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:visibility="gone"
-                    android:gravity="center">
 
-                    <TextView
-                        android:id="@+id/enter_shop_shaixuan"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-
-                        android:text="全部客户"
-                        android:textColor="@color/colorWhite"
-                        android:textSize="18sp" />
-                    <ImageView
-                        android:layout_width="8dp"
-                        android:layout_height="6dp"
-                        android:layout_centerVertical="true"
-                        android:layout_marginLeft="6dp"
-                        android:layout_toRightOf="@+id/enter_shop_shaixuan"
-                        />
-                </RelativeLayout>
 
                 <RelativeLayout
                     android:id="@+id/bt_sousuo_ditu"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:layout_marginRight="48dp"
+                    android:layout_toLeftOf="@+id/bt_fenpei"
+                    android:layout_marginLeft="8dp"
                     android:gravity="center">
 
                     <ImageView
@@ -97,6 +73,26 @@
                         android:background="@mipmap/icon_fenpei"
                         />
                 </RelativeLayout>
+
+
+
+                <RelativeLayout
+                    android:id="@+id/bt_sousuo_two"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="8dp"
+                    android:visibility="gone"
+                    android:gravity="center">
+
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:background="@mipmap/marking_sousuo"
+                        />
+                </RelativeLayout>
+
             </RelativeLayout>
 
 

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

@@ -28,6 +28,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/reply_rcey"
             android:layout_width="match_parent"
+            android:background="@color/colorWhite"
             android:layout_height="150dp"/>
         <LinearLayout
             android:layout_width="match_parent"