();
- 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);
}
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
index fa6fa39..5cceb65 100644
--- 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
@@ -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+" (必填)");
+ /**
+ * 页面逻辑
+ * travel：1:已分配，2：已被抢，3：已进店，4：已成交 4种类型的条目
+ *
+ * order_state：0：未成交，1：已成交
+ * ygd_state：0：未被抢，1：已被抢
+ * enter_state:0：未进店，1：已进店
+ *
+ * type：1：已回收，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, "", "");
+ }
}
}
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
index 64c0f45..1cb5c17 100644
--- 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
@@ -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+" (必填)");
+ /**
+ * 页面逻辑
+ * travel：1:已分配，2：已被抢，3：已进店，4：已成交 4种类型的条目
+ *
+ * order_state：0：未成交，1：已成交
+ * ygd_state：0：未被抢，1：已被抢
+ * enter_state:0：未进店，1：已进店
+ *
+ * type：1：已回收，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, "", "");
}
}
}
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
index 70362a1..60cbc8f 100644
--- 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
@@ -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, "", "");
+ }
}
}
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
index 0fc8032..72a7325 100644
--- 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
@@ -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_state：0：未成交，1：已成交
* ygd_state：0：未被抢，1：已被抢
+ * enter_state:0：未进店，1：已进店
+ *
* type：1：已回收，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, "", "");
+ }
}
}
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
index abe7334..8f928c5 100644
--- 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
@@ -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) {
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
index c2163fc..16cf986 100644
--- 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
@@ -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) {
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
index 59e350c..efb7d7d 100644
--- 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
@@ -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 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 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;
}
}
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
index 4628574..c8e755e 100644
--- 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
@@ -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：代表上传图片（只能上传一张）
/**
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FpListBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FpListBean.java
index 77b3457..196d3d8 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FpListBean.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FpListBean.java
@@ -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;
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
index 5b795a7..3cbdbb8 100644
--- 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
@@ -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;
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/orderListBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/orderListBean.java
index 019c43b..806badd 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/orderListBean.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/orderListBean.java
@@ -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;
}
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 6be2ffb..673d90c 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
@@ -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());
}
});
}
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/HangyeSelectDialog.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/HangyeSelectDialog.java
new file mode 100644
index 0000000..056560a
--- /dev/null
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/HangyeSelectDialog.java
@@ -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 industryData;
+
+ public HangyeSelectDialog(Context context) {
+ super(context);
+ this.mContext = context;
+ }
+
+ public HangyeSelectDialog(Context context, int themeResId, List 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(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);
+
+ }
+}
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 f1dbd98..23668d2 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
@@ -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());
}
});
}
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
index eed5e71..1595e12 100644
--- 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
@@ -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 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() {
@@ -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();
}
});
}
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 45f3582..f348844 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
@@ -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);
}
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/FpOrderInfoAdaptertwo.java b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/FpOrderInfoAdaptertwo.java
index afe8859..87e6527 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/FpOrderInfoAdaptertwo.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/FpOrderInfoAdaptertwo.java
@@ -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
-
+ android:background="@color/colorWhite"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ app:iv_icon_01="@drawable/shape_pro_yuan"
+ app:iv_icon_02="@drawable/shape_pro_yuan"
+ app:iv_icon_03="@drawable/shape_pro_yuan"
+ />
-
+
- app:layout_constraintVertical_bias="1.0"
- app:layout_constraintHorizontal_bias="0.123"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/tv_question"
- app:layout_constraintBottom_toBottomOf="parent"
- android:gravity="left"
+
+
- android:minLines="3"
- />
-
-
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/dingdan_rv_three.xml b/app/src/main/res/layout/dingdan_rv_three.xml
index 114a233..3c191e3 100644
--- a/app/src/main/res/layout/dingdan_rv_three.xml
+++ b/app/src/main/res/layout/dingdan_rv_three.xml
@@ -1,25 +1,198 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ app:iv_icon_01="@drawable/shape_pro_yuan"
+ app:iv_icon_02="@drawable/shape_pro_yuan"
+ app:iv_icon_03="@drawable/shape_pro_yuan"
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/dingdan_rv_threetwo.xml b/app/src/main/res/layout/dingdan_rv_threetwo.xml
index 3c52dbf..f9a15f9 100644
--- a/app/src/main/res/layout/dingdan_rv_threetwo.xml
+++ b/app/src/main/res/layout/dingdan_rv_threetwo.xml
@@ -1,43 +1,154 @@
-
+ android:background="@color/colorWhite"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/dingdan_rv_two.xml b/app/src/main/res/layout/dingdan_rv_two.xml
index d3e6c5a..20b3477 100644
--- a/app/src/main/res/layout/dingdan_rv_two.xml
+++ b/app/src/main/res/layout/dingdan_rv_two.xml
@@ -1,7 +1,7 @@
@@ -16,35 +16,32 @@
android:id="@+id/item_my_twitter"
android:layout_width="300dp"
android:layout_below="@+id/view2"
- android:layout_marginTop="20dp"
+ android:layout_marginTop="12.5dp"
android:layout_centerHorizontal="true"
android:layout_height="wrap_content"
- app:iv_icon_01="@drawable/shape_pro_yuan"
- app:iv_icon_02="@drawable/shape_pro_yuan"
- app:iv_icon_03="@drawable/shape_pro_yuan"
/>
+ android:layout_marginTop="14.5dp"
+ android:layout_height="55dp">
+ android:layout_height="55dp">
+ android:textSize="15sp" />
+
+ android:layout_height="55dp"
+ android:layout_alignParentBottom="true"
+ android:layout_marginLeft="2dp"
+ android:layout_marginBottom="0dp"
+ android:layout_toRightOf="@+id/rl_01">
+
+ android:textSize="13sp" />
+
+ android:textSize="13sp" />
+
+ android:textSize="13sp" />
diff --git a/app/src/main/res/layout/disliat_item.xml b/app/src/main/res/layout/disliat_item.xml
index c9a3b1e..0275f9a 100644
--- a/app/src/main/res/layout/disliat_item.xml
+++ b/app/src/main/res/layout/disliat_item.xml
@@ -58,7 +58,7 @@
android:layout_marginLeft="13.5dp"
android:layout_marginTop="5dp"
android:layout_below="@+id/tv_dea_name"
- android:background="@mipmap/ic_launcher"
+ android:background="@mipmap/icon_watch_blue"
android:layout_height="16.5dp"/>
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/item_hangyeselect_dialog.xml b/app/src/main/res/layout/item_hangyeselect_dialog.xml
new file mode 100644
index 0000000..6bb6f7d
--- /dev/null
+++ b/app/src/main/res/layout/item_hangyeselect_dialog.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/mobanfragment.xml b/app/src/main/res/layout/mobanfragment.xml
index 0c1b612..b421f11 100644
--- a/app/src/main/res/layout/mobanfragment.xml
+++ b/app/src/main/res/layout/mobanfragment.xml
@@ -52,13 +52,22 @@
+
+
+
+
+
-
diff --git a/app/src/main/res/mipmap-hdpi/icon_pro_ima_bq.png b/app/src/main/res/mipmap-hdpi/icon_pro_ima_bq.png
new file mode 100644
index 0000000000000000000000000000000000000000..c735bff87578bc12f89d88a0680134709458d927
GIT binary patch
literal 2820
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
VPj(}Z`kDX$002ovPDHLkV1k75lc4|r
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-hdpi/icon_ycj.png b/app/src/main/res/mipmap-hdpi/icon_ycj.png
new file mode 100644
index 0000000000000000000000000000000000000000..34755b555676a1656eccb3effaf7b41aba518c7b
GIT binary patch
literal 7844
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
Hu0mjf;m3lf
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-mdpi/icon_pro_ima_bq.png b/app/src/main/res/mipmap-mdpi/icon_pro_ima_bq.png
new file mode 100644
index 0000000000000000000000000000000000000000..14da72e93c59f5243f7e2b0e4d8e349ff678020a
GIT binary patch
literal 1863
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
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-mdpi/icon_ycj.png b/app/src/main/res/mipmap-mdpi/icon_ycj.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2e9e60a47a215aaa3175de739cf4e4f05f28e7d
GIT binary patch
literal 4203
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
B{ssU5
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-mdpi/icon_yihuishou.png b/app/src/main/res/mipmap-mdpi/icon_yihuishou.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b83c6e27cbb817a8cb60629936e84cf1b07e74a
GIT binary patch
literal 4005
zcmV;W4_fevP)6sCNGh4hnE0%y
zzOoOAY?TKnE6fc?Ons#~|}
z);;H}z4pKU^{;;mf90hh%$k*D{P;tGd5F{jmB184#sHleO9E5W-
zf#VQ42Gt3OyoTz7c>llj^mNeHmVA~)?04WH;Efw6;N0hdZy_=nXhiify1SdCt!?}M
zBtd7)D5aue4kG6wvJl%jxQ{q~ggD+PZEf-XJZIRz10<@eM*wrkWWF1|RUao!@1(1%
zgE3=HLUlaZY!jWG@o)>!+S<`%vr2DoN;Z2as*8a0QQbkB-a=pB^R%_?7%uxm23`z$
z98q*8&izY(Lz>OrMbg?X3wtldeh5PF3FGS>DfxiLnB}snDvSk~>JvB8K5k*&``U=k7NJYil
zg9Sfe;34RSh6>{NGNR}_()2$ipZ~8t11bhTk0`n!6db&S_jgD>|3tXI@UbhfhHbsh
zo;{ASW3NHvAAr%QZbo%6-Q9nXwl*tpw7&jiM6Sd8_v!6jEGt)jFi;{s6?k~*+_~c^
zExi=D81Ju^eExR>-K=xxPGH1{FQ7UO?_UhT*bAWykql8}&rg6Jyx&P2N0gRMN94l5
zFsi>sAd+qUoXcT=wF!KjvzBp>g)fV~0_
zH?+4`5=9RH50cCMm>Dxl4A-A}_;JULWbD`@fpdT_hpd8SyA9`BiR1TiF2Y`JjY;H0
zM2tnsfu|91y*T2(cMOlAsERDtRlz!wlHL3JbEf17;%jsE}d4!l^52LiVv
zasYAs4YFB>_s5XQES1Ja+j0YJ0ZJt$XM`;mDM$55`ugsb*47V)WRwL9M$*$`)c1Fx
zFgrS)V&X(cY3U)vvAug9&Yg$IDBu&ke-_ncMA5at8shkJX=&*$)=aU28X7Y6^_@!;
z-AJ1L5Rt=ht^!y{l3W73Y%Q9TPO6}^^dg+Q7}Y;-MD(uS2a>~k#u_oc%
z3{<~}a|Sotwb$_exAgS9L|a>TDC(M;^T}jxCQ0g9w(LFo?JpUxs;Z!*HWX+ns{poapg{rD1GGfG3()3V7PDjKF
z)b4*5)kjIw7iekOwr>&wgi1@>Q2iN`C*N(w8Uoj!{KTbF^0T~FP#?fou)O2*vATX3#!kPB!6c6_V%z!?rdpnG;s#n&@h5DeHiGXx%sP9RZXI#9TkG(FftjscU(QPEpSI&ofTq*G&g^7z)X%9QH99G#PN@4
zZQV>m!$|u2X5gIZjafyVT?%{@px|7No}Ra8ZM8OT43Mh9Cyvj>xpl@9z*t0P;{830
z8uk2s1zue}n{3wV;w%Y;`P_3WQGG&kxobWZctO^hLOdMrKOu^aLiMO(QyC9zL*z|V
zb77D$C~Vj;3g-?-bt0+;tMxc{QeYDA^N83Ez8YA?28rp@TZU4CyLY(Ish8R$C803A
z@4)+SN-p=vUNEsgZrL)CG_~o)ip;jysH`WnaPLhTICns3
z_o}^!yo~C}K>~=_2xsG-G15t);F2V_zXOEU*WUn~COUKGXeuh2NYe`>pMO1IzOr%*
zWo4FC3-(x44+{$t*%Y9VByE(It_^Lzy*&!}t*o@7w5((7B~u1l-@6=tZWtDkD+8=)#M-zqz#2ph3a?XAvd%ixUetH|@duI3o)`k{>)SvS?ZmmW5Sc0~R$QZ%
zl?#ePbO%v%B&yr+ehVVz2)vDRk5XD1)7e>xbK?wh^76}D6e6msEGd>*n_-U%i?lfu
zEP<~P$E#Vktev{LOX=?ZqXll+c@vR4*s)`ctXlQSKwKJdHgo1E#*8@v)v+OKg()Tt
z_#HiZIbB@`k*2fAWNfB1xTK`%E~2PlMg9{U2hIls9INdB+jiS
zj!&?_e;xQXmpgsfwrg3RH_z;eGf9$LY)%Zr$A%3iPfhe&w#*osj`uB$9=*wmO-(X)
zbsb1)sj-eN+!i+)Xb-FcZ`(A4b4ImW_8sMR!?mX79HQu#cz>8^ZS6vwv)QjknwpH_
zhR*t&ITMMZ>X1$Et@#{Nghe~fz020E?}p)E!Gd0%efEGNBiI0J^lF8_Ed(1yZaIuR6izv%&Kl5I(sV^phy44nfm`-=?wm~&
zof;ILLBW_Kiq_NG+DSu$akypl6jZB#NvIm-nVw!9TE6%1kk6Yk+%2rMzW!X`D&X3%
zuuNvNL4qV%OKa&DVkqj-q$)ejUxt9}o0=t*ktd^76ZaMo*IeAd~qHU~<7~;UaRmwNzIh
z8+1yVE+U_AEU3fU+A5q|62wbO%d+9J9w^+zSwn*vnnsUStR}duVf|m|gsS$v!3@oz
z+Idk9{{T1x)qkV2vyIWCp9JOx2zq}Jnam@k>5qZaiJ}H+Z2Y94#|s_m8Pm(s+-xm%
z&?``xQDP?ZVq2R-0GB;Vl_fJ5!vhRg$>FPRe-wYM?%LK~G&JNiH8+5I6K8yFwM9~L^Tgm5b
z!r8AYFio1;82C@X!z9Vww6tuZw$}Q7cobNQ>e+}~K$?EOe=siuZg81D-{fi@
z?=LnRE&N^>!Hf|uDrUf-(1!O<7LEGNHjWKs>I}JS)z#+weiQgy@FcyzpM3s
zy3_D}HJQu=;IT00e)Q4p{j=#`rhMy4-QD*A<{sUKb7t6^uo)9~w7nsyC6#J-F8bi@x}7tx;F^ZA2EE
z3=VUs>aT!bNprKoD_mMvcL^fj#rx-gTgd0z2iozWPb3-|CeYXS6{6^$Lq^l|8p-E3
z1uBcAc`)N#>Ty@jeUWub#>Pv@*PA>4*vm>+v)0B9>kitzhlOHFPQ$S
zzen|s!GgBu4u1wzRb_`wC*zzQf7qGLoowCu5aY(#Z(qUt7XYh`C4-$FgiIFBjEtoY
zM&us@M{nQ$0IOH;3hZP}$GWc_U`5g6gUN&bWDI-iw)>^#g&QZUD}~~!F~l^Y*Oa7jv|w(GFXH`
zKy_`{a@D8FX4enb=8F)sj2r)(`BaJOI^eDV#mSSm?vKAREK~+sanKjFwIhShF0hIj
z{FXT@u(yIwSkNm4yqm{j62W?dY4U;*YJQ>}?mkRkUklTweX_p+ea?ArwN`5xiyd03H=$~A
zipUHdtJpfWLq}$6m657-c$8XH+Cgo{M`5$Pw#eWnyDYoFK9kcqH-6chyGicNO|k>q
zeE$$~&pF@so!@t!-^~&nj(V;AG8bY?2v`VUArU4!6!m|_#=uDe{u*cA=LY@daL9kk
zi2^7Wrbex!p3rw66TU>C8M*M5XftY{iGf#`U5_<~YERnLlP%yT1$k5zM}tJT->%>i
zUG5rS@B`ss-9vUbErAOJqssw)0>DH&0!uV`YJhP9E?U*3`SxU!lo2?wvTBY#1H#wy
zTuO=Efd-iIR5;}SUMAMGz|9DD)w$698iD3In6t!EAPq3Eud~Xx^yB;KyjkQB;HGI@
zSw_(}2)Lp^^OwZrp#cW(3TyuBLBvKeLx5}4T3;Zd6?x26VlA)+nEBCgsBUdW;2N~Z
zY8T=00?%7iao@exi>>>+E$0xrno1WA9P7jWBmI{2LU8SjGM&yYy)B^*iI}i7todJ7
z>`9B8rnOEeBOE7Cg+tlH&i3Y-TGUn%9@}%?61=^u$7Avs7q-9M1MSb}Y^`<8byc`y
zz87uh8P{xV%gCeFakMRl8-8`hmTU(^r#$SN{$Ysvgf|IXqZZjlgj*d5Ov|D+osT>#
zg+2StF}Qkq8TK6R!}qs$W}T{7z-_#FG;W$Rc-EhOqZ=D{56LC+QNtiF^SY)`-6Kih
zW@xPqE~3K(xC%1^FdV>zmR4ism6b4`beY>cZk}7ITjyKH`tkm$ft1I`+hTbB-JT&l
zRu(6&^w+nHLAe|F&*=etc7g|8y^MJqGFxX}`emHygKyID5cTL5*QiCFB*L9}2`wPA
zmBPf*WK?(vSA5!oz8LU!OFyFL;#l)S7Y=K_oL2MBe+O{OGaWet_v$_4P+#lTL0kS*
z2b5J8(`7Q_u5ifzBu&}GUTp3`w&At&y2XC=^OewUtkx~ij{A0^LI&Om2mM#lCoQcP
zod~hw5haMi#5LvO_pN|4yTUKeuFw+?rBnsns%>YJ8DY8@_ukKZx{}wubS~*CCHq`C
z&#P~((nC71V$qRvas9hPrw4GMkM+1F-~aAFYD^RUA1zL}>SBS{TZT#0s6{su@ei#)
zaPnN8%1o{(lT0h%jC^v+A6{0iD>3wP0suR}J+ZO|i)WS(iH}Cv>DFOPMs~i}tGj0N
zFw!VD>O_B;c;bZHD4@0O2hsdO3Rbd)12`3DjHlZUaFSRozq}GntpgcL2{Ujz?i{Np
zAa<-tc)xX(SGQwBLL+V&27%EfRkXo=a620*c$adw{8tq<$%g6
zKRO%7gFCx0YobR7K>;T)7)j}YSuy4ETmhF0kC8STaK=PHT(MY=lm_xyGEKW9n?jAi{rJUB+&+I4
z-aOieYwFAO`cV!{OM5J3sQ;yxvFIsd6BZzGPGX)60kN^pjc{uWy#uM|Qxq>FTfwX>+PGFpcmzP#N12_em
zxT4ms1Tbo-1Vw;T34zKu=R6cm(kU5cK!re+2=ZBENI773+1d7`tTfk5Iv4#jbA%d$
zkq-!%l?$U?+F}7W!|&1SC#ey|Whqx_Y&|JutNKlWl&*X*?nf-{bY~pW2AfvvPTOS8
zv@empYQ9%bT#5=D_+R2GrTAWM7mQr!@&!%>c5zR}R9ao-80AaLOLg+aN>u%1EQlpO
zt-GOGS8O_KGw&@^yfW|0oP?z-%yZG36)gkXsWB9JfEeqoh@Cvo7dW%h&G%wv`QoN7
zpX|}yr?IYk?mJ^sGEK2Y$r7#Z+3W%*>s&Fn5+8TQ^?vDrWBth%SOIIdK?n$Is9}9%
zfh&%EPJprE$rm`KI61+0JvZ3CQuC&he{gNBo>UmySVFJ9m(O;uUhD#wNe>b)Wu#lX
zmF}`VkGU|9ps}YBkyAwE&qr7~UZq&8LORpDsx6g?-wd2mv@xR-cPrl;lNiYmx9-1S
zdHI?Ta5C?2Z%f=_7<;Dq>X?C+aL_+Bajg@K{E~n*`3g1j8+&#VtR)Vqk?symg1aOH
zGA7ixaQ&=`%i-D9Z*mf2}5^9THk9i(1~TN(7!w=;L|R~yg(?8I{c|t@l9>3Z8W;T4E}h0)
zlNq}vI9`8(;8Z(ij(Ny!J2HrPCq7
zURq3V7KpgTMtleT<$H7t@8R)rQo4---5^{sNG=W>M5t)5~>N
zYe#7Uz@nMuDXldDRb=FHhiJ9d{GW653}bpERHwh`l=5C>K#Sf3;w|}4Qj$=34bY0F
zpl^qgo9>0!=ZWYmg`c=2(Xj>?k2i(<_Zj)qzJgv(k$(X6ImZ)~7z?HW26l%v-xAAL
z&}ByX(TAJ6cY|n7!B$Wb2+GywvtOqJWdlB>w(N|6UNLW&=Y`dyGAcj)uldL;aE-j$P%&w(CHm
z*Sagq9~?N?Q&G009TK|gXd#QIgm0QfY
zMig*^*>B`&0JqEk8Q2;Q`Y)Q_{uK($5eb|qr(u2D)$(uigSBrJN?8|^oc{sn7q_bH
Swc7{)0000rAyG8r8J1A)lq9!1il9m(`OVj!hMTi_W*s08Ez2KM(igx7p@7oE$6%p-1*
z&UMw4JV?Oh0rg*jDZ&E`-ks1R*MW$wFnPqa>D@btXnhfVRa67^05d<3h&OL?B(7CA
zHfn^21MYX)!d<cPSJ}zXYCf$*YpD#YQ%
z@5O0ED2)@>rW?-?;YKe=g=E{WZNSY})fWZVbB^()tvz`dVx~WO!)(-4!O>}xLEN)H
zn1jnd8Nz@2(pb5zx2UlyDKp>Q5pTY4oVcZWcdJHpgaAzmKtZUK#EI^=er*=6U!DmL
z5AHpOCk_l|Srr6vf|yS
zPVI2lDB5=p1nJ_3C>rZF015|*n!DnT^`x-(ee?LC)Ru&+utK{)c0Mp7R)Zk)kofK8ICuabY1DD*Zw^5hv4hnT}s*;@q-dzvFk(WAHnZ
zLYxRAUA-yK_Mac&f-^ODFBB6+HkpKo)&5cc#AY`O_5yUq@z{!t#WqclrM2SOi|tF1>qt;gLTuHY~rl;yw=`i
zRyFQ^;cV7Qa?2F07?QXR&-9sRM4@YK*2;-paw1l`-TBbXZ*I?-*`T(V@h$C%2x;_NUak%cly(NCeh*N-1_br}4%2$kaSy)FpAT#RCg6VAJB
zMFal))==L5V;3rA|FVv0SNv5aPKIG?IW2buI{D1&In=A~8Q4K>apN9hZ1$?GB3~?V
z;$Z!=RSmW)$B8(%n*&wir0rJn%Y`@)+NpK3u|i8@zX}mvWr`(E&RlU$y7k%2K4WdN
z$ZUNs_cr11dtV&L(@`Z(;=F!*6yN_tpV@7>5SP;M1%l3@HW;UfDB_hEH+e~%-*owr
zZ#Oy~#I2->dpSYg&bNo~<<=TB))DT1<(zGJRUu9kkGHIyX%5eNWmFEtG0>HWMHXhR
zbz;VE2xxaB!s~PEotdatzS%XgVnjhW_uM2Lwy3Gf>}Fo0hU+e^H7`p=<$vAd6V-bw
zX`;9+!lSs}5lu{z?tzrK(o_rELSHnwq9uOrs+GhQx_c{ma`N$Is!80!Eyn!XQFH;w
zj6R@dy>{^nDOS?<{Sz0Zautf-1!atq%M!-*d@?Zwby07M*?Yy27{YDxm
z`4Ea7^32`W!KrPJ@SHwO6Fg8#G8L1{5?TjtUt^c
zI$2H^szFa8RXh>0MavE4vZVIZ!Se;*>XH|%ZY4WadopsIJk3~a#GB2xqq3%BR8QUx
z;_co5E7FtW0b1V?3qLRWvU?%+IU@S{0rgM7;S9CuG-LxixOws4;IV)$0wx4|&QXb};znM6CJMLL+e{PAIqPJ&hVt
z_krlPDesmt9RP#RGi$%>jEC=6F;R&)2^5VbKh4Y=iLkcvX|alX-DQ~ZE`XQQRJZkL
zY*x3sMn=LDaaPbJx)IehT1A{*3C4<26sc7QF_q*Pe3Y2>r8WG6xo)=?vI-strjipf
z8F25iDo(ws{`v(c(_FQpGv4&xR2%EGB2Ek@^Y>Rq_kpmm5E){&r#Q6oSbVN1s88wU
zJ5-k2sH2%$>+S-7aNy8TZT0G|pU*j6ZnpceXW9@a2A}!zDER^b*Je3`c~`nAvcB^U
z8usI)a@3ht#7$(s#*+YkDE`mD6Ny-)Y`*;qY7$IK;)HWrH}_mA{_VWC>GhzTRZckn
Y1IvEbn_Ih_IRF3v07*qoM6N<$f~=NC9RL6T
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-xhdpi/icon_ycj.png b/app/src/main/res/mipmap-xhdpi/icon_ycj.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2b4c2762b726f50a8bf7d45d9142fa973833cf0
GIT binary patch
literal 5594
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
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-xhdpi/icon_yihuishou.png b/app/src/main/res/mipmap-xhdpi/icon_yihuishou.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8a7e2ef0d43629824f1d348381b83d7f19fbf3d
GIT binary patch
literal 5510
zcmV;16?y83P)$ogXm=^X
z%ufM0VhF?Wg5st;8pEO&oM~U7?a&EwGP*c^`E;S*t^&&GRk=@J)3;^D_Xx2%^gX
z$bX+E-#<8RU)l3s2jCA3Z>!nFuKOAQp8{}_g5VxY@?~bq42`bS==ZOmq|{Fgbj97X
zvyT9XY-~}G`zQ!RdI~Rg-Tff?M9vN0L9cfiJ@Ld3#s%Gg{68St2;w7;P^ztvg-(N*T};%wbUL9jH5woC+cqnI9#y+*OCd%fL7<{mFDwlNsUbpG80
z1togUzeYju=acB90^Rfe8NhX!_x1a4pyS8Ck@p?;JQ0|o)H5$p5bPbdO=E*@xKQ{z
zx(<@>59uYRh3vY!0Q@D0e!8#&z21eBl5zw3pNg{1d@l@NPo0jYx4gD${UoNWwsIuA
z&}v;j4$qGTdIoUjy>+J`UwP#$Hf{Qdk@la;>FX(G2rL6a??7^S$&v?7B*4
zRas_5?;Z*Cl$A0z;8CO4^WI6m|M{HG?NmW4<|t^D4UpLn>6rRy6UIH7XFbIhNx#3f
z>FjJWQ1&ymK{qb*so2CDL1~WC$lBrFdN0j{ae4dppTNw_{p9+Yl=kXTZ!
zt3K$iE80Jbd+#UTPsUVgeJ=kdD^4Q;sA1?JDaAVE8^zT#(?VsJB%GU$AnH3MlF58f
zIC$Iun`!U6z${cd%mv6y8w_r%nnATdPbg02qZ9=BDYFK^v*$%Yu_Sefk^>H7Fj%YV
zL}F~Tc_;0Q07=HtbsBGPqd2`zx9%PhG{(2aX9v?3ol3&+`s_u6ZGe9R%bZW4|r!a!1Q;EY^
z((rXUeYk{P?{FeSEmjTD-GWM1JPmh`%7iBnmtd#z(Q$jaEqcyaOGP|Aaw;(qBxe-ryy9b(>kR_BgRH!+$
zTLgM!v1CldLV6KJ+iLBxDT8f?Y6LT_iFDb|SUjCKqcl%TLZTprIQI8#!OWT28PLl(
z$wGR#TB5|BmZ)EzaR1D-cC
zQeJ!_xswOFHWO>Q`!VpAB&TSl&`D@Ajn5TNkJ{E0D{n)0Pl6f$qy_IF_ZF0HP9NP#>*
zFBZj12*Xn#x)DTgHZ-^gGcym
z4m6F=@cg{E`gfw+eG8pB^@17%;06FMA`I^U(OD2JVKBI28d9zXT9;@i!U99kZ9cCN
zG0ZiSbOK>dnTb}@o|a0g#ub?&e;`(VW)%l|y;WRzq0q?J06a)5D<4y!%l(E{L_sPF0qz3uQIT@v
z!Ai}{doeqE&$K~TZE{^%;dhl1YW0WYNQ`W`)Zl4Z%QMoNBE`48o+v%3&=T7FDwzKY
z%#Wp&9&g+BM*=9VtPF){e*QD6G`ij1gMR;ZFkg)@ycri<@PZPWUQZV`=~)t+k<*ZL
zg|X*J%xZ&V;56tuNgSo+N;BCp9aYCYBp@bnkCE+ZLlMHiQn>#h!tkMpI@E7^K;83~5o^(9@KssSt)e!}veA}{KJ6r}E%oBItoj;!=}5uzUieC98p*L!;00kBpRiWjV-p3KVWtgHqwd{nl`
z_N