From 96b845b673548fd741085228727a345ceba28d64 Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Fri, 4 Sep 2020 14:08:34 +0800 Subject: [PATCH] d --- app/src/main/AndroidManifest.xml | 28 +++ .../fenghoo/seven/main/find/FindFragment.java | 1 - .../main/kehu/Bean/CustomerListBean.java | 170 +++++++++++------- .../seven/main/kehu/Bean/FourEvent.java | 17 ++ .../kehu/activity/AllocationActivity.java | 22 +-- .../kehu/activity/CustomerDetailActivity.java | 14 +- .../main/kehu/activity/DesignActivity.java | 4 +- .../main/kehu/activity/SearchActivity.java | 3 +- .../seven/main/kehu/activity/ShowAty.java | 3 +- .../mvp/presenter/CommitDesignPresenter.java | 8 + .../main/kehu/adapter/AllocationAdapter.java | 12 +- .../main/kehu/adapter/CusListAdapter.java | 2 +- .../main/kehu/adapter/DeaListAdapter.java | 2 +- .../main/kehu/adapter/DisListAdapter.java | 2 +- .../main/kehu/fragment/AddCusFragment.java | 42 +++-- .../main/kehu/fragment/CustomerFragment.java | 38 +++- .../main/kehu/fragment/TraceFragment.java | 3 +- .../res/layout/activity_customer_detail.xml | 2 +- app/src/main/res/layout/allocation_item.xml | 36 ++-- app/src/main/res/layout/cuslist_item.xml | 11 +- app/src/main/res/layout/dealist_item.xml | 10 +- app/src/main/res/layout/disliat_item.xml | 10 +- 22 files changed, 294 insertions(+), 146 deletions(-) create mode 100644 app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FourEvent.java diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dc8711b..7d312d1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + data; public String getMsg() { @@ -57,14 +57,6 @@ public class CustomerListBean extends BaseModel { this.msg = msg; } - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - public int getSuccess() { return success; } @@ -73,6 +65,14 @@ public class CustomerListBean extends BaseModel { this.success = success; } + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + public List getData() { return data; } @@ -83,63 +83,49 @@ public class CustomerListBean extends BaseModel { public static class DataBean implements Serializable { /** - * headimg : - * phone : 15862656263 - * name : text - * wechat : weixin + * address : + * budget : + * customer_id : 49fc031a8b374e5c69b1640c2f77b5f4 + * decoration : 1 + * headimg : http://192.168.1.3/upload/2020090409422893432.jpg + * name : 狗子 + * phone : 13255558866 * source : 1 - * customer_id : 3aaa642ed2f57470f62c51ee60d8a852 - * type : old * source_name : 添加客户 + * style_id : + * style_name : + * type : new + * wechat : — — */ - private String headimg; - private String phone; - private String name; - private String wechat; - private String source; + private String address; + private String budget; private String customer_id; - private String type; + private String decoration; + private String headimg; + private String name; + private String phone; + private String source; private String source_name; + private String style_id; + private String style_name; + private String type; + private String wechat; - public String getHeadimg() { - return headimg; + public String getAddress() { + return address; } - public void setHeadimg(String headimg) { - this.headimg = headimg; + public void setAddress(String address) { + this.address = address; } - public String getPhone() { - return phone; + public String getBudget() { + return budget; } - public void setPhone(String phone) { - this.phone = phone; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getWechat() { - return wechat; - } - - public void setWechat(String wechat) { - this.wechat = wechat; - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; + public void setBudget(String budget) { + this.budget = budget; } public String getCustomer_id() { @@ -150,12 +136,44 @@ public class CustomerListBean extends BaseModel { this.customer_id = customer_id; } - public String getType() { - return type; + public String getDecoration() { + return decoration; } - public void setType(String type) { - this.type = type; + public void setDecoration(String decoration) { + this.decoration = decoration; + } + + public String getHeadimg() { + return headimg; + } + + public void setHeadimg(String headimg) { + this.headimg = headimg; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; } public String getSource_name() { @@ -165,6 +183,38 @@ public class CustomerListBean extends BaseModel { public void setSource_name(String source_name) { this.source_name = source_name; } + + public String getStyle_id() { + return style_id; + } + + public void setStyle_id(String style_id) { + this.style_id = style_id; + } + + public String getStyle_name() { + return style_name; + } + + public void setStyle_name(String style_name) { + this.style_name = style_name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getWechat() { + return wechat; + } + + public void setWechat(String wechat) { + this.wechat = wechat; + } } } } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FourEvent.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FourEvent.java new file mode 100644 index 0000000..603a266 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/FourEvent.java @@ -0,0 +1,17 @@ +package com.fenghoo.seven.main.kehu.Bean; + +/** + * Time: 2020/8/28 + * Author: jianbo + * Description: + */ +public class FourEvent { + private String mMsg; + public FourEvent(String msg) { + // TODO Auto-generated constructor stub + mMsg = msg; + } + public String getMsg(){ + return mMsg; + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java index 39752e3..ef49631 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java @@ -12,9 +12,9 @@ import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseActivity; import com.fenghoo.seven.db.DbRecordBeanData; import com.fenghoo.seven.db.dao.DbRecordDao; -import com.fenghoo.seven.main.kehu.Bean.WxuSerinfo; +import com.fenghoo.seven.main.find.entity.ThreeEvent; +import com.fenghoo.seven.main.kehu.Bean.FourEvent; import com.fenghoo.seven.main.kehu.Bean.customerFPListBean; -import com.fenghoo.seven.main.kehu.Bean.fenpeisuccess; import com.fenghoo.seven.main.kehu.adapter.AllocationAdapter; import com.fenghoo.seven.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; @@ -45,30 +45,26 @@ public class AllocationActivity extends BaseActivity implements View.OnClickList private List dbRecordBeanData; private String search; private DbRecordDao dbRecordDao; - private String times; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_allocation); - times = getIntent().getStringExtra("times"); + search = getIntent().getStringExtra("search"); initView(); setEvent(); EventBus.getDefault().register(this); dbRecordDao = new DbRecordDao(this); initData(); - getData(times); + getData(); } - public void onEvent(fenpeisuccess event) { + public void onEvent(FourEvent event) { if (null != event && event.getMsg().equals("2")) { - // dbRecordDao.delete(mShowList); - // getData(times); - WxuSerinfo wxuSerinfo = new WxuSerinfo(); - wxuSerinfo.setHongbao("1"); - wxuSerinfo.setMessage(event.getMessage()); - EventBus.getDefault().post(wxuSerinfo); + //通知客户列表刷新数据 + EventBus.getDefault().post(new ThreeEvent("0",search)); finish(); + Log.d("客户调拨--","关闭客户调拨页面"); } } private void initView() { @@ -116,7 +112,7 @@ public class AllocationActivity extends BaseActivity implements View.OnClickList }); } - public void getData(String times) { + public void getData() { new NetApi().customerFPList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()).subscribe(new Observer() { @Override public void onNext(Response response) { diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/CustomerDetailActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/CustomerDetailActivity.java index f487a75..fd1128e 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/CustomerDetailActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/CustomerDetailActivity.java @@ -71,7 +71,8 @@ public class CustomerDetailActivity extends BaseActivity { String data1 = result1.getString("data"); Map data = JSON.parseObject(data1, new TypeReference>() { }); - GlideTools.init(CustomerDetailActivity.this).displaypic(mIvDraUserHeads, ToolsText.getValue(data, "customer_head"), R.mipmap.icon_default_head); + String headimg = ToolsText.getValue(data, "headimg"); + GlideTools.init(CustomerDetailActivity.this).displaypic(mIvDraUserHeads, headimg, R.mipmap.icon_default_head); String name = ToolsText.getValue(data, "name"); String phone = ToolsText.getValue(data, "phone"); mTitleBar.setTitle(name+phone); @@ -80,18 +81,18 @@ public class CustomerDetailActivity extends BaseActivity { //1：毛坯，2：精装，3：旧房改造 switch (ToolsText.getValue(data, "decoration")){ case "1": - WidgetTools.setTextfive(mTvDraInfo02, "", ToolsText.getValue(data, "毛坯")); + WidgetTools.setTextfive(mTvDraInfo02, "", "毛坯"); break; case "2": - WidgetTools.setTextfive(mTvDraInfo02, "", ToolsText.getValue(data, "精装")); + WidgetTools.setTextfive(mTvDraInfo02, "", "精装"); break; case "3": - WidgetTools.setTextfive(mTvDraInfo02, "", ToolsText.getValue(data, "旧房改造")); + WidgetTools.setTextfive(mTvDraInfo02, "", "旧房改造"); break; } - WidgetTools.setTextfive(mTvDraInfo04, "4.户型面积：", ToolsText.getValue(data, "style_name")); - WidgetTools.setTextfive(mTvDraInfo06, "6.备 注：", ToolsText.getValue(data, "budget")); + WidgetTools.setTextfive(mTvDraInfo04, "", ToolsText.getValue(data, "style_name")); + WidgetTools.setTextfive(mTvDraInfo06, "", ToolsText.getValue(data, "budget")); }else { ToastUtils.showToast(CustomerDetailActivity.this, msg); @@ -108,5 +109,4 @@ public class CustomerDetailActivity extends BaseActivity { } }); } - } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java index 913a66c..956eb06 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java @@ -218,7 +218,7 @@ public class DesignActivity extends BaseTreeActivity implements CommitDesignContract.Presenter { @@ -24,6 +29,9 @@ public class CommitDesignPresenter extends MvpBasePresenter addData() { + private ArrayList addData(String select1,String select2,String select3) { ArrayList label = new ArrayList<>(); LabelBean labelBean = new LabelBean(); labelBean.setDecoration("毛坯"); labelBean.setDecorationid("1"); - labelBean.setIf_sel_del("1"); + labelBean.setIf_sel_del(select1); label.add(labelBean); LabelBean labelBean1 = new LabelBean(); labelBean1.setDecoration("精装"); labelBean1.setDecorationid("2"); - labelBean1.setIf_sel_del("0"); + labelBean1.setIf_sel_del(select2); label.add(labelBean1); LabelBean labelBean2 = new LabelBean(); labelBean2.setDecoration("旧房改造"); labelBean2.setDecorationid("3"); - labelBean2.setIf_sel_del("0"); + labelBean2.setIf_sel_del(select3); label.add(labelBean2); return label; } private void setLabel(final List label) { - if(label.size()>0){ - if(isSelect(label)){ - label.get(0).setIf_sel_del("1"); - } - } GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 3); recy_10.setLayoutManager(gridLayoutManager); recy_10.setAdapter(new BaseQuickAdapter(R.layout.markquestionsadapter_item, label) { diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java index 5c51826..b3bb602 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java @@ -1,5 +1,6 @@ package com.fenghoo.seven.main.kehu.fragment; +import android.Manifest; import android.util.Log; import android.view.ViewParent; import android.widget.FrameLayout; @@ -20,11 +21,13 @@ import com.fenghoo.seven.utils.ToastUtils; import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; +import com.tbruyelle.rxpermissions2.RxPermissions; import java.util.List; import androidx.recyclerview.widget.LinearLayoutManager; import de.greenrobot.event.EventBus; +import io.reactivex.disposables.Disposable; /** * 客户列表 @@ -33,7 +36,7 @@ public class CustomerFragment extends MobanFragment { private static int mSerial = 0; private int mTabPos = 0; - private String search=""; + public String search=""; public CustomerFragment(int serial) { super(); @@ -56,7 +59,7 @@ public class CustomerFragment extends MobanFragment { @Override public void phoneClick() {//拨打电话 if (item.getPhone() != null) { - call(item.getPhone()); + getPermissions(item.getPhone()); } } @@ -97,10 +100,41 @@ public class CustomerFragment extends MobanFragment { }); } + private void getPermissions(final String phone) { + RxPermissions rxPermissions = new RxPermissions(this); + rxPermissions.request(Manifest.permission.CALL_PHONE) + .subscribe(new io.reactivex.Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(Boolean aBoolean) { + if (aBoolean) { + call(phone); + } else { + ToastUtils.showToast(getActivity(), "获取权限失败，请重新授权"); + } + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onComplete() { + + } + }); + } + public void onEvent(ThreeEvent event) { if (null != event ) { String pagetype = event.getPagetype(); Log.e("刷新页面==",pagetype); + Log.d("客户调拨--","刷新列表页面"); if(pagetype.equals("0")){ search = event.getSearch(); diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java index 7f04542..2099d46 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java @@ -25,6 +25,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.ViewPager; +import de.greenrobot.event.EventBus; /** * 功能：客户列表 @@ -177,7 +178,7 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener ShowAty.SearchActivity(getActivity(),pagetype,""); break; case R.id.bt_fenpei: - ShowAty.AllocationActivity(getActivity()); + ShowAty.AllocationActivity(getActivity(),genzongzhongFragment.search); break; } diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index 9bd1dbd..a333caf 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -85,7 +85,7 @@ android:layout_height="20dp" android:layout_marginLeft="16.5dp" android:layout_centerVertical="true" - android:text="家装阶段：" + android:text="家装阶段" android:textColor="#ff000000" android:textSize="14sp" /> + android:layout_marginLeft="0dp"> - - + + + diff --git a/app/src/main/res/layout/cuslist_item.xml b/app/src/main/res/layout/cuslist_item.xml index 22d0436..65aa666 100644 --- a/app/src/main/res/layout/cuslist_item.xml +++ b/app/src/main/res/layout/cuslist_item.xml @@ -57,24 +57,17 @@ android:layout_height="21dp" android:layout_marginLeft="13.5dp" android:layout_marginTop="19.5dp" + android:textStyle="bold" android:layout_toRightOf="@+id/iv_dea_avatar" android:text="欧阳子文" android:textColor="#ff333333" android:textSize="15sp" /> - + - -