Skip to content

android / dayu

Go to a project
Commit 0394856e by mReturn
Options

调整工单详情页小绿人相关数据展示

parent 6c53d657
Inline Side-by-side
Showing with 48 additions and 40 deletions
build.gradle
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 17
ext.target_sdk_version = 26
ext.version_code = 267
ext.verson_name = "2.6.7"
ext.version_code = 269
ext.verson_name = "2.6.9"
ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false
ext.isDebugMinify = false
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
......@@ -87,7 +87,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
orderId = detail.getId();
setListenter();
mBind.setItem(detail);
if (detail.getCreateProviderId() == Constants.XLR_PID){
if (detail.getCreateProviderId() == Constants.XLR_PID) {
initWrongView(detail);
initInfoView(detail);
getShowPriceData();
......@@ -190,44 +190,52 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
//小绿人相关信息
private void initInfoView(OrderDetail detail) {
mBind.llSiteInfo.setVisibility(View.VISIBLE);
if (!TextUtils.isEmpty(detail.getSn())){
if (!TextUtils.isEmpty(detail.getSn())) {
showDialog();
mBind.tvDeviceSn.setText(detail.getSn());
Api.getService(OrderService.class).getDeviceInfo(detail.getSn(),detail.getCreateProviderId(),2).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(result->{
if (result != null){
Api.getService(OrderService.class).getDeviceInfo(detail.getSn(), detail.getCreateProviderId(), 2).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(result -> {
if (result != null) {
mBind.tvDeviceTime.setText(result.getGuaranteeEndDate());
}else {
} else {
mBind.tvDeviceTime.setText(R.string.no_data);
}
},responeThrowable -> {
}, responeThrowable -> {
mBind.tvDeviceTime.setText(R.string.no_data);
}));
Api.getService(OrderService.class).getSiteInfo(detail.getSn()).compose(Api.applySchedulersSource())
.subscribe(mPresenter.baseObserver(result->{
if (result.getErrorCode() == 200 && result.getData() != null){
if (result.getData().getStation() != null){
.subscribe(mPresenter.baseObserver(result -> {
if (result.getErrorCode() == 200 && result.getData() != null) {
if (result.getData().getStation() != null) {
GreenPersionSiteInfo.DataBean.StationBean sResult = result.getData().getStation();
String info = sResult.getProvince()+sResult.getCityName()+sResult.getDistrict()+sResult.getStreet()+sResult.getAddress();
setText(mBind.tvSiteInfo,info);
setText(mBind.tvSiteId,sResult.getStationName());
}else{
String info = sResult.getProvince() + sResult.getCityName() + sResult.getDistrict() + sResult.getStreet() + sResult.getAddress();
setText(mBind.tvSiteInfo, info);
setText(mBind.tvSiteId, sResult.getStationName());
} else {
mBind.tvSiteInfo.setText(R.string.no_data);
mBind.tvSiteId.setText(R.string.no_data);
}
if (result.getData().getProblem()!= null)
if (result.getData().getProblem() != null && result.getData().getProblem().size() > 0) {
setWrongInfoAdapter(result.getData().getProblem());
}else {
} else {
GreenPersionSiteInfo.DataBean.ProblemBean problemBean = new GreenPersionSiteInfo.DataBean.ProblemBean();
problemBean.setErrorCode(result.getData().getNetWorkStatus() + "");
problemBean.setErrorName(result.getData().getNetWorkStatus() == -1 ? "网络故障" : "正常");
List<GreenPersionSiteInfo.DataBean.ProblemBean> problemBeans = new ArrayList<>();
problemBeans.add(problemBean);
setWrongInfoAdapter(problemBeans);
}
} else {
mBind.tvSiteInfo.setText(R.string.no_data);
mBind.tvSiteId.setText(R.string.no_data);
mBind.llWrongInfo.setVisibility(View.GONE);
}
},responeThrowable -> {
}, responeThrowable -> {
mBind.tvSiteInfo.setText(R.string.no_data);
mBind.tvSiteId.setText(R.string.no_data);
mBind.llWrongInfo.setVisibility(View.GONE);
}));
}else{
} else {
mBind.tvSiteId.setText(R.string.no_data);
mBind.tvSiteInfo.setText(R.string.no_data);
mBind.tvDeviceSn.setText(R.string.no_data);
......@@ -237,12 +245,12 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
}
private void setWrongInfoAdapter(List<GreenPersionSiteInfo.DataBean.ProblemBean> problems) {
BaseQuickAdapter<GreenPersionSiteInfo.DataBean.ProblemBean,BaseViewHolder> wrongAdapter
= new BaseQuickAdapter<GreenPersionSiteInfo.DataBean.ProblemBean, BaseViewHolder>(R.layout.item_wrong_part,problems) {
BaseQuickAdapter<GreenPersionSiteInfo.DataBean.ProblemBean, BaseViewHolder> wrongAdapter
= new BaseQuickAdapter<GreenPersionSiteInfo.DataBean.ProblemBean, BaseViewHolder>(R.layout.item_wrong_part, problems) {
@Override
protected void convert(BaseViewHolder helper, GreenPersionSiteInfo.DataBean.ProblemBean item) {
helper.getView(R.id.iv_picture).setVisibility(View.GONE);
helper.setText(R.id.tv_desc,item.getErrorName());
helper.setText(R.id.tv_desc, item.getErrorName());
}
};
......@@ -253,9 +261,9 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
}
private void setText(TextView textView, String info) {
if (TextUtils.isEmpty(info)){
if (TextUtils.isEmpty(info)) {
textView.setText(R.string.no_data);
}else{
} else {
textView.setText(info);
}
}
......@@ -263,9 +271,9 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
//是否显示价格
private void getShowPriceData() {
initUser();
Api.getService(OrderService.class).getShowDetailPriceData(mUserId,orderId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(result->{
if (!TextUtils.isEmpty(result) && "false".equals(result)){
Api.getService(OrderService.class).getShowDetailPriceData(mUserId, orderId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(result -> {
if (!TextUtils.isEmpty(result) && "false".equals(result)) {
mBind.llBottomPrice.setVisibility(View.GONE);
}
}));
......@@ -273,28 +281,28 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
//故障部位
private void initWrongView(OrderDetail detail) {
if (detail.getSpus() != null && detail.getSpus().size() > 0){
if (detail.getSpus() != null && detail.getSpus().size() > 0) {
List<Integer> lists = CommonUtils.string2IntListF(detail.getSpus().get(0).getProductName());
if (lists.size()>0){
if (lists.size() > 0) {
mBind.llWrong.setVisibility(View.VISIBLE);
mBind.tvNoWrong.setVisibility(View.GONE);
List<Integer> tempList = new ArrayList<>();
if (lists.contains(7)){
if (lists.contains(7)) {
tempList.add(7);
}else {
} else {
tempList.addAll(lists);
}
BaseQuickAdapter<Integer,BaseViewHolder> wrongAdapter = new BaseQuickAdapter<Integer, BaseViewHolder>(R.layout.item_wrong_part,tempList) {
BaseQuickAdapter<Integer, BaseViewHolder> wrongAdapter = new BaseQuickAdapter<Integer, BaseViewHolder>(R.layout.item_wrong_part, tempList) {
@Override
protected void convert(BaseViewHolder helper, Integer item) {
ImageView ivItem = helper.getView(R.id.iv_picture);
TextView tvItem = helper.getView(R.id.tv_desc);
if (item==7){
if (item == 7) {
ivItem.setImageResource(R.drawable.ic_wrong_hole);
tvItem.setText("整机");
}else {
} else {
ivItem.setImageResource(R.drawable.ic_wrong_num);
tvItem.setText(item+"");
tvItem.setText(item + "");
}
}
};
......@@ -302,8 +310,8 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
mBind.rvWrong.setLayoutManager(layoutManager);
mBind.rvWrong.setAdapter(wrongAdapter);
}else {
if (!TextUtils.isEmpty(detail.getSpus().get(0).getProductName())){
} else {
if (!TextUtils.isEmpty(detail.getSpus().get(0).getProductName())) {
mBind.llWrong.setVisibility(View.VISIBLE);
mBind.tvNoWrong.setVisibility(View.VISIBLE);
mBind.tvNoWrong.setText("...");
......@@ -362,7 +370,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
private void addDialPhoneRecord(String phoneNum) {
String time = UtilsDate.getCurrDate("yyyy-MM-dd HH:mm:ss");
AddDialRecordData recordData = new AddDialRecordData(mUserId, time, mUserInfo.getAccountName(),phoneNum, orderId);
AddDialRecordData recordData = new AddDialRecordData(mUserId, time, mUserInfo.getAccountName(), phoneNum, orderId);
Api.getService(OrderService.class).addDialRecord(recordData).compose(Api.applySchedulers()).subscribe();
}
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
......@@ -212,7 +212,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="故障信息"
android:text="设备状态"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment