Commit a2504a15 by mReturn

调试接口

parent c6939d89
Showing with 814 additions and 47 deletions
......@@ -29,7 +29,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
......
......@@ -12,16 +12,16 @@ public class Constants {
/**
* 测试环境配置.
*/
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static final String ENVIROMENT = "debug";
// public static final String BASE_URL = "http://47.94.101.239:3112";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
// public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
// public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
// public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
// public static final boolean IS_DEBUG = true;
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static final String ENVIROMENT = "debug";
public static final String BASE_URL = "http://47.94.101.239:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final boolean IS_DEBUG = true;
/**
* uat环境配置.
......@@ -40,16 +40,16 @@ public class Constants {
/**
* 正式环境.
*/
public static final String ENVIROMENT = "release";
public static final int LOG_LEVEL = LogUtils.LEVEL_OFF;
public static final String BASE_URL = "https://mobile.kf.ai";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
public static final boolean IS_DEBUG = false;
// public static final String ENVIROMENT = "release";
// public static final int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static final String BASE_URL = "https://mobile.kf.ai";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final boolean IS_DEBUG = false;
/**
* 统一配置.
......@@ -136,6 +136,7 @@ public class Constants {
public final static int MANAGER_NOSITE_ENGINEER = 4;
public final static String BUNDLE = "bundle";
public final static String ID = "id";
public final static String IDS = "ids";
//订单详情
public final static String ORDER_DETAIL = "order_detail";
//数据返回失败标识
......
......@@ -97,8 +97,15 @@ public class UserManager {
}
} else if (isEngineer) {
return Constants.ENGINEER;
// } else if (isManager) {
// return Constants.MANAGER;
// } else {
// return Constants.NOT_LOGIN;
// }
} else if (isManager) {
return Constants.MANAGER;
} else if (userInfo.getRoles().size()>0){
return Constants.ENGINEER;
} else {
return Constants.NOT_LOGIN;
}
......
......@@ -2,9 +2,12 @@ package com.dayu.order.api;
import com.dayu.base.api.Api;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.order.api.protocol.ErrorOrder;
import com.dayu.order.api.protocol.KaAddress;
import com.dayu.order.api.protocol.LogsticsInfo;
import com.dayu.order.api.protocol.OperateInfo;
import com.dayu.order.api.protocol.OperatePostData;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.OrderPart;
......@@ -71,6 +74,9 @@ public class OrderApiFactory {
public static Observable<BasePageBean<ServerInstruction>> getInstruction(long id, int page, int pageSize) {
return Api.getService(OrderService.class).getInstruction(id, page, pageSize).compose(Api.applySchedulers());
}
public static Observable<OperateInfo> getOperateInfo(OperatePostData data) {
return Api.getService(OrderService.class).getOperateInfo(data).compose(Api.applySchedulers());
}
public static Observable<KaAddress> getKaAddress(int companyId) {
return Api.getService(OrderService.class).getKaAddress(companyId).compose(Api.applySchedulers());
......
......@@ -5,6 +5,8 @@ import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.order.api.protocol.ErrorOrder;
import com.dayu.order.api.protocol.KaAddress;
import com.dayu.order.api.protocol.LogsticsInfo;
import com.dayu.order.api.protocol.OperateInfo;
import com.dayu.order.api.protocol.OperatePostData;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.OrderPart;
......@@ -151,6 +153,12 @@ interface OrderService {
@GET(OrderConstant.ORDER_INSTRUCTION)
Observable<BaseResponse<BasePageBean<ServerInstruction>>> getInstruction(@Query("kaSpuId") long id, @Query("page") int page,
@Query("pageSize") int pageSize);
/**
* 获取操作指南.
*
*/
@POST(OrderConstant.ORDER_OPERATE)
Observable<BaseResponse<OperateInfo>> getOperateInfo(@Body OperatePostData data);
/**
* 获取厂商默认收货地址.
......
......@@ -26,6 +26,24 @@ public class ErrorOrder {
private String appointmentTime;
private int createdSource;
private List<Spu> spus;
private String createdProvider;
private double price;
public String getCreatedProvider() {
return createdProvider;
}
public void setCreatedProvider(String createdProvider) {
this.createdProvider = createdProvider;
}
public double getPrice() {
return price;
}
public void setPrice(double price) {
this.price = price;
}
public List<Spu> getSpus() {
return spus;
......
package com.dayu.order.api.protocol;
import java.io.Serializable;
import java.util.List;
/**
* Created by mReturn
* on 2020\1\7 0007.
*/
public class OperateInfo implements Serializable {
private int id;
private String spuNum;
private String name;
private Object brandId;
private Object brandName;
private int categoryOneId;
private String categoryOneName;
private int categoryTwoId;
private String categoryTwoName;
private int categoryThreeId;
private String categoryThreeName;
private int productLineId;
private Object productLineName;
private int serviceType;
private int providerTypeId;
private String providerTypeName;
private String serviceDescription;
private int converAreaLevel;
private int companyId;
private Object companyName;
private Object createId;
private Object createName;
private String createTime;
private int sopStatus;
private int accreditSiteNum;
private Object needSerialNumPic;
private Object referencePrice;
private Object referenceTime;
private Object logoUrl;
private Object firstUrl;
private Object doorPrice;
private Object salesBase;
private Object salesVolume;
private Object salesTotal;
private Object priceUrl;
private Object detailUrl;
private Object alikeWord;
private Object minprogramCategoryId;
private Object minprogramCategoryName;
private int status;
private int type;
private Object publishMarket;
private Object serviceBrief;
private Object feeStandard;
private Object providerId;
private Object providerName;
private Object labelId;
private Object labelName;
private Object hotline;
private String videoUrl;
private Object spuRelationProductLines;
private List<?> spuAccessoryList;
private List<SopsBean> sops;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getSpuNum() {
return spuNum;
}
public void setSpuNum(String spuNum) {
this.spuNum = spuNum;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Object getBrandId() {
return brandId;
}
public void setBrandId(Object brandId) {
this.brandId = brandId;
}
public Object getBrandName() {
return brandName;
}
public void setBrandName(Object brandName) {
this.brandName = brandName;
}
public int getCategoryOneId() {
return categoryOneId;
}
public void setCategoryOneId(int categoryOneId) {
this.categoryOneId = categoryOneId;
}
public String getCategoryOneName() {
return categoryOneName;
}
public void setCategoryOneName(String categoryOneName) {
this.categoryOneName = categoryOneName;
}
public int getCategoryTwoId() {
return categoryTwoId;
}
public void setCategoryTwoId(int categoryTwoId) {
this.categoryTwoId = categoryTwoId;
}
public String getCategoryTwoName() {
return categoryTwoName;
}
public void setCategoryTwoName(String categoryTwoName) {
this.categoryTwoName = categoryTwoName;
}
public int getCategoryThreeId() {
return categoryThreeId;
}
public void setCategoryThreeId(int categoryThreeId) {
this.categoryThreeId = categoryThreeId;
}
public String getCategoryThreeName() {
return categoryThreeName;
}
public void setCategoryThreeName(String categoryThreeName) {
this.categoryThreeName = categoryThreeName;
}
public int getProductLineId() {
return productLineId;
}
public void setProductLineId(int productLineId) {
this.productLineId = productLineId;
}
public Object getProductLineName() {
return productLineName;
}
public void setProductLineName(Object productLineName) {
this.productLineName = productLineName;
}
public int getServiceType() {
return serviceType;
}
public void setServiceType(int serviceType) {
this.serviceType = serviceType;
}
public int getProviderTypeId() {
return providerTypeId;
}
public void setProviderTypeId(int providerTypeId) {
this.providerTypeId = providerTypeId;
}
public String getProviderTypeName() {
return providerTypeName;
}
public void setProviderTypeName(String providerTypeName) {
this.providerTypeName = providerTypeName;
}
public String getServiceDescription() {
return serviceDescription;
}
public void setServiceDescription(String serviceDescription) {
this.serviceDescription = serviceDescription;
}
public int getConverAreaLevel() {
return converAreaLevel;
}
public void setConverAreaLevel(int converAreaLevel) {
this.converAreaLevel = converAreaLevel;
}
public int getCompanyId() {
return companyId;
}
public void setCompanyId(int companyId) {
this.companyId = companyId;
}
public Object getCompanyName() {
return companyName;
}
public void setCompanyName(Object companyName) {
this.companyName = companyName;
}
public Object getCreateId() {
return createId;
}
public void setCreateId(Object createId) {
this.createId = createId;
}
public Object getCreateName() {
return createName;
}
public void setCreateName(Object createName) {
this.createName = createName;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public int getSopStatus() {
return sopStatus;
}
public void setSopStatus(int sopStatus) {
this.sopStatus = sopStatus;
}
public int getAccreditSiteNum() {
return accreditSiteNum;
}
public void setAccreditSiteNum(int accreditSiteNum) {
this.accreditSiteNum = accreditSiteNum;
}
public Object getNeedSerialNumPic() {
return needSerialNumPic;
}
public void setNeedSerialNumPic(Object needSerialNumPic) {
this.needSerialNumPic = needSerialNumPic;
}
public Object getReferencePrice() {
return referencePrice;
}
public void setReferencePrice(Object referencePrice) {
this.referencePrice = referencePrice;
}
public Object getReferenceTime() {
return referenceTime;
}
public void setReferenceTime(Object referenceTime) {
this.referenceTime = referenceTime;
}
public Object getLogoUrl() {
return logoUrl;
}
public void setLogoUrl(Object logoUrl) {
this.logoUrl = logoUrl;
}
public Object getFirstUrl() {
return firstUrl;
}
public void setFirstUrl(Object firstUrl) {
this.firstUrl = firstUrl;
}
public Object getDoorPrice() {
return doorPrice;
}
public void setDoorPrice(Object doorPrice) {
this.doorPrice = doorPrice;
}
public Object getSalesBase() {
return salesBase;
}
public void setSalesBase(Object salesBase) {
this.salesBase = salesBase;
}
public Object getSalesVolume() {
return salesVolume;
}
public void setSalesVolume(Object salesVolume) {
this.salesVolume = salesVolume;
}
public Object getSalesTotal() {
return salesTotal;
}
public void setSalesTotal(Object salesTotal) {
this.salesTotal = salesTotal;
}
public Object getPriceUrl() {
return priceUrl;
}
public void setPriceUrl(Object priceUrl) {
this.priceUrl = priceUrl;
}
public Object getDetailUrl() {
return detailUrl;
}
public void setDetailUrl(Object detailUrl) {
this.detailUrl = detailUrl;
}
public Object getAlikeWord() {
return alikeWord;
}
public void setAlikeWord(Object alikeWord) {
this.alikeWord = alikeWord;
}
public Object getMinprogramCategoryId() {
return minprogramCategoryId;
}
public void setMinprogramCategoryId(Object minprogramCategoryId) {
this.minprogramCategoryId = minprogramCategoryId;
}
public Object getMinprogramCategoryName() {
return minprogramCategoryName;
}
public void setMinprogramCategoryName(Object minprogramCategoryName) {
this.minprogramCategoryName = minprogramCategoryName;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public Object getPublishMarket() {
return publishMarket;
}
public void setPublishMarket(Object publishMarket) {
this.publishMarket = publishMarket;
}
public Object getServiceBrief() {
return serviceBrief;
}
public void setServiceBrief(Object serviceBrief) {
this.serviceBrief = serviceBrief;
}
public Object getFeeStandard() {
return feeStandard;
}
public void setFeeStandard(Object feeStandard) {
this.feeStandard = feeStandard;
}
public Object getProviderId() {
return providerId;
}
public void setProviderId(Object providerId) {
this.providerId = providerId;
}
public Object getProviderName() {
return providerName;
}
public void setProviderName(Object providerName) {
this.providerName = providerName;
}
public Object getLabelId() {
return labelId;
}
public void setLabelId(Object labelId) {
this.labelId = labelId;
}
public Object getLabelName() {
return labelName;
}
public void setLabelName(Object labelName) {
this.labelName = labelName;
}
public Object getHotline() {
return hotline;
}
public void setHotline(Object hotline) {
this.hotline = hotline;
}
public String getVideoUrl() {
return videoUrl;
}
public void setVideoUrl(String videoUrl) {
this.videoUrl = videoUrl;
}
public Object getSpuRelationProductLines() {
return spuRelationProductLines;
}
public void setSpuRelationProductLines(Object spuRelationProductLines) {
this.spuRelationProductLines = spuRelationProductLines;
}
public List<?> getSpuAccessoryList() {
return spuAccessoryList;
}
public void setSpuAccessoryList(List<?> spuAccessoryList) {
this.spuAccessoryList = spuAccessoryList;
}
public List<SopsBean> getSops() {
return sops;
}
public void setSops(List<SopsBean> sops) {
this.sops = sops;
}
public static class SopsBean implements Serializable {
/**
* id : 1
* spuId : 1
* sortNum : 1
* description : 开箱验机,有无外损或部件缺失11111
* type : 1
* typeResult : null
* status : 1
* example :
*/
private int id;
private int spuId;
private int sortNum;
private String description;
private int type;
private Object typeResult;
private int status;
private String example;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getSpuId() {
return spuId;
}
public void setSpuId(int spuId) {
this.spuId = spuId;
}
public int getSortNum() {
return sortNum;
}
public void setSortNum(int sortNum) {
this.sortNum = sortNum;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public Object getTypeResult() {
return typeResult;
}
public void setTypeResult(Object typeResult) {
this.typeResult = typeResult;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public String getExample() {
return example;
}
public void setExample(String example) {
this.example = example;
}
}
}
package com.dayu.order.api.protocol;
/**
* Created by mReturn
* on 2020\1\7 0007.
*/
public class OperatePostData {
public int [] spuIds;
public OperatePostData(int[] ids) {
this.spuIds = ids;
}
}
......@@ -55,7 +55,24 @@ public class Order implements Serializable{
private Integer commited;
private Integer kaCompanyId;
private Integer faceSwitch ;//0:关闭;1:打开
private String createdProvider;
private double price;
public String getCreatedProvider() {
return createdProvider;
}
public void setCreatedProvider(String createdProvider) {
this.createdProvider = createdProvider;
}
public double getPrice() {
return price;
}
public void setPrice(double price) {
this.price = price;
}
public Integer getFaceSwitch() {
return faceSwitch;
......
......@@ -76,6 +76,24 @@ public class OrderDetail implements Serializable {
private Integer needEsignature;//1:需要2:不需要.
private String esignatureImg;
private Integer payStatus;//或null:未支付 2.已支付3.支付成功4.支付失败
private String createdProvider;
private double price;
public String getCreatedProvider() {
return createdProvider;
}
public void setCreatedProvider(String createdProvider) {
this.createdProvider = createdProvider;
}
public double getPrice() {
return price;
}
public void setPrice(double price) {
this.price = price;
}
public String getTaskDesc() {
return taskDesc;
......
......@@ -16,6 +16,15 @@ public class Tab {
private int pendingservice;
private int reservation;
private int error;
private int waits;
public int getWaits() {
return waits;
}
public void setWaits(int waits) {
this.waits = waits;
}
public int getCanceled() {
return canceled;
......
......@@ -70,6 +70,11 @@ public class OrderConstant {
* 获取服务说明.
*/
public final static String ORDER_INSTRUCTION = "/api-ka-base/" + "spuServiceDetail";
/**
* 获取操作指南.
*/
public final static String ORDER_OPERATE = "/api-ka-base/" + "spu/getMobileSpusBySpuIds";
/**
* 获取厂商默认收货地址.
*/
......
package com.dayu.order.presenter.operate;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
import com.dayu.order.api.protocol.OperateInfo;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.presenter.serverinstruction.ServerInstructionContract;
/**
* Created by mReturn
* on 2020\1\7 0007.
*/
public interface OperateConstract {
interface View extends BaseView {
void setDatas(OperateInfo operateInfo);
}
abstract class Presenter extends BaseListPresenter<OperateConstract.View> {
/**
* 获取操作指南.
*/
public abstract void getOperateData();
}
}
package com.dayu.order.presenter.operate;
import android.databinding.ObservableField;
import android.os.Bundle;
import com.dayu.common.Constants;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OperateInfo;
import com.dayu.order.api.protocol.OperatePostData;
/**
* Created by mReturn
* on 2020\1\7 0007.
*/
public class OperatePresenter extends OperateConstract.Presenter {
private int[] mSpuIds;
@Override
public ObservableField<Object> getSourceDatas() {
return null;
}
@Override
public void onAttached() {
Bundle bundle = mView.getBundle();
mSpuIds = bundle.getIntArray(Constants.IDS);
getOperateData();
}
@Override
public void getOperateData() {
mView.showDialog();
OrderApiFactory.getOperateInfo(new OperatePostData(mSpuIds)).subscribe(baseObserver(info-> mView.setDatas(info)));
}
}
......@@ -9,6 +9,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.Spu;
import com.dayu.order.databinding.ActivityOrderDetailsBinding;
import com.dayu.order.presenter.orderdetail.OrderDetailContract;
import com.dayu.order.presenter.orderdetail.OrderDetailPresenter;
......@@ -64,9 +65,20 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
mFragments = new ArrayList<>();
orderDatailsFragment = OrderDetaillsFragment.newInstance(detail);
mMultiDetailFragment = MultiOrderDetailFragment.newInstance(detail);
mOperateFragment = new OrderOperateFragment();
orderDatailsServeFragment = OrderDetailsServeFragment.newInstance(detail);
mOrderPartFragment = OrderPartFragment.newInstance(detail);
if (detail.getSpus().size()>0){
mBind.btnOperate.setVisibility(View.VISIBLE);
int[] ids = new int[detail.getSpus().size()];
for (int i=0;i<detail.getSpus().size();i++){
ids[i] = detail.getSpus().get(i).getKaSpuId();
}
mOperateFragment = OrderOperateFragment.newInstance(ids);
}else {
int [] ids ={-1};
mOperateFragment = OrderOperateFragment.newInstance(ids);
}
if (detail.getCreatedSource() == 2 || detail.getCreatedSource() == 3 || detail.getCreatedSource() == 4) {
mFragments.add(mMultiDetailFragment);
} else {
......@@ -77,13 +89,13 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
mFragments.add(mOrderPartFragment);
mBind.titleBack.setOnClickListener(v -> dumpBack());
mBind.btnDetail.setVisibility(View.VISIBLE);
mBind.btnOperate.setVisibility(View.VISIBLE);
mBind.btnServer.setVisibility(View.VISIBLE);
if (detail.getCreatedSource() == 1) {
mBind.btnServer.setBackgroundResource(R.drawable.detail_end_selector);
} else {
mBind.btnPart.setVisibility(View.VISIBLE);
}
initBtn();
addFragment();
}
......
......@@ -80,6 +80,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
item.getDistrictName() + item.getAddress();
holder.itemTextWeixiuLeixing.setText(item.getCategoryName());
holder.itemTextWeixiu.setText(item.getProviderName());
holder.tvOrderSender.setText(TextUtils.isEmpty(item.getCreatedProvider())
? mContext.getString(R.string.no_data) : item.getCreatedProvider());
holder.tvPrice.setText(item.getPrice() + "元");
holder.itemTextDizhi.setText(address);
holder.tvErrorState.setVisibility(View.GONE);
holder.itemUpdataTime.setVisibility(View.VISIBLE);
......
......@@ -56,6 +56,9 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE
}
helper.itemTextWeixiu.setText(item.getProviderName());
helper.itemTextWeixiuLeixing.setText(item.getCategoryName());
helper.tvOrderSender.setText(TextUtils.isEmpty(item.getCreatedProvider())
? mContext.getString(R.string.no_data) : item.getCreatedProvider());
helper.tvPrice.setText(item.getPrice()+"元");
String address = item.getProvinceName() + item.getCityName() +
item.getDistrictName() + item.getAddress();
helper.itemTextDizhi.setText(address);
......
......@@ -189,7 +189,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
public void setTabNum(Tab tab, int myTabIndex) {
// String[] tabNum = new String[]{"tab.getReservation() + "", tab.getPendingservice() + "",
// tab.getError() + "", tab.getCanceled() + ""};
String[] tabNum = new String[]{"0",tab.getReservation() + "", tab.getPendingservice() + "",
String[] tabNum = new String[]{tab.getWaits() + "",tab.getReservation() + "", tab.getPendingservice() + "",
tab.getError() + ""};
EventBus.getDefault().post(new TabNumEvent(tab.getPendingservice()+tab.getError()));
if (isFirstAddTab) {
......
package com.dayu.order.ui.fragment;
import android.os.Bundle;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.base.ui.fragment.DataBindingFragment;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.protocol.OperateInfo;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.databinding.FragmentOrderOperateBinding;
import com.dayu.order.presenter.operate.OperateConstract;
import com.dayu.order.presenter.operate.OperatePresenter;
import com.dayu.order.presenter.serverinstruction.ServerInstructionContract;
import com.dayu.order.presenter.serverinstruction.ServerInstructionPresenter;
import com.dayu.order.ui.adapter.OrderAdapter;
import java.util.List;
public class OrderOperateFragment extends BaseFragment<ServerInstructionPresenter,FragmentOrderOperateBinding>
implements ServerInstructionContract.View {
public class OrderOperateFragment extends BaseFragment<OperatePresenter,FragmentOrderOperateBinding>
implements OperateConstract.View {
private OrderAdapter mAdapter;
public static OrderOperateFragment newInstance(int[] ids) {
Bundle args = new Bundle();
args.putSerializable(Constants.IDS, ids);
OrderOperateFragment fragment = new OrderOperateFragment();
fragment.setArguments(args);
return fragment;
}
@Override
public int getLayoutId() {
return R.layout.fragment_order_operate;
......@@ -26,7 +42,12 @@ public class OrderOperateFragment extends BaseFragment<ServerInstructionPresente
@Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
// mBind.setPresenter(mPresenter);
}
@Override
public void setDatas(OperateInfo operateInfo) {
}
}
......@@ -28,7 +28,7 @@ import org.greenrobot.eventbus.ThreadMode;
/**
* 待预约的Fragment
* 待接单的Fragment
*/
public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, FragmentCommomRecycleBinding> implements
......
......@@ -44,7 +44,7 @@
android:layout_height="28dp"
android:background="@drawable/detail_center_selector"
android:gravity="center"
android:visibility="invisible"
android:visibility="gone"
android:text="@string/order_operate_help" />
<Button
android:id="@+id/btn_server"
......
......@@ -469,7 +469,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_15"
android:text="aaaaaa"
android:text='@{!TextUtils.isEmpty(item.createdProvider)?item.createdProvider:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
</LinearLayout>
......@@ -486,7 +486,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/order_send_company"
android:text="@string/order_take_price"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -495,7 +495,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_15"
android:text="180元"
android:text='@{item.price+"元"}'
android:textColor="@color/cl_order_item_date"
android:textSize="14sp" />
</LinearLayout>
......
......@@ -109,7 +109,7 @@
android:ellipsize="end"
android:maxEms="7"
android:maxLines="1"
android:text="aaaaaaaaaaaaaa"
android:text=""
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/size_login_hint_text"
android:textStyle="bold" />
......@@ -121,7 +121,7 @@
android:ellipsize="end"
android:maxEms="7"
android:maxLines="1"
android:text="180元"
android:text="0元"
android:layout_marginLeft="5dp"
android:layout_marginRight="10dp"
android:gravity="right"
......
......@@ -38,15 +38,5 @@
android:textColor="@color/white"
android:textSize="12sp" />
</RelativeLayout>
<com.dayu.widgets.LRecyclerView
android:id="@+id/recyclerView"
setPresenter="@{presenter}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#f5f5f5"
app:isRefreshable="true"
app:itemType="@layout/item_order_instruction"
app:needCoreAdapter="true"
app:needFoot="true" />
</LinearLayout>
</layout>
\ No newline at end of file
......@@ -123,7 +123,7 @@
android:ellipsize="end"
android:maxEms="7"
android:maxLines="1"
android:text="aaaaaaaaa"
android:text=""
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/size_login_hint_text"
android:textStyle="bold" />
......@@ -135,7 +135,7 @@
android:ellipsize="end"
android:maxEms="7"
android:maxLines="1"
android:text="180元"
android:text="0元"
android:layout_marginLeft="5dp"
android:layout_marginRight="10dp"
android:gravity="right"
......
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