This commit is contained in:
2020-08-28 18:15:52 +08:00
parent 46011a09c3
commit 28ac667afc
50 changed files with 1249 additions and 588 deletions

View File

@@ -98,52 +98,73 @@ public class XikeInfoFragment extends MoFragment {
@Override
public void requestData() {
new NetApi().xikeInfo("b886798bdce09746a787651013f2c6e6").subscribe(new Observer<Response>() {
@Override
public void onNext(Response response) {
String body = (String) response.body();
XikeInfoBean.ResultBean esdv = JsonUtils.fromJson(body, XikeInfoBean.class).getResult();
mSwl.setRefreshing(false);
if (esdv != null && String.valueOf(esdv.getSuccess()).equals("0")) {
xike = esdv.getXike();
// WidgetTools.setTextfive(xike_01, "", xike);
// List<XikeInfoBean.ResultBean.DataBean> data = esdv.getData();
// new NetApi().xikeInfo("b886798bdce09746a787651013f2c6e6").subscribe(new Observer<Response>() {
// @Override
// public void onNext(Response response) {
// String body = (String) response.body();
// XikeInfoBean.ResultBean esdv = JsonUtils.fromJson(body, XikeInfoBean.class).getResult();
// mSwl.setRefreshing(false);
// if (esdv != null && String.valueOf(esdv.getSuccess()).equals("0")) {
// xike = esdv.getXike();
// // WidgetTools.setTextfive(xike_01, "", xike);
// // List<XikeInfoBean.ResultBean.DataBean> data = esdv.getData();
//
//
// List<XikeInfoBean.ResultBean.DataBean> data = new ArrayList<XikeInfoBean.ResultBean.DataBean>();
// for (int i = 0; i < 20; i++)
// {
// XikeInfoBean.ResultBean.DataBean dataBean = new XikeInfoBean.ResultBean.DataBean();
// dataBean.setTime("2020-07-01 12:00:00");
// dataBean.setXike_num("+89.00");
// dataBean.setXike_remark("收益账户转入");
// data.add(dataBean);
// }
//
// if (data.size() == 0) {
// //markingtwoAdapter.setEmptyView(notDataView);
// return;
// }
// if (mNextRequestPage == 1) {
// setData(true, data);
// } else {
// setData(false, data);
// }
// } else {
// setData(true, null);
// markingtwoAdapter.setEmptyView(notDataView);
// mSwl.setRefreshing(false);
// }
//
// }
//
// @Override
// public void onError(Exception e) {
// e.printStackTrace();
// markingtwoAdapter.setEmptyView(errorView);
// mSwl.setRefreshing(false);
// }
// });
List<XikeInfoBean.ResultBean.DataBean> data = new ArrayList<XikeInfoBean.ResultBean.DataBean>();
for (int i = 0; i < 20; i++)
{
XikeInfoBean.ResultBean.DataBean dataBean = new XikeInfoBean.ResultBean.DataBean();
dataBean.setTime("2020-07-01 12:00:00");
dataBean.setXike_num("+89.00");
dataBean.setXike_remark("收益账户转入");
data.add(dataBean);
}
List<XikeInfoBean.ResultBean.DataBean> data = new ArrayList<XikeInfoBean.ResultBean.DataBean>();
for (int i = 0; i < 20; i++)
{
XikeInfoBean.ResultBean.DataBean dataBean = new XikeInfoBean.ResultBean.DataBean();
dataBean.setTime("2020-07-01 12:00:00");
dataBean.setXike_num("+89.00");
dataBean.setXike_remark("收益账户转入");
data.add(dataBean);
}
if (data.size() == 0) {
//markingtwoAdapter.setEmptyView(notDataView);
return;
}
if (mNextRequestPage == 1) {
setData(true, data);
} else {
setData(false, data);
}
} else {
setData(true, null);
markingtwoAdapter.setEmptyView(notDataView);
mSwl.setRefreshing(false);
}
}
@Override
public void onError(Exception e) {
e.printStackTrace();
markingtwoAdapter.setEmptyView(errorView);
mSwl.setRefreshing(false);
}
});
if (data.size() == 0) {
//markingtwoAdapter.setEmptyView(notDataView);
return;
}
if (mNextRequestPage == 1) {
setData(true, data);
} else {
setData(false, data);
}
mSwl.setRefreshing(false);
}

View File

@@ -5,50 +5,115 @@ import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import com.fenghoo.seven.R;
import com.fenghoo.seven.main.find.entity.markquestions;
import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener;
import com.fenghoo.seven.main.kehu.Bean.fpOrderInfoBean;
import com.fenghoo.seven.utils.AbStrUtil;
import com.fenghoo.seven.utils.WidgetTools;
import com.fenghoo.seven.widget.ItemProView;
public class BeizhuViewHolder extends TypeAbstractViewHolder {
private TextView tv_question;
private EditText et_remarkquestion;
private ItemProView itemProView;
private final TextView tv_time_01;
private final TextView tv_time_02;
private final TextView tv_fphy;
private final TextView tv_fpcs;
private final TextView tv_khys;
private final TextView tv_time_001;
private final TextView tv_time_002;
private final TextView tv_pl;
private final TextView tv_md;
private final TextView tv_qdr;
private final TextView tv_time_00;
private final TextView tv_time_000;
private final ImageView tv_fphy_0;
private final TextView tv_cjr;
private final TextView tv_cjje;
public BeizhuViewHolder(View itemView) {
super(itemView);
tv_question = (TextView) itemView.findViewById(R.id.tv_question);
et_remarkquestion = (EditText) itemView.findViewById(R.id.et_remarkquestion);
itemProView = (ItemProView) itemView.findViewById(R.id.item_my_twitter);
tv_time_01 = (TextView) itemView.findViewById(R.id.tv_time_01);
tv_time_02 = (TextView) itemView.findViewById(R.id.tv_time_02);
tv_fphy = (TextView) itemView.findViewById(R.id.tv_fphy);
tv_fpcs = (TextView) itemView.findViewById(R.id.tv_fpcs);
tv_khys = (TextView) itemView.findViewById(R.id.tv_khys);
tv_time_001 = (TextView) itemView.findViewById(R.id.tv_time_001);
tv_time_002 = (TextView) itemView.findViewById(R.id.tv_time_002);
tv_pl = (TextView) itemView.findViewById(R.id.tv_pl);
tv_md = (TextView) itemView.findViewById(R.id.tv_md);
tv_qdr = (TextView) itemView.findViewById(R.id.tv_qdr);
tv_time_00 = (TextView) itemView.findViewById(R.id.tv_time_00);
tv_time_000 = (TextView) itemView.findViewById(R.id.tv_time_000);
tv_fphy_0 = (ImageView) itemView.findViewById(R.id.tv_fphy_0);
tv_cjr = (TextView) itemView.findViewById(R.id.tv_cjr);
tv_cjje = (TextView) itemView.findViewById(R.id.tv_cjje);
}
public void bindHolder(final markquestions.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) {
//1.根据Tag移除掉监听
if (et_remarkquestion.getTag() instanceof TextWatcher) {
et_remarkquestion.removeTextChangedListener((TextWatcher) et_remarkquestion.getTag());
}
final String markname = dataBean.getMarkname();
final String answer = dataBean.getAnswer();
// tv_question.setText(position + "." + markname);
String is_must = dataBean.getIs_must();
if (is_must.equals("1")) {
tv_question.setText(position + "." + markname+" (必填)");
/**
* 页面逻辑
* travel1:已分配2已被抢3已进店4已成交 4种类型的条目
* <p>
* order_state0未成交1已成交
* ygd_state0未被抢1已被抢
* enter_state:0未进店1已进店
* <p>
* type1已回收2已成交
*/
public void bindHolder(final fpOrderInfoBean.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) {
/**
* 三个字段有7种状态
*/
String order_state = dataBean.getOrder_state();
String ygd_state = dataBean.getYgd_state();
String enter_state = dataBean.getEnter_state();
itemProView.refresh("0", order_state, ygd_state, enter_state);
//_____________分配客户
String fp_time = dataBean.getFp_time();
settime(fp_time, tv_time_01, tv_time_02);
WidgetTools.setTextfive(tv_fphy, "分配行业:", dataBean.getIndustry());
WidgetTools.setTextfive(tv_fpcs, "分配城市:", dataBean.getCity());
WidgetTools.setTextfive(tv_khys, "客户预算:", dataBean.getBudget());
//_____________抢单客户
String rob_time = dataBean.getRob_time();
settime(rob_time, tv_time_001, tv_time_002);
WidgetTools.setTextfive(tv_pl, "品类:", dataBean.getIndustry());
WidgetTools.setTextfive(tv_md, "门店:", dataBean.getCity());
WidgetTools.setTextfive(tv_qdr, "抢单人:", dataBean.getYgd_rob_name());
//_____________成交客户
String type_time = dataBean.getType_time();
settime(type_time, tv_time_00, tv_time_000);
WidgetTools.setTextfive(tv_pl, "成交人:", dataBean.getIndustry());
WidgetTools.setTextfive(tv_md, "成交金额:", dataBean.getCity());
String type = dataBean.getType();
if (type.equals("1")) {
tv_fphy_0.setBackgroundResource(R.mipmap.icon_yihuishou);
} else {
tv_question.setText(position + "." + markname);
tv_fphy_0.setBackgroundResource(R.mipmap.icon_ycj);
}
et_remarkquestion.setText(answer);
}
if (et_remarkquestion.getTag() != null && et_remarkquestion.getTag() instanceof TextWatcher) {
et_remarkquestion.removeTextChangedListener((TextWatcher) et_remarkquestion.getTag());
}
TextWatcher textWatcher = new textwatcher() {
@Override
public void afterTextChanged(Editable s) {
dataBean.setAnswer(s.toString());
private void settime(String rob_time, TextView tv_time_001, TextView tv_time_002) {
if (!AbStrUtil.isEmpty(rob_time)) {
String[] s = rob_time.split(" ");
if (s[1] != null) {
WidgetTools.setTextfive(tv_time_001, "", s[1]);
}
};
et_remarkquestion.addTextChangedListener(textWatcher);
et_remarkquestion.setTag(textWatcher);
if (s[0] != null) {
WidgetTools.setTextfive(tv_time_002, "", s[0]);
}
} else {
WidgetTools.setTextfive(tv_time_001, "", "");
WidgetTools.setTextfive(tv_time_002, "", "");
}
}
}

View File

@@ -2,33 +2,105 @@ package com.fenghoo.seven.main.find.adapter.holder;
import android.content.Context;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.fenghoo.seven.R;
import com.fenghoo.seven.main.find.entity.markquestions;
import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener;
import androidx.recyclerview.widget.RecyclerView;
import com.fenghoo.seven.main.kehu.Bean.fpOrderInfoBean;
import com.fenghoo.seven.utils.AbStrUtil;
import com.fenghoo.seven.utils.WidgetTools;
import com.fenghoo.seven.widget.ItemProView;
public class BottomViewHolder extends TypeAbstractViewHolder {
private TextView optionproblem;
private RecyclerView marking_recycler_relation;
private ItemProView itemProView;
private final TextView tv_time_01;
private final TextView tv_time_02;
private final TextView tv_fphy;
private final TextView tv_fpcs;
private final TextView tv_khys;
private final TextView tv_time_001;
private final TextView tv_time_002;
private final TextView tv_pl;
private final TextView tv_md;
private final TextView tv_qdr;
private final TextView tv_time_00;
private final TextView tv_time_000;
private final ImageView tv_fphy_0;
public BottomViewHolder(View itemView) {
super(itemView);
optionproblem = (TextView) itemView.findViewById(R.id.optionproblem);
marking_recycler_relation = itemView.findViewById(R.id.marking_recycler_question);
itemProView = (ItemProView) itemView.findViewById(R.id.item_my_twitter);
tv_time_01 = (TextView) itemView.findViewById(R.id.tv_time_01);
tv_time_02 = (TextView) itemView.findViewById(R.id.tv_time_02);
tv_fphy = (TextView) itemView.findViewById(R.id.tv_fphy);
tv_fpcs = (TextView) itemView.findViewById(R.id.tv_fpcs);
tv_khys = (TextView) itemView.findViewById(R.id.tv_khys);
tv_time_001 = (TextView) itemView.findViewById(R.id.tv_time_001);
tv_time_002 = (TextView) itemView.findViewById(R.id.tv_time_002);
tv_pl = (TextView) itemView.findViewById(R.id.tv_pl);
tv_md = (TextView) itemView.findViewById(R.id.tv_md);
tv_qdr = (TextView) itemView.findViewById(R.id.tv_qdr);
tv_time_00 = (TextView) itemView.findViewById(R.id.tv_time_00);
tv_time_000 = (TextView) itemView.findViewById(R.id.tv_time_000);
tv_fphy_0 = (ImageView) itemView.findViewById(R.id.tv_fphy_0);
}
public void bindHolder(final markquestions.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) {
String markname = dataBean.getMarkname();
// optionproblem.setText(position + "." + markname);
String is_must = dataBean.getIs_must();
if (is_must.equals("1")) {
optionproblem.setText(position + "." + markname+" (必填)");
/**
* 页面逻辑
* travel1:已分配2已被抢3已进店4已成交 4种类型的条目
* <p>
* order_state0未成交1已成交
* ygd_state0未被抢1已被抢
* enter_state:0未进店1已进店
* <p>
* type1已回收2已成交
*/
public void bindHolder(final fpOrderInfoBean.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) {
/**
* 三个字段有7种状态
*/
String order_state = dataBean.getOrder_state();
String ygd_state = dataBean.getYgd_state();
String enter_state = dataBean.getEnter_state();
itemProView.refresh("0", order_state, ygd_state, enter_state);
//_____________分配客户
String fp_time = dataBean.getFp_time();
settime(fp_time, tv_time_01, tv_time_02);
WidgetTools.setTextfive(tv_fphy, "分配行业:", dataBean.getIndustry());
WidgetTools.setTextfive(tv_fpcs, "分配城市:", dataBean.getCity());
WidgetTools.setTextfive(tv_khys, "客户预算:", dataBean.getBudget());
//_____________抢单客户
String rob_time = dataBean.getRob_time();
settime(rob_time, tv_time_001, tv_time_002);
WidgetTools.setTextfive(tv_pl, "品类:", dataBean.getIndustry());
WidgetTools.setTextfive(tv_md, "门店:", dataBean.getCity());
WidgetTools.setTextfive(tv_qdr, "抢单人:", dataBean.getBudget());
//_____________成交客户
String type_time = dataBean.getType_time();
settime(type_time, tv_time_00, tv_time_000);
String type = dataBean.getType();
if (type.equals("1")) {
tv_fphy_0.setBackgroundResource(R.mipmap.icon_yihuishou);
} else {
optionproblem.setText(position + "." + markname);
tv_fphy_0.setBackgroundResource(R.mipmap.icon_ycj);
}
}
private void settime(String rob_time, TextView tv_time_001, TextView tv_time_002) {
if (!AbStrUtil.isEmpty(rob_time)) {
String[] s = rob_time.split(" ");
if (s[1] != null) {
WidgetTools.setTextfive(tv_time_001, "", s[1]);
}
if (s[0] != null) {
WidgetTools.setTextfive(tv_time_002, "", s[0]);
}
} else {
WidgetTools.setTextfive(tv_time_001, "", "");
WidgetTools.setTextfive(tv_time_002, "", "");
}
}
}

View File

@@ -2,61 +2,81 @@ package com.fenghoo.seven.main.find.adapter.holder;
import android.content.Context;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.fenghoo.seven.R;
import com.fenghoo.seven.main.find.entity.markquestions;
import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener;
import com.fenghoo.seven.main.kehu.Bean.fpOrderInfoBean;
import com.fenghoo.seven.utils.AbStrUtil;
import com.fenghoo.seven.utils.WidgetTools;
import com.fenghoo.seven.widget.ItemProView;
public class CalendarViewHolder extends TypeAbstractViewHolder{
private TextView tv_question;
private TextView et_remarkquestion;
private ItemProView itemProView;
private final TextView tv_time_01;
private final TextView tv_time_02;
private final TextView tv_fphy;
private final TextView tv_fpcs;
private final TextView tv_khys;
private final TextView tv_time_001;
private final TextView tv_time_002;
private final TextView tv_pl;
private final TextView tv_md;
private final TextView tv_qdr;
public CalendarViewHolder(View itemView) {
super(itemView);
tv_question = (TextView) itemView.findViewById(R.id.tv_question);
et_remarkquestion = (TextView) itemView.findViewById(R.id.et_remarkquestion);
itemProView = (ItemProView) itemView.findViewById(R.id.item_my_twitter);
tv_time_01 = (TextView) itemView.findViewById(R.id.tv_time_01);
tv_time_02 = (TextView) itemView.findViewById(R.id.tv_time_02);
tv_fphy = (TextView) itemView.findViewById(R.id.tv_fphy);
tv_fpcs = (TextView) itemView.findViewById(R.id.tv_fpcs);
tv_khys = (TextView) itemView.findViewById(R.id.tv_khys);
tv_time_001 = (TextView) itemView.findViewById(R.id.tv_time_001);
tv_time_002 = (TextView) itemView.findViewById(R.id.tv_time_002);
tv_pl = (TextView) itemView.findViewById(R.id.tv_pl);
tv_md = (TextView) itemView.findViewById(R.id.tv_md);
tv_qdr = (TextView) itemView.findViewById(R.id.tv_qdr);
}
public void bindHolder(final markquestions.ResultBean.DataBean dataBean, final int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) {
final String markname = dataBean.getMarkname();
final String answer = dataBean.getAnswer();
// tv_question.setText(position + "." + markname);
String is_must = dataBean.getIs_must();
if (is_must.equals("1")) {
tv_question.setText(position + "." + markname+" (必填)");
} else {
tv_question.setText(position + "." + markname);
}
et_remarkquestion.setText(answer);
public void bindHolder(final fpOrderInfoBean.ResultBean.DataBean dataBean, final int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) {
/**
* 三个字段有7种状态
*/
String order_state = dataBean.getOrder_state();
String ygd_state = dataBean.getYgd_state();
String enter_state = dataBean.getEnter_state();
itemProView.refresh("0", order_state, ygd_state, enter_state);
//_____________分配客户
String fp_time = dataBean.getFp_time();
settime(fp_time, tv_time_01, tv_time_02);
WidgetTools.setTextfive(tv_fphy, "分配行业:", dataBean.getIndustry());
WidgetTools.setTextfive(tv_fpcs, "分配城市:", dataBean.getCity());
WidgetTools.setTextfive(tv_khys, "客户预算:", dataBean.getBudget());
//_____________抢单客户
String rob_time = dataBean.getRob_time();
settime(rob_time, tv_time_001, tv_time_002);
WidgetTools.setTextfive(tv_pl, "品类:", dataBean.getIndustry());
WidgetTools.setTextfive(tv_md, "门店:", dataBean.getCity());
WidgetTools.setTextfive(tv_qdr, "抢单人:", dataBean.getBudget());
}
//1.根据Tag移除掉监听
// if (et_remarkquestion.getTag() instanceof TextWatcher) {
// et_remarkquestion.removeTextChangedListener((TextWatcher) et_remarkquestion.getTag());
// }
// if (et_remarkquestion.getTag() != null && et_remarkquestion.getTag() instanceof TextWatcher) {
// et_remarkquestion.removeTextChangedListener((TextWatcher) et_remarkquestion.getTag());
// }
// TextWatcher textWatcher = new textwatcher() {
// @Override
// public void afterTextChanged(Editable s) {
// dataBean.setAnswer(s.toString());
// }
// };
//
// et_remarkquestion.addTextChangedListener(textWatcher);
// et_remarkquestion.setTag(textWatcher);
et_remarkquestion.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (mviewListener != null) {
mviewListener.CalendarControlClick(et_remarkquestion,position,dataBean);
}
private void settime(String rob_time, TextView tv_time_001, TextView tv_time_002) {
if (!AbStrUtil.isEmpty(rob_time)) {
String[] s = rob_time.split(" ");
if (s[1] != null) {
WidgetTools.setTextfive(tv_time_001, "", s[1]);
}
});
if (s[0] != null) {
WidgetTools.setTextfive(tv_time_002, "", s[0]);
}
} else {
WidgetTools.setTextfive(tv_time_001, "", "");
WidgetTools.setTextfive(tv_time_002, "", "");
}
}
}

View File

@@ -2,18 +2,32 @@ package com.fenghoo.seven.main.find.adapter.holder;
import android.content.Context;
import android.view.View;
import android.widget.TextView;
import com.fenghoo.seven.R;
import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener;
import com.fenghoo.seven.main.kehu.Bean.fpOrderInfoBean;
import com.fenghoo.seven.utils.AbStrUtil;
import com.fenghoo.seven.utils.WidgetTools;
import com.fenghoo.seven.widget.ItemProView;
public class ContentViewHolder extends TypeAbstractViewHolder {
private ItemProView itemProView;
private final TextView tv_time_01;
private final TextView tv_time_02;
private final TextView tv_fphy;
private final TextView tv_fpcs;
private final TextView tv_khys;
public ContentViewHolder(View itemView) {
super(itemView);
itemProView = (ItemProView) itemView.findViewById(R.id.item_my_twitter);
tv_time_01 = (TextView) itemView.findViewById(R.id.tv_time_01);
tv_time_02 = (TextView) itemView.findViewById(R.id.tv_time_02);
tv_fphy = (TextView) itemView.findViewById(R.id.tv_fphy);
tv_fpcs = (TextView) itemView.findViewById(R.id.tv_fpcs);
tv_khys = (TextView) itemView.findViewById(R.id.tv_khys);
}
/**
* 页面逻辑
@@ -21,13 +35,36 @@ public class ContentViewHolder extends TypeAbstractViewHolder {
*
* order_state0未成交1已成交
* ygd_state0未被抢1已被抢
* enter_state:0未进店1已进店
*
* type1已回收2已成交
*/
public void bindHolder(final fpOrderInfoBean.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) {
/**
* 三个字段,有种状态
* 三个字段,有7种状态
*/
itemProView.refresh("2");
String order_state = dataBean.getOrder_state();
String ygd_state = dataBean.getYgd_state();
String enter_state = dataBean.getEnter_state();
itemProView.refresh("0",order_state,ygd_state,enter_state);
String fp_time = dataBean.getFp_time();
settime(fp_time, tv_time_01, tv_time_02);
WidgetTools.setTextfive(tv_fphy, "分配行业:", dataBean.getIndustry());
WidgetTools.setTextfive(tv_fpcs, "分配城市:", dataBean.getCity());
WidgetTools.setTextfive(tv_khys, "客户预算:", dataBean.getBudget());
}
private void settime(String rob_time, TextView tv_time_001, TextView tv_time_002) {
if (!AbStrUtil.isEmpty(rob_time)) {
String[] s = rob_time.split(" ");
if (s[1] != null) {
WidgetTools.setTextfive(tv_time_001, "", s[1]);
}
if (s[0] != null) {
WidgetTools.setTextfive(tv_time_002, "", s[0]);
}
} else {
WidgetTools.setTextfive(tv_time_001, "", "");
WidgetTools.setTextfive(tv_time_002, "", "");
}
}
}

View File

@@ -8,6 +8,7 @@ import com.fenghoo.seven.R;
import com.fenghoo.seven.main.find.entity.Markquestionsone;
import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener;
import com.fenghoo.seven.utils.GlideTools;
import com.fenghoo.seven.utils.WidgetTools;
import com.fenghoo.seven.widget.CircleImageView;
//头部 ViewHolder
@@ -15,17 +16,27 @@ public class HeaderViewHolder extends TypeAbstractViewHolder {
private CircleImageView iv_fporder_head;
private TextView marking_fragment_title;
private final TextView tv_dar_user_phone;
private final TextView tv_dra_user_name;
public HeaderViewHolder(View itemView) {
super(itemView);
iv_fporder_head = (CircleImageView) itemView.findViewById(R.id.iv_fporder_head);
marking_fragment_title = (TextView) itemView.findViewById(R.id.marking_fragment_title);
tv_dra_user_name = (TextView) itemView.findViewById(R.id.tv_dra_user_name);
tv_dar_user_phone = (TextView) itemView.findViewById(R.id.tv_dar_user_phone);
}
public void bindHoldertwo(Context mContext, final int position, final Markquestionsone markquestionsone, final MarKQuestionItemviewOnClickListener mviewListener) {
String image = markquestionsone.getImage();
String image = markquestionsone.getHeadimg();
GlideTools.init(mContext).displaypic(iv_fporder_head, image, R.mipmap.icon_default_head);
WidgetTools.setTextfive(tv_dra_user_name, "", markquestionsone.getWechat());
WidgetTools.setTextfive(tv_dar_user_phone, "", markquestionsone.getAddress());
marking_fragment_title.setText(markquestionsone.getIndustry());
marking_fragment_title.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {

View File

@@ -16,8 +16,8 @@ public class MultipleViewHolder extends TypeAbstractViewHolder {
public MultipleViewHolder(View itemView) {
super(itemView);
optionproblem = (TextView) itemView.findViewById(R.id.optionproblem);
marking_recycler_relation = itemView.findViewById(R.id.marking_recycler_question);
// optionproblem = (TextView) itemView.findViewById(R.id.optionproblem);
// marking_recycler_relation = itemView.findViewById(R.id.marking_recycler_question);
}
public void bindHolder(final markquestions.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) {

View File

@@ -6,333 +6,55 @@ import java.util.List;
public class Markquestionsone extends BaseModel {
private String record_id = "";
private String uid= "";
private String usertype= "1";
private String name= "";
private String sex= "1";//初始值为男
private String phone= "";
private String wechat= "";
private String tracktype= "1";
private String plantime= "";
/**
* industry_id : 1
* industry : 家具
*/
private String industry_id;
private String industry;
private String headimg;
public String getIsUpAvatar() {
return isUpAvatar;
public String getHeadimg() {
return headimg;
}
public void setIsUpAvatar(String isUpAvatar) {
this.isUpAvatar = isUpAvatar;
}
private String isUpAvatar= "";//进入类型
public String getType_id() {
return type_id;
}
public void setType_id(String type_id) {
this.type_id = type_id;
}
private String type_id= "";//1顾客2工作人员4无需求老客户5红名单6黑名单
public String getPlantimetwo() {
return plantimetwo;
}
public void setPlantimetwo(String plantimetwo) {
this.plantimetwo = plantimetwo;
}
private String plantimetwo= "";
private String loss= "";
private String ordernum= "";
private String labernum= "";
private String position= "";
private String image= "";
private String relationid= ",";
private String design_scheme= "";
private String turnover = "";
public List<CustomerTypeBean.ResultBean.DataBean> getData() {
return data;
}
public void setData(List<CustomerTypeBean.ResultBean.DataBean> data) {
this.data = data;
}
private List<CustomerTypeBean.ResultBean.DataBean> data;
public String getCustomer_id() {
return customer_id;
}
public void setCustomer_id(String customer_id) {
this.customer_id = customer_id;
}
private String customer_id = "";
public String getActivity_type() {
return activity_type;
}
public void setActivity_type(String activity_type) {
this.activity_type = activity_type;
}
private String activity_type = "";
public String getTurnover() {
return turnover;
}
public void setTurnover(String turnover) {
this.turnover = turnover;
}
public String getEntertype() {
return entertype;
}
public void setEntertype(String entertype) {
this.entertype = entertype;
}
private String entertype= "";
public String getDesign_scheme() {
return design_scheme;
}
public void setDesign_scheme(String design_scheme) {
this.design_scheme = design_scheme;
}
public String getBirthday() {
return birthday;
}
public void setBirthday(String birthday) {
this.birthday = birthday;
}
private String birthday= "";
public String getIdentity() {
return identity;
}
public void setIdentity(String identity) {
this.identity = identity;
}
private String identity= ",";
public String getSeclectdatas() {
return seclectdatas;
}
public void setSeclectdatas(String seclectdatas) {
this.seclectdatas = seclectdatas;
}
private String seclectdatas= "";
public String getJccf_type() {
return jccf_type;
}
public void setJccf_type(String jccf_type) {
this.jccf_type = jccf_type;
}
private String jccf_type= ",";
private String baobei= "0";//初始值报备0不报备
public String getIsSelectImage() {
return isSelectImage;
}
public void setIsSelectImage(String isSelectImage) {
this.isSelectImage = isSelectImage;
}
private String isSelectImage= "0";//上传图像成功后传1
public String getBaobei() {
return baobei;
}
public void setBaobei(String baobei) {
this.baobei = baobei;
}
public String getBuild_info() {
return build_info;
}
public void setBuild_info(String build_info) {
this.build_info = build_info;
}
public String getTag_type() {
return tag_type;
}
public void setTag_type(String tag_type) {
this.tag_type = tag_type;
}
private String build_info= "";
private String tag_type= "";//1提交标签2修改标签
public String getRecord_id() {
return record_id;
}
public void setRecord_id(String record_id) {
this.record_id = record_id;
}
public String getUid() {
return uid;
}
public void setUid(String uid) {
this.uid = uid;
}
public String getUsertype() {
return usertype;
}
public void setUsertype(String usertype) {
this.usertype = usertype;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getSex() {
return sex;
}
public void setSex(String sex) {
this.sex = sex;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
public void setHeadimg(String headimg) {
this.headimg = headimg;
}
public String getWechat() {
return wechat;
}
public void setWechat(String wechat) {
this.wechat = wechat;
}
public String getTracktype() {
return tracktype;
public String getAddress() {
return address;
}
public void setTracktype(String tracktype) {
this.tracktype = tracktype;
public void setAddress(String address) {
this.address = address;
}
public String getPlantime() {
return plantime;
private String wechat;
private String address;
public String getIndustry_id() {
return industry_id;
}
public void setPlantime(String plantime) {
this.plantime = plantime;
public void setIndustry_id(String industry_id) {
this.industry_id = industry_id;
}
public String getLoss() {
return loss;
public String getIndustry() {
return industry;
}
public void setLoss(String loss) {
this.loss = loss;
}
public String getOrdernum() {
return ordernum;
}
public void setOrdernum(String ordernum) {
this.ordernum = ordernum;
}
public String getLabernum() {
return labernum;
}
public void setLabernum(String labernum) {
this.labernum = labernum;
}
public String getPosition() {
return position;
}
public void setPosition(String position) {
this.position = position;
}
public String getImage() {
return image;
}
public void setImage(String image) {
this.image = image;
}
public String getRelationid() {
return relationid;
}
public void setRelationid(String relationid) {
this.relationid = relationid;
}
@Override
public String toString() {
return "Markquestionsone{" +
"record_id='" + record_id + '\'' +
", uid='" + uid + '\'' +
", usertype='" + usertype + '\'' +
", name='" + name + '\'' +
", sex='" + sex + '\'' +
", phone='" + phone + '\'' +
", wechat='" + wechat + '\'' +
", tracktype='" + tracktype + '\'' +
", plantime='" + plantime + '\'' +
", loss='" + loss + '\'' +
", ordernum='" + ordernum + '\'' +
", labernum='" + labernum + '\'' +
", position='" + position + '\'' +
", image='" + image + '\'' +
", relationid='" + relationid + '\'' +
", turnover='" + turnover + '\'' +
'}';
public void setIndustry(String industry) {
this.industry = industry;
}
}

View File

@@ -76,9 +76,9 @@ public class markquestions extends BaseModel {
public static class DataBean {
public static final int ITEM_TYPE_HEADER = 0;
public static final int ITEM_TYPE_CONTENT = 1;
public static final int ITEM_TYPE_BOTTOM = 2;//单选
public static final int ITEM_TYPE_CALENDAR = 3;//日历控件
public static final int ITEM_TYPE_BEIZHU = 4;//多行输入
public static final int ITEM_TYPE_BOTTOM = 2;//已被抢
public static final int ITEM_TYPE_CALENDAR = 3;//已进店
public static final int ITEM_TYPE_BEIZHU = 4;//已成交
public static final int ITEM_TYPE_MULTIPLE = 5;//多选
public static final int ITEM_TYPE_PIC = 6;//6代表上传图片只能上传一张
/**

View File

@@ -82,6 +82,16 @@ public class FpListBean extends BaseModel {
*/
private String headimg;
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
private String address;
private String fp_num;
private String phone;
private String name;

View File

@@ -95,10 +95,20 @@ public class fpOrderInfoBean extends BaseModel {
*/
private String ygd_brand_type;
public String getType_time() {
return type_time;
}
public void setType_time(String type_time) {
this.type_time = type_time;
}
private String type_time;
private String rob_time;
private String enter_state;
private String city;
private String fp_time;
private String fp_time;//分配客户时间
private String industry;
private String ygd_order;
private String type;

View File

@@ -87,6 +87,16 @@ public class orderListBean extends BaseModel {
private String order_num;
private String customer_id;
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
private String address;
public String getHeadimg() {
return headimg;
}

View File

@@ -43,7 +43,7 @@ public class DealFragment extends MobanFragment {
@Override
public void enterCusDetail(orderListBean.ResultBean.DataBean item) {
//进入分配/成交列表详情
ShowAty.FpOrderInfoActivity(getActivity(),item.getCustomer_id(),item.getName()+item.getPhone());
ShowAty.FpOrderInfoActivity(getActivity(),item.getCustomer_id(),item.getName()+item.getPhone(),item.getHeadimg(),item.getWechat(),item.getAddress());
}
});
}

View File

@@ -0,0 +1,101 @@
package com.fenghoo.seven.main.kehu.Dialog;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
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.industryBean;
import com.fenghoo.seven.utils.WidgetTools;
import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
public class HangyeSelectDialog extends Dialog implements View.OnClickListener {
private Context mContext;
private OnCloseListener listener;
private RecyclerView reply_rcey;
private TextView tv_cancel;
private List<industryBean.ResultBean.DataBean> industryData;
public HangyeSelectDialog(Context context) {
super(context);
this.mContext = context;
}
public HangyeSelectDialog(Context context, int themeResId, List<industryBean.ResultBean.DataBean> industryData, OnCloseListener listener) {
super(context, themeResId);
this.mContext = context;
this.listener = listener;
this.industryData = industryData;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.hangselect_dialog);
setCanceledOnTouchOutside(true);
Window window = getWindow();
window.getDecorView().setPadding(0, 0, 0, 0);
WindowManager.LayoutParams layoutParams = window.getAttributes();
layoutParams.width = WindowManager.LayoutParams.MATCH_PARENT;
layoutParams.horizontalMargin = 0;
window.setAttributes(layoutParams);
window.setGravity(Gravity.BOTTOM);
initView();
}
private void initView() {
tv_cancel = (TextView) findViewById(R.id.tv_cancel);
tv_cancel.setOnClickListener(this);
reply_rcey = (RecyclerView) findViewById(R.id.reply_rcey);
LinearLayoutManager manager = new LinearLayoutManager(mContext);
reply_rcey.setLayoutManager(manager);
reply_rcey.setAdapter(new BaseQuickAdapter<industryBean.ResultBean.DataBean, BaseViewHolder>(R.layout.item_hangyeselect_dialog, industryData) {
@Override
protected void convert(final BaseViewHolder helper, final industryBean.ResultBean.DataBean item) {
WidgetTools.setTextfive((TextView) helper.getView(R.id.img_modify), "", item.getIndustry());
RelativeLayout reply_dialog_rl = helper.getView(R.id.reply_dialog_rl);
reply_dialog_rl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
listener.uploadAvatar(item.getIndustry_id(),item.getIndustry());
dismiss();
}
});
}
});
}
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.tv_cancel:
dismiss();
break;
}
}
public interface OnCloseListener {
/**
* @description 列表选择的内容
* @param
* @return
*/
void uploadAvatar(String item,String industry);
}
}

View File

@@ -44,7 +44,7 @@ public class DistriFragment extends MobanFragment {
@Override
public void enterCusDetail(FpListBean.ResultBean.DataBean item) {
//进入分配/成交列表详情
ShowAty.FpOrderInfoActivity(getActivity(),item.getCustomer_id(),item.getName()+item.getPhone());
ShowAty.FpOrderInfoActivity(getActivity(),item.getCustomer_id(),item.getName()+item.getPhone(),item.getHeadimg(),item.getWechat(),item.getAddress());
}
});
}

View File

@@ -8,12 +8,13 @@ import android.widget.TextView;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseActivity;
import com.fenghoo.seven.main.kehu.adapter.FpOrderInfoAdaptertwo;
import com.fenghoo.seven.main.find.entity.Markquestionsone;
import com.fenghoo.seven.main.find.entity.markquestions;
import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener;
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.NetApi;
import com.fenghoo.seven.okgonet.Observer;
import com.fenghoo.seven.widget.TitleBar;
@@ -33,7 +34,7 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis
private FpOrderInfoAdaptertwo adapter;
private Markquestionsone markquestionsone;
private String customer_id;
private String name;
private String name,headimg,wechat,address;
private List<industryBean.ResultBean.DataBean> industryData;
@Override
@@ -42,10 +43,16 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis
contentView = LayoutInflater.from(this).inflate(R.layout.activity_refactor_marking_detail, null);
customer_id = getIntent().getStringExtra("customer_id");
name = getIntent().getStringExtra("name");
headimg = getIntent().getStringExtra("headimg");
wechat = getIntent().getStringExtra("wechat");
address = getIntent().getStringExtra("address");
setContentView(contentView);
initView();
//第一部分的数据
markquestionsone = new Markquestionsone();
markquestionsone.setHeadimg(headimg);
markquestionsone.setWechat(wechat);
markquestionsone.setAddress(address);
//获得行业数据
// getPresenter().getindustry();
new NetApi().industry().subscribe(new Observer<Response>() {
@@ -56,6 +63,7 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis
if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
industryData = result.getData();
industryBean.ResultBean.DataBean dataBean = industryData.get(0);
markquestionsone.setIndustry(dataBean.getIndustry());
String industry_id = dataBean.getIndustry_id();
fpOrderInfo(industry_id);
}
@@ -123,6 +131,15 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis
@Override
public void industry(TextView marking_fragment_title, int postion, Markquestionsone markquestionson) {
new HangyeSelectDialog(FpOrderInfoActivity.this, R.style.dialog,industryData, new HangyeSelectDialog.OnCloseListener() {
@Override
public void uploadAvatar(String industry_id,String industry) {
markquestionsone.setIndustry(industry);
// adapter.notifyDataSetChanged();
//刷新列表数据
fpOrderInfo(industry_id);
}
}).show();
}
});
}

View File

@@ -17,6 +17,8 @@ import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
import java.io.Serializable;
import java.util.List;
import mlxy.utils.S;
public class ShowAty {
/**
@@ -108,10 +110,13 @@ public class ShowAty {
* @param
* @return
*/
public static void FpOrderInfoActivity(Context ctx,String customer_id,String name) {
public static void FpOrderInfoActivity(Context ctx, String customer_id, String name, String headimg,String wechat,String address) {
Intent i = new Intent(ctx, FpOrderInfoActivity.class);
i.putExtra("customer_id",customer_id);
i.putExtra("name",name);
i.putExtra("headimg",headimg);
i.putExtra("wechat",wechat);
i.putExtra("address",address);
ctx.startActivity(i);
}

View File

@@ -10,8 +10,6 @@ import com.fenghoo.seven.main.find.adapter.holder.BottomViewHolder;
import com.fenghoo.seven.main.find.adapter.holder.CalendarViewHolder;
import com.fenghoo.seven.main.find.adapter.holder.ContentViewHolder;
import com.fenghoo.seven.main.find.adapter.holder.HeaderViewHolder;
import com.fenghoo.seven.main.find.adapter.holder.MultipleViewHolder;
import com.fenghoo.seven.main.find.adapter.holder.PicViewHolder;
import com.fenghoo.seven.main.find.adapter.holder.TypeAbstractViewHolder;
import com.fenghoo.seven.main.find.entity.Markquestionsone;
import com.fenghoo.seven.main.find.entity.markquestions;
@@ -69,11 +67,6 @@ public class FpOrderInfoAdaptertwo extends RecyclerView.Adapter<RecyclerView.Vie
return new CalendarViewHolder(mLayoutInflater.inflate(R.layout.dingdan_rv_threetwo, parent, false));
case markquestions.ResultBean.DataBean.ITEM_TYPE_BEIZHU:
return new BeizhuViewHolder(mLayoutInflater.inflate(R.layout.dingdan_rv_four, parent, false));
// case markquestions.ResultBean.DataBean.ITEM_TYPE_MULTIPLE:
// return new MultipleViewHolder(mLayoutInflater.inflate(R.layout.dingdan_rv_three, parent, false));
// case markquestions.ResultBean.DataBean.ITEM_TYPE_PIC:
// return new PicViewHolder(mLayoutInflater.inflate(R.layout.dingdan_rv_six, parent, false));
}
return null;
}

View File

@@ -3,6 +3,7 @@ package com.fenghoo.seven.widget;
import android.content.Context;
import android.content.res.TypedArray;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
@@ -10,8 +11,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.fenghoo.seven.R;
import com.fenghoo.seven.main.activity.Main2Activity;
import com.fenghoo.seven.main.my.activity.PersonalProfileActivity;
import androidx.annotation.AttrRes;
import androidx.annotation.NonNull;
@@ -126,11 +125,49 @@ public class ItemProView extends FrameLayout {
}
public void refresh(String stutas){
public void refresh(String stutas,String order_state,String ygd_state,String enter_state){
// iv_icon_01.setImageResource(mIv_icon_01);
if(order_state.equals("1")&&ygd_state.equals("0")&&enter_state.equals("0")){
stutas="0";
}
if(order_state.equals("0")&&ygd_state.equals("0")&&enter_state.equals("0")){
stutas="1";
}
if(order_state.equals("0")&&ygd_state.equals("1")&&enter_state.equals("0")){
stutas="2";
}
if(order_state.equals("0")&&ygd_state.equals("1")&&enter_state.equals("1")){
stutas="3";
}
if(order_state.equals("1")&&ygd_state.equals("0")&&enter_state.equals("1")){
stutas="4";
}
if(order_state.equals("1")&&ygd_state.equals("1")&&enter_state.equals("0")){
stutas="5";
}
if(order_state.equals("1")&&ygd_state.equals("1")&&enter_state.equals("1")){
stutas="6";
}
Log.e("状态==",stutas);
switch (stutas) {
case "0"://100三个字段的状态
iv_icon_01.setImageResource(mIv_icon_01_h) ;
iv_icon_02.setImageResource(mIv_icon_01_h) ;
iv_icon_03.setImageResource(mIv_icon_01_h) ;
tv_item_pro_01.setBackgroundResource(R.mipmap.icon_pro_ima_bq);
tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1));
tv_item_pro_02.setBackgroundResource(mTv_item_pro_01_h);
tv_item_pro_02.setTextColor(getResources().getColor(R.color.ffb1b1b1));
tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h);
tv_item_pro_03.setTextColor(getResources().getColor(R.color.ffb1b1b1));
view_line_01.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_02.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1));
break;
case "1"://000三个字段的状态
iv_icon_01.setImageResource(mIv_icon_01_h) ;
iv_icon_02.setImageResource(mIv_icon_01_h) ;
@@ -153,7 +190,7 @@ public class ItemProView extends FrameLayout {
tv_item_pro_01.setBackgroundResource(mTv_item_pro_01_h);
tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1));
// tv_item_pro_02.setBackgroundResource(mTv_item_pro_01);
tv_item_pro_02.setBackgroundResource(R.mipmap.icon_pro_ima_cj);
tv_item_pro_02.setBackgroundResource(R.mipmap.icon_pro_ima_jd);
tv_item_pro_02.setText("");
tv_item_pro_02.setTextColor(getResources().getColor(R.color.colortheme));
tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h);
@@ -204,7 +241,7 @@ public class ItemProView extends FrameLayout {
tv_item_pro_01.setBackgroundResource(mTv_item_pro_01);
tv_item_pro_01.setTextColor(getResources().getColor(R.color.colortheme));
// tv_item_pro_02.setBackgroundResource(mTv_item_pro_01);
tv_item_pro_02.setBackgroundResource(R.mipmap.icon_pro_ima_cj);
tv_item_pro_02.setBackgroundResource(R.mipmap.icon_pro_ima_jd);
tv_item_pro_02.setText("");
tv_item_pro_02.setTextColor(getResources().getColor(R.color.colortheme));
tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h);
@@ -233,6 +270,4 @@ public class ItemProView extends FrameLayout {
break;
}
}
}