From 0e3553e29c9092145d89cbca53db21d69c2f3e94 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Sat, 29 Aug 2020 16:29:26 +0800
Subject: [PATCH] d
---
app/src/main/AndroidManifest.xml | 7 +-
.../fenghoo/seven/main/find/FindFragment.java | 9 -
.../seven/main/find/PriLetFragment.java | 53 ++-
.../seven/main/find/QuestionsFragment.java | 13 +
.../seven/main/find/adapter/AwemeAdapter.java | 80 ++++
.../main/find/adapter/FindListAdapter.java | 59 ---
.../main/find/ui/PrivateletterFragment.java | 63 ++-
.../seven/main/kehu/Bean/awemeBean.java | 180 +++++++++
.../seven/main/kehu/DistriFragment.java | 2 -
.../seven/main/kehu/MobanFragment.java | 17 +-
.../kehu/activity/AddCustDialogActivity.java | 63 +++
.../kehu/activity/FpOrderInfoActivity.java | 8 +-
.../seven/main/kehu/activity/ShowAty.java | 11 +
.../fenghoo/seven/okgonet/HttpConstants.java | 373 +-----------------
.../com/fenghoo/seven/okgonet/NetApi.java | 98 +++--
app/src/main/res/anim/scale_in.xml | 6 +
app/src/main/res/anim/scale_out.xml | 6 +
.../main/res/drawable/shape_addcustomer.xml | 6 +
.../main/res/layout/activity_add_cust_dia.xml | 32 ++
app/src/main/res/layout/findfragment.xml | 13 +-
app/src/main/res/layout/findlist_item.xml | 5 +-
.../main/res/layout/fragment_questions.xml | 115 ++++--
app/src/main/res/mipmap-hdpi/icon_fudong.png | Bin 0 -> 4059 bytes
app/src/main/res/mipmap-mdpi/icon_fudong.png | Bin 0 -> 2227 bytes
app/src/main/res/mipmap-xhdpi/icon_fudong.png | Bin 0 -> 4980 bytes
.../main/res/mipmap-xxhdpi/icon_fudong.png | Bin 0 -> 9792 bytes
.../main/res/mipmap-xxxhdpi/icon_fudong.png | Bin 0 -> 11930 bytes
app/src/main/res/values/colors.xml | 1 +
app/src/main/res/values/styles.xml | 40 ++
29 files changed, 681 insertions(+), 579 deletions(-)
create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/AwemeAdapter.java
delete mode 100644 app/src/main/java/com/fenghoo/seven/main/find/adapter/FindListAdapter.java
create mode 100644 app/src/main/java/com/fenghoo/seven/main/kehu/Bean/awemeBean.java
create mode 100644 app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java
create mode 100644 app/src/main/res/anim/scale_in.xml
create mode 100644 app/src/main/res/anim/scale_out.xml
create mode 100644 app/src/main/res/drawable/shape_addcustomer.xml
create mode 100644 app/src/main/res/layout/activity_add_cust_dia.xml
create mode 100644 app/src/main/res/mipmap-hdpi/icon_fudong.png
create mode 100644 app/src/main/res/mipmap-mdpi/icon_fudong.png
create mode 100644 app/src/main/res/mipmap-xhdpi/icon_fudong.png
create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_fudong.png
create mode 100644 app/src/main/res/mipmap-xxxhdpi/icon_fudong.png
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fd8f807..884e659 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -104,11 +104,16 @@
android:screenOrientation="portrait" />
+
+
+
-
industryData;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -37,14 +49,48 @@ public class PriLetFragment extends BaseFragment {
return view;
}
view = inflater.inflate(R.layout.findfragment, container, false);
- getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.containerr,new PrivateletterFragment()).commit();
initView(view);
+ 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 = new industryBean.ResultBean.DataBean();
+ dataBean.setIndustry("全部");
+ dataBean.setIndustry_id("");
+ industryData.add(0,dataBean);
+ privateletterFragment = new PrivateletterFragment(left_tvtwo);
+ getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.containerr,privateletterFragment).commit();
+ }
+ }
+ @Override
+ public void onError(Exception e) {
+ e.printStackTrace();
+
+ }
+ });
return view;
}
private void initView(View mContentView) {
rl_privateletter = (RelativeLayout)view.findViewById(R.id.rl_privateletter);
-
+ left_tvtwo = (TextView)view.findViewById(R.id.left_tvtwo);
+ marking_fragment_title = (TextView)view.findViewById(R.id.marking_fragment_title);
+ marking_fragment_title.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ new HangyeSelectDialog(getActivity(), R.style.dialog, industryData, new HangyeSelectDialog.OnCloseListener() {
+ @Override
+ public void uploadAvatar(String industry_id, String industry) {
+ marking_fragment_title.setText(industry);
+ //刷新抖音列表数据
+ privateletterFragment.onRefresh(industry_id);
+ }
+ }).show();
+ }
+ });
}
interface ClickCallback {
@@ -59,5 +105,4 @@ public class PriLetFragment extends BaseFragment {
}
});
}
-
}
\ No newline at end of file
diff --git a/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java
index ccf68fd..825a64c 100644
--- a/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java
@@ -7,6 +7,7 @@ import android.text.TextWatcher;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
+import android.widget.TextView;
import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseTreeFragment;
@@ -14,7 +15,9 @@ import com.fenghoo.seven.main.find.adapter.QuestionsAdapter;
import com.fenghoo.seven.main.find.entity.QuestionsEntity;
import com.fenghoo.seven.main.find.mvp.contract.QuestionsContract;
import com.fenghoo.seven.main.find.mvp.presenter.QuestionsPresenterImpl;
+import com.fenghoo.seven.main.kehu.activity.ShowAty;
import com.fenghoo.seven.widget.PastEditText;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
import java.util.ArrayList;
import java.util.List;
@@ -38,6 +41,7 @@ public class QuestionsFragment extends BaseTreeFragment {
+ Context mcontext;
+ OnViewClickListener onViewClickListener;
+
+ public AwemeAdapter(Context context, List list) {
+ super(R.layout.findlist_item, list);
+ this.mcontext = context;
+ }
+
+ @Override
+ protected void convert(final BaseViewHolder helper, final awemeBean.ResultBean.DataBean item) {
+ WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_dea_name), "", item.getNick_name());
+ ImageView iv_dea_avatar = helper.getView(R.id.iv_dea_avatar);
+ GlideTools.init(mContext).displaypic(iv_dea_avatar, item.getCover(), R.mipmap.icon_default_empty);
+ CircleImageView ima_dea_watch = helper.getView(R.id.ima_dea_watch);
+ GlideTools.init(mContext).displaypic(ima_dea_watch, item.getNick_img(), R.mipmap.icon_default_head);
+ WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_aweme_title), "", item.getTitle());
+ WidgetTools.setTextfive((TextView) helper.getView(R.id.tv_aweme_time), "", item.getCreate_time());
+ TextView left_tvtwo = helper.getView(R.id.left_tvtwo);
+ String comment_num = item.getComment_num();
+ if(AbStrUtil.isEmpty(comment_num)){
+ left_tvtwo.setVisibility(View.INVISIBLE);
+ }else {
+ if(comment_num.equals("0")){
+ left_tvtwo.setVisibility(View.INVISIBLE);
+ }else {
+ left_tvtwo.setVisibility(View.VISIBLE);
+ WidgetTools.setTextfive((TextView) helper.getView(R.id.left_tvtwo), "", item.getComment_num());}
+ }
+
+
+
+ RelativeLayout tv_cuslist_caozuo = (RelativeLayout)helper.getView(R.id.tv_cuslist_caozuo);
+ tv_cuslist_caozuo.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ //查看评论
+ onViewClickListener.enterCusDetail(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{
+
+ void enterCusDetail(awemeBean.ResultBean.DataBean item);
+
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/FindListAdapter.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/FindListAdapter.java
deleted file mode 100644
index d1037ef..0000000
--- a/app/src/main/java/com/fenghoo/seven/main/find/adapter/FindListAdapter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.fenghoo.seven.main.find.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.kehu.Bean.CustomerListBean;
-import com.fenghoo.seven.utils.WidgetTools;
-
-import java.util.List;
-
-
-public class FindListAdapter extends BaseQuickAdapter {
- Context mcontext;
- OnViewClickListener onViewClickListener;
-
- public FindListAdapter(Context context, List list) {
- super(R.layout.findlist_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());
- RelativeLayout tv_cuslist_caozuo = (RelativeLayout)helper.getView(R.id.tv_cuslist_caozuo);
- tv_cuslist_caozuo.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
-
- }
- });
- 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 enterCusDetail(CustomerListBean.ResultBean.DataBean item);
-
- }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java
index 1ff58ee..0192584 100644
--- a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java
@@ -1,19 +1,21 @@
package com.fenghoo.seven.main.find.ui;
-import android.widget.Toast;
+import android.view.View;
+import android.widget.TextView;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.R;
-import com.fenghoo.seven.dialog.BaseTipsDialog;
-import com.fenghoo.seven.main.find.adapter.FindListAdapter;
-import com.fenghoo.seven.main.find.adapter.PrivateletAdapter;
-import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
-import com.fenghoo.seven.main.kehu.Dialog.CusOperationDialog;
+import com.fenghoo.seven.main.find.adapter.AwemeAdapter;
+import com.fenghoo.seven.main.kehu.Bean.awemeBean;
import com.fenghoo.seven.main.kehu.MobanFragment;
import com.fenghoo.seven.main.kehu.activity.ShowAty;
+import com.fenghoo.seven.okgonet.HttpConstants;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;
+import com.fenghoo.seven.utils.AbStrUtil;
+import com.fenghoo.seven.utils.WidgetTools;
import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
+import com.lzy.okgo.model.HttpParams;
import com.lzy.okgo.model.Response;
import java.util.List;
@@ -24,21 +26,21 @@ import androidx.recyclerview.widget.LinearLayoutManager;
* 视频评论（列表）
*/
public class PrivateletterFragment extends MobanFragment {
-
-
- public PrivateletterFragment() {
+ TextView left_tvtwo;
+ private String industry_id="";
+ public PrivateletterFragment(TextView left_tvtwo) {
super();
-
+ this.left_tvtwo=left_tvtwo;
}
@Override
public void initAdapter() {
mMarkingFragmentRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
- FindListAdapter markingtwoAdapter = new FindListAdapter(mContext, null);
+ AwemeAdapter markingtwoAdapter = new AwemeAdapter(mContext, null);
getAdpter(markingtwoAdapter);
mMarkingFragmentRecyclerView.setAdapter(markingtwoAdapter);
- markingtwoAdapter.operationListenner(new FindListAdapter.OnViewClickListener() {
+ markingtwoAdapter.operationListenner(new AwemeAdapter.OnViewClickListener() {
@Override
- public void enterCusDetail(CustomerListBean.ResultBean.DataBean item) {
+ public void enterCusDetail(awemeBean.ResultBean.DataBean item) {
//进入查看评论
ShowAty.CommentActivity(getActivity(),20);
}
@@ -47,20 +49,34 @@ public class PrivateletterFragment extends MobanFragment {
@Override
public void requestData() {
- new NetApi().customerList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(),"").subscribe(new Observer() {
+ final HttpParams paramsPost = new HttpParams();
+ paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
+ paramsPost.put("city", "");
+ paramsPost.put("industry_id", industry_id);
+ paramsPost.put("page", mNextRequestPage);
+ new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppDouyin_aweme).subscribe(new Observer() {
@Override
public void onNext(Response response) {
String body = (String) response.body();
- CustomerListBean.ResultBean result = JsonUtils.fromJson(body, CustomerListBean.class).getResult();
+ awemeBean.ResultBean result = JsonUtils.fromJson(body, awemeBean.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;
+ String read_num = result.getRead_num();
+ if(AbStrUtil.isEmpty(read_num)){
+ left_tvtwo.setVisibility(View.INVISIBLE);
+ }else {
+ if(read_num.equals("0")){
+ left_tvtwo.setVisibility(View.INVISIBLE);
+ }else {
+ left_tvtwo.setVisibility(View.VISIBLE);
+ WidgetTools.setTextfive(left_tvtwo, "", read_num);}
}
+ List data = result.getData();
if (mNextRequestPage == 1) {
+ if (data.size() == 0) {
+ markingtwoAdapter.setEmptyView(notDataView);
+ return;
+ }
setData(true, data);
} else {
setData(false, data);
@@ -78,8 +94,13 @@ public class PrivateletterFragment extends MobanFragment {
mSwl.setRefreshing(false);
}
});
-
}
+
+ public void onRefresh(String industry_id){
+ this.industry_id=industry_id;
+ requestData();
+ }
+
@Override
public void onDestroy() {
super.onDestroy();
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/awemeBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/awemeBean.java
new file mode 100644
index 0000000..1e01d31
--- /dev/null
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/awemeBean.java
@@ -0,0 +1,180 @@
+package com.fenghoo.seven.main.kehu.Bean;
+
+import com.fenghoo.seven.test.BaseModel;
+
+import java.util.List;
+
+/**
+ * Time: 2020/8/17
+ * Author: jianbo
+ * Description:
+ */
+public class awemeBean extends BaseModel {
+
+
+ /**
+ * result : {"msg":"成功","read_num":"0","data":[{"cover":"","comment_num":"1","aweme_id":"1","create_time":"2020-08-25 15:17:40","nick_name":"抖音昵称","nick_img":"抖音头像","short_id":"抖音id","title":"此处显示视频标题","dy_uid":"1"}],"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 : 成功
+ * read_num : 0
+ * data : [{"cover":"","comment_num":"1","aweme_id":"1","create_time":"2020-08-25 15:17:40","nick_name":"抖音昵称","nick_img":"抖音头像","short_id":"抖音id","title":"此处显示视频标题","dy_uid":"1"}]
+ * success : 0
+ */
+
+ private String msg;
+ private String read_num;
+ private int success;
+ private List data;
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public String getRead_num() {
+ return read_num;
+ }
+
+ public void setRead_num(String read_num) {
+ this.read_num = read_num;
+ }
+
+ 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 {
+ /**
+ * cover :
+ * comment_num : 1
+ * aweme_id : 1
+ * create_time : 2020-08-25 15:17:40
+ * nick_name : 抖音昵称
+ * nick_img : 抖音头像
+ * short_id : 抖音id
+ * title : 此处显示视频标题
+ * dy_uid : 1
+ */
+
+ private String cover;
+ private String comment_num;
+ private String aweme_id;
+ private String create_time;
+ private String nick_name;
+ private String nick_img;
+ private String short_id;
+ private String title;
+ private String dy_uid;
+
+ public String getCover() {
+ return cover;
+ }
+
+ public void setCover(String cover) {
+ this.cover = cover;
+ }
+
+ public String getComment_num() {
+ return comment_num;
+ }
+
+ public void setComment_num(String comment_num) {
+ this.comment_num = comment_num;
+ }
+
+ public String getAweme_id() {
+ return aweme_id;
+ }
+
+ public void setAweme_id(String aweme_id) {
+ this.aweme_id = aweme_id;
+ }
+
+ public String getCreate_time() {
+ return create_time;
+ }
+
+ public void setCreate_time(String create_time) {
+ this.create_time = create_time;
+ }
+
+ public String getNick_name() {
+ return nick_name;
+ }
+
+ public void setNick_name(String nick_name) {
+ this.nick_name = nick_name;
+ }
+
+ public String getNick_img() {
+ return nick_img;
+ }
+
+ public void setNick_img(String nick_img) {
+ this.nick_img = nick_img;
+ }
+
+ public String getShort_id() {
+ return short_id;
+ }
+
+ public void setShort_id(String short_id) {
+ this.short_id = short_id;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getDy_uid() {
+ return dy_uid;
+ }
+
+ public void setDy_uid(String dy_uid) {
+ this.dy_uid = dy_uid;
+ }
+ }
+ }
+}
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 23668d2..666d921 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,9 +2,7 @@ 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;
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/MobanFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/MobanFragment.java
index 65919fb..a027c53 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/MobanFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/MobanFragment.java
@@ -10,6 +10,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
import android.widget.TextView;
+import android.widget.Toast;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.fenghoo.seven.R;
@@ -22,7 +23,6 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-@SuppressLint("ValidFragment")
public abstract class MobanFragment extends BaseFragment {
public static final String ARG_PAGE = "ARG_PAGE";
private boolean IS_LOADED = false;
@@ -41,13 +41,8 @@ public abstract class MobanFragment extends BaseFragment {
}
};
- public Savaselect savaselectbean;
- private RelativeLayout rl_top;
- private RelativeLayout layTop_left_tv;
- public MobanFragment() {
-
- }
+ public MobanFragment() { }
public BaseQuickAdapter markingtwoAdapter;
public void sendMessage() {
Message message = handler.obtainMessage();
@@ -111,6 +106,12 @@ public abstract class MobanFragment extends BaseFragment {
public void requesdata() {
initAdapter();
+ markingtwoAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+ @Override
+ public void onLoadMoreRequested() {
+ loadMore();
+ }
+ });
initRefreshLayout();
mSwl.setRefreshing(true);
refresh();
@@ -156,14 +157,12 @@ public abstract class MobanFragment extends BaseFragment {
}
}
-
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/AddCustDialogActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java
new file mode 100644
index 0000000..b7294d1
--- /dev/null
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java
@@ -0,0 +1,63 @@
+package com.fenghoo.seven.main.kehu.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.fenghoo.seven.R;
+import com.fenghoo.seven.base.BaseActivity;
+import com.fenghoo.seven.main.kehu.ui.AddCusFragment;
+import com.fenghoo.seven.utils.StatusBarUtil;
+import com.fenghoo.seven.widget.TitleBar;
+
+/**
+ *添加客户和完善信息
+ */
+public class AddCustDialogActivity extends BaseActivity {
+ private static int REQUEST_CODE_CHOOSE = 100;
+ private AddCusFragment addCusFragment;
+ private TitleBar mTitleBar;
+ private String customer_id="";
+ private String source="";
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_add_cust_dia);
+ StatusBarUtil.transparencyBar(this); //设置状态栏全透明
+ StatusBarUtil.StatusBarLightMode(this); //设置白底黑字
+ customer_id = getIntent().getStringExtra("customer_id");
+ source = getIntent().getStringExtra("source");
+ addCusFragment = new AddCusFragment(customer_id,source);
+ getSupportFragmentManager().beginTransaction().replace(R.id.containerrr,addCusFragment).commit();
+
+ findViewById(R.id.btn_comit).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ addCusFragment.comit();
+ }
+ });
+
+
+//窗口对齐屏幕宽度
+ Window win = this.getWindow();
+ win.getDecorView().setPadding(0, 0, 0, 0);
+ WindowManager.LayoutParams lp = win.getAttributes();
+ lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+ lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+ lp.gravity = Gravity.TOP;//设置对话框置顶显示
+ win.setAttributes(lp);
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == REQUEST_CODE_CHOOSE && resultCode == RESULT_OK) {
+ addCusFragment.Result(data);
+ }
+ }
+}
\ No newline at end of file
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 1595e12..8f20831 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
@@ -15,9 +15,11 @@ 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.HttpConstants;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;
import com.fenghoo.seven.widget.TitleBar;
+import com.lzy.okgo.model.HttpParams;
import com.lzy.okgo.model.Response;
import java.util.List;
@@ -89,7 +91,10 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis
* @return
*/
private void fpOrderInfo(String industry_id) {
- new NetApi().fpOrderInfo(customer_id,industry_id).subscribe(new Observer() {
+ final HttpParams paramsPost = new HttpParams();
+ paramsPost.put("customer_id", customer_id);
+ paramsPost.put("industry_id", industry_id);
+ new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_fpOrderInfo).subscribe(new Observer() {
@Override
public void onNext(Response response) {
String body = (String) response.body();
@@ -111,7 +116,6 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis
private void initRecyclerView(final List data) {
-
adapter = new FpOrderInfoAdaptertwo(this, data, markquestionsone);
LinearLayoutManager manager = new LinearLayoutManager(this);
mLabelRvList.setLayoutManager(manager);
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 f348844..ef7bbe5 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
@@ -131,6 +131,17 @@ public class ShowAty {
i.putExtra("source",source);
ctx.startActivity(i);
}
+ /**
+ * @description 添加客户和完善信息(对话框形式)
+ * @param
+ * @return
+ */
+ public static void AddCustDialogActivity(Context ctx,String customer_id,String source) {
+ Intent i = new Intent(ctx, AddCustDialogActivity.class);
+ i.putExtra("customer_id",customer_id);
+ i.putExtra("source",source);
+ ctx.startActivity(i);
+ }
public static void StyleActivity(Context ctx) {
diff --git a/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java b/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java
index 689c06a..fd4dfa2 100644
--- a/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java
+++ b/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java
@@ -17,376 +17,9 @@ public class HttpConstants {
/**
- * 蜂狐商户版
+ * 七月七
*/
- /**
- * 账号密码登录
- */
- public static String URi_device_DevLogin_accountPwd = URiBase + "/device/DevLogin/accountPwd";
-
- /**
- * 获取验证码
- */
- public static String URi_device_DevSendSMS_send = URiBase + "/device/DevSendSMS/send";
-
- /**
- * 手机号登录登录接口
- */
- public static String Uri_device_SendSMS_checkCode = URiBase + "/device/SendSMS/checkCode";
- /**
- * 手机号验证码登录
- */
- public static String Uri_device_DevSendSMS_checkCode = URiBase + "/device/DevSendSMS/checkCode";
- /**
- * 找回密码
- */
- public static String URi_device_DevLogin_changePwd = URiBase + "/device/DevLogin/changePwd";
- /**
- * 订单—订单审核和审核完成接口
- */
- public static String Uri_device_DevOrder_checkOrderInfo = URiBase + "/device/DevOrder/checkOrderInfo";
-
- /**
- * 退换货—退货单待审核和审核完成
- */
- public static String Uri_device_DevOrder_checkReturnInfo = URiBase + "/device/DevStock/checkReturnInfo";
-
- /**
- * 查询是否绑定摄像头
- */
- public static String URi_is_bind_camera = URiBase + "/device/DevLogin/checkCamera";
-
- /**
- * 打标：获取打标问题
- */
- public static String URi_get_marking_requestion = URiBase + "/device/DevMark/getMarkProblem";
-
- /**
- * 打标：提交标签
- */
- public static String URi_commit_tag = URiBase + "/device/DevMark/submitMarkInfo";
- /**
- * 打标：黑名单提交记录
- */
- public static String URi_DevJoinGood_BlackList = URiBase + "/device/DevJoinGood/BlackList";
- /**
- * 获取雷达图数据
- */
- public static String Uri_device_DevMark_styleRadar = URiBase + "/device/DevMark/styleRadar";
- /**
- * 订单—搜索手机号
- */
- public static String Uri_device_DevOrder_SearchPhone = URiBase + "/device/DevOrder/searchPhone";
- /**
- * 订单—搜索手机号
- */
- public static String Uri_device_DevOrder_GetOrderNum = URiBase + "/device/DevOrder/getOrderNum";
- /**
- * 订单—获取店铺
- */
- public static String Uri_device_DevOrder_GetStoreName = URiBase + "/device/DevOrder/getStoreInfo";
- /**
- * 退换货—退货单提交页面
- */
- public static String Uri_device_DevOrder_ReturnGoods = URiBase + "/device/DevStock/returnGoods";
-
- /**
- * 退货—退货单转开订单
- */
- public static String Uri_device_DevOrder_OrderChangeGood = URiBase + "/device/DevStock/OrderChangeGood";
-
- /**
- * 退换货—退货单详细信息
- */
- public static String Uri_device_DevOrder_ReturnOrderDetail = URiBase + "/device/DevStock/ReturnOrderDetail";
- /**
- * 退换货—审核通过和审核驳回---店长
- */
- public static String Uri_device_DevOrder_ReturnOrderPass = URiBase + "/device/DevStock/ReturnOrderPass";
-
- /**
- * 退换货—退换单提交审核
- */
- public static String Uri_device_DevOrder_SubmitReturnAudit = URiBase + "/device/DevStock/submitReturnAudit";
- /**
- * 订单—分享订单获取奖励
- */
- public static String Uri_device_DevOrder_GetOrderAward = URiBase + "/device/DevOrder/getOrderAward";
- /**
- * 订单—订单详细信息接口
- */
- public static String Uri_device_DevOrder_OrderDetail = URiBase + "/device/DevOrder/orderDetail";
- /**
- * 退货—历史退货单
- */
- public static String Uri_device_DevOrder_HistoryReturnOrder = URiBase + "/device/DevStock/HistoryReturnOrder";
- /**
- * 订单—新建订单接口
- */
- public static String Uri_device_DevOrder_CreatOrder = URiBase + "/device/DevOrder/creatOrder";
- /**
- * 订单—保存订单的详细信息
- */
- public static String Uri_device_DevOrder_GetSaveInfomation = URiBase + "/device/DevOrder/getSaveInfomation";
- /**
- * 订单--草稿箱
- */
- public static String Uri_device_DevOrder_GetSaveRecord = URiBase + "/device/DevOrder/getSaveRecord";
- /**
- * 库存查询—品牌查询
- */
- public static String Uri_device_DevStock_GetStockFind = URiBase + "/device/DevStock/getStockFind";
- /**
- * 库存查询—预定商品订单
- */
- public static String Uri_device_DevStock_GetStockOrderGoods = URiBase + "/device/DevStock/getStockOrderGoods";
- /**
- * 订单—新建订单接口
- */
- public static String Uri_device_DevOrder_AddGoods = URiBase + "/device/DevOrder/addGoods";
- /**
- * 打标：关联
- */
- public static String Uri_device_DevMark_relationVsitor = URiBase + "/device/DevMark/relationVsitor";
- /**
- * 打标：关联历史
- */
- public static String Uri_device_DevMark_relationHistory = URiBase + "/device/DevMark/relationHistory";
- /**
- * 打标：我的客户-更改状态
- */
- public static String URi_device_DevOrder_updatetime = URiBase + "/device/DevMark/updatetime";
- /**
- * 订单--保存订单
- */
- public static String URi_device_DevOrder_GetBaveInfo = URiBase + "/device/DevOrder/getBaveInfo";//submitAudit
- /**
- * 订单—提交审核
- */
- public static String URi_device_DevOrder_submitAudit = URiBase + "/device/DevOrder/submitAudit";//submitAudit
-
- /**
- * 订单—审核通过或审核驳回--店长
- */
- public static String URi_device_DevOrder_orderPass = URiBase + "/device/DevOrder/orderPass";
- /**
- * 订单--获取历史凭证
- */
- public static String URi_device_DevOrder_getHistoryProof = URiBase + "/device/DevOrder/getHistoryProof";
- /**
- * 我的--绑定摄像头
- */
- public static String URi_device_Bind_Camera = URiBase + "/device/DevLogin/bindCamera";
- /**
- * 微信登录
- */
- public static String URi_device_DevLogin_wechatLogin = URiBase + "/device/DevLogin/wechatLogin";
- /**
- * 退出登录
- */
- public static String URi_device_DevLogin_exitLogin = URiBase + "/device/DevLogin/exitLogin";
- /**
- * 微信绑定手机号
- */
- public static String URi_device_DevLogin_BlindPhone = URiBase + "/device/DevLogin/bindPhone";
-
- /**
- * 获取用户基本信息
- */
- public static String URi_user_Base_Msg = URiBase + "/device/DevMark/visitorInfo";
- /**
- * 获取打标详细信息
- */
- public static String URi_marking_detail_msg = URiBase + "/device/DevMark/markDetails";
- /**
- * 成交报备详细信息
- */
- public static String URi_device_DevMark_orderDetails = URiBase + "/device/DevMark/orderDetails";
-// /**
-// * 打标：确认关联
-// */
-// public static String URi_marking_confirm_relevance = URiBase + "/device/DevMark/sureRelation";
-
- /**
- * 打标：进店记录搜索
- */
- public static String URi_marking_enter_store_search = URiBase + "/device/DevMark/searchHistory";
- /**
- * 我的页面：登录人信息
- */
- public static String URi_logged_msg = URiBase + "/device/DevLogin/loginInfomation";
- /**
- * 我的客户--筛选店员名称
- */
- public static String URi_DevMark_screenfVisitor = URiBase + "/device/DevMark/screenfVisitor";
- /**
- * 我的：提现
- */
- public static String URi_withdrawal = URiBase + "/device/DevLogin/withDrawal";
- /**
- * 我的：微信提现
- */
- public static String URi_WECHAT_MONEY = URiBase + "/device/DevLogin/wechatTX";
- /**
- * 我的:收支明细
- */
- public static String URi_detial_discraption = URiBase + "/device/DevLogin/paymentDetail";
- /**
- * 我的:退回账户余额
- */
- public static String URi_back_account_balance = URiBase + "/device/DevLogin/returnBalance";
-
- /**
- * 打标：获取今日打标及未打标的顾客信息 全部客户
- */
- public static String URi_device_DevMark_showVisitor = URiBase + "/device/DevMark/showVisitor";
-
- /**
- * 我的页面—名单管理
- */
- public static String URi_get_from_manager = URiBase + "/device/DevClient/CustormList";
-
- /**
- * 客户分配---待分配客户列表
- */
- public static String URi_get_from_waitingAssigned = URiBase + "/device/DevClient/waitingAssigned";
-
- /**
- * 客户分配--店员列表
- */
- public static String URi_get_from_assignUser = URiBase + "/device/DevClient/assignUser";
-
- /**
- * 我的页面—名单管理--移出
- */
- public static String URi_get_from_manager_remove = URiBase + "/device/DevClient/RemoverCustorm";
- /**
- * 我的页面—获取当前版本号
- */
- public static String URi_Device_DevLogin_NowVersion = URiBase + "/device/DevLogin/NowVersion";
-
- /**
- * 我的页面—同一个人所属店铺
- */
- public static String URi_Device_DevClient_AllStore = URiBase + "/device/DevClient/AllStore";
- /**
- * 我的页面—切换店铺
- */
- public static String URi_Device_DevClient_SwitchStore = URiBase + "/device/DevClient/SwitchStore";
- /**
- * 上传头像
- */
- public static String URi_Device_Device_UploadImg = URiBase + "/device/DevClient/UploadImg";
- /**
- * 上传二维码
- */
- public static String URi_Device_DevLogin_uplCode = URiBase + "/device/DevLogin/uplCode";
- /**
- * 请求摄像头参数
- */
- public static String URi_device_DevJoinGood_GetCameraInfo = URiBase + "/device/DevJoinGood/GetCameraInfo";
-
- /**
- * 消息通知
- */
- public static String Uri_device_DevOrder_Devclient_MessgaeNotice = URiBase + "/device/DevClient/MessageNotice";
- /**
- * 删除消息
- */
- public static String Uri_device_DevOrder_Devclient_DeleteMessage = URiBase + "/device/DevClient/DeleteMessage";
-
- /**
- * 标为已读消息
- */
- public static String Uri_device_DevOrder_Devclient_ReadMessage = URiBase + "/device/DevClient/ReadMessage";
- /**
- * 我的客户(筛选)
- */
- public static String Uri_device_DevMark_myselfVisitor = URiBase + "/device/DevMark/myselfVisitor";
-
- /**
- * 引流客户(筛选)
- */
- public static String Uri_device_DevFission_fissionClient = URiBase + "/device/DevFission/fissionClient";
- /**
- * 云推荐列表
- */
- public static String Uri_device_DevFission_wxcloundinfo = URiBase + "/device/DevFission/WxCloudInfo";
- /**
- * 设计师推荐列表
- */
- public static String Uri_device_DevTool_designerList = URiBase + "/device/DevTool/designerList";
- /**
- * 转介 -- 批量转介 -- 选择转介客户 （跟踪中、已流失、已成交客户）
- */
- public static String Uri_device_DevRefer_myTrackCustomer = URiBase + "/device/DevRefer/myTrackCustomer";
-
- /**
- * 老带新列表
- */
- public static String Uri_device_DevTool_ldxList = URiBase + "/device/DevTool/ldxList";
- /**
- * 转介 -- 推荐客户
- */
- public static String Uri_device_DevRefer_RoundVidInfo = URiBase + "/device/DevRefer/roundVidInfo";
- /**
- * 云推荐 -- 开通
- */
- public static String Uri_device_DevFission_wxptOpen = URiBase + "/device/DevFission/wxptOpen";
-
- /**
- * 某条标为已读消息
- */
- public static String Uri_device_DevOrder_Devclient_OneReadMessage = URiBase + "/device/DevClient/OneReadMessage";
- /**
- * 获取登录者所有店铺信息
- */
- public static String Uri_device_DevOperat_getStore = URiBase + "/device/DevOperat/getStore";
- /**
- * 获取店铺的员工名称
- */
- public static String Uri_device_DevPersonOperat_getPersonal = URiBase + "/device/DevPersonOperat/getPersonal";
- /**
- * 店铺运营各项指标信息
- */
- public static String Uri_device_DevOperat_getOperatIndices = URiBase + "/device/DevOperat/getOperatIndices";
- /**
- * 个人业务指标
- */
- public static String Uri_device_DevPersonOperat_getPerTarget = URiBase + "/device/DevPersonOperat/getPerTarget";
-
- /**
- * 分享业务指标
- */
- public static String Uri_device_DevPersonOperat_getForword = URiBase + "/device/DevJoinGood/getForword";
-
- /**
- * 分享总结统计
- */
- public static String Uri_device_DevPersonOperat_getData = URiBase + "/device/DevJoinGood/shareData";
-
-
- /**
- * 1.2.5版本获取标签问题和打标内容
- */
- public static String Uri_device_DevMark_getMarkQuestions = URiBase + "/device/DevMark/getMarkQuestions";
-
- /**
- * 补打上传头像
- */
- public static String Uri_device_DevMark_updateHeadImg = URiBase + "/device/DevMark/updateHeadImg";
-
- /**
- * jc修改visitor_id后，返回正确的访客id
- */
- public static String Uri_device_DevMark_trueVisitor = URiBase + "/device/DevMark/trueVisitor";
-
- /**
- * 我的客户跟踪历史
- */
- public static String URi_device_DevMark_trackhistory = URiBase + "/device/DevMark/trackhistory";
-
/**
* 惜客指数详情
*/
@@ -442,6 +75,10 @@ public class HttpConstants {
*/
public static String URi_device_AppCustomer_addCustomer = URiBase + "/device/AppCustomer/addCustomer";
+ /**
+ * 抖音视频
+ */
+ public static String URi_device_AppDouyin_aweme = URiBase + "/device/AppDouyin/aweme";
}
diff --git a/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java b/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java
index bd440a7..7dfc471 100644
--- a/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java
+++ b/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java
@@ -4,6 +4,7 @@ package com.fenghoo.seven.okgonet;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.cache.CacheMode;
import com.lzy.okgo.convert.StringConvert;
+import com.lzy.okgo.model.HttpParams;
import com.lzy.okgo.model.Response;
import com.lzy.okrx2.adapter.ObservableResponse;
@@ -14,6 +15,51 @@ import io.reactivex.schedulers.Schedulers;
public class NetApi {
+// final HttpParams paramsPost = new HttpParams();
+// paramsPost.put("customer_id", customer_id);
+// paramsPost.put("industry_id", industry_id);
+ /**
+ * @description 简单的封装OkGo
+ */
+ public Observable getPostData(final HttpParams paramsPost,final String uri) {
+ return new Observable() {
+ @Override
+ public void subscribe(final Observer observer) {
+ OkGo.post(uri)
+ .params(paramsPost)
+ .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() {
+
+ }
+ });
+ }
+ };
+
+ }
+
/**
* 惜客指数详情
*/
@@ -372,58 +418,6 @@ public class NetApi {
}
-
-
- /**
- * @description 分配/成交列表详情
- * @param customer_id 客户id
- * @return industry_id 行业id
- */
- public Observable 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() {
-
- }
- });
- }
- };
-
- }
-
-
-
-
/**
* style
*/
diff --git a/app/src/main/res/anim/scale_in.xml b/app/src/main/res/anim/scale_in.xml
new file mode 100644
index 0000000..a3c90ff
--- /dev/null
+++ b/app/src/main/res/anim/scale_in.xml
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/anim/scale_out.xml b/app/src/main/res/anim/scale_out.xml
new file mode 100644
index 0000000..7a83fb7
--- /dev/null
+++ b/app/src/main/res/anim/scale_out.xml
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_addcustomer.xml b/app/src/main/res/drawable/shape_addcustomer.xml
new file mode 100644
index 0000000..3673841
--- /dev/null
+++ b/app/src/main/res/drawable/shape_addcustomer.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_cust_dia.xml b/app/src/main/res/layout/activity_add_cust_dia.xml
new file mode 100644
index 0000000..ce28ad4
--- /dev/null
+++ b/app/src/main/res/layout/activity_add_cust_dia.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/findfragment.xml b/app/src/main/res/layout/findfragment.xml
index 16a85d6..d0a794e 100644
--- a/app/src/main/res/layout/findfragment.xml
+++ b/app/src/main/res/layout/findfragment.xml
@@ -21,6 +21,7 @@
android:drawableRight="@mipmap/marking_down_pic"
android:drawablePadding="6dp"
android:text="全国"
+ android:visibility="invisible"
android:textColor="#ff333333"
android:textSize="14sp" />
@@ -31,7 +32,7 @@
android:layout_centerInParent="true"
android:drawableRight="@mipmap/marking_down_pic"
android:drawablePadding="6dp"
- android:text="家居"
+ android:text="全部"
android:textColor="#ff333333"
android:textSize="14sp" />
@@ -84,14 +85,4 @@
android:layout_below="@+id/titlebar">
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/findlist_item.xml b/app/src/main/res/layout/findlist_item.xml
index a02b905..852a834 100644
--- a/app/src/main/res/layout/findlist_item.xml
+++ b/app/src/main/res/layout/findlist_item.xml
@@ -23,14 +23,13 @@
android:src="@mipmap/icon_default_empty"
/>
-
+
-
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/mipmap-hdpi/icon_fudong.png b/app/src/main/res/mipmap-hdpi/icon_fudong.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1af251d0bcdd71a83de99e73a404d2c6ee09728
GIT binary patch
literal 4059
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
N002ovPDHLkV1f(;;X(ia
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-mdpi/icon_fudong.png b/app/src/main/res/mipmap-mdpi/icon_fudong.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad8c0d80d3f72548185ed58811635b0a9b2f907d
GIT binary patch
literal 2227
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%0DwM
z`AUlL)ydWjhP1S_Jg{WRl0VU1C0hfwa)|ODmxhFuJ3b%8Fv=&?{&a#cHB&UII>mZe
z&xdWVU@IT+)9%+OBES6pHG;1o)u`$c3vg|1?HyjP_xGk-M-YT~S8&|8Xn4^bldL!1
zc;j0$XU?p#0x+BdV(`&(gF|##
zvI5s%fBh8tnQ$zID#45n`e~Bd!v;IOi)B{@!@F5?=FFK*|GYF74;y5_@IUg64z<^H
z8XFsTq^71W;}DqXMeGVV5D2_gR8&;XdR%D4ds%u$vY3G3frHWmf2&8c)b0|y0#@oG
z!3+Sl0j%`O&f||ip0{%4%8%^u%8pF|4?pwFGt+BoYOcicm7TD1M-&1typMXL1LwcO
zpNrb@r8_&mlVz8e?#2Mt6NjxFlhz94c6+PRwy(|7fay4lGwHy~cXoR&taTGuxu1OT
zo&K$`5%HH+rq;D#LKewSS3VL&QJzje`R_9e3=Iwad-m+vH`(Q`iQ)60@@KevG2@BiJrdGmh3`8FjSs5M(W)4V+0Bs@^_1$d>OkKTFbotaNO@x=Rf
zdBZZ+H`?&)K97dh>a
zki{fPx=>zTev=)iaA0%4jMDp?ClVT?vdfn*-|cd_=IZiAF)kbo20wW1wbxc|-@d(z
z<(A`lX**TON{eJEElvreUita?Df{>D-{y9^SHzeb*XjHF`}f^*&pjJpo()`qlxImh
zsN5{qtQ14JE=Zve9nVL_V>m`>kxCc{As5WT1uG98Ja}tfUfwT_UcNn=izJVQW#C&|
zTPv0>U0O#j79HX8vW6{ZXT(4U%SNn(O%pPyWcUnl$pxalUaxcCzI_i&oH+4Ohr={w3o0|nrxU6oFA#ho-
zQ|pG{*{=v0pE{B58a}Hn_fCU;@x>RfEh#CfOifKKwQxzi{(*skKOZ}G?Ab>jee{A7
zSk{W)aDC)3Bzz~PLNXPuS%B4&E_ok0W(^z2mC|UJ4g1k;lj>f$aADdbk36z4Cnx87
zZnyhZQ4}Zh+N2{>ZNa3I~4La+!MM!+x;gKd%|ISw2+aO0FIQx>PEr+?4sbbgf=Bv~#L3Z1@s
z_3GgZ7cSJTTD9tgD2g&fC_`q)_#Hsgs)c>{@F3Q3%?8X3S;=Js*lE+I$u1l-ZG;Sf
z0c=)QmaK5xj=(D`EAysLpPuFMcqV#0o(WE;bE3=T%7XpDV6ZC`3SIX5{oQ`Q|ML0s
z=esH@Dp~<3!o$B^U0ni#M%Xl1D2s^{d`6cHpBW2WS)yFLag9#0Si(`wuHgVO`GW80
zvQf=6XxvVN1!a?<>CddjAv6*!ObSYa27s^)6-y>jEY-rckv=X7l$AUgmQe8;pH(i}
zZEBEZrDI%1HEV$$QKDQg>B4EK+1c6he%1v5w9d}X@GjCFqbd<9LgWFDznztDBOc@}_i0%9SifDi~EtLxu0~LOKbZj@Mw4!^UY!anjT5SCR?
zt&&Pjb<5=SSgByG^N#61lWv;@ng&X`ViG#f9g8qYmBMEdcszlPm4dY(%L=A|$nhEe
zq3b4L!)Hj!@ECO2G*l8k>5A!cETB*Z`m&^2;d5106-%K?>a5VF*9Gn8lLV@w
zRxN-rQLWt+%-bGCrIWC+GSZ#%fJSwaWffd77Eyy2bFkP*U3WQ;p$sac)vjpwD>YLK
zOtkwAG7o<>T884U$-I(0ZR9BvNei`rYPsl0&S~f|W*NrNMvhb#Nn3f2;ep7yo=A@~
z!#0X_@)*F<263J&R_%@psJuxHr>$*M%xLIw2a`p@XrtJMcCsO#Ss)2G!S945;3VJ#
yw?KklUQ)qHzzJ@F1i!qbf|Gy~+yV)HdH)Az3q++$qK>`*0000nk$?vi$>bdBzAfgvH%DGj5$OC=TQ&+GmD
zAHKV;ZP&G5_B_vhUgtjN+|Q@CY6^spppQTx5TTOdYfa!A_1_y80(^>(LU=(SMv&5L
zX>DJVU)gw`6gsT~l@(2%Q+Nmx?+Fc~__i0rUYiViJ^V0Lt%k9Z;JzO>P
zx%!j(aQC~P_wPVWD7XScAoPd%lfD{^e#jz%G2gxuB9fmm%@s|E8kLfn2_f{9;V(6&
zqOr{kji|t&*^jVS`^F9!nEP3HiL2=gPXDq8Z
zOe550+KK?8q_%jHU^HatQ#ohu)XAT2LVB_Jcyq`3FQF<5tf)6V`4=+?!J@!P#n*ON
z^32@w?Xq?)+ucK9hMJmBQxO&JRyH<*A*xvWZ$fpTYC6>B)bkVlAFZVA*Q!xsnj42X
zlN`0sknvne_4n%j{;lTm6dsH+mC)G8N)9S@6L!XAss~#Z!?;{z45F@)1n09uCe*eva!*UCD`4v+VJU)817@
zSc)JhyJp)`)H4}E
z`UIxS*P9blMG8W+$l*#$4LYL8B6O$Oz(yaZ5M~yn=}i=;P0UVC=Ev8!*ZDi3uH2|Y
z%M7`GX*t*K2d72UCp4u$7vvS8313J*(?IpBFq%+9ZSCH?Jy>PTk>ixPa`W|eUP=Hx
zdD%|hC#4cgBlpi$^;sw>MrI`@n;17!C0`nTdrL)eWNPYMI2Z?NJl%Jp{Z|KE^)0)s4k=Yk=!ie~YL|VBa
zLU;lwLOj9xdDwenhq^6F`$`N>VG@~JS7;~4b8gotm4^P4Eb9+;BuOVb|J48Ud*xeY
zR8*9#FSU~I26b2_Y84l*=@4b$m_fi~6bKuxn#pzgGD@yK#wJx+_v0;8BdxEBcWSU%
zqMuX1Ibnx!Y-q?WjzRK%Q@0v^H?()&cUOK(-d8>JsW4PoC#}Vf9PM+u}
zD+6LnI0;y?heta8AdC@=EnT+ZcW?QULWGhiGRnc;K2}Ftn}R_y=r;AaGV<1QdoTfH
zFY>C{?h?b<$c8zFv$!^)aTdd?=%WU+-nN`B2u?Us&seBNx3EyCgimXpv$rrZqJl_<
zx-v|S3=b>QiF*I^Qq6!Jq$ei2$MkI2cJrt}hwIB5*P)ZhAZd~cYD76fWKYK&8vXO;
z?sCoNF(qYCz1Pt!n=i(I8>y{p{P2$-PcKgcie@3KGT!vXZA`qThPrx&)ccTZNq3aG
z8oO*{+=c%76z00zY+3{jh@Qt(YU%H5-Rjti847UcQ{=Asn#tw;E$4+yL|8Byq
z_x7#pMscc1MrKY<&e0!#58>EvLJ&|?d*a?z?rqS+>e<=ZdxbdqyNgK$hP%er){FtB
zelLMlzar@vk(fbv5}kYuQp9?S87Wm6W-t~NsvK=Snjtp@ImT{{lN$T+!(5S_u-<&C
zNGS$~m|m=F@BA)htGR@rCnWi!)t%y9EGUgFXHQ*6N5{#a#eHY9SUEMPcqn#iYU-m{
ze(3u{G%LpCyBC<~I(r^fo+J~3DLREW1gw4-AwEa5qv8OSeg#TFo1BpF3SqS%uUp^$
z=KLvccRH}@;@sf-tNyun!FTibcQ;rkTcdT
z9-MG#BCmfS%P)hq?bnAXbRwS3%>4ZPaa+y!oQ^Rm?xT@C8}BMAE1T$q-7SBWX%x11
z@e6p;8go5~6G?8)BtGWZlsNK@SY(sZ5)DzbRy42emKv4_&GE_&M*tq
z#*KEM5qlt1(|q$8ZF5VoxX11YeuK@p$)D2!h8v~#stvRMLZZ9gD$Kl5ps{^ED?Ejv
zjpbowWd(j?nKGot5Qq~WNz4$Wv^SQ`;PGwcJz3||;k$Nl$6CkMM82$gl~K!?0$89^
z#T!c6X=i6gice%h67zOo`J7ZW?{OEwc^xO#~#?oCaD!ZrfId;Hh{4Htd)9XHPx?tF2Xn?IA|dVB2_b%bvT3
zhgOMt?&>$ErLXwFGRuoL$i)f9&j+GDf2Q}lJspq~@;xzqZODulR+AzVL)>0=5|~Eh
z1q;!A#&6qdz&?V7L!=V$ZzGbSB8AG}6H!IR8D7|1|KH0kR`^f2jBaNQU34;Vy;O=K
z7o^w`>B&%78WTZHI##IE>lcNjl3&Iw24Y8Ph26LLOlmJFvG(-K%vk8VApjcIOxgpl
zlDoURd0ESLL_V9AKbI#jB=X`2>0dK&QKZSu3>_xewn2tpm6zt&FO{n23e(5E;Ko>S
zlYe;Y3lz=n=I^ft>yb1!+DNF$w)Z!`w!)9&^Mx@lDAz27dChUZhBOj>`F*Q
zfHVCs_9t;732FYe(4zmTh(poeyno4@yunb#bkUE=#75bt<-b-GOsZ5qA(fiSJpI`)
zZZZ#`_&HbV5xmF#IUe~VNcgwafaC9#==k!KY9Xxr$@;s(9=oXh
zr6!lqfvp3FVS<$o87hN7mmUNm`4bL(S2!Lzugt!zQBCk_h2eu?w=6AlU-oUXmZ$0r38q$@T^g><2e_B=Wd%m_m
zy7d|y0=K4^)Q*dsloF&G>#qk0r8S1LqY$rBCHxwsx9GTl>&53{I=;;=nN;3_R=c(JWz)%ISk!7u8}E
z^Fc-E+m{zRN$L{mI1T3@OVqxuioaqsV}^6_C}wL{79p9fk!bihwLPsD_;j*Uz-duP
zuhvBTxw!Zpsd2Tr!mJL~&dv_LbK7Y@cBmAi${S*|G&~rnCIQv5rE1x$n?hWME)Mgjf960O&3C{v14(GNGg3~XCnhY6Y_*Iu$$S2t=F5Hx
z?c)gh=i)TBgEUpVzZd44T-K%~a$QjOC1137Dj;lZY$oly84e{0^u&q`MUX02jrCKW
zY7bkM3Btc~oeJ1HRp)Jf=WyU0=uoK|)E^4W4!~a>7pAD+?Sx&x7E?2M~fs-=rc!$y^PAr@=P%Qx10SzT8)YD9{1-}xUDvjd=LMQ%0EYPfLTe5mK|
zJim4M58y}bH@`*S_>1Lvd_+1F7ZssLFXO3gUyUr0dgV=uNV})ebP)u=T$Y>NEWN$|
z8VM~*fA#(a(x}A{dQ(_bWZ55rfrTvmUQURl%MeBQhfsRWO?pcej8b(dkm^cCURzt6v#cBn`XTF>
zK&l7YbyV9C#5dp;oE2sl%wd2fHvZ)ONf*u?L(spCcYTPS(}W)R7^vKKWUmB0VvuM$
zq(pVIbcis7>X!meQv51_c+pHjm-gPoYFnEM6GDn7PuAvu!U=YLi2OSwn}oD&I4Q_4
zjKOT>qT_eR0=;-Y4v3+^>8;ZX)Iwbl;lI0k;#SWCcTp$G95R>4=${isg^ifiaLH+i
zmMIyTz7@)F9}o{2(bRmql~g$bRzh+E!+yJKHx6mFagk{R+{4SWtRD{E8+5De)uaRD
zY6Yw&b|eMD9`Ih$Nw_;py
z#zWfKx37S_Abx33@Bw1*QA1WXvMUAxcW4cFr}So2VaAowF+sAZ*r
ze~Z4tkHI1YF_*E5ERsphc`SUw$j;6l&9~AUlzHdch3&=s;hWDfeP(+4mG9H)eKklP
zH3Ba=B}II;P$4cAWJ|>=7Vy_`y9__@I5sgcagdgn*0#B3#cb#csVp-G>e&RYIT+TC
zek2mH9_hT&+UW6Xu`$ld(lT28V~(a1QzF>5q@Z9kw`nctW*P9xU^n)dk|fMQ5KKD?
z5u48zjDqJ8p1Q`L3tnFyA7{R@fQ+nBnPbrf^S?DV{_YIOAgxY@7~*i{(IcMWX|rb&
zpT%fVcuGK9bLREjpU^YnntQidE8ORi#X%`TMG%DY|8uA@E`GUu3=KuRDRN4VWz(xm
z`3jzJMVgwJtU^ks{aOe;Z)ZSRpf6U#NG3oSNFY&CvXLaCJ0aBG-vcgJf4T~h*&~eW
z_4i$cj4l9SHapse^^1T`_HiQfJz!BU3gn{h(Up3&PM^FT-ReP{xZUO1qCS5!h1@pB
zZND0KW5swY$Uvbu{->LLsX*Jb5FM^h*S!zNmz}q%^kbpYMGhD6neFBavO&SlNe8C)
z!ul=WR`#sZt6;HiBFWzc7xTf=FPDI|#1KpTTaP;>f_Z6h2*1Idl6kcM#Kd=_-l6up
z_lx2BRa-&C)FqwhFdx3RHt#!%$h0$PewXXlDNj^HctRiPToI2Soft9#P7-k_9`N_V
ze?1hZy%dAcN#Z9yrIoeBqFFBVxN2}V*eNsR2BY|3FN#zIw
zIL0e=iK}gd+gAUbLez)VFJ|FZ&u}ck27WqN?5DG=fe+t6=O>wjqP~-1P)e{^PHO)@
zG5d$Ij9l5AyA8nRP
z*bHI9vXG5{vHk`a3$Lekk?n4I191#%zP%qwKhVdO#`!x|(J&i?0LoERw@Uw&_fX<<
z8!|jwA?=2)pa~Rq{nMpj&J+LdKJX{%e}t7O^Vr$h=SDIGj}w4KsAmUW{PLk5-a3*P
z;Qo;=fJ3k=7_c^cff8%7hjn$%(UuskKqp!6r*R2{3OIxFhGJ-{#kv@d!A}#T;bC6y
ztgUy+KcTw(5lq*;p(20{
zmVFZvTj@lwjp#^nD@=dgG=cYhlHfKh#b3lWVCngyuIUh?Fqs)U&q6E{803PJNP8kq
zE$DE2b;-l`Z{`ewk12w3<#qTy^pP82l%=hKxH$RDk$6L@-eK#QiV#HSwj0I2--Z9Y
zTLFe~^gsT7Nndx?X3I~JBQ(HgF`H!*B(4=KG4Lx}d?dQv&OWi;etx3fYS^8U6YdGO
z7d5UcOw4~PKN{}5?yhBEQE?ebxfGhbd~yr8)+Hk@J;9W#I?EF&eN%z=)TX+0WoEIt
zgnTA~!=BDt<|WJVKTxfm8RRi&ZA-xDtd(n(2C+E#5*cXlU{?jjHWE~QyrZH}WqwY)
zTtutnrgy$OnyaT(r%Qx?M6As2S0eI~hX`rLt0l}LE~nmTSc(E*m*omztxBnvnbnoL
z;AkRmvAoDoIM%@|yQINGW>$)q4oY$AxlSjW5evbSS(39GjAx<-7|~?^kN<>t=Ea5v{AlB2BSzKH^eRFx-@ic*G6%B^HP85Zgq;QvQLR45_sWL0qe(xt2ivT
zG>k!C{kKJv!yK2pmd8pYINdD2xXKf3S)45k!y;}%v+LFTOiM~?csltvc2-uGV-wM{
zv9|v2YXY+ZJ(D=iKLfVy^azS0f~H>YBRz369bm9c=j@ADoSU|?eOCRx0K6F2SHSek
z=UxK~Fv{;YTaRjPUesiJ!EIZ-rgDx>8yZY^yX;fC5$gA_nGR9`b1}exuQSOa0_8Jxa9F$B0Po?dO0P+LX+QonIT4C%
zm@t1kw?txGnF4VTx1GqlP)cGM{pChKgUSKA#2A};@_E3#PS(R=y78H~9)K^L6Uw$wSX^6$jyD27d>v%V%_sV{3xiVj<}gT
zbNpy$R0!2{4~k4nL8NZI?I}0NE8dV;TqdoV1hdR*0pMTdZZWE3dsdKXmMij%Z=F%K*}KIEGa7f3r-$Ea48qDyz(D$<@rxwQa*S-L%1%e*Hi>eRG!CiHR(S%w5L!8v
z>-$B9Lyf_qd&|9oPZEn8W|!$n(j{Q3y8zz1F92I(Yce0sE~w-^mR1$z$4{l_37aob
zrGflC4Y~PeL`-}5=VM-_M&rf$d#DF=ev~}RwiqF~(F^#}a
zk5_3-<2+D(AWJ_06{zJ!pyM0HN;)0Ce$aI+W@20vAxNbkWSi#TCy43sSk{zPr~^9Q
z`LeUmI~x0iT%yi4r-4{HJ|N7y&xEEiS;0au=WJ{EjM&qTIjrlf_^O_TEFe`l-Vc$!
zhN35wB5vHzu!tC2caVmZ{$e>MpX!U#5)s4*|-
zvkl)IZeYqWkHW^MZ2J~)`P-h{j1o8t18dd^3f;IvQ}?%8O(a_Q{Nv}2^78VQyyU%{
zFJCq{1LrX=nmsngG3>9sCxY=5H*B5wgG}!6a*Ic|Oupg
zQx+(ijVp{1*JdnR^zy9L>&OJ*0miWW7##;H_;l^c&_;dIk!Ia*R)d|6>NnS&_dKFi
z9b&qCBCV_L5DJ}}0dUJ2{BX0j&FPLJt
zxDXxfpGS=Y!33vb57P(JrBB8)_>W?MbOk3~r~k!1bKYsX#~Y3Y@JLayeBa@mxtHeb2p-BZ5v`h;6DBD^M?<}M3D?m
z{%4VW#=YKX%f)AxLfULA&KM?UVur*V?metkUL;W_EZ>+`n|$O>YfrmbRaMn0
z%(O4zEC0LW;a;9uKAI{QKxh0`vo6PQYk>wHe2ocLMv5e2^L%f-!$4pEUw4I0-QFhTH+*9kwB`^2nTl|njK|xbrFhZCD~H-_vTjl8WP&lgb6333>%_BaL&$X
zvJwLaTE}L{`2p(;5ORjq})a8fbaAO9sd$D
zGXg3uD+1;GB||L@rRfAFRv|#It}y^6G`GiqJSV*L6%)7cCGzV$zC0H3Iz;~fRK(^m
zkRhfxueE>A08@8G`(V0N6O6m1xqZSIHw}}xWvJybq_c(J9}>1pfdY^1z$~oNrjOWG
z&5A+^NeW|`iG-FTkCRwb?U#Xg-60cZclM-dX$2TD^#e~BHA1PJ?#tx2OL}4~#uMVN
z?7&P=g^@()EgXJ*3e3_Z4Vqmys0VSl*yA4~h!|9z^W5`7$-{ZL
zgf`YOb$ABg8gl<{S8~gcp>3dgisK~?m%EZPW=m{X|z-%c|iqW;T
zq-0my&CP8R5Y9p1RGKhK9g6yP*hkW`6G^FP4qiOo)>;fpVbj9Hg2FqQDooV!JN&~h
z!p(oyWe@F}BOQPu!yJe)xUmHer8X%uy$K~l0Kqx;SkEXSF+2O$ssHye6bcr(^vk=|
zi0egQ?WopEDgp#%s8m^fJ+G0mF&!H#>uK=KuO|N7pldslDh@m@Jea;Nda@^XvItwO
z)Q`tCegmH08y_aT%gA0At#L&z-S+x7j=a~=#@il#R#`;{LNnJdq-ddk&3*EIud@~Z
z#Tq&<`ZT6Qa&Qycx_(QzJRPI=M-*Wb@fr==S>ZCj;+B16*+Nt5^nx~{(Q#>+wHWh*hFb5T$*w$5~$st_Jrg7#5
z*_hMhcC7|69H@t*54$R)Wbe1nbY1Ro*y5??6~m;2!2CwcgfTFI`z(k6p>4AQ+_CYk
zvVraLk8b{&xD8QN=AQR~asof%z=O})+`s$~*E7UMM5KoI$EWTqzUB)4T*dEP*BHWS
z-8kfK_aP&Kx;Ux`ljs#u1?^z7PQUc5UCK_?*Vx@z1|1@*I~N`nY<{w5<|`VJr0scX
z%tQi4!(D`C@z13DI;%xnBMsff`{a;M)UgZj%v{LUBUDVo0Jr>
zIYY;u&0!4l`6vQ4MXt31N<)>;@w%B1q2;88{vx?lc0n#0TQjA~m|;AM9P5}#zL+VQ
zPkl&sxJu4&C~1-kYhZa|+wdDw-zPP7eH?no(g;1wSG`PuLz+mP
zPl0dA+f!J=V_l3d6w8+0TT^UXAKpF+TlM~|8(6%f
zK`6imQq4&-5TZ4`p#OjrDwmS?Dx?7MEsaE@Qjp4AM&I|EcLeZVu|ez@I_1SW(6ML%
z-sh?<5dNKF4Ha#tD|AFDqF9<+$E164Q+lSegrzEx;Wb6(;JjYBos`8I?Ft%|tffp_
zeMi~7}haYhM360huWJ!xOIS`X>E
Xf+x)_EQElYVIUAFWU(>HFhL*?_D4A>HQ@8)-|GcB@Gb(`jRS$GK_8{W
zH9QRu)4{F~>6Sm&9|mZ|k!iZ|5@a|3N*mwiyh0y-5#1tyO^R^H_5%${qE)PRw&yI*
zHt6t7+D6g}STPTFVc39O`P)Blu$hUG4J2mg{_PL8HA)B-GQoeH^WV>S7Yo1G-$aQe
z21bY1tA*MTi9c&gZM6Jazufv?&Y1RLJu2&o=~34ag#|b4wESK~UPKN-*Y-fR55UtC
zLwWN%w6L^-H4ACh4>+ltXdD!Jv$0!Z3$}u}QH>M5s7B*K(0uW1*;_;=gRWrIp-I>w
zVLOFUWmL2@z|gg?k^bM8S$DcX>c~*1d$TjJs(UxXSu^*0hZT3|d>o3AhY_0Jh1#tj
zt@+lbVNOMGQP?S1y8QKq?xAvtU2Q%3V$hc)`}9GS_zX9&{TkJ9wy}HhpIw|CxbaFu
z@zQoHcG}Xm;IkBpe$G-l4dRnWosGl%L=@K{&m#88GQ*S-x#SOitMvcu&|L?=C?#&z
zKmJ4>Fa8X7=s3Ox+xDGKIVsH#hjSs&f$s>!loB?jNWWa+Djy$eV4T!VimVJ*l$UM&
z*-3ftoWo3~-RfRmq|dCPGa$LP=I}+!j-XDW+_faDzVq;IzB*QZ700?9rmLrC>pd11
zhi}e-3N1~@jZ5;&a6fBV;rC@X$`86V)QMq+&hRnaj*kx_To?Ih$Nj$Q1Py!jGo_F0
zir`P5mCd83{V8*$4X#Jo4}VRsxIbBMt2IQ;AQshz!I$n{j#dX1G*mHmsWH^F3m9;r
zi=u#a!^&oelQY6FXGDp(GUEA%r6G@(YS)MP?xl(L__{ZDZ9#qp2-T
zr+I;0_rdP_LgAx;V8eC*bD(Bk6^V*^aYEUbBH8b0Y0QT=v{lk#=hF*PiRRZo48|6z
zf4rpt%_ux5=Phd1UQiGagUgw!wB@RI`%MvIU~B1J4H#dLj(9ADI;5nu;JPDJwT5^RU{J7L!cd`TuVbb2BN?OYh33pD+tr7#WmC#&
zo}WTL^w2CY2uQ&Ud=#^0?S)PRGz|>R?LNO_Ufzl`|8~UyFXecS^|MaQL6J)L$;061{Q^ZR-V=*
z)+fUWNx?~Iny4jnpjv3HSOnA}F=bRXh=u%Z{4TvzHyN0oFFnS9)MK9kDbhOP-Ap|)
zn{WlMx-OY6k>abO;NalohTqbRQ0i%XsvXh5fKsC8RUog$S8JhZf=&sG-S|M!?Zxnq_~xSu=zQIXDZO{2VZ7I
znnEug8jg0ep6P)pv<^x+TN9IlSxYN~wA)aVAx4_{5Gb8PE#cfEZ9hq3Po8rl#u5X?
z)U7?ivA3qqV
z9pQ6z@S#fK2OG-k@NSr=kReG#&)MdwXNECJ`i4gr$C+uhHc~QY`~VMm$VA+LnJ!k>
z`xK=@y^U*Eft6%Mx@*7d6%U_iD$({o*B#G~8TLyJ>1LmlCGGhr={SZoQeeaCX2Unh
znx+^u4*ZD`ezS==oYYO9P052z_E=m~HrlHQ@He^6X@@K-xN!9|7Qam=qh0lqJ05ud
zN%z2EXJR5t&CK-Ip^YUWiRp9RXJjRNpRVMeqDUv|Xl=bPH9lVDa(lKtvp-iUDo#v~
zoC+IKH(%A(Av6=v9dRk9_@)+$X@Z4C)EdaVz;Ov7J09$95t`v8-^71EpbV=iDk@qb
zIpDpC4sk!*8dz~?J#4V`zWB>YD=PZDx4gWpfZf&a+!J>rv7}Z!UC7GHD!8}5FY5bv
zIrm)SeYr;$myW?5P@kRMNj*2tk1kCV6(j9XkH*^z`t~uXF)M@9;XFJFI
zvL3rKW$&!F`GDkynEbL?#v;Dear2*yqs`tZavg1L&r5442IH_fGx=CHR*DAGc$%EyACx`1dTI;-Ejo50o(iU2$@KTn~@$4NBXWg4IqEA!5fB!bx
z`txTEN+Ltw7`5YkTd1q6%QrJK({_tM!L?g%^YMs-m?75;*Y_52j^(>|rsKfzhY%-C
zxK57rrMbmt-vS{_C#l73ZS#TrPpr($LwZe48+k5c!q=;wLQlEWB-4iiV$=s|j_qC+
zvt>G!M@xs6m)pI7|{7q2P)n!KIq&ex+
z;XfY&otB$~L2-1wM%Lds)v(p3?0s7{zoA4{S1(Y!4P`TEQH<#^S$W`rsvM;cnC+#d
zrW*dM1tS=Y7}xB#<`TrT*4deW28Rhzbi?xT2hiakt-V$%G>lH
zN|B;iP~6aPHBoKaSMhMvdd$VsZz0Z>(@;m2);zs{T8%}}@f4OeGo)+v^S(eSy(O)%*InO+i_QJzZ$$H?II6ZL{gwB<
zrMnwpuYJMBcJna&gMqG_W839yh0D(Ht(&-br)x4g_G>AmBHNbcX0M(pWzn|3QT(g#
zY1B>KkzN#W3eHF+EYfvz$(hdy^Oj=~DKncIFZ-Yy7BPgs7sO^SZ!vq-8-h*#Wwq7g
zSQcmz#d9*>CLg&{h9@LLafF3{XXtXA4U|HOF=cZ=&>hx8`9CZ9NEst1m%_{LOg6Ud
z#h~KB@4g>+5E2spVbQLFI)C}{#4h9`uj7=Pl$6AK{%5QsQ>xTD%nONawJAADB@K9z
zSabyK(TmZOr|1*=+O~WxAls0DAMPneo*Tgtp}15}x@H543{`^*f@*3=3b#v0X&OH6cz&YD&(Dv5
zwr2bh7HoC!Je#jJ#WnDMysR8&Vt&q_4#)cJ8cDtLUr
zXFFSFd47K0XGSdh)X)GdWApTI%k9O+8yS%vGH({Gy~8$C(P|?{Dpaxh;JU%IXG`YX
z`%9s+Ea&YA3miEk!EcqgStCmZ4U$SoK7E?QX|1owNh&VD9>O&A-`Db(^Z`BHb8mZne#a{!=o?
zhGYuBm*;1{_LS!d=8IHd%
zl~{FgsYHZI;qV9hQoINv@2?AqIJAg{AWe%w@Z&3e%P_uL)78VJ#%Fb7;|-L~-P#tq
zNVN6Hy-?XGvie92&V8lxS*6w&)$9&+MxZ4%qnTY=P-+MSbPWIX>lX$uS7)P`si~>C
zj?RK<37%0u-^ny
zwj7l*V-Z;u7Z;NXnhz#)OyW%qu_2kLn(6XU;sjx0ph2zIF$IqjrGLJJbBqa^bcgxV
zII@omeVsyfTI?H57kuu!*qvIMQ%0#e$z18_mN+=`oUer?{QwD8wCC`S=425D5MP}>
z?P+z~DF{&>zaDicwf&?=ovuWsU1K)T4=L5GKV~kV;fqk5!i&(~%_?=m12yEgm+eQs
z)ID6R-;aXB;h9!gIi>-#v$G{Mk|Bzn==Fc4DcPDQGm4z3k%-bOjEUTKnn&Tz$5)3-
zm#(U=O~R$`4leMED(!^qh!TlV>#C;YW0AElLVv~G>AI!QRTv1GtRn&(_rqMIUh+j=
z09EAgKJ|&e^Mv6=McqE0Pd>s5=Cv0QE)bz_$#s-2=;3fm;jvsTOcaqQ)o{NT(pjnz
z({Z;~I;Wwj`K2o;nZI62sc8#nXj;bXAepYA3XdJ>44upE=FtO_C=tKAt@g`Vy?ubU
z%(TSFt|1SYeO_Ac407Zl$4!&Yr@*mlF8LLJoUCb7YyH-6{ad3(T#+Nt5{@x3F)d^|
z_V<(ay=(k16d{yW%szbUzCT;uh6VCmZgNKJcsz9U=-xbCU085)EA2$y
zb-g>;8i)_|y;`s=?8jtXU9Kv@bX=$j7Tev|o_B-^9=!i0lVLt310Zz=BLhQnZfkV|
z$T0xp!$KT?xtV&fw9WoE%vQ9jxVvvTV;6=-poY4-x;FjaBJn}H{dKQMG1v`SE@&y5
zCfC)7tZ=PX0Kk486(oo`(57YbJ(#b)qENihPCg(l!0oJc`j)?mcaKwLw-?5L%&fi!
zY!B<$(9nI#(XU11Ze)7pjEAoAY{_G1YnFpF@%*+V79<^*cJ`Bw4Bu1BDshHsgbd
z%;e^##+t#bER`2h!G0*(u5yB{=HC@5Qp&yP&fC39v(U9H0`Bhag5SzU`wrT6J6DUx1j|N}#6CZqkNHzZ^t237=Co(D5y=%!$y$tM
z2%GgqQ?Q!7!J61gwn2w6P3bB2wvWKCIsr=^Ak<
zg*@L_#G|+?y=MZQ6RbF2r=$y{a$Alzd#t$4b&!T^gviFW2@AKdj+N;*e_oGQ7SV}N
z-JourQ1b93MN~A6=`}i}L-h6G3@wkJ8i%dHKfm-%o|C}5=-ubBEI#bWU=TqC?pXA^
zE>HWY97je*+NO6y%Z4H<&;Y7zsb%Q3&5-!PcwtgrblHj?sh4HlN^5;_QFmkX?Zo6q
zd_TI@Xt@)cnG(nkYzhHa1=rS8hZH@c`5N<~FrVW#52}Es;$lWgl&El-x1+`Qz{4cOQB$N(ISt+2osgBuR!ovFp@q9cz|ppOzEyFIrH856lIVw-b;R
zkm!!M!5n^P=%D2efB)S2`ufMV4vYIQor$Y;)>Gwe-k08Vk-~i=0*$gs7t0a*V~za
z!b1KWc#kE60Kr}Uj9LnM9Qi5~c}HR-ra!2~pYF~v9;LGhiq2^Z*Qa6BzvyE%yZ^c?
zMpXA==c^8E!-wcM2a?^D?D{ZoEr`hRAwtKm-sk!#22guzPOgN}M5RNFC||=^~!D+dqsL)uCyd&^f~wM_-W@RxC+!P3A;v&pY6zE(pJhva$ny
zi{a!{*fp+EiAT@z-lyaH0ZC!sVl5R%T?mBtrW1ooh&o7{^SgA6a~F1%)dQIIza@;z
zo4MwrawN^#ZGapfw{3)wuOdLh(LvGyEJXpt4t4aH!!2Xu@2~!9LtvLTTFW1K5jLRG
z$ezT3}^93TQe)IgYc)pyseB0Q(FD0lA`F9l(NtRFFF}
zNQjGyC_yU2Cg*#AD`$$ZGd1!la9P1-sOr)Qb@&M1pMVtpz#vGog~~Q)nzGYEp$Cs2
zFTSxHXv7iIL%g#Q`mn>YfZ0l=36LOm6}kFH9kePd%y8m>S@y$O;1I{L`8r&VCtT=!
zR?1~ovi7KYGmQ*67r_LYo1T790HopX3&}`%FK?`}r~l#ywkkSJpA{!`okxiW^MONZtDvxMk;!>ED=~%d1&M
zI+urzR44e(FA{#M3-}j!KMwd&ytt29TMybX1aqZaYS-Ok`Ww
z>ED6gikrA)F6(tD@E*X#2_jt^*K7_q}wcVn8
zk%3i&|LvRpo$e%wZap%I4T(l&3ROO7<+tLLS3L5R2-S3%NpThoxjOBy88QM(P8G;+
zwiC5Mr+ZUVayjwuSg%xNYs61%+))c-FXUMqk!IP?`8rkkl4c9l+<7t#!G|;mZ|6dcMl|
z+EjT90XKO!x%9HLTXXE|YKz-`8KCW@_hJ|YKLf>=>0)58(v>R{<-LlD_|m>L9F?D7
zN1*FXm$VoD1_FT)KHgpWNI!C#%i>^H-MNVTFNYa3hH-{2h8HBMM7=;osHpoDQS5nT
z<6Fa2Ed-b+l34X*mVqXJUj>rgR%ykt@mXa0>ylmFH`vh7(7T~;^+xz
zHS8)fgi_hBKtXv!PNvU^td8#pItyp-qVN4bewi+n)`1OJE)2C@mO^+CB@~c^41SE|
z`T6-LP4v4FEDLqH7cdG@+#wg(M#u%Y{qUz^abX+}LJ0|Qgy42JCmXoNeI3b+{}t(N
ztt#~+V`Y{ry#pTR-C4snZ{f{p$w;*ii@};csdtw-zCIu4B&R@K#~kT-MknR7x1Pm7
z3*)<3M_bD|tz5V+l9^AJiEG{{a^?t^ngU67);L$;n4M-;qm#^BFTFlR)`p+5=LK_e
zd;mxI%Cu|tu&8YN;0Wcf#P1JW8|m%jcwQ>kYrG=%>pD(MOnmH(Bvm)PrjcQN-ujUmsob$c745Nb+uXZX
z94inxI=gAw*YWAoCsKD=d>usgx=5|*(g`z1-HY=Ks4z~$4Al~MTKYk?nM8o|3QXzB
z5kCN5i0rwBV=AeZ_sLByK-xU}hsNY46xQUp)=m*UM>D8U>hyo;dY0&i#joW?|3xKI
zW$-*{F3lPq{a@hx-aC_nxOen9wfGq5TiDu$FQ0d7v$7w*lp$!{J!mmmnH2=myQ71$
z#U@-TE1B|{xvy2wttUH2gaI0|=Pth3I<|Dm%ZBFU-)d-QxuW6uikmZGW)
z^R*mj4qseMtYU6Es+3#7hY63FdGdtDRCEot=r}=<8dxET(GjWk>
zWtIPpd<6O7W;5p5>f-N2Yx1UDZKc*8ktyqUod&yw9>At8?<(^T`O7`#XVKST_-1RA
zZ`_)AQI(%eqp7ZrM~28Xxp~6d1Ha*T&lQkE_kbMgOX&n_B46JEM#f
z*{ioQTcX#?F8)z{n{73P%zH^Cy43LlZ_;^fXJb4L<|ibMuggnIxjpawgAPP|iV+8G
z<4lUm^x`x;bqCrvLAWAKm9jCEF-0O8=^{QXDn>>fPFwx4$^*Ua-3B+=p!L|ayH!Sd?%gXdNS`BOfF43hvF7=puN8JyC(u8
z@D6{wr-a?P(95OcOGzcEl{;22+WaTN+5Ox@k{!Vk6(vLCXxU0zIq1&gFyvt$lW(EKh{pLf)rK^G;X$WA@|IrdQpx*RdIs&H~0h
zEw+GMRJ?mluhgvpA#rB}e2a9XyGaH1!wbMYwEIWW-{(B4@q>*60Dt+|+}!-FQif0p
z-8mc^8ynqms$I@+!{=@b`vz`4M1)+je=N#nTaX62ulRKgKOem$)_3Y8>voy_NNW@D
zcz^wD0!Y5&Rsydph~J8Pb~PyTqpSuAL9$!!26trez@632Fr_!fT6Kh=`{ClHjiKRc
za@dvf3d?J7T|30(JdJLccM7b{D7OIB+g@P-sj6qnxe>gzh8SDZuZxI7b!9@VE(
zj^locrV3&YGs3)Iy{W8=)R>Cwi|h8f>&1>AKYr{T3nsS8dF
zCl>KXKK>Xg1h*I=(_VM}=-T@Esve8`2(5G;OaF9w_D6N)aJ^eDMl#y4K+~ivM+C(9
zM$s@trj%n}{~S%64TTUKtPw2l8(gz&qZUawAe=7B{Ia;?d_9
zR8ECq;q8})maOzXUjVAT_4sbT(m#=beL76o7^VHKIP*<}W}kr{62a@x>Kq<%a@wzh_DnSik%7{CHiMkd!2n
zojWy4!@I&DhREy>d24JhGG86vBqHrC
z)Tw?a(7wXxuECV-yr_70g9R3)E|RVo=&Sq9>z+grc~eLhMQzwpBXWc%ea{B|d;mWi3ULsiujz!hA1K_(sDP5ZP$UQoXy`y)9&l6ZYP{Md
zJQ^zB>$4$tBTmngb;486hd`F#p&5(9soh6jUS95_rp;(&kUlaaYT@7QSoif{cwiPG
z?yOj}&u%E*e=rmYsO3Fsm}(STTCbZqQ7xU}uV5GD|r>Tvr%J>0JW^!r%n#{#Qo
zaiV7SS1t5NDg(JI3~6g27Il-RQJF&PYtk=&&>Gk8qsaM{4pv(Ehl%&+8t3;JM}U|m
zL(kB#J;^;Ke6VIp>O@!&g1R<zIhx_IuLZkwE;nepvOjRoQmZ%m8tiPL+7n
z|AtRqSy@@o0>hi^hbnadkJyDCFQyV5;itVXXU#(Ey$DO%1+3Kyx;X)~_dPFX5H9><;GlzS_u@VzsA
ziyU~B7|Iv=<9#=6uk62w7@yr$JQ-N_6WrTlz8UppbpWdzbDBjU&$`8GmzSF`T
zqQ>y92oyn`_;^~4#o2Zc$H4jUA9Ks!L_ODpREX(|&m(||r>m+uAxySKMM(@>0s`wg
zAc^F~&!crR(IB22A1vK?RK^O#sx7nKd9tEDy9{wfnqOWKXb
zp09a?i(jJ?<(j4V05@tknZ(Ar!DI-hTgpqPF%_}}sPdb=nNmk4R@TQpKo%io=!|xe
z=c^TuMZft_WA^LoOUHkM0i;CwDXmy@kiJ$P_<1OuaRD1X
zXv$h3b!7!S$=e)=o>SBxwXSQf##Hp=)sh!$W67Mk_x6n|d=&t1d<_`=FXDrq0!{o?
zg}DHBE9>X?*pjdC&IIt;-oE3
z1I_Hx4a4~;1QF|=-w5yA@-(1$!ke3$g96R$R1E+t
z^ADhD_8S1}|7atWN<>i-+)>L`joI{_2(*n>($9Od%LNb6GCZ?06GJT*HQuu&H?iVL
zQKOYtfYHfbj^j;LO-+|uBAj;EDJt)6$vzU?35;D8v9%OP
zve(0Q13MnxiLe$6C!6|SYomxF4+}Z|`@zhF>P`SDLqAQ(>vN-?L$kRQP=_%W}apdAmMP>-rgoAA|x~zueY6}+TPkC_yfFpHcx*6O&rLA2>%`G
zHK{f{6#fwZVG*!2k_XJ%KNU`4@4AwS*<0D#mI^xm?$!b*>pj22@=YTlvnJ1kn1o?Y
zl@Qcg%*#f>h?tQrFS|1z$wS3WTCBE>SK~xto0HlzDDTdI!>tjG6Wt7dD=t8>>!Vmf
zVV2yvjZEm-k&9?#1x)(t%;52ZK
z5L?%HcFKKY_n6q*qoSIj@JSN0Lr>L=%fpXqIAFAmgr4;t7;E>YSuBS1w
zDQAbbc@En3B?)7duj*^eL^Y@CQR)S?v=fq|p5?}!8gCmPX1Hs&ISSp*on$JM*k?^lfP{M8Es
zn!{09X>uz_?
zdc7*ITlh@)%<^4JYMhln!6n
zR;;NvPoSSQEorn#yov*QU>8F^*nxdHTpk;o|XwVBB~U%yOe~Gq!OvMe64q!E%wA=w|5e>`P;gWwdK8;z+6NBM2kY!Ov`$-S
zRF~-~a&g9*@n`oWMcF75;2R4V5G-2fV{6*y##Kt{W=NDW)hG5&dP!wr5@-@Kl@40-
zW*WGl3UtU@f?Xx`%YIUj7wR!iRs3El&rk1aE%~~m^gm;^VVyr2h8VSfGW3OWNlc|2
zXikTRIyT}Mj~*vH{$%R2)e}HVQ{VPn`LcFQJR7~)x{-|8WGu@+SZB)5PwkScC}@vm
zu$tu-H%|Ip-I(2OZ&nx%8jSFf%BIR*T-THpTM+`|Ti-vOeCMrWb8}zm)aNQw9y~Cx
z-SPlPgT0wxF#3GMOIBh$-X&Wos|VUXY3^)znI0|4hpsarp0dur?1T3vC~AjgWg&A;
zwsMl=Bk&^v8jkRaoCYyZmMkQkvD!)A8KS>XB^E?H?Fdl0Welwb`NV1
z3j@ZgaZbCYAalT2^}a|JE1n53RxSB(;yP0gj8(VbT7kdLBa^M;i3%CG+5cMx<^Oq^
bCsFUT=%XAX*?wT=9Q09INvc8u8u#ffb1b1b1
#999999
#ffffff
+ #66000000
#CCCCCC
#67c729
#a3da7e
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e4389ff..ded94db 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -100,6 +100,11 @@
- 0.6
+
@@ -109,6 +114,41 @@
+
+
+
+
+
+