Skip to content

W
workoffice
提交 f2ad2c35 authored 作者: lgd's avatar lgd
浏览文件
操作

1.往来详情 信息 

2.//TODO erp用户激活，忘记密码测试，产品下单还差附件，bat，mes，消息，我的，刷新token
上级 977b30bd
隐藏空白字符变更
内嵌 并排
正在显示 包含 1384 行增加 和 324 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ f2ad2c35
......@@ -416,6 +416,22 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkContactsDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkContactsInfoActivity"
android:configChanges="keyboardHidden|orientation"
android:label="详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/bean/ContactsBean.java
浏览文件 @ f2ad2c35
......@@ -9,363 +9,439 @@ import java.util.List;
**/
public class ContactsBean {
/**
* records : [{"createdBy":111,"createdByName":null,"createdTime":"2019-11-25 11:31:32","updatedBy":143,"updatedByName":null,"updatedTime":"2019-12-31 13:49:23","id":40,"name":"北京首鑫联合耐火材料有限公司1","contacter":"吕届蜂","address":"No 1173 Street , Ste. 7681","phone":"15020055000","erpId":"89","productId":null,"partTypeRelList":null,"processRelList":null,"processList":null,"referProcessList":null,"partTypeNames":"供应商","partTypeCode":null,"accountId":null,"accountName":null,"deptName":null,"channelPrice":null,"deptIdList":null,"supplier":null,"customer":null,"transporters":null,"processes":null}]
* total : 1
* size : 10
* current : 1
* orders : []
* searchCount : true
* pages : 1
*/
/**
* createdBy : 111
* createdByName : null
* createdTime : 2019-11-25 11:31:32
* updatedBy : 143
* updatedByName : null
* updatedTime : 2019-12-31 13:49:23
* id : 40
* name : 北京首鑫联合耐火材料有限公司1
* contacter : 吕届蜂
* address : No 1173 Street , Ste. 7681
* phone : 15020055000
* erpId : 89
* productId : null
* partTypeRelList : null
* processRelList : null
* processList : null
* referProcessList : null
* partTypeNames : 供应商
* partTypeCode : null
* accountId : null
* accountName : null
* deptName : null
* channelPrice : null
* deptIdList : null
* supplier : null
* customer : null
* transporters : null
* processes : null
*/
private int createdBy;
private Object createdByName;
private String createdTime;
private int updatedBy;
private Object updatedByName;
private String updatedTime;
private int id;
private String name;
private String contacter;
private String address;
private String phone;
private String erpId;
private Object productId;
private List<PartTypeRelListBean> partTypeRelList;
private Object processRelList;
private List<ProcessListBean> processList;
private Object referProcessList;
private String partTypeNames;
private Object partTypeCode;
private Object accountId;
private Object accountName;
private Object deptName;
private Object channelPrice;
private Object deptIdList;
private Object supplier;
private Object customer;
private Object transporters;
private Object processes;
public int getCreatedBy() {
return createdBy;
}
public void setCreatedBy(int createdBy) {
this.createdBy = createdBy;
}
public Object getCreatedByName() {
return createdByName;
}
public void setCreatedByName(Object createdByName) {
this.createdByName = createdByName;
}
public String getCreatedTime() {
return createdTime;
}
public void setCreatedTime(String createdTime) {
this.createdTime = createdTime;
}
public int getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(int updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public String getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getContacter() {
return contacter;
}
public void setContacter(String contacter) {
this.contacter = contacter;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getErpId() {
return erpId;
}
public void setErpId(String erpId) {
this.erpId = erpId;
}
private int total;
private int size;
private int current;
private boolean searchCount;
private int pages;
private List<RecordsBean> records;
private List<?> orders;
public Object getProductId() {
return productId;
}
public int getTotal() {
return total;
}
public void setProductId(Object productId) {
this.productId = productId;
}
public void setTotal(int total) {
this.total = total;
}
public List<PartTypeRelListBean> getPartTypeRelList() {
return partTypeRelList;
}
public int getSize() {
return size;
}
public void setPartTypeRelList(List<PartTypeRelListBean> partTypeRelList) {
this.partTypeRelList = partTypeRelList;
}
public void setSize(int size) {
this.size = size;
}
public Object getProcessRelList() {
return processRelList;
}
public int getCurrent() {
return current;
}
public void setProcessRelList(Object processRelList) {
this.processRelList = processRelList;
}
public void setCurrent(int current) {
this.current = current;
}
public List<ProcessListBean> getProcessList() {
return processList;
}
public boolean isSearchCount() {
return searchCount;
}
public void setProcessList(List<ProcessListBean> processList) {
this.processList = processList;
}
public void setSearchCount(boolean searchCount) {
this.searchCount = searchCount;
}
public Object getReferProcessList() {
return referProcessList;
}
public int getPages() {
return pages;
}
public void setReferProcessList(Object referProcessList) {
this.referProcessList = referProcessList;
}
public void setPages(int pages) {
this.pages = pages;
}
public String getPartTypeNames() {
return partTypeNames;
}
public List<RecordsBean> getRecords() {
return records;
}
public void setPartTypeNames(String partTypeNames) {
this.partTypeNames = partTypeNames;
}
public void setRecords(List<RecordsBean> records) {
this.records = records;
}
public Object getPartTypeCode() {
return partTypeCode;
}
public List<?> getOrders() {
return orders;
}
public void setPartTypeCode(Object partTypeCode) {
this.partTypeCode = partTypeCode;
}
public void setOrders(List<?> orders) {
this.orders = orders;
}
public Object getAccountId() {
return accountId;
}
public void setAccountId(Object accountId) {
this.accountId = accountId;
}
public Object getAccountName() {
return accountName;
}
public void setAccountName(Object accountName) {
this.accountName = accountName;
}
public Object getDeptName() {
return deptName;
}
public void setDeptName(Object deptName) {
this.deptName = deptName;
}
public Object getChannelPrice() {
return channelPrice;
}
public void setChannelPrice(Object channelPrice) {
this.channelPrice = channelPrice;
}
public Object getDeptIdList() {
return deptIdList;
}
public void setDeptIdList(Object deptIdList) {
this.deptIdList = deptIdList;
}
public Object getSupplier() {
return supplier;
}
public void setSupplier(Object supplier) {
this.supplier = supplier;
}
public Object getCustomer() {
return customer;
}
public void setCustomer(Object customer) {
this.customer = customer;
}
public Object getTransporters() {
return transporters;
}
public void setTransporters(Object transporters) {
this.transporters = transporters;
}
public static class RecordsBean {
/**
* createdBy : 111
* createdByName : null
* createdTime : 2019-11-25 11:31:32
* updatedBy : 143
* updatedByName : null
* updatedTime : 2019-12-31 13:49:23
* id : 40
* name : 北京首鑫联合耐火材料有限公司1
* contacter : 吕届蜂
* address : No 1173 Street , Ste. 7681
* phone : 15020055000
* erpId : 89
* productId : null
* partTypeRelList : null
* processRelList : null
* processList : null
* referProcessList : null
* partTypeNames : 供应商
* partTypeCode : null
* accountId : null
* accountName : null
* deptName : null
* channelPrice : null
* deptIdList : null
* supplier : null
* customer : null
* transporters : null
* processes : null
*/
private int createdBy;
private Object createdByName;
private String createdTime;
private int updatedBy;
private Object updatedByName;
private String updatedTime;
private int id;
private String name;
private String contacter;
private String address;
private String phone;
private String erpId;
private Object productId;
private Object partTypeRelList;
private Object processRelList;
private Object processList;
private Object referProcessList;
private String partTypeNames;
private Object partTypeCode;
private Object accountId;
private Object accountName;
private Object deptName;
private Object channelPrice;
private Object deptIdList;
private Object supplier;
private Object customer;
private Object transporters;
private Object processes;
public int getCreatedBy() {
return createdBy;
}
public void setCreatedBy(int createdBy) {
this.createdBy = createdBy;
}
public Object getCreatedByName() {
return createdByName;
}
public void setCreatedByName(Object createdByName) {
this.createdByName = createdByName;
}
public String getCreatedTime() {
return createdTime;
}
public void setCreatedTime(String createdTime) {
this.createdTime = createdTime;
}
public int getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(int updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public String getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getContacter() {
return contacter;
}
public void setContacter(String contacter) {
this.contacter = contacter;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getErpId() {
return erpId;
}
public void setErpId(String erpId) {
this.erpId = erpId;
}
public Object getProcesses() {
return processes;
}
public Object getProductId() {
return productId;
}
public void setProcesses(Object processes) {
this.processes = processes;
}
public void setProductId(Object productId) {
this.productId = productId;
}
public static class PartTypeRelListBean {
/**
* id : e668bc6969584a02b446b5687d758fca
* transitPartId : 42
* transitPartType : CUSTOMER
* transitPartTypeName : 客户
* deptId : 122
* delFlag : 0
* deptName : 销售二公司
* accountId : 680
* accountName : 吴同得
*/
public Object getPartTypeRelList() {
return partTypeRelList;
}
private String id;
private int transitPartId;
private String transitPartType;
private String transitPartTypeName;
private int deptId;
private String delFlag;
private String deptName;
private int accountId;
private String accountName;
public String getId() {
return id;
}
public void setPartTypeRelList(Object partTypeRelList) {
this.partTypeRelList = partTypeRelList;
}
public void setId(String id) {
this.id = id;
}
public Object getProcessRelList() {
return processRelList;
}
public int getTransitPartId() {
return transitPartId;
}
public void setProcessRelList(Object processRelList) {
this.processRelList = processRelList;
}
public void setTransitPartId(int transitPartId) {
this.transitPartId = transitPartId;
}
public Object getProcessList() {
return processList;
}
public String getTransitPartType() {
return transitPartType;
}
public void setProcessList(Object processList) {
this.processList = processList;
}
public void setTransitPartType(String transitPartType) {
this.transitPartType = transitPartType;
}
public Object getReferProcessList() {
return referProcessList;
}
public String getTransitPartTypeName() {
return transitPartTypeName;
}
public void setReferProcessList(Object referProcessList) {
this.referProcessList = referProcessList;
}
public void setTransitPartTypeName(String transitPartTypeName) {
this.transitPartTypeName = transitPartTypeName;
}
public String getPartTypeNames() {
return partTypeNames;
}
public int getDeptId() {
return deptId;
}
public void setPartTypeNames(String partTypeNames) {
this.partTypeNames = partTypeNames;
}
public void setDeptId(int deptId) {
this.deptId = deptId;
}
public Object getPartTypeCode() {
return partTypeCode;
}
public String getDelFlag() {
return delFlag;
}
public void setPartTypeCode(Object partTypeCode) {
this.partTypeCode = partTypeCode;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public Object getAccountId() {
return accountId;
}
public String getDeptName() {
return deptName;
}
public void setAccountId(Object accountId) {
this.accountId = accountId;
}
public void setDeptName(String deptName) {
this.deptName = deptName;
}
public Object getAccountName() {
return accountName;
}
public int getAccountId() {
return accountId;
}
public void setAccountName(Object accountName) {
this.accountName = accountName;
}
public void setAccountId(int accountId) {
this.accountId = accountId;
}
public Object getDeptName() {
return deptName;
}
public String getAccountName() {
return accountName;
}
public void setDeptName(Object deptName) {
this.deptName = deptName;
}
public void setAccountName(String accountName) {
this.accountName = accountName;
}
}
public Object getChannelPrice() {
return channelPrice;
}
public static class ProcessListBean {
/**
* id : null
* name : 销售流程
* item : null
* subKey : PROCESS_SALE
* subValue : null
*/
public void setChannelPrice(Object channelPrice) {
this.channelPrice = channelPrice;
}
private Object id;
private String name;
private Object item;
private String subKey;
private Object subValue;
public Object getDeptIdList() {
return deptIdList;
}
public Object getId() {
return id;
}
public void setDeptIdList(Object deptIdList) {
this.deptIdList = deptIdList;
}
public void setId(Object id) {
this.id = id;
}
public Object getSupplier() {
return supplier;
}
public String getName() {
return name;
}
public void setSupplier(Object supplier) {
this.supplier = supplier;
}
public void setName(String name) {
this.name = name;
}
public Object getCustomer() {
return customer;
}
public Object getItem() {
return item;
}
public void setCustomer(Object customer) {
this.customer = customer;
}
public void setItem(Object item) {
this.item = item;
}
public Object getTransporters() {
return transporters;
}
public String getSubKey() {
return subKey;
}
public void setTransporters(Object transporters) {
this.transporters = transporters;
}
public void setSubKey(String subKey) {
this.subKey = subKey;
}
public Object getProcesses() {
return processes;
}
public Object getSubValue() {
return subValue;
}
public void setProcesses(Object processes) {
this.processes = processes;
}
public void setSubValue(Object subValue) {
this.subValue = subValue;
}
}
}
app/src/main/java/com/wd/workoffice/bean/ContactsList.java 0 → 100644
浏览文件 @ f2ad2c35
package com.wd.workoffice.bean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class ContactsList {
/**
* records : [{"createdBy":111,"createdByName":null,"createdTime":"2019-11-25 11:31:32","updatedBy":143,"updatedByName":null,"updatedTime":"2019-12-31 13:49:23","id":40,"name":"北京首鑫联合耐火材料有限公司1","contacter":"吕届蜂","address":"No 1173 Street , Ste. 7681","phone":"15020055000","erpId":"89","productId":null,"partTypeRelList":null,"processRelList":null,"processList":null,"referProcessList":null,"partTypeNames":"供应商","partTypeCode":null,"accountId":null,"accountName":null,"deptName":null,"channelPrice":null,"deptIdList":null,"supplier":null,"customer":null,"transporters":null,"processes":null}]
* total : 1
* size : 10
* current : 1
* orders : []
* searchCount : true
* pages : 1
*/
private int total;
private int size;
private int current;
private boolean searchCount;
private int pages;
private List<ContactsBean> records;
private List<?> orders;
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public int getSize() {
return size;
}
public void setSize(int size) {
this.size = size;
}
public int getCurrent() {
return current;
}
public void setCurrent(int current) {
this.current = current;
}
public boolean isSearchCount() {
return searchCount;
}
public void setSearchCount(boolean searchCount) {
this.searchCount = searchCount;
}
public int getPages() {
return pages;
}
public void setPages(int pages) {
this.pages = pages;
}
public List<ContactsBean> getRecords() {
return records;
}
public void setRecords(List<ContactsBean> records) {
this.records = records;
}
public List<?> getOrders() {
return orders;
}
public void setOrders(List<?> orders) {
this.orders = orders;
}
}
app/src/main/java/com/wd/workoffice/contract/WorkContactsContract.java
浏览文件 @ f2ad2c35
......@@ -2,7 +2,7 @@ package com.wd.workoffice.contract;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.bean.ContactsBean;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.ContactsList;
import java.util.List;
import java.util.Map;
......@@ -24,7 +24,7 @@ public interface WorkContactsContract {
}
interface View extends IBaseView {
void getData(List<ContactsBean.RecordsBean> dataList);
void getData(List<ContactsBean> dataList);
}
......
app/src/main/java/com/wd/workoffice/presenter/WorkContactsPresenter.java
浏览文件 @ f2ad2c35
......@@ -3,9 +3,8 @@ package com.wd.workoffice.presenter;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.bean.ContactsBean;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.ContactsList;
import com.wd.workoffice.contract.WorkContactsContract;
import com.wd.workoffice.contract.WorkProContract;
import com.wd.workoffice.model.WorkContactsModel;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -43,7 +42,7 @@ public class WorkContactsPresenter extends BasePresenter<WorkContactsContract.V
mView.onError(data.getMessage());
return;
}
mView.getData(JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), ContactsBean.RecordsBean.class));
mView.getData(JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), ContactsBean.class));
}
});
}
......
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ f2ad2c35
......@@ -515,4 +515,13 @@ public interface ApiService {
*/
@GET("/stockType/app/search/list")
Observable<BaseBean> getStockType(@QueryMap Map<String, Object> param);
/**
* 查看往来单位详情
*
* @return
*/
@GET("/transitpart/{id}")
Observable<BaseBean> contactInfo(@Path("id") String id);
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsActivity.java
浏览文件 @ f2ad2c35
......@@ -21,7 +21,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 工作台 - 产品
* 工作台 - 往来
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsDetailActivity.java 0 → 100644
浏览文件 @ f2ad2c35
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.LinearLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 工作台 - 往来-详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkContactsDetailActivity extends WorkToolBarActivity {
@BindView(R.id.ll_info)
LinearLayout llInfo;
@BindView(R.id.ll_receive)
LinearLayout llReceive;
@BindView(R.id.ll_live)
LinearLayout llLive;
@BindView(R.id.ll_settle)
LinearLayout llSettle;
@BindView(R.id.ll_client)
LinearLayout llClient;
@BindView(R.id.ll_ticket)
LinearLayout llTicket;
@BindView(R.id.ll_order)
LinearLayout llOrder;
@BindView(R.id.ll_return)
LinearLayout llReturn;
@Override
protected void initView() {
ButterKnife.bind(this);
if (TextUtils.equals("客户", getIntent().getStringExtra("partTypeNames"))) {
llClient.setVisibility(View.GONE);
}
}
@Override
protected void initData() {
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_work_contacts_detail;
}
@OnClick({R.id.ll_info, R.id.ll_receive, R.id.ll_live, R.id.ll_settle, R.id.ll_ticket, R.id.ll_order, R.id.ll_return})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.ll_info:
startActivity(WorkContactsInfoActivity.class,"id",getIntent().getStringExtra("id"));
break;
case R.id.ll_receive:
break;
case R.id.ll_live:
break;
case R.id.ll_settle:
break;
case R.id.ll_ticket:
break;
case R.id.ll_order:
break;
case R.id.ll_return:
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsInfoActivity.java 0 → 100644
浏览文件 @ f2ad2c35
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ContactsBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkContactsInfoAdapter;
import com.wd.workoffice.util.MathUtils;
import java.util.ArrayList;
import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 工作台 - 往来 - 详情 - 信息
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkContactsInfoActivity extends WorkToolBarActivity {
@BindView(R.id.tv_company_name)
TextView tvCompanyName;
@BindView(R.id.tv_link_man)
TextView tvLinkMan;
@BindView(R.id.tv_link_phone)
TextView tvLinkPhone;
@BindView(R.id.tv_address)
TextView tvAddress;
@BindView(R.id.tv_process)
TextView tvProcess;
@BindView(R.id.rv_data)
RecyclerView rvData;
private ContactsBean dataBean;
private WorkContactsInfoAdapter workContactsInfoAdapter;
private List<ContactsBean.PartTypeRelListBean> partTypeRelList =new ArrayList<>();
@Override
protected void initView() {
ButterKnife.bind(this);
rvData.setLayoutManager(new LinearLayoutManager(this,RecyclerView.VERTICAL,false));
workContactsInfoAdapter = new WorkContactsInfoAdapter(R.layout.item_work_contacts_info,partTypeRelList);
}
@Override
protected void initData() {
getData();
}
private void getData() {
RtfUtils.getRtf().contactInfo(getIntent().getStringExtra("id")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
dataBean = JSON.parseObject(data.getData().toString(), ContactsBean.class);
tvCompanyName.setText(dataBean.getName());
tvLinkMan.setText(dataBean.getContacter());
tvLinkPhone.setText(dataBean.getPhone());
tvAddress.setText(dataBean.getAddress());
tvProcess.setText(getProcessString(dataBean.getProcessList()));
partTypeRelList.addAll(dataBean.getPartTypeRelList());
}
});
}
@Override
protected void initEvent() {
}
protected String getProcessString(List<ContactsBean.ProcessListBean> data) {
String returnData = "";
if (data != null && data.size() != 0) {
for (ContactsBean.ProcessListBean process : data) {
returnData = returnData + process.getName() + ",";
}
returnData = returnData.substring(0, returnData.length() - 1);
} else {
returnData = "无";
}
return returnData;
}
@Override
protected int layoutId() {
return R.layout.activity_work_contacts_info;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsSearchActivity.java
浏览文件 @ f2ad2c35
......@@ -10,6 +10,7 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.ContactsBean;
import com.wd.workoffice.bean.ContactsList;
import com.wd.workoffice.contract.WorkContactsContract;
import com.wd.workoffice.presenter.WorkContactsPresenter;
import com.wd.workoffice.ui.adapter.WorkContactsAdapter;
......@@ -49,7 +50,7 @@ public class WorkContactsSearchActivity extends WorkBaseActivity implements Work
private Map<String, Object> param;
private WorkContactsPresenter workProPresenter;
private WorkContactsAdapter workProductAdapter;
private List<ContactsBean.RecordsBean> dataList;
private List<ContactsBean> dataList;
private int page = 1;
private String partTypeNames="供应商";
private String tab[] = {"供应商", "客户", "物流公司"};
......@@ -146,7 +147,7 @@ public class WorkContactsSearchActivity extends WorkBaseActivity implements Work
@Override
public void getData(List<ContactsBean.RecordsBean> data) {
public void getData(List<ContactsBean> data) {
toast("加载完成");
if (page == 1) {
dataList.clear();
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkContactsAdapter.java
浏览文件 @ f2ad2c35
......@@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ContactsBean;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.ContactsList;
import java.util.List;
......@@ -13,14 +13,14 @@ import java.util.List;
* Created by flexible on 2018/8/13.
*/
public class WorkContactsAdapter extends BaseQuickAdapter<ContactsBean.RecordsBean, BaseViewHolder> {
public class WorkContactsAdapter extends BaseQuickAdapter<ContactsBean, BaseViewHolder> {
public WorkContactsAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, ContactsBean.RecordsBean item) {
protected void convert(BaseViewHolder helper,ContactsBean item) {
helper.setText(R.id.tv_name, item.getName());
helper.setText(R.id.tv_address, item.getAddress());
helper.setText(R.id.tv_phone, item.getPhone());
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkContactsInfoAdapter.java 0 → 100644
浏览文件 @ f2ad2c35
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ContactsBean;
import com.wd.workoffice.util.MathUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkContactsInfoAdapter extends BaseQuickAdapter<ContactsBean.PartTypeRelListBean, BaseViewHolder> {
public WorkContactsInfoAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper,ContactsBean.PartTypeRelListBean item) {
helper.setText(R.id.tv_first_contact_type, item.getTransitPartType());
helper.setText(R.id.tv_first_dep, item.getDeptName());
helper.setText(R.id.tv_first_person, item.getAccountName());
helper.setText(R.id.tv_level, "类别".concat(MathUtils.conver(helper.getAdapterPosition())));
}
}
app/src/main/java/com/wd/workoffice/ui/fg/WorkContactsFragment.java
浏览文件 @ f2ad2c35
......@@ -8,8 +8,10 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.ContactsBean;
import com.wd.workoffice.bean.ContactsList;
import com.wd.workoffice.contract.WorkContactsContract;
import com.wd.workoffice.presenter.WorkContactsPresenter;
import com.wd.workoffice.ui.activity.bat.work.WorkContactsDetailActivity;
import com.wd.workoffice.ui.adapter.WorkContactsAdapter;
import com.wd.workoffice.util.WorkUtils;
......@@ -40,7 +42,7 @@ public class WorkContactsFragment extends WorkBaseFg implements WorkContactsCont
private Map<String, Object> param;
private WorkContactsPresenter workProPresenter;
private WorkContactsAdapter workProductAdapter;
private List<ContactsBean.RecordsBean> dataList;
private List<ContactsBean> dataList;
@Override
protected void initView() {
......@@ -87,7 +89,8 @@ public class WorkContactsFragment extends WorkBaseFg implements WorkContactsCont
workProductAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// startActivity(WorkProDetailActivity.class, "pro", JSON.toJSONString(dataList.get(position)));
startActivity(WorkContactsDetailActivity.class,
"id",dataList.get(position).getId()+"","partTypeNames", partTypeNames);
}
});
}
......@@ -99,7 +102,7 @@ public class WorkContactsFragment extends WorkBaseFg implements WorkContactsCont
}
@Override
public void getData(List<ContactsBean.RecordsBean> data) {
public void getData(List<ContactsBean> data) {
if (page == 1) {
dataList.clear();
dataList.addAll(data);
......
app/src/main/res/layout/activity_work_contacts_detail.xml 0 → 100644
浏览文件 @ f2ad2c35
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_info"
style="@style/llStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="3"
android:text="基本信息"
android:textSize="16sp" />
<ImageView
android:layout_width="20mm"
android:layout_height="20mm"
android:background="@mipmap/arrow_right_my" />
</LinearLayout>
<View
style="@style/dividerX"
android:layout_marginHorizontal="26mm" />
<LinearLayout
android:id="@+id/ll_receive"
style="@style/llStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="3"
android:text="应收账款"
android:textSize="16sp" />
<ImageView
android:layout_width="20mm"
android:layout_height="20mm"
android:background="@mipmap/arrow_right_my" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_client"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_live"
style="@style/llStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="3"
android:text="现场库"
android:textSize="16sp" />
<ImageView
android:layout_width="20mm"
android:layout_height="20mm"
android:background="@mipmap/arrow_right_my" />
</LinearLayout>
<View
style="@style/dividerX"
android:layout_marginHorizontal="26mm" />
<LinearLayout
android:id="@+id/ll_settle"
style="@style/llStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="3"
android:text="未结算库"
android:textSize="16sp" />
<ImageView
android:layout_width="20mm"
android:layout_height="20mm"
android:background="@mipmap/arrow_right_my" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_ticket"
style="@style/llStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="3"
android:text="开票单"
android:textSize="16sp" />
<ImageView
android:layout_width="20mm"
android:layout_height="20mm"
android:background="@mipmap/arrow_right_my" />
</LinearLayout>
<View
style="@style/dividerX"
android:layout_marginHorizontal="26mm" />
<LinearLayout
android:id="@+id/ll_order"
style="@style/llStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="3"
android:text="成交订单"
android:textSize="16sp" />
<ImageView
android:layout_width="20mm"
android:layout_height="20mm"
android:background="@mipmap/arrow_right_my" />
</LinearLayout>
<View
style="@style/dividerX"
android:layout_marginHorizontal="26mm" />
<LinearLayout
android:id="@+id/ll_return"
style="@style/llStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="3"
android:text="退货记录"
android:textSize="16sp" />
<ImageView
android:layout_width="20mm"
android:layout_height="20mm"
android:background="@mipmap/arrow_right_my" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
app/src/main/res/layout/activity_work_contacts_info.xml 0 → 100644
浏览文件 @ f2ad2c35
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:orientation="vertical"
android:paddingBottom="20mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="基本信息"
android:textSize="16sp" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="单位名称"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_company_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="联系人"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_link_man"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="联系电话"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_link_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="地址"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="所属流程"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_process"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:layout_marginTop="5mm"
android:textColor="@color/flexible_text_gray"
/>
</LinearLayout>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<LinearLayout
android:id="@+id/ll_second"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:layout_marginTop="10mm"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="类别二"
android:textSize="16sp" />
</LinearLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="往来单位类型"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_second_contact_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="部门"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_second_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="维护人"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_second_person"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
app/src/main/res/layout/item_work_contacts_info.xml 0 → 100644
浏览文件 @ f2ad2c35
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ll_first"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:id="@+id/tv_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="类别一"
android:textSize="16sp" />
</LinearLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="往来单位类型"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_first_contact_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="部门"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_first_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="维护人"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_first_person"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp" />
</RelativeLayout>
</LinearLayout>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论