From 7f61e539dbd7f25ea084f17421004c88e427bff9 Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Mon, 14 Sep 2020 15:14:38 +0800 Subject: [PATCH] d --- .../fenghoo/seven/main/find/ConversationActivity.java | 3 ++- .../com/fenghoo/seven/main/find/QuestionsFragment.java | 6 ++++-- .../seven/main/find/entity/privateListBean.java | 10 ++++++++++ .../main/kehu/activity/AddCustDialogActivity.java | 4 +++- .../seven/main/kehu/activity/AddCustomerActivity.java | 2 +- .../com/fenghoo/seven/main/kehu/activity/ShowAty.java | 3 ++- .../seven/main/kehu/fragment/AddCusFragment.java | 6 ++++-- .../seven/main/kehu/fragment/TraceFragment.java | 2 +- .../main/java/com/fenghoo/seven/okgonet/NetApi.java | 3 ++- 9 files changed, 29 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java b/app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java index b77f33a..56f6940 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java @@ -40,11 +40,12 @@ public class ConversationActivity extends BaseActivity { dataBean = (privateListBean.ResultBean.DataBean) getIntent().getSerializableExtra("dataBean"); String private_id = dataBean.getPrivate_id(); String dy_uid = dataBean.getDy_uid(); + String use_dy_uid = dataBean.getUse_dy_uid(); String nick_name = dataBean.getNick_name(); String nick_img = dataBean.getNick_img(); mTitleBar.setTitle(nick_name); - getSupportFragmentManager().beginTransaction().replace(R.id.container, new QuestionsFragment(private_id, dy_uid, nick_img)).commit(); + getSupportFragmentManager().beginTransaction().replace(R.id.container, new QuestionsFragment(private_id, dy_uid,use_dy_uid, nick_img)).commit(); } /** diff --git a/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java index 7a07cc4..f4f534f 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java @@ -62,11 +62,13 @@ public class QuestionsFragment extends BaseTreeFragment data; private String private_id; private String dy_uid; + private String use_dy_uid; private String nick_img; - public QuestionsFragment(String private_id,String dy_uid,String nick_img){ + public QuestionsFragment(String private_id,String dy_uid,String use_dy_uid,String nick_img){ this.private_id=private_id; this.dy_uid=dy_uid; + this.use_dy_uid=use_dy_uid; this.nick_img=nick_img; } @@ -88,7 +90,7 @@ public class QuestionsFragment extends BaseTreeFragment label=new ArrayList<>(); CustomerListBean.ResultBean.DataBean dataBean; addCustomerDao addCustomerdao; - public AddCusFragment(String customer_id, String source, String search, String pagetype,String dy_uid, CustomerListBean.ResultBean.DataBean dataBean,addCustomerDao addCustomerdao ) { + public AddCusFragment(String customer_id, String source, String search, String pagetype,String dy_uid,String use_dy_uid, CustomerListBean.ResultBean.DataBean dataBean,addCustomerDao addCustomerdao ) { super(); this.customer_id=customer_id; this.source=source; this.search=search; this.pagetype=pagetype;//pagetype为""说明是信息完善，否则是添加客户 this.dy_uid=dy_uid; + this.use_dy_uid=use_dy_uid; this.dataBean=dataBean; this.addCustomerdao=addCustomerdao; addCustomerBean = new addCustomerBean(); @@ -257,7 +259,7 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene } //网络请求提交数据 - new NetApi().addCustomer(addCustomerBean.getUid(),addCustomerBean.getHeadimg(),addCustomerBean.getName(),addCustomerBean.getPhone(),addCustomerBean.getWechat(),addCustomerBean.getAddress(),addCustomerBean.getDecoration(),addCustomerBean.getStyle_id(),addCustomerBean.getBudget(),addCustomerBean.getSource(),addCustomerBean.getCustomer_id(),dy_uid).subscribe(new Observer() { + new NetApi().addCustomer(addCustomerBean.getUid(),addCustomerBean.getHeadimg(),addCustomerBean.getName(),addCustomerBean.getPhone(),addCustomerBean.getWechat(),addCustomerBean.getAddress(),addCustomerBean.getDecoration(),addCustomerBean.getStyle_id(),addCustomerBean.getBudget(),addCustomerBean.getSource(),addCustomerBean.getCustomer_id(),dy_uid,use_dy_uid).subscribe(new Observer() { @Override public void onNext(Response response) { String body = (String) response.body(); diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java index a985c4d..2cfe722 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java @@ -160,7 +160,7 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener @Override public void onClick(View view) { //进入添加客户 - ShowAty.AddCustDialogActivity(getActivity(),"","1","",pagetype,""); + ShowAty.AddCustDialogActivity(getActivity(),"","1","",pagetype,"",""); } }); } diff --git a/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java b/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java index 3ee7acb..dd7df2c 100644 --- a/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java +++ b/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java @@ -80,7 +80,7 @@ public class NetApi { }; } - public Observable addCustomer(final String uid, final String headimg, final String name, final String phone, final String wechat, final String address, final String decoration, final String style_id, final String budget, final String source, final String customer_id,final String dy_uid) { + public Observable addCustomer(final String uid, final String headimg, final String name, final String phone, final String wechat, final String address, final String decoration, final String style_id, final String budget, final String source, final String customer_id,final String dy_uid,final String use_dy_uid) { return new Observable() { @Override @@ -99,6 +99,7 @@ public class NetApi { .params("source", source) .params("customer_id", customer_id) .params("dy_uid", dy_uid) + .params("use_dy_uid", use_dy_uid) .converter(new StringConvert())// .cacheMode(CacheMode.NO_CACHE) //无缓存模式 CacheMode.NO_CACHE .adapt(new ObservableResponse())//