Commit a2504a15 by mReturn

调试接口

parent c6939d89
Showing with 239 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;
/**
* 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