From a9ea74aae7c642c33d7eb58028e3e664a56d76ab Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Thu, 27 Aug 2020 16:29:16 +0800 Subject: [PATCH] d --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 7 +- .../fenghoo/seven/base/BaseTreeActivity.java | 10 - .../main/find/adapter/FpOrderInfoAdapter.java | 64 ++++ .../find/adapter/FpOrderInfoAdaptertwo.java | 108 ++++++ .../find/adapter/holder/BeizhuViewHolder.java | 54 +++ .../find/adapter/holder/BottomViewHolder.java | 35 ++ .../adapter/holder/CalendarViewHolder.java | 62 ++++ .../adapter/holder/ContentViewHolder.java | 54 +++ .../find/adapter/holder/HeaderViewHolder.java | 38 ++ .../adapter/holder/MultipleViewHolder.java | 34 ++ .../find/adapter/holder/PicViewHolder.java | 59 +++ .../holder/TypeAbstractViewHolder.java | 23 ++ .../main/find/adapter/holder/textwatcher.java | 16 + .../main/find/entity/CustomerTypeBean.java | 166 +++++++++ .../main/find/entity/Markquestionsone.java | 338 ++++++++++++++++++ .../seven/main/find/entity/markquestions.java | 201 +++++++++++ .../MarKQuestionItemviewOnClickListener.java | 24 ++ .../seven/main/kehu/Bean/fpOrderInfoBean.java | 270 ++++++++++++++ .../fenghoo/seven/main/kehu/DealFragment.java | 13 + .../seven/main/kehu/DistriFragment.java | 15 + .../fenghoo/seven/main/kehu/MoActivity.java | 154 ++++++++ .../kehu/activity/FpOrderInfoActivity.java | 147 ++++++++ .../kehu/activity/FpOrderInfoActivitytwo.java | 99 +++++ .../seven/main/kehu/activity/ShowAty.java | 12 +- .../main/kehu/adapter/DeaListAdapter.java | 34 +- .../main/kehu/adapter/DisListAdapter.java | 23 ++ .../fenghoo/seven/okgonet/HttpConstants.java | 4 + .../com/fenghoo/seven/okgonet/NetApi.java | 49 +++ .../com/fenghoo/seven/widget/ItemProView.java | 112 ++++++ app/src/main/res/drawable/shape_pro_tv.xml | 7 + app/src/main/res/drawable/shape_pro_yuan.xml | 6 + .../main/res/drawable/shape_pro_yuan_hui.xml | 7 + .../res/layout/activity_customer_detail.xml | 4 + .../res/layout/activity_fp_order_info.xml | 9 + app/src/main/res/layout/activity_mo.xml | 72 ++++ .../activity_refactor_marking_detail.xml | 20 ++ app/src/main/res/layout/activity_register.xml | 222 ------------ app/src/main/res/layout/dingdan_rv_four.xml | 43 +++ app/src/main/res/layout/dingdan_rv_one.xml | 91 +++++ app/src/main/res/layout/dingdan_rv_six.xml | 51 +++ app/src/main/res/layout/dingdan_rv_three.xml | 25 ++ .../main/res/layout/dingdan_rv_threetwo.xml | 43 +++ app/src/main/res/layout/dingdan_rv_two.xml | 16 + app/src/main/res/layout/fporderinfo_item.xml | 80 +++++ app/src/main/res/layout/widget_pro_item.xml | 149 ++++++++ .../res/mipmap-hdpi/icon_address_blue.png | Bin 0 -> 1251 bytes .../main/res/mipmap-hdpi/icon_watch_blue.png | Bin 0 -> 1450 bytes .../res/mipmap-mdpi/icon_address_blue.png | Bin 0 -> 921 bytes .../main/res/mipmap-mdpi/icon_watch_blue.png | Bin 0 -> 978 bytes .../res/mipmap-xhdpi/icon_address_blue.png | Bin 0 -> 1152 bytes .../main/res/mipmap-xhdpi/icon_watch_blue.png | Bin 0 -> 1473 bytes .../res/mipmap-xxhdpi/icon_address_blue.png | Bin 0 -> 2480 bytes .../res/mipmap-xxhdpi/icon_watch_blue.png | Bin 0 -> 3153 bytes .../res/mipmap-xxxhdpi/icon_address_blue.png | Bin 0 -> 2403 bytes .../res/mipmap-xxxhdpi/icon_watch_blue.png | Bin 0 -> 3096 bytes app/src/main/res/values/styles.xml | 9 + 57 files changed, 2840 insertions(+), 241 deletions(-) create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/FpOrderInfoAdapter.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/FpOrderInfoAdaptertwo.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BeizhuViewHolder.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BottomViewHolder.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/CalendarViewHolder.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/HeaderViewHolder.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/MultipleViewHolder.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/PicViewHolder.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/TypeAbstractViewHolder.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/textwatcher.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/entity/CustomerTypeBean.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/entity/Markquestionsone.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/entity/markquestions.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/mvp/contract/MarKQuestionItemviewOnClickListener.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/kehu/Bean/fpOrderInfoBean.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/kehu/MoActivity.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java create mode 100644 app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java create mode 100644 app/src/main/java/com/fenghoo/seven/widget/ItemProView.java create mode 100644 app/src/main/res/drawable/shape_pro_tv.xml create mode 100644 app/src/main/res/drawable/shape_pro_yuan.xml create mode 100644 app/src/main/res/drawable/shape_pro_yuan_hui.xml create mode 100644 app/src/main/res/layout/activity_fp_order_info.xml create mode 100644 app/src/main/res/layout/activity_mo.xml create mode 100644 app/src/main/res/layout/activity_refactor_marking_detail.xml delete mode 100644 app/src/main/res/layout/activity_register.xml create mode 100644 app/src/main/res/layout/dingdan_rv_four.xml create mode 100644 app/src/main/res/layout/dingdan_rv_one.xml create mode 100644 app/src/main/res/layout/dingdan_rv_six.xml create mode 100644 app/src/main/res/layout/dingdan_rv_three.xml create mode 100644 app/src/main/res/layout/dingdan_rv_threetwo.xml create mode 100644 app/src/main/res/layout/dingdan_rv_two.xml create mode 100644 app/src/main/res/layout/fporderinfo_item.xml create mode 100644 app/src/main/res/layout/widget_pro_item.xml create mode 100644 app/src/main/res/mipmap-hdpi/icon_address_blue.png create mode 100644 app/src/main/res/mipmap-hdpi/icon_watch_blue.png create mode 100644 app/src/main/res/mipmap-mdpi/icon_address_blue.png create mode 100644 app/src/main/res/mipmap-mdpi/icon_watch_blue.png create mode 100644 app/src/main/res/mipmap-xhdpi/icon_address_blue.png create mode 100644 app/src/main/res/mipmap-xhdpi/icon_watch_blue.png create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_address_blue.png create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_watch_blue.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/icon_address_blue.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/icon_watch_blue.png diff --git a/app/build.gradle b/app/build.gradle index a209ecf..503223d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 28 defaultConfig { - applicationId "com.example.administrator.newjiajiesone" + applicationId "com.fenghoo.seven" minSdkVersion 19 targetSdkVersion 28 versionCode 1 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2314976..eaf25e4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,8 +16,11 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - - + + + + + diff --git a/app/src/main/java/com/fenghoo/seven/base/BaseTreeActivity.java b/app/src/main/java/com/fenghoo/seven/base/BaseTreeActivity.java index 1916ef8..009cfdb 100644 --- a/app/src/main/java/com/fenghoo/seven/base/BaseTreeActivity.java +++ b/app/src/main/java/com/fenghoo/seven/base/BaseTreeActivity.java @@ -210,17 +210,7 @@ public abstract class BaseTreeActivity { + Context mcontext; + OnViewClickListener onViewClickListener; + + public FpOrderInfoAdapter(Context context, List list) { + super(R.layout.fporderinfo_item, list); + this.mcontext = context; + } + + @Override + protected void convert(final BaseViewHolder helper, final CustomerListBean.ResultBean.DataBean item) { + WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_name), "", item.getName()); + + TextView tv_cuslist_caozuo = (TextView)helper.getView(R.id.tv_cuslist_caozuo); + tv_cuslist_caozuo.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + onViewClickListener.reply(item); + } + }); + RelativeLayout yichengjhiao_rv = (RelativeLayout)helper.getView(R.id.yichengjhiao_rv); + yichengjhiao_rv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + onViewClickListener.enterCusDetail(item); + } + }); + + } + + public void operationListenner(OnViewClickListener onViewClickListener){ + this.onViewClickListener = onViewClickListener; + } + + public interface OnViewClickListener{ + + /** + * 回复 + * @param item + */ + void reply(CustomerListBean.ResultBean.DataBean item); + + + void enterCusDetail(CustomerListBean.ResultBean.DataBean item); + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/FpOrderInfoAdaptertwo.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/FpOrderInfoAdaptertwo.java new file mode 100644 index 0000000..3356c5d --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/FpOrderInfoAdaptertwo.java @@ -0,0 +1,108 @@ +package com.fenghoo.seven.main.find.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import com.fenghoo.seven.R; +import com.fenghoo.seven.main.find.adapter.holder.BeizhuViewHolder; +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; +import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener; +import com.fenghoo.seven.main.kehu.Bean.fpOrderInfoBean; + +import java.util.List; + +import androidx.recyclerview.widget.RecyclerView; + +/** + * 创建者：任剑波 + * 创建时间：2018/1/18 15:09 + * 描述：打标页面的数据适配器 + */ + +public class FpOrderInfoAdaptertwo extends RecyclerView.Adapter { + + private List data; + private LayoutInflater mLayoutInflater; + private Context mContext; + Markquestionsone markquestionsone; + MarKQuestionItemviewOnClickListener mviewListener; + + public FpOrderInfoAdaptertwo(Context context, List data, Markquestionsone markquestionsone) { + mContext = context; + mLayoutInflater = LayoutInflater.from(context); + this.data = data; + this.markquestionsone = markquestionsone; + } + + public void upData(List data){ + this.data = data; + } + + @Override + public int getItemViewType(int position) { + if (position == 0) { // 头部 + return 0; + } else { + return Integer.parseInt(data.get(position - 1).getTravel()); + } + } + + @Override + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + switch (viewType) { + case markquestions.ResultBean.DataBean.ITEM_TYPE_HEADER: + return new HeaderViewHolder(mLayoutInflater.inflate(R.layout.dingdan_rv_one, parent, false)); + case markquestions.ResultBean.DataBean.ITEM_TYPE_CONTENT: + return new ContentViewHolder(mLayoutInflater.inflate(R.layout.dingdan_rv_two, parent, false)); + case markquestions.ResultBean.DataBean.ITEM_TYPE_BOTTOM: + return new BottomViewHolder(mLayoutInflater.inflate(R.layout.dingdan_rv_three, parent, false)); + case markquestions.ResultBean.DataBean.ITEM_TYPE_CALENDAR: + 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; + } + + @Override + public void onBindViewHolder(final RecyclerView.ViewHolder holder, final int position) { + if (holder instanceof HeaderViewHolder) { + ((TypeAbstractViewHolder) holder).bindHoldertwo(mContext, position, markquestionsone, mviewListener); + } else { + ((TypeAbstractViewHolder) holder).bindHolder(data.get(position - 1), position, mContext, mviewListener); + } + } + + @Override + public int getItemCount() { + return data.size() + 1; + } + + public void setItemviewOnClickListener(MarKQuestionItemviewOnClickListener listener) { + mviewListener = listener; + } +} + + +/** + * 页面逻辑 + * travel：1:已分配，2：已被抢，3：已进店，4：已成交 4种类型的条目 + * + * order_state：0：未成交，1：已成交 + * ygd_state：0：未被抢，1：已被抢 + * type：1：已回收，2：已成交 + */ diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BeizhuViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BeizhuViewHolder.java new file mode 100644 index 0000000..fa6fa39 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BeizhuViewHolder.java @@ -0,0 +1,54 @@ +package com.fenghoo.seven.main.find.adapter.holder; + +import android.content.Context; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.View; +import android.widget.EditText; +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; + +public class BeizhuViewHolder extends TypeAbstractViewHolder { + private TextView tv_question; + private EditText et_remarkquestion; + + public BeizhuViewHolder(View itemView) { + super(itemView); + tv_question = (TextView) itemView.findViewById(R.id.tv_question); + et_remarkquestion = (EditText) itemView.findViewById(R.id.et_remarkquestion); + } + + 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+" (必填)"); + } else { + tv_question.setText(position + "." + markname); + } + 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()); + } + }; + + et_remarkquestion.addTextChangedListener(textWatcher); + et_remarkquestion.setTag(textWatcher); + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BottomViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BottomViewHolder.java new file mode 100644 index 0000000..64c0f45 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/BottomViewHolder.java @@ -0,0 +1,35 @@ +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.entity.markquestions; +import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener; + +import androidx.recyclerview.widget.RecyclerView; + +public class BottomViewHolder extends TypeAbstractViewHolder { + private TextView optionproblem; + private RecyclerView marking_recycler_relation; + + public BottomViewHolder(View itemView) { + super(itemView); + 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) { + String markname = dataBean.getMarkname(); + // optionproblem.setText(position + "." + markname); + String is_must = dataBean.getIs_must(); + if (is_must.equals("1")) { + optionproblem.setText(position + "." + markname+" (必填)"); + } else { + optionproblem.setText(position + "." + markname); + } + } +} + diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/CalendarViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/CalendarViewHolder.java new file mode 100644 index 0000000..70362a1 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/CalendarViewHolder.java @@ -0,0 +1,62 @@ +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.entity.markquestions; +import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener; + +public class CalendarViewHolder extends TypeAbstractViewHolder{ + private TextView tv_question; + private TextView et_remarkquestion; + + public CalendarViewHolder(View itemView) { + super(itemView); + tv_question = (TextView) itemView.findViewById(R.id.tv_question); + et_remarkquestion = (TextView) itemView.findViewById(R.id.et_remarkquestion); + } + + 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); + + + //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); + } + } + }); + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java new file mode 100644 index 0000000..c5bd288 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java @@ -0,0 +1,54 @@ +package com.fenghoo.seven.main.find.adapter.holder; + +import android.content.Context; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.View; +import android.widget.EditText; +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; + +public class ContentViewHolder extends TypeAbstractViewHolder { + private TextView tv_question; + private EditText et_remarkquestion; + + public ContentViewHolder(View itemView) { + super(itemView); + tv_question = (TextView) itemView.findViewById(R.id.tv_question); + et_remarkquestion = (EditText) itemView.findViewById(R.id.et_remarkquestion); + } + + 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(); + 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); + + 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); + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/HeaderViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/HeaderViewHolder.java new file mode 100644 index 0000000..abe7334 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/HeaderViewHolder.java @@ -0,0 +1,38 @@ +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.entity.Markquestionsone; +import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener; +import com.fenghoo.seven.utils.GlideTools; +import com.fenghoo.seven.widget.CircleImageView; + +//头部 ViewHolder +public class HeaderViewHolder extends TypeAbstractViewHolder { + + private CircleImageView iv_fporder_head; + private TextView marking_fragment_title; + + 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); + } + + public void bindHoldertwo(Context mContext, final int position, final Markquestionsone markquestionsone, final MarKQuestionItemviewOnClickListener mviewListener) { + + String image = markquestionsone.getImage(); + GlideTools.init(mContext).displaypic(iv_fporder_head, image, R.mipmap.icon_default_head); + marking_fragment_title.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (mviewListener != null) { + mviewListener.industry(marking_fragment_title, position, markquestionsone); + } + } + }); + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/MultipleViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/MultipleViewHolder.java new file mode 100644 index 0000000..c2163fc --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/MultipleViewHolder.java @@ -0,0 +1,34 @@ +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.entity.markquestions; +import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener; + +import androidx.recyclerview.widget.RecyclerView; + +public class MultipleViewHolder extends TypeAbstractViewHolder { + private TextView optionproblem; + private RecyclerView marking_recycler_relation; + + public MultipleViewHolder(View itemView) { + super(itemView); + 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) { + String markname = dataBean.getMarkname(); + // optionproblem.setText(position + "." + markname); + String is_must = dataBean.getIs_must(); + if (is_must.equals("1")) { + optionproblem.setText(position + "." + markname+" (必填)"); + } else { + optionproblem.setText(position + "." + markname); + } + } +} + diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/PicViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/PicViewHolder.java new file mode 100644 index 0000000..fbad51b --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/PicViewHolder.java @@ -0,0 +1,59 @@ +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; + +public class PicViewHolder extends TypeAbstractViewHolder { + private TextView tv_question; + private ImageView imageView_pic01; + private ImageView imageView_pic02; + + public PicViewHolder(View itemView) { + super(itemView); + tv_question = (TextView) itemView.findViewById(R.id.tv_question); + imageView_pic01 = (ImageView) itemView.findViewById(R.id.imageView_pic01); + imageView_pic02 = (ImageView) itemView.findViewById(R.id.imageView_pic02); + } + + public void bindHolder(final markquestions.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) { + + final String markname = dataBean.getMarkname(); + final String answer = dataBean.getAnswer(); + if(answer.equals("")){ + imageView_pic02.setVisibility(View.GONE); + }else { + imageView_pic02.setVisibility(View.VISIBLE); + } + String is_must = dataBean.getIs_must(); + if (is_must.equals("1")) { + tv_question.setText(position + "." + markname+" (必填)"); + } else { + tv_question.setText(position + "." + markname); + } + + + + imageView_pic01.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + + if (mviewListener != null) { + } + } + }); + imageView_pic02.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dataBean.setAnswer(""); + if (mviewListener != null) { + } + } + }); + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/TypeAbstractViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/TypeAbstractViewHolder.java new file mode 100644 index 0000000..2e0374d --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/TypeAbstractViewHolder.java @@ -0,0 +1,23 @@ +package com.fenghoo.seven.main.find.adapter.holder; + +import android.content.Context; +import android.view.View; + +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 androidx.recyclerview.widget.RecyclerView; + +public abstract class TypeAbstractViewHolder extends RecyclerView.ViewHolder { + + public TypeAbstractViewHolder(View itemView) { + super(itemView); + } + + public void bindHolder(final fpOrderInfoBean.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener){} + + public void bindHoldertwo(Context mContext, final int position, final Markquestionsone markquestionsone, final MarKQuestionItemviewOnClickListener mviewListener) { } + +} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/textwatcher.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/textwatcher.java new file mode 100644 index 0000000..b83496a --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/textwatcher.java @@ -0,0 +1,16 @@ +package com.fenghoo.seven.main.find.adapter.holder; + +import android.text.Editable; +import android.text.TextWatcher; + +public abstract class textwatcher implements TextWatcher { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + } + @Override + public void afterTextChanged(Editable s) { + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/CustomerTypeBean.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/CustomerTypeBean.java new file mode 100644 index 0000000..5696d22 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/CustomerTypeBean.java @@ -0,0 +1,166 @@ +package com.fenghoo.seven.main.find.entity; + +import com.fenghoo.seven.test.BaseModel; + +import java.util.List; + +/** + * Time: 2020/7/23 + * Author: jianbo + * Description: + */ +public class CustomerTypeBean extends BaseModel { + + /** + * result : {"msg":"获取成功","data":[{"type_id":"2","name":"工作人员","label":[{"type_id":"2","type_detail_name":"社会闲杂人员","type_detail":"2"}]}],"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 : [{"type_id":"2","name":"工作人员","label":[{"type_id":"2","type_detail_name":"社会闲杂人员","type_detail":"2"}]}] + * success : 0 + */ + + private String msg; + private int success; + private List 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 getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * type_id : 2 + * name : 工作人员 + * label : [{"type_id":"2","type_detail_name":"社会闲杂人员","type_detail":"2"}] + */ + + private String type_id; + private String name; + + public String getIf_sel() { + return if_sel; + } + + public void setIf_sel(String if_sel) { + this.if_sel = if_sel; + } + + private String if_sel="0";//0为未选中 1为选中 + private List label; + + public String getType_id() { + return type_id; + } + + public void setType_id(String type_id) { + this.type_id = type_id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public List getLabel() { + return label; + } + + public void setLabel(List label) { + this.label = label; + } + + public static class LabelBean { + /** + * type_id : 2 + * type_detail_name : 社会闲杂人员 + * type_detail : 2 + */ + + private String type_id;//大类型id + private String type_detail_name;//小类型名称 + private String type_detail;//小类型id + + + public String getIf_sel_del() { + return if_sel_del; + } + + public void setIf_sel_del(String if_sel_del) { + this.if_sel_del = if_sel_del; + } + + private String if_sel_del="0";//是否选中 //0未选中 1为选中 + + public String getType_id() { + return type_id; + } + + public void setType_id(String type_id) { + this.type_id = type_id; + } + + public String getType_detail_name() { + return type_detail_name; + } + + public void setType_detail_name(String type_detail_name) { + this.type_detail_name = type_detail_name; + } + + public String getType_detail() { + return type_detail; + } + + public void setType_detail(String type_detail) { + this.type_detail = type_detail; + } + } + } + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/Markquestionsone.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/Markquestionsone.java new file mode 100644 index 0000000..59e350c --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/Markquestionsone.java @@ -0,0 +1,338 @@ +package com.fenghoo.seven.main.find.entity; + +import com.fenghoo.seven.test.BaseModel; + +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= ""; + + public String getIsUpAvatar() { + return isUpAvatar; + } + + 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 getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + private List 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 String getWechat() { + return wechat; + } + + + public void setWechat(String wechat) { + this.wechat = wechat; + } + + public String getTracktype() { + return tracktype; + } + + public void setTracktype(String tracktype) { + this.tracktype = tracktype; + } + + public String getPlantime() { + return plantime; + } + + public void setPlantime(String plantime) { + this.plantime = plantime; + } + + public String getLoss() { + return loss; + } + + 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 + '\'' + + '}'; + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/markquestions.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/markquestions.java new file mode 100644 index 0000000..4628574 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/markquestions.java @@ -0,0 +1,201 @@ +package com.fenghoo.seven.main.find.entity; + +import com.fenghoo.seven.test.BaseModel; + +import java.util.List; + +public class markquestions extends BaseModel { + + /** + * status : 0 + * result : {"success":0,"data":[{"ord":"140","markid":"201804101044351085146","markname":"意向产品","addstyle":"1","markidsec":["201804101044353971175"],"marknamesec":[""],"answer":""},{"ord":"141","markid":"201804101044476756907","markname":"报价折扣","addstyle":"1","markidsec":["201804101044476796068"],"marknamesec":[""],"answer":""},{"ord":"142","markid":"201804101044563044066","markname":"小区楼盘","addstyle":"1","markidsec":["201804101044562556198"],"marknamesec":[""],"answer":""},{"ord":"143","markid":"201804101045049978637","markname":"户型面积","addstyle":"1","markidsec":["201804101045049860827"],"marknamesec":[""],"answer":""},{"ord":"144","markid":"201804101047324070614","markname":"装修风格","addstyle":"2","markidsec":["201804101047324287488","201804101047327086639","201804101047322225398","201804101047328663042","201804101047324833991","201804101047326145086","201804101047323381375"],"marknamesec":["现代简约","欧式","田园","美式","日式","新中式","地中海"],"answer":""},{"ord":"145","markid":"201804101048069640754","markname":"装修公司","addstyle":"1","markidsec":["201804101048065234614"],"marknamesec":[""],"answer":""},{"ord":"146","markid":"201804101048359541923","markname":"客户年龄","addstyle":"2","markidsec":["201804101048359743166","201804101048354218340","201804101048358590920","201804101048359983377"],"marknamesec":["40-50岁","30-40岁","30岁以下","50岁以上"],"answer":""},{"ord":"147","markid":"201804101049054850564","markname":"客户职业","addstyle":"2","markidsec":["201804101049053378142","201804101049053234521","201804101049051954113","201804101049056066514"],"marknamesec":["文艺类","技术类","销售类","管理类"],"answer":""},{"ord":"149","markid":"201804101116503188288","markname":"客户兴趣","addstyle":"2","markidsec":["201804101116506226348","201804101116508592245","201804101116501708135","201804101116509536479"],"marknamesec":["其他","歌曲演奏","手工制作","旅游/美食"],"answer":""},{"ord":"150","markid":"201804101117208509656","markname":"子女年龄","addstyle":"2","markidsec":["201804101117204651899","201804101117203835930","201804101117208416137","201804101117202848546"],"marknamesec":["3岁以下","其他","10岁以上","3-10岁"],"answer":""},{"ord":"151","markid":"201804101117377637513","markname":"子女性别","addstyle":"2","markidsec":["201804101117374358402","201804101117378954437"],"marknamesec":["女","男"],"answer":""},{"ord":"152","markid":"201804101118077300310","markname":"家庭成员","addstyle":"1","markidsec":["201804101118071369164"],"marknamesec":[""],"answer":""},{"ord":"153","markid":"201804101118391388141","markname":"受教育程度","addstyle":"2","markidsec":["201804101118396533695","201804101118395000276","201804101118399041655","201804101118398002783"],"marknamesec":["其他","博士","研究生","大学"],"answer":""},{"ord":"154","markid":"201804101119331708409","markname":"消费力分析","addstyle":"2","markidsec":["201804101119331782186","201811091043329022785","201804101119338095697","201804101119331400006","201804101119334477212","201804101119332442977","201811091043327790198"],"marknamesec":["1k-2K","10-20万","1万以上","6K-8K","4K-6K","2K-4K","20万以上"],"answer":""},{"ord":"155","markid":"201804101119478575895","markname":"备注","addstyle":"1","markidsec":["201804101119471945367"],"marknamesec":[""],"answer":""}],"msg":"获取信息成功"} + */ + + private int status; + private ResultBean result; + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public ResultBean getResult() { + return result; + } + + public void setResult(ResultBean result) { + this.result = result; + } + + @Override + public String toString() { + return "markquestions{" + + "status=" + status + + ", result=" + result + + '}'; + } + + public static class ResultBean { + /** + * success : 0 + * data : [{"ord":"140","markid":"201804101044351085146","markname":"意向产品","addstyle":"1","markidsec":["201804101044353971175"],"marknamesec":[""],"answer":""},{"ord":"141","markid":"201804101044476756907","markname":"报价折扣","addstyle":"1","markidsec":["201804101044476796068"],"marknamesec":[""],"answer":""},{"ord":"142","markid":"201804101044563044066","markname":"小区楼盘","addstyle":"1","markidsec":["201804101044562556198"],"marknamesec":[""],"answer":""},{"ord":"143","markid":"201804101045049978637","markname":"户型面积","addstyle":"1","markidsec":["201804101045049860827"],"marknamesec":[""],"answer":""},{"ord":"144","markid":"201804101047324070614","markname":"装修风格","addstyle":"2","markidsec":["201804101047324287488","201804101047327086639","201804101047322225398","201804101047328663042","201804101047324833991","201804101047326145086","201804101047323381375"],"marknamesec":["现代简约","欧式","田园","美式","日式","新中式","地中海"],"answer":""},{"ord":"145","markid":"201804101048069640754","markname":"装修公司","addstyle":"1","markidsec":["201804101048065234614"],"marknamesec":[""],"answer":""},{"ord":"146","markid":"201804101048359541923","markname":"客户年龄","addstyle":"2","markidsec":["201804101048359743166","201804101048354218340","201804101048358590920","201804101048359983377"],"marknamesec":["40-50岁","30-40岁","30岁以下","50岁以上"],"answer":""},{"ord":"147","markid":"201804101049054850564","markname":"客户职业","addstyle":"2","markidsec":["201804101049053378142","201804101049053234521","201804101049051954113","201804101049056066514"],"marknamesec":["文艺类","技术类","销售类","管理类"],"answer":""},{"ord":"149","markid":"201804101116503188288","markname":"客户兴趣","addstyle":"2","markidsec":["201804101116506226348","201804101116508592245","201804101116501708135","201804101116509536479"],"marknamesec":["其他","歌曲演奏","手工制作","旅游/美食"],"answer":""},{"ord":"150","markid":"201804101117208509656","markname":"子女年龄","addstyle":"2","markidsec":["201804101117204651899","201804101117203835930","201804101117208416137","201804101117202848546"],"marknamesec":["3岁以下","其他","10岁以上","3-10岁"],"answer":""},{"ord":"151","markid":"201804101117377637513","markname":"子女性别","addstyle":"2","markidsec":["201804101117374358402","201804101117378954437"],"marknamesec":["女","男"],"answer":""},{"ord":"152","markid":"201804101118077300310","markname":"家庭成员","addstyle":"1","markidsec":["201804101118071369164"],"marknamesec":[""],"answer":""},{"ord":"153","markid":"201804101118391388141","markname":"受教育程度","addstyle":"2","markidsec":["201804101118396533695","201804101118395000276","201804101118399041655","201804101118398002783"],"marknamesec":["其他","博士","研究生","大学"],"answer":""},{"ord":"154","markid":"201804101119331708409","markname":"消费力分析","addstyle":"2","markidsec":["201804101119331782186","201811091043329022785","201804101119338095697","201804101119331400006","201804101119334477212","201804101119332442977","201811091043327790198"],"marknamesec":["1k-2K","10-20万","1万以上","6K-8K","4K-6K","2K-4K","20万以上"],"answer":""},{"ord":"155","markid":"201804101119478575895","markname":"备注","addstyle":"1","markidsec":["201804101119471945367"],"marknamesec":[""],"answer":""}] + * msg : 获取信息成功 + */ + + private int success; + private String msg; + private List data; + + public int getSuccess() { + return success; + } + + public void setSuccess(int success) { + this.success = success; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + 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_MULTIPLE = 5;//多选 + public static final int ITEM_TYPE_PIC = 6;//6：代表上传图片（只能上传一张） + /** + * ord : 140 + * markid : 201804101044351085146 + * markname : 意向产品 + * addstyle : 1 + * markidsec : ["201804101044353971175"] + * marknamesec : [""] + * answer : + */ + + private String ord; + private String markid; + private String markname; + private String addstyle; + private String answer; + + public String getIs_must() { + return is_must; + } + + public void setIs_must(String is_must) { + this.is_must = is_must; + } + + private String is_must; + + public String getIs_baobei() { + return is_baobei; + } + + public void setIs_baobei(String is_baobei) { + this.is_baobei = is_baobei; + } + + private String is_baobei; + + public String getAnswer_sec() { + return answer_sec; + } + + public void setAnswer_sec(String answer_sec) { + this.answer_sec = answer_sec; + } + + private String answer_sec; + private List markidsec; + private List marknamesec; + + public List getCheckmark() { + return checkmark; + } + + public void setCheckmark(List checkmark) { + this.checkmark = checkmark; + } + + private List checkmark; + + public String getOrd() { + return ord; + } + + public void setOrd(String ord) { + this.ord = ord; + } + + public String getMarkid() { + return markid; + } + + public void setMarkid(String markid) { + this.markid = markid; + } + + public String getMarkname() { + return markname; + } + + public void setMarkname(String markname) { + this.markname = markname; + } + + public String getAddstyle() { + return addstyle; + } + + public void setAddstyle(String addstyle) { + this.addstyle = addstyle; + } + + public String getAnswer() { + return answer; + } + + public void setAnswer(String answer) { + this.answer = answer; + } + + public List getMarkidsec() { + return markidsec; + } + + public void setMarkidsec(List markidsec) { + this.markidsec = markidsec; + } + + public List getMarknamesec() { + return marknamesec; + } + + public void setMarknamesec(List marknamesec) { + this.marknamesec = marknamesec; + } + + + } + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/mvp/contract/MarKQuestionItemviewOnClickListener.java b/app/src/main/java/com/fenghoo/seven/main/find/mvp/contract/MarKQuestionItemviewOnClickListener.java new file mode 100644 index 0000000..38e742f --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/mvp/contract/MarKQuestionItemviewOnClickListener.java @@ -0,0 +1,24 @@ +package com.fenghoo.seven.main.find.mvp.contract; + +import android.widget.TextView; + +import com.fenghoo.seven.main.find.entity.Markquestionsone; +import com.fenghoo.seven.main.find.entity.markquestions; + +public interface MarKQuestionItemviewOnClickListener { + + /** + * 日历控件 + */ + void CalendarControlClick(TextView et_remarkquestion, int postion, markquestions.ResultBean.DataBean dataBean); + + + /** + * 选择行业 + */ + void industry(TextView marking_fragment_title, int postion, Markquestionsone markquestionson); + + + +} + diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/fpOrderInfoBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/fpOrderInfoBean.java new file mode 100644 index 0000000..5b795a7 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/fpOrderInfoBean.java @@ -0,0 +1,270 @@ +package com.fenghoo.seven.main.kehu.Bean; + +import com.fenghoo.seven.test.BaseModel; + +import java.util.List; + +/** + * Time: 2020/8/20 + * Author: jianbo + * Description: + */ +public class fpOrderInfoBean extends BaseModel { + + + /** + * result : {"msg":"成功","data":[{"ygd_brand_type":"","rob_time":"","enter_state":"0","city":"太原市","fp_time":"2020-08-25 15:13:40","industry":"家具","ygd_order":"","type":"","ygd_store_name":"","ygd_state":"0","ygd_enter":"","province":"山西省","id":"9f4b9abff5bb3120ddbcd1253c3c9d6d","ygd_brand_name":"","travel":"1","ygd_rob_name":"","order_state":"0","decoration":"精装","budget":"15万-20万"}],"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 : [{"ygd_brand_type":"","rob_time":"","enter_state":"0","city":"太原市","fp_time":"2020-08-25 15:13:40","industry":"家具","ygd_order":"","type":"","ygd_store_name":"","ygd_state":"0","ygd_enter":"","province":"山西省","id":"9f4b9abff5bb3120ddbcd1253c3c9d6d","ygd_brand_name":"","travel":"1","ygd_rob_name":"","order_state":"0","decoration":"精装","budget":"15万-20万"}] + * success : 0 + */ + + private String msg; + private int success; + private List 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 getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * ygd_brand_type : + * rob_time : + * enter_state : 0 + * city : 太原市 + * fp_time : 2020-08-25 15:13:40 + * industry : 家具 + * ygd_order : + * type : + * ygd_store_name : + * ygd_state : 0 + * ygd_enter : + * province : 山西省 + * id : 9f4b9abff5bb3120ddbcd1253c3c9d6d + * ygd_brand_name : + * travel : 1 + * ygd_rob_name : + * order_state : 0 + * decoration : 精装 + * budget : 15万-20万 + */ + + private String ygd_brand_type; + private String rob_time; + private String enter_state; + private String city; + private String fp_time; + private String industry; + private String ygd_order; + private String type; + private String ygd_store_name; + private String ygd_state; + private String ygd_enter; + private String province; + private String id; + private String ygd_brand_name; + private String travel; + private String ygd_rob_name; + private String order_state; + private String decoration; + private String budget; + + public String getYgd_brand_type() { + return ygd_brand_type; + } + + public void setYgd_brand_type(String ygd_brand_type) { + this.ygd_brand_type = ygd_brand_type; + } + + public String getRob_time() { + return rob_time; + } + + public void setRob_time(String rob_time) { + this.rob_time = rob_time; + } + + public String getEnter_state() { + return enter_state; + } + + public void setEnter_state(String enter_state) { + this.enter_state = enter_state; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getFp_time() { + return fp_time; + } + + public void setFp_time(String fp_time) { + this.fp_time = fp_time; + } + + public String getIndustry() { + return industry; + } + + public void setIndustry(String industry) { + this.industry = industry; + } + + public String getYgd_order() { + return ygd_order; + } + + public void setYgd_order(String ygd_order) { + this.ygd_order = ygd_order; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getYgd_store_name() { + return ygd_store_name; + } + + public void setYgd_store_name(String ygd_store_name) { + this.ygd_store_name = ygd_store_name; + } + + public String getYgd_state() { + return ygd_state; + } + + public void setYgd_state(String ygd_state) { + this.ygd_state = ygd_state; + } + + public String getYgd_enter() { + return ygd_enter; + } + + public void setYgd_enter(String ygd_enter) { + this.ygd_enter = ygd_enter; + } + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getYgd_brand_name() { + return ygd_brand_name; + } + + public void setYgd_brand_name(String ygd_brand_name) { + this.ygd_brand_name = ygd_brand_name; + } + + public String getTravel() { + return travel; + } + + public void setTravel(String travel) { + this.travel = travel; + } + + public String getYgd_rob_name() { + return ygd_rob_name; + } + + public void setYgd_rob_name(String ygd_rob_name) { + this.ygd_rob_name = ygd_rob_name; + } + + public String getOrder_state() { + return order_state; + } + + public void setOrder_state(String order_state) { + this.order_state = order_state; + } + + public String getDecoration() { + return decoration; + } + + public void setDecoration(String decoration) { + this.decoration = decoration; + } + + public String getBudget() { + return budget; + } + + public void setBudget(String budget) { + this.budget = budget; + } + } + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/DealFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/DealFragment.java index 80bd518..6be2ffb 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/DealFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/DealFragment.java @@ -2,6 +2,7 @@ package com.fenghoo.seven.main.kehu; import com.fenghoo.seven.JsonUtils; import com.fenghoo.seven.main.kehu.Bean.orderListBean; +import com.fenghoo.seven.main.kehu.activity.ShowAty; import com.fenghoo.seven.main.kehu.adapter.DeaListAdapter; import com.fenghoo.seven.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; @@ -33,6 +34,18 @@ public class DealFragment extends MobanFragment { DeaListAdapter markingtwoAdapter = new DeaListAdapter(mContext, null); getAdpter(markingtwoAdapter); mMarkingFragmentRecyclerView.setAdapter(markingtwoAdapter); + markingtwoAdapter.operationListenner(new DeaListAdapter.OnViewClickListener() { + @Override + public void operation(final orderListBean.ResultBean.DataBean item) { + + } + + @Override + public void enterCusDetail(orderListBean.ResultBean.DataBean item) { + //进入分配/成交列表详情 + ShowAty.FpOrderInfoActivity(getActivity(),item.getCustomer_id(),item.getName()+item.getPhone()); + } + }); } @Override diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/DistriFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/DistriFragment.java index 872bf7d..f1dbd98 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/DistriFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/DistriFragment.java @@ -2,6 +2,9 @@ package com.fenghoo.seven.main.kehu; import com.fenghoo.seven.JsonUtils; import com.fenghoo.seven.main.kehu.Bean.FpListBean; +import com.fenghoo.seven.main.kehu.Bean.orderListBean; +import com.fenghoo.seven.main.kehu.activity.ShowAty; +import com.fenghoo.seven.main.kehu.adapter.DeaListAdapter; import com.fenghoo.seven.main.kehu.adapter.DisListAdapter; import com.fenghoo.seven.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; @@ -32,6 +35,18 @@ public class DistriFragment extends MobanFragment { DisListAdapter markingtwoAdapter = new DisListAdapter(mContext, null); getAdpter(markingtwoAdapter); mMarkingFragmentRecyclerView.setAdapter(markingtwoAdapter); + markingtwoAdapter.operationListenner(new DisListAdapter.OnViewClickListener() { + @Override + public void operation(final FpListBean.ResultBean.DataBean item) { + + } + + @Override + public void enterCusDetail(FpListBean.ResultBean.DataBean item) { + //进入分配/成交列表详情 + ShowAty.FpOrderInfoActivity(getActivity(),item.getCustomer_id(),item.getName()+item.getPhone()); + } + }); } @Override diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/MoActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/MoActivity.java new file mode 100644 index 0000000..18b6d64 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/MoActivity.java @@ -0,0 +1,154 @@ +package com.fenghoo.seven.main.kehu; + +import android.annotation.SuppressLint; +import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.util.Log; +import android.view.View; +import android.view.ViewGroup; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.main.entity.Savaselect; + +import java.util.List; + +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + +public abstract class MoActivity extends BaseActivity { + + public static final String ARG_PAGE = "ARG_PAGE"; + private boolean IS_LOADED = false; + private static int mSerial = 0; + private boolean isFirst = true; + @SuppressLint("HandlerLeak") + private Handler handler = new Handler() { + public void handleMessage(Message msg) { + Log.e("tag", "IS_LOADED=" + IS_LOADED); + if (!IS_LOADED) { + IS_LOADED = true; + //请求我的客户已流失数据 + requesdata(); + } + return; + } + + }; + public Savaselect savaselectbean; + private RelativeLayout rl_top; + private RelativeLayout layTop_left_tv; + public BaseQuickAdapter markingtwoAdapter; + public void sendMessage() { + Message message = handler.obtainMessage(); + message.sendToTarget(); + } + + private String uid; + public RecyclerView mMarkingFragmentRecyclerView; + public SwipeRefreshLayout mSwl; + public int mNextRequestPage = 1; + private static final int PAGE_SIZE = 10; + View view; + public View notDataView; + public View errorView; + public TextView mLayTopTitle; + + + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_mo); + initView(view); + //设置页和当前页一致时加载，防止预加载 + if (isFirst) { + isFirst = false; + sendMessage(); + } + } + + private void initView(View mContentView) { + mMarkingFragmentRecyclerView = (RecyclerView) findViewById(R.id.marking_fragment_recyclerView); + mSwl = mContentView.findViewById(R.id.srl); + notDataView = this.getLayoutInflater().inflate(R.layout.empty_view, (ViewGroup) mMarkingFragmentRecyclerView.getParent(), false); + notDataView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // refresh(); + } + }); + errorView = this.getLayoutInflater().inflate(R.layout.error_view, (ViewGroup) mMarkingFragmentRecyclerView.getParent(), false); + errorView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // onRefresh(); + } + }); + + } + + public void requesdata() { + initAdapter(); + initRefreshLayout(); + mSwl.setRefreshing(true); + refresh(); + } + + public abstract void initAdapter(); + + + private void initRefreshLayout() { + mSwl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { + @Override + public void onRefresh() { + refresh(); + } + }); + } + + private void refresh() { + mNextRequestPage = 1; + markingtwoAdapter.setEnableLoadMore(false);//这里的作用是防止下拉刷新的时候还可以上拉加载 + requestData(); + } + + public void loadMore() { + requestData(); + } + + public void setData(boolean isRefresh, List data) { + mNextRequestPage++; + final int size = data == null ? 0 : data.size(); + if (isRefresh) { + markingtwoAdapter.setNewData(data); + } else { + if (size > 0) { + markingtwoAdapter.addData(data); + } + } + if (size < PAGE_SIZE) { + //第一页如果不够一页就不显示没有更多数据布局 + markingtwoAdapter.loadMoreEnd(isRefresh); + } else { + markingtwoAdapter.loadMoreComplete(); + } + } + + + public abstract void requestData(); + + public void getAdpter(BaseQuickAdapter markingtwoAdapter){ + this.markingtwoAdapter=markingtwoAdapter; + } + @Override + public void onDestroy() { + super.onDestroy(); + + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java new file mode 100644 index 0000000..e257faa --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java @@ -0,0 +1,147 @@ +package com.fenghoo.seven.main.kehu.activity; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +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.find.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.okgonet.NetApi; +import com.fenghoo.seven.okgonet.Observer; +import com.fenghoo.seven.widget.CircleImageView; +import com.fenghoo.seven.widget.TitleBar; +import com.lzy.okgo.model.Response; + +import java.util.List; + +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + + +public class FpOrderInfoActivity extends BaseActivity implements View.OnClickListener { + private TitleBar mTitleBar; + private String entrytype = ""; + private View contentView; + private RecyclerView mLabelRvList; + private FpOrderInfoAdaptertwo adapter; + private Markquestionsone markquestionsone; + private String customer_id; + private String name; + private List industryData; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + contentView = LayoutInflater.from(this).inflate(R.layout.activity_refactor_marking_detail, null); + customer_id = getIntent().getStringExtra("customer_id"); + name = getIntent().getStringExtra("name"); + setContentView(contentView); + initView(); + //第一部分的数据 + markquestionsone = new Markquestionsone(); + //获得行业数据 + // getPresenter().getindustry(); + new NetApi().industry().subscribe(new Observer() { + @Override + public void onNext(Response response) { + String body = (String) response.body(); + industryBean.ResultBean result = JsonUtils.fromJson(body, industryBean.class).getResult(); + if (result != null && String.valueOf(result.getSuccess()).equals("0")) { + industryData = result.getData(); + industryBean.ResultBean.DataBean dataBean = industryData.get(0); + String industry_id = dataBean.getIndustry_id(); + fpOrderInfo(industry_id); + } + } + + @Override + public void onError(Exception e) { + e.printStackTrace(); + + } + }); + + } + private void initView() { + mTitleBar = (TitleBar) findViewById(R.id.title_bar); + mTitleBar.setTitle(name); + initNormalBack(); + mLabelRvList = (RecyclerView) findViewById(R.id.label_rv_list); + } + /** + * @description 获得分配/成交列表详情数据 + * @param + * @return + */ + private void fpOrderInfo(String industry_id) { + new NetApi().fpOrderInfo(customer_id,industry_id).subscribe(new Observer() { + @Override + public void onNext(Response response) { + String body = (String) response.body(); + fpOrderInfoBean.ResultBean result = JsonUtils.fromJson(body, fpOrderInfoBean.class).getResult(); + if (result != null && String.valueOf(result.getSuccess()).equals("0")) { + List data = result.getData(); + initRecyclerView(data); + } + } + + @Override + public void onError(Exception e) { + e.printStackTrace(); + + } + }); + } + + + + private void initRecyclerView(final List data) { + + adapter = new FpOrderInfoAdaptertwo(this, data, markquestionsone); + LinearLayoutManager manager = new LinearLayoutManager(this); + mLabelRvList.setLayoutManager(manager); + mLabelRvList.setAdapter(adapter); + adapter.setItemviewOnClickListener(new MarKQuestionItemviewOnClickListener() { + + /** + * 日历控件点击监听 + */ + @Override + public void CalendarControlClick(TextView et_remarkquestion, int postion,markquestions.ResultBean.DataBean dataBean) { + + } + /** + * 选择行业 + */ + @Override + public void industry(TextView marking_fragment_title, int postion, Markquestionsone markquestionson) { + + } + }); + } + + + @Override + public void onClick(View v) { + switch (v.getId()) { +// case R.id.landingPage_retrieve_back: +// Intent i = new Intent(); +// i.putExtra("bian", "sd"); +// setResult(4, i); +// //返回时刷新选择日期 +// setResult(10, i); +// finish(); +// break; + + } + } +} + 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 new file mode 100644 index 0000000..8176a0b --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java @@ -0,0 +1,99 @@ +package com.fenghoo.seven.main.kehu.activity; + +import android.os.Bundle; + +import com.fenghoo.seven.JsonUtils; +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; +import com.lzy.okgo.model.Response; + +import java.util.List; + +import androidx.recyclerview.widget.LinearLayoutManager; + + +public class FpOrderInfoActivitytwo extends MoActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_fp_order_info); + } + + @Override + public void initAdapter() { + mMarkingFragmentRecyclerView.setLayoutManager(new LinearLayoutManager(FpOrderInfoActivitytwo.this)); + FpOrderInfoAdapter markingtwoAdapter = new FpOrderInfoAdapter(FpOrderInfoActivitytwo.this, null); + getAdpter(markingtwoAdapter); + mMarkingFragmentRecyclerView.setAdapter(markingtwoAdapter); + markingtwoAdapter.operationListenner(new FpOrderInfoAdapter.OnViewClickListener() { + @Override + public void reply(CustomerListBean.ResultBean.DataBean item) { + new RreplyDialog(FpOrderInfoActivitytwo.this, R.style.dialog, new RreplyDialog.OnCloseListener() { + //回复 + @Override + public void uploadAvatar() { + + } + + }).show(); + } + + @Override + public void enterCusDetail(CustomerListBean.ResultBean.DataBean item) { + //进入查看评论 + ShowAty.CustomerDetailActivity(FpOrderInfoActivitytwo.this,item); + } + }); + } + + @Override + public void requestData() { + new NetApi().customerList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(),"").subscribe(new Observer() { + @Override + public void onNext(Response response) { + String body = (String) response.body(); + CustomerListBean.ResultBean result = JsonUtils.fromJson(body, CustomerListBean.class).getResult(); + mSwl.setRefreshing(false); + if (result != null && String.valueOf(result.getSuccess()).equals("0")) { + + List data = result.getData(); + 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); + } + }); + } + @Override + public void onDestroy() { + super.onDestroy(); + } +} + + +/** + * 列表有5种类型 1.分配 2.回收 3.成交 4.被抢 5进店 + */ diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java index 8c0eb4a..db5320f 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java @@ -103,7 +103,17 @@ public class ShowAty { i.putExtra("code",code); ctx.startActivity(i); } - + /** + * @description 分配/成交列表详情 + * @param + * @return + */ + public static void FpOrderInfoActivity(Context ctx,String customer_id,String name) { + Intent i = new Intent(ctx, FpOrderInfoActivity.class); + i.putExtra("customer_id",customer_id); + i.putExtra("name",name); + ctx.startActivity(i); + } } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DeaListAdapter.java b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DeaListAdapter.java index 84ce2a8..0422d8e 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DeaListAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DeaListAdapter.java @@ -1,28 +1,52 @@ package com.fenghoo.seven.main.kehu.adapter; import android.content.Context; +import android.view.View; +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.entity.XikeInfoBean; +import com.fenghoo.seven.main.kehu.Bean.CustomerListBean; +import com.fenghoo.seven.main.kehu.Bean.orderListBean; import com.fenghoo.seven.utils.WidgetTools; import java.util.List; -public class DeaListAdapter extends BaseQuickAdapter { +public class DeaListAdapter extends BaseQuickAdapter { Context mcontext; + OnViewClickListener onViewClickListener; public DeaListAdapter(Context context, List list) { super(R.layout.dealist_item, list); this.mcontext = context; } @Override - protected void convert(final BaseViewHolder helper, final XikeInfoBean.ResultBean.DataBean item) { - WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_name), "", item.getXike_remark()); - WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_phone), "", item.getTime()); - WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_watch), "", item.getXike_num()); + protected void convert(final BaseViewHolder helper, final orderListBean.ResultBean.DataBean item) { +// WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_name), "", item.getXike_remark()); +// WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_phone), "", item.getTime()); +// WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_watch), "", item.getXike_num()); + RelativeLayout yichengjhiao_rv = (RelativeLayout)helper.getView(R.id.yichengjhiao_rv); + yichengjhiao_rv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + onViewClickListener.enterCusDetail(item); + } + }); + } + + public void operationListenner(OnViewClickListener onViewClickListener){ + this.onViewClickListener = onViewClickListener; + } + + public interface OnViewClickListener{ + + void operation(orderListBean.ResultBean.DataBean item); + + + void enterCusDetail(orderListBean.ResultBean.DataBean item); } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DisListAdapter.java b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DisListAdapter.java index 93e8555..a8ae21e 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DisListAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DisListAdapter.java @@ -1,13 +1,16 @@ package com.fenghoo.seven.main.kehu.adapter; import android.content.Context; +import android.view.View; 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.R; import com.fenghoo.seven.main.kehu.Bean.FpListBean; +import com.fenghoo.seven.main.kehu.Bean.orderListBean; import com.fenghoo.seven.utils.GlideTools; import com.fenghoo.seven.utils.WidgetTools; @@ -19,6 +22,7 @@ import androidx.recyclerview.widget.RecyclerView; public class DisListAdapter extends BaseQuickAdapter { Context mcontext; + OnViewClickListener onViewClickListener; public DisListAdapter(Context context, List list) { super(R.layout.disliat_item, list); this.mcontext = context; @@ -61,6 +65,25 @@ public class DisListAdapter extends BaseQuickAdapter fpOrderInfo(final String customer_id, final String industry_id) { + + return new Observable() { + @Override + public void subscribe(final Observer observer) { + + OkGo.post(HttpConstants.URi_device_AppCustomer_fpOrderInfo) + .params("customer_id", customer_id) + .params("industry_id", industry_id) + .converter(new StringConvert())// + .cacheMode(CacheMode.NO_CACHE) //无缓存模式 CacheMode.NO_CACHE + .adapt(new ObservableResponse())// + .subscribeOn(Schedulers.io())// + .observeOn(AndroidSchedulers.mainThread())// + .subscribe(new io.reactivex.Observer>() { + + @Override + public void onSubscribe(@NonNull Disposable d) { + // addDisposable(d); + } + + @Override + public void onNext(@NonNull Response response) { + observer.onNext(response); + } + + @Override + public void onError(@NonNull Throwable e) { + e.printStackTrace(); + + } + + @Override + public void onComplete() { + + } + }); + } + }; + + } + } \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java b/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java new file mode 100644 index 0000000..ab616a6 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java @@ -0,0 +1,112 @@ +package com.fenghoo.seven.widget; + +import android.content.Context; +import android.content.res.TypedArray; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.FrameLayout; +import android.widget.ImageView; +import android.widget.TextView; + +import com.fenghoo.seven.R; + +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +/** + * ItemProView + * (๑• . •๑) + * 类描述:功能条目，圆点进度条 + * Created by LeiXiaoXing on 2017/3/17 16:02 + */ + +public class ItemProView extends FrameLayout { + + private View mViewbottomline; + private TextView mTvtitle; + private ImageView mIvicon; + private View mViewtopline; + private String mTitle; + private int mIcon; + private boolean show_bottom_line; + private boolean show_top_line; + private int mIv_icon_01; + private ImageView iv_icon_01; + + public ItemProView(@NonNull Context context) { + super(context, null); + } + + public ItemProView(@NonNull Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + initView(context, attrs); + } + + public ItemProView(@NonNull Context context, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr) { + super(context, attrs, defStyleAttr); + initView(context, attrs); + } + + private void initView(Context context, AttributeSet attrs) { + LayoutInflater.from(context).inflate(R.layout.widget_pro_item, this, true); +// mViewbottomline = findViewById(R.id.view_bottom_line); +// mTvtitle = (TextView) findViewById(R.id.tv_title); +// mIvicon = (ImageView) findViewById(R.id.iv_icon); +// mViewtopline = findViewById(R.id.view_top_line); + iv_icon_01 = (ImageView)findViewById(R.id.iv_icon_01); + ImageView iv_icon_02 = (ImageView)findViewById(R.id.iv_icon_02); + ImageView iv_icon_03 = (ImageView)findViewById(R.id.iv_icon_03); + TextView tv_item_pro_01 = (TextView)findViewById(R.id.tv_item_pro_01); + TextView tv_item_pro_02 = (TextView)findViewById(R.id.tv_item_pro_02); + TextView tv_item_pro_03 = (TextView)findViewById(R.id.tv_item_pro_03); + View view_bottom_line_01 = (View)findViewById(R.id.view_bottom_line_01); + View view_top_line_02 = (View)findViewById(R.id.view_top_line_02); + View view_bottom_line_03 = (View)findViewById(R.id.view_bottom_line_03); + View view_top_line_04 = (View)findViewById(R.id.view_top_line_04); + + initAttrs(attrs); + setUpView(); + } + + /** + * 初始化参数 + * + * @param attrs + */ + private void initAttrs(AttributeSet attrs) { + + TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.ItemProView); +// mTitle = typedArray.getString(R.styleable.ItemProView_title); +// mIcon = typedArray.getResourceId(R.styleable.ItemProView_icon, R.color.bg_gray); +// show_bottom_line = typedArray.getBoolean(R.styleable.ItemProView_show_bottom_line, false); +// show_top_line = typedArray.getBoolean(R.styleable.ItemProView_show_top_line, false); + + + mIv_icon_01 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_01, R.color.bg_gray); + + + + + + + typedArray.recycle(); + } + + /** + * 设置视图状态 + */ + private void setUpView() { +// mViewtopline.setVisibility(show_top_line ? VISIBLE : GONE); +// mViewbottomline.setVisibility(show_bottom_line ? VISIBLE : GONE); +// mIvicon.setImageResource(mIcon); +// mTvtitle.setText(mTitle); + + iv_icon_01.setImageResource(mIv_icon_01); + + + } + + +} diff --git a/app/src/main/res/drawable/shape_pro_tv.xml b/app/src/main/res/drawable/shape_pro_tv.xml new file mode 100644 index 0000000..1e7a74e --- /dev/null +++ b/app/src/main/res/drawable/shape_pro_tv.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/drawable/shape_pro_yuan.xml b/app/src/main/res/drawable/shape_pro_yuan.xml new file mode 100644 index 0000000..1d0b66a --- /dev/null +++ b/app/src/main/res/drawable/shape_pro_yuan.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_pro_yuan_hui.xml b/app/src/main/res/drawable/shape_pro_yuan_hui.xml new file mode 100644 index 0000000..c4d793e --- /dev/null +++ b/app/src/main/res/drawable/shape_pro_yuan_hui.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index 0423936..9bd1dbd 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -51,6 +51,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" + android:drawableLeft="@mipmap/icon_watch_blue" + android:drawablePadding="10dp" android:layout_toRightOf="@+id/iv_dra_user_heads" android:text="姓名：－－" android:textSize="14sp" /> @@ -59,6 +61,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/tv_user_name" + android:drawableLeft="@mipmap/icon_address_blue" + android:drawablePadding="10dp" android:layout_marginTop="15dp" android:layout_toRightOf="@+id/iv_user_heads" android:text="电话：— —" diff --git a/app/src/main/res/layout/activity_fp_order_info.xml b/app/src/main/res/layout/activity_fp_order_info.xml new file mode 100644 index 0000000..9c5d1a0 --- /dev/null +++ b/app/src/main/res/layout/activity_fp_order_info.xml @@ -0,0 +1,9 @@ + + + + diff --git a/app/src/main/res/layout/activity_mo.xml b/app/src/main/res/layout/activity_mo.xml new file mode 100644 index 0000000..a681dc0 --- /dev/null +++ b/app/src/main/res/layout/activity_mo.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_refactor_marking_detail.xml b/app/src/main/res/layout/activity_refactor_marking_detail.xml new file mode 100644 index 0000000..85a84f7 --- /dev/null +++ b/app/src/main/res/layout/activity_refactor_marking_detail.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml deleted file mode 100644 index 980f976..0000000 --- a/app/src/main/res/layout/activity_register.xml +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -