This commit is contained in:
2020-09-14 15:14:38 +08:00
parent 723ebcee5a
commit 7f61e539db
9 changed files with 29 additions and 10 deletions

View File

@@ -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();
}
/**

View File

@@ -62,11 +62,13 @@ public class QuestionsFragment extends BaseTreeFragment<QuestionsContract.View,
private List<commonWordsBean.ResultBean.DataBean> 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<QuestionsContract.View,
@Override
public void onClick(View view) {
//进入添加客户和完善信息
ShowAty.AddCustDialogActivity(getActivity(),"","1","","3",dy_uid);
ShowAty.AddCustDialogActivity(getActivity(),"","1","","3",dy_uid,use_dy_uid);
}
});
btnSend = (Button) view.findViewById(R.id.btn_send);

View File

@@ -100,6 +100,16 @@ public class privateListBean extends BaseModel {
private String dy_uid;
public String getUse_dy_uid() {
return use_dy_uid;
}
public void setUse_dy_uid(String use_dy_uid) {
this.use_dy_uid = use_dy_uid;
}
private String use_dy_uid;
public String getRead_num() {
return read_num;
}

View File

@@ -27,6 +27,7 @@ public class AddCustDialogActivity extends BaseActivity {
private String search="";
private String pagetype="";
private String dy_uid="";
private String use_dy_uid="";
private FragmentBackListener backListener;
private boolean isInterception = true;
private addCustomerDao addCustomerdao;
@@ -42,8 +43,9 @@ public class AddCustDialogActivity extends BaseActivity {
search = getIntent().getStringExtra("search");
pagetype = getIntent().getStringExtra("pagetype");
dy_uid = getIntent().getStringExtra("dy_uid");
use_dy_uid = getIntent().getStringExtra("use_dy_uid");
addCustomerdao = new addCustomerDao(this);
addCusFragment = new AddCusFragment(customer_id,source,search,pagetype,dy_uid,null, addCustomerdao);
addCusFragment = new AddCusFragment(customer_id,source,search,pagetype,dy_uid,use_dy_uid,null, addCustomerdao);
getSupportFragmentManager().beginTransaction().replace(R.id.containerrr,addCusFragment).commit();
findViewById(R.id.btn_comit).setOnClickListener(new View.OnClickListener() {

View File

@@ -34,7 +34,7 @@ public class AddCustomerActivity extends BaseActivity {
CustomerListBean.ResultBean.DataBean dataBean = (CustomerListBean.ResultBean.DataBean) getIntent().getSerializableExtra("dataBean");
customer_id = dataBean.getCustomer_id();
source = dataBean.getSource();
addCusFragment = new AddCusFragment(this.customer_id, this.source, this.search,pagetype,"",dataBean,null);
addCusFragment = new AddCusFragment(this.customer_id, this.source, this.search,pagetype,"","",dataBean,null);
getSupportFragmentManager().beginTransaction().replace(R.id.containerrr,addCusFragment).commit();
findViewById(R.id.btn_comit).setOnClickListener(new View.OnClickListener() {
@Override

View File

@@ -141,13 +141,14 @@ public class ShowAty {
* @param
* @return
*/
public static void AddCustDialogActivity(Context ctx,String customer_id,String source,String search,String pagetype,String dy_uid) {
public static void AddCustDialogActivity(Context ctx,String customer_id,String source,String search,String pagetype,String dy_uid,String use_dy_uid) {
Intent i = new Intent(ctx, AddCustDialogActivity.class);
i.putExtra("customer_id",customer_id);
i.putExtra("source",source);
i.putExtra("search",search);
i.putExtra("pagetype",pagetype);
i.putExtra("dy_uid",dy_uid);
i.putExtra("use_dy_uid",use_dy_uid);
ctx.startActivity(i);
}

View File

@@ -85,17 +85,19 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
private String search;
private String pagetype;
private String dy_uid;
private String use_dy_uid;
private ArrayList<LabelBean> 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<Response>() {
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<Response>() {
@Override
public void onNext(Response response) {
String body = (String) response.body();

View File

@@ -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,"","");
}
});
}

View File

@@ -80,7 +80,7 @@ public class NetApi {
};
}
public Observable<Response> addCustomer(final String uid, final String headimg, final String name, final String phone, final String wechat, final String address, final String decoration, final String style_id, final String budget, final String source, final String customer_id,final String dy_uid) {
public Observable<Response> addCustomer(final String uid, final String headimg, final String name, final String phone, final String wechat, final String address, final String decoration, final String style_id, final String budget, final String source, final String customer_id,final String dy_uid,final String use_dy_uid) {
return new Observable<Response>() {
@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<String>())//