Skip to content

android / dayu

Go to a project
Commit c120d69a by wukun
Options

0904

parent b8bd230f
Inline Side-by-side
Showing with 32 additions and 34 deletions
orderCenter/src/main/java/com/dayu/order/api/OrderService.java
...@@ -42,6 +42,7 @@ import com.dayu.order.api.protocol.data.ReceivePartData; ...@@ -42,6 +42,7 @@ import com.dayu.order.api.protocol.data.ReceivePartData;
import com.dayu.order.api.protocol.data.SendPartData; import com.dayu.order.api.protocol.data.SendPartData;
import com.dayu.order.common.OrderConstant; import com.dayu.order.common.OrderConstant;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import io.reactivex.Observable; import io.reactivex.Observable;
...@@ -470,9 +471,9 @@ public interface OrderService { ...@@ -470,9 +471,9 @@ public interface OrderService {
/** /**
* 工单sop列表项 * 工单sop列表项
*/ */
@GET(Constants.API_7200 + "/ordersRelationSpuItemSop") @GET(Constants.API_7200 + "/ordersRelationSpuItemSop/list")
Observable<BaseResponse<BasePageBean<SopListBean>>> getSopList(@Query("ordersRelationSpuItemId") int ordersRelationSpuItemId Observable<BaseResponse<ArrayList<SopListBean>>> getSopList(@Query("ordersRelationSpuItemId") int ordersRelationSpuItemId
, @Query("pageSize") int pageSize); , @Query("orderId") int orderId);
/** /**
* 工单sop列表项 * 工单sop列表项
......
orderCenter/src/main/java/com/dayu/order/api/protocol/Spu.java
...@@ -34,14 +34,6 @@ public class Spu implements Serializable, Parcelable { ...@@ -34,14 +34,6 @@ public class Spu implements Serializable, Parcelable {
private String productName; private String productName;
private boolean isHide = false; private boolean isHide = false;
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
private int ordersRelationSpuId; private int ordersRelationSpuId;
/** /**
* 处理工单获取信息使用. * 处理工单获取信息使用.
...@@ -53,6 +45,14 @@ public class Spu implements Serializable, Parcelable { ...@@ -53,6 +45,14 @@ public class Spu implements Serializable, Parcelable {
private String serialNumPicUrl; private String serialNumPicUrl;
private String needShortVideo; private String needShortVideo;
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getNeedShortVideo() { public String getNeedShortVideo() {
return needShortVideo; return needShortVideo;
} }
......
orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
...@@ -99,14 +99,14 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen ...@@ -99,14 +99,14 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
// if (mSpu.getStatus() == 2) { // if (mSpu.getStatus() == 2) {
// getInfo(); // getInfo();
// } // }
// if (mSpu.getSopStatus() == 1){ if (mSpu.getSopStatus() == 1){
// mView.hideSOP(false); mView.hideSOP(false);
// }else{ }else{
// mView.hideSOP(true); mView.hideSOP(true);
// } }
// if (isHide){ if (isHide){
// mView.hideSOP(true); mView.hideSOP(true);
// } }
} }
private void commitOrder(List<String> list, List<String> snList, String videoUrl) { private void commitOrder(List<String> list, List<String> snList, String videoUrl) {
...@@ -298,14 +298,14 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen ...@@ -298,14 +298,14 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
OrderApiFactory.getMultiProcessInfo(mId).subscribe(baseObserver(spu -> { OrderApiFactory.getMultiProcessInfo(mId).subscribe(baseObserver(spu -> {
mDetail.set(spu); mDetail.set(spu);
// if (mSpu.getSopStatus() == 1){ if (mSpu.getSopStatus() == 1){
// mView.hideSOP(false); mView.hideSOP(false);
// }else{ }else{
// mView.hideSOP(true); mView.hideSOP(true);
// } }
// if (isHide){ if (isHide){
// mView.hideSOP(true); mView.hideSOP(true);
// } }
mBrandName.set(spu.getBrandName()); mBrandName.set(spu.getBrandName());
mView.setSnNumbers(spu.getSn()); mView.setSnNumbers(spu.getSn());
// mSn.set(spu.getSn()); // mSn.set(spu.getSn());
......
orderCenter/src/main/java/com/dayu/order/ui/activity/SopLocalActivity.java
...@@ -155,10 +155,10 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL ...@@ -155,10 +155,10 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
private void initData() { private void initData() {
if (OrderConstant.sopListData == null) { if (OrderConstant.sopListData == null) {
showDialog(); showDialog();
Api.getService(OrderService.class).getSopList(mSopRid, 100).compose(Api.applySchedulers()) Api.getService(OrderService.class).getSopList(mSopRid, orderDetailId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(datas -> { .subscribe(mPresenter.baseObserver(datas -> {
if (datas != null && datas.getData() != null) { if (datas != null) {
OrderConstant.sopListData = datas.getData(); OrderConstant.sopListData = datas;
setStepData(); setStepData();
} }
})); }));
...@@ -496,7 +496,6 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL ...@@ -496,7 +496,6 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
if (mSpu != null) { if (mSpu != null) {
Intent intent = new Intent(mActivity, MultiProcessOrderActivity.class); Intent intent = new Intent(mActivity, MultiProcessOrderActivity.class);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
mSpu.setSopStatus(2);
bundle.putSerializable(OrderConstant.SPU, mSpu); bundle.putSerializable(OrderConstant.SPU, mSpu);
bundle.putParcelableArrayList(OrderConstant.SPUS, mSpus); bundle.putParcelableArrayList(OrderConstant.SPUS, mSpus);
bundle.putParcelableArrayList(OrderConstant.SPUS_SOURCE, mBundle.getParcelableArrayList(OrderConstant.SPUS_SOURCE)); bundle.putParcelableArrayList(OrderConstant.SPUS_SOURCE, mBundle.getParcelableArrayList(OrderConstant.SPUS_SOURCE));
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
...@@ -138,7 +138,6 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen ...@@ -138,7 +138,6 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
//联系电话 //联系电话
mBind.tvContactSeller.setOnClickListener(v -> { mBind.tvContactSeller.setOnClickListener(v -> {
//TODO 联系电话
if (phoneNum == null || phoneNum.size() == 0){ if (phoneNum == null || phoneNum.size() == 0){
ToastUtils.showShortToast(R.string.no_mobile); ToastUtils.showShortToast(R.string.no_mobile);
}else{ }else{
......
orderCenter/src/main/res/layout/activity_multi_process_order.xml
...@@ -59,8 +59,7 @@ ...@@ -59,8 +59,7 @@
android:onClick="@{()->presenter.dumpToSop()}" android:onClick="@{()->presenter.dumpToSop()}"
android:text="@string/sop_finish" android:text="@string/sop_finish"
android:textColor="@color/cl_white" android:textColor="@color/cl_white"
android:textSize="13.3sp" android:textSize="13.3sp"/>
android:visibility="@{presenter.mDetail.sopStatus == 1?View.VISIBLE:View.GONE}" />
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
......
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