Skip to content

android / dayu

Go to a project
Commit 3d7fca81 by wukun
Options

1022

parent 4ba89224
Inline Side-by-side
Showing with 206 additions and 40 deletions
build.gradle
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "29.0.2"
ext.min_sdk_version = 21
ext.target_sdk_version = 29
ext.version_code = 315
ext.verson_name = "3.1.5"
ext.version_code = 316
ext.verson_name = "3.1.6"
ext.gradle_version = '4.0.1'
ext.isReleaseMinify = false
ext.isDebugMinify = false
......
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java
......@@ -14,6 +14,7 @@ import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.OrderService;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.ui.activity.OrderDetailsActivity;
import com.dayu.order.ui.activity.OrderDetailsClockActivity;
import com.dayu.provider.event.RefreshApoiment;
import com.dayu.provider.event.RefreshReceivingNum;
import com.dayu.provider.event.RefreshTab;
......@@ -156,4 +157,10 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
public int getmUserId() {
return mUserId;
}
public void dumpDetailClock(int orderId) {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, orderId);
mView.startActivity(OrderDetailsClockActivity.class, bundle);
}
}
orderCenter/src/main/java/com/dayu/order/presenter/redeploy/RedeployPresenter.java
......@@ -9,6 +9,7 @@ import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.order.api.OrderService;
import com.dayu.order.ui.activity.OrderDetailsActivity;
import com.dayu.order.ui.activity.OrderDetailsClockActivity;
import com.dayu.provider.event.RefreshTab;
import com.dayu.utils.UserManager;
......@@ -68,4 +69,9 @@ public class RedeployPresenter extends RedeployContract.Presenter {
return mUserId;
}
public void dumpDetailClock(int orderId) {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, orderId);
mView.startActivity(OrderDetailsClockActivity.class, bundle);
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsClockActivity.java
package com.dayu.order.ui.activity;
import android.Manifest;
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
......@@ -7,19 +10,39 @@ import androidx.databinding.ObservableField;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.activity.ImgGalleryActivty;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.databinding.ActivityOrderDetailsClockBinding;
import com.dayu.order.presenter.orderdetail.OrderDetailClockContract;
import com.dayu.order.presenter.orderdetail.OrderDetailClockPresenter;
import com.dayu.provider.event.RefreshServe;
import com.dayu.provider.event.RefreshTab;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.tbruyelle.rxpermissions2.RxPermissions;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
import java.util.HashMap;
import java.util.List;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
/**
* 工单详情（打卡）
* on 2023/10/15.
......@@ -73,22 +96,16 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
if (3 == detail.getStatus()) {
mBind.tvButton.setText(getString(R.string.begain_server));
} else if (4 == detail.getStatus()) {
if (7 != detail.getSubStatus()) {
if (6 == detail.getSubStatus()) {
mBind.tvButton.setText(getString(R.string.check_upon_delivery));
} else if (7 != detail.getSubStatus()) {
// mBind.tvButton.setText("第" + detail.getFinishedDays() + "天打卡");
mBind.tvButton.setText("第" + "天打卡");
mBind.tvButton.setText("第" + "天打卡");
} else {
mBind.tvButton.setText(getString(R.string.submit_order));
}
}
mBind.tvButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
}
});
mBind.recyclerView.setLayoutManager(linearLayoutManager);
// OrderServerClockAdapter adapter = new OrderServerClockAdapter(false);
// adapter.setOrderDetail(mPresenter.getDetail());
......@@ -119,6 +136,120 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
});
mBind.dlLine.getLayoutParams().height = 300;
mBind.tvButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (3 == detail.getStatus()) {
startServer(detail);
} else if (4 == detail.getStatus()) {
if (6 == detail.getSubStatus()) {
if (detail.getIsCheck() == 0) {
ToastUtils.showShortToast("请等待自动验收");
} else if (detail.getIsCheck() == 2) {
ToastUtils.showShortToast("请等待商家验收");
} else {
UserInfo info = UserManager.getInstance().getUser();
Bundle bundle = new Bundle();
bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + info.getAccountId() +
"&token=" + info.getToken() + "&orderId=" + detail.getId());
bundle.putString("title", "客户验收");
ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle).navigation();
}
} else if (7 != detail.getSubStatus()) {
// mBind.tvButton.setText("第" + detail.getFinishedDays() + "天打卡");
HashMap<String, Object> params = new HashMap<>();
params.put("orderId", detail.getId());
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
OrderApiFactory.clockIn(body)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(aBoolean -> {
mPresenter.getOrderDetailInfo(detail.getId());
EventBus.getDefault().post(new RefreshServe(1));
}, responeThrowable -> {
}));
} else {
HashMap<String, Object> params = new HashMap<>();
params.put("doorPrice", "0");
params.put("servicePrice", "0");
params.put("materialCost", "0");
params.put("otherPrice", "0");
params.put("doorPriceComment", "");
params.put("repairType", 1);
params.put("payType", 3);
params.put("engineerId", Integer.parseInt(UserManager.getInstance().getUser().getAccountId()));
params.put("id", detail.getId());
params.put("esignatureImg", null);
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
OrderApiFactory.commitOrder(body)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(integer -> {
EventBus.getDefault().post(new RefreshServe(1));
mPresenter.getOrderDetailInfo(detail.getId());
}, responeThrowable -> {
}));
}
}
}
});
}
private void startServer(OrderDetail detail) {
RxPermissions permissions = new RxPermissions((Activity) this);
if (permissions.isGranted(Manifest.permission.ACCESS_COARSE_LOCATION)) {
startFirstServe(detail);
} else {
CustomDialog mDialog = new CustomDialog((Activity) this, com.dayu.baselibrary.R.style.CustomDialog, "大鱼需要你的定位权限，用于记录处理sop的当前位置"
, (dialog, confirm) -> {
if (confirm) {
Disposable observable = permissions.request(Manifest.permission.ACCESS_COARSE_LOCATION)
.subscribe(aBoolean -> {
if (aBoolean) {
ProgressUtil.setCanDismiss(false);
ProgressUtil.startLoad(this);
startFirstServe(detail);
} else {
ToastUtils.showShortToast("权限申请失败!");
}
});
}
dialog.dismiss();
});
mDialog.setTitle("温馨提示")
.setPositiveButton("去开启")
.setNegativeButton("取消");
mDialog.show();
}
}
private void startFirstServe(OrderDetail detail) {
if (detail.getSubStatus() == 1 || detail.getSubStatus() == 2 || (detail.getSource() == 7)) {
HashMap<String, Object> params = new HashMap<>();
params.put("orderId", detail.getId());
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
OrderApiFactory.startServer(body)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(integer -> {
mPresenter.getOrderDetailInfo(detail.getId());
EventBus.getDefault().post(new RefreshServe(1));
}, responeThrowable -> {
if ("ORDER0006".equals(responeThrowable.subCode)) {
EventBus.getDefault().post(new RefreshTab(3));
EventBus.getDefault().post(new RefreshServe(1));
}
}));
// MobclickAgent.onEvent(mContext, "start_server");
}
}
@Override
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -197,26 +197,25 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.orderLineOne.setVisibility(View.VISIBLE);
}
holder.itemUpdataTime.setText(mContext.getString(R.string.modify_appointment_time));
// int source = item.getSource();
// if (7 == source){
// Log.e("TAG111", "initData: "+ item.getStatus()+"---"+ item.getSubStatus());
// if (3 == item.getStatus()){
// holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
// }else if (4 == item.getStatus()){
// if (7 != item.getSubStatus()){
// holder.tvItemProcess.setText("第"+item.getFinishedDays() +"天打卡");
// }else{
// holder.tvItemProcess.setText(mContext.getString(R.string.submit_order));
// }
// }
// }else{
int source = item.getSource();
if (7 == source){
if (3 == item.getStatus()){
holder.tvItemEnd.setText(mContext.getString(R.string.begain_server));
}else if (4 == item.getStatus()){
if (7 != item.getSubStatus()){
holder.tvItemEnd.setText("第"+item.getFinishedDays() +"天打卡");
}else{
holder.tvItemEnd.setText(mContext.getString(R.string.submit_order));
}
}
}else{
if (item.getSubStatus() == 1) {
// holder.tvItemProcess.setText(mContext.getString(R.string.have_go_on));
holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
} else if (item.getSubStatus() == 2) {
holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
}
// }
}
time = item.getConfirmDoorTime();
setTimeStatus(holder, item, time);
......@@ -224,8 +223,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
case 4://待处理
holder.tvItemProcess.setVisibility(View.GONE);
holder.tvItemEnd.setVisibility(View.VISIBLE);
int source = item.getSource();
if (7 == source){
int source1 = item.getSource();
if (7 == source1){
if (3 == item.getStatus()){
holder.tvItemEnd.setText(mContext.getString(R.string.begain_server));
}else if (4 == item.getStatus()){
......@@ -239,8 +238,10 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if (item.getSubStatus() == 1) {
// holder.tvItemProcess.setText(mContext.getString(R.string.have_go_on));
holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
holder.tvItemEnd.setText(mContext.getString(R.string.begain_server));
} else if (item.getSubStatus() == 2) {
holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
holder.tvItemEnd.setText(mContext.getString(R.string.begain_server));
}
}
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDoneFragment.java
package com.dayu.order.ui.fragment;
import static com.dayu.order.common.OrderConstant.ORDER_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_NOCONTACT_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_YUYUE;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.common.Constants;
import com.dayu.order.R;
......@@ -20,11 +25,6 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
import static com.dayu.order.common.OrderConstant.ORDER_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_NOCONTACT_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
import static com.dayu.order.common.OrderConstant.ORDER_YUYUE;
/**
* 已完成的Fragment
......@@ -57,7 +57,11 @@ public class OrderDoneFragment extends BaseFragment<OrderDoingPresenter, Fragmen
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order, FragmentOrderdoingItemBinding>() {
@Override
public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) {
mPresenter.dumpDetail(item.getId());
if (7 == item.getSource()){
mPresenter.dumpDetailClock(item.getId());
}else{
mPresenter.dumpDetail(item.getId());
}
}
});
}
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderFirstTabFragment.java
......@@ -43,7 +43,11 @@ public class OrderFirstTabFragment extends BaseFragment<OrderDoingPresenter, Fra
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order, FragmentOrderdoingItemBinding>() {
@Override
public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) {
mPresenter.dumpDetail(item.getId());
if (7 == item.getSource()){
mPresenter.dumpDetailClock(item.getId());
}else{
mPresenter.dumpDetail(item.getId());
}
}
});
}
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderFourTabFragment.java
......@@ -36,7 +36,11 @@ public class OrderFourTabFragment extends BaseFragment<OrderDoingPresenter, Frag
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order,FragmentOrderCancleItemBinding>() {
@Override
public void OnItemClick(Order item, FragmentOrderCancleItemBinding bind) {
mPresenter.dumpDetail(item.getId());
if (7 == item.getSource()){
mPresenter.dumpDetailClock(item.getId());
}else{
mPresenter.dumpDetail(item.getId());
}
}
});
}
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderReceivingFragment.java
......@@ -28,6 +28,7 @@ import com.dayu.utils.LogUtils;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.OnItemClickListener;
......@@ -37,8 +38,6 @@ import org.greenrobot.eventbus.ThreadMode;
import io.reactivex.functions.Consumer;
import com.dayu.utils.UserManager;
/**
* 待接单的Fragment
......@@ -72,7 +71,11 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
if (4 == item.getSource() && item.getReceiveOrderCommission() > 0) {
showCashDialog(item.getReceiveOrderCommission(), mUserId, item.getId(), item.getAppointmentTime());
} else {
mPresenter.dumpDetail(item.getId());
if (7 == item.getSource()){
mPresenter.dumpDetailClock(item.getId());
}else{
mPresenter.dumpDetail(item.getId());
}
}
} else {
showVerifyDialog(data.getSubCode(), data.getMsg(), data.getData());
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderRedeployFragment.java
......@@ -42,7 +42,13 @@ public class OrderRedeployFragment extends BaseFragment<RedeployPresenter, Fragm
}
mBind.recyclerView.setAdapter(mAdapter);
initListener();
mBind.recyclerView.setOnItemClickListener((OnItemClickListener<Order, FragmentOrderdoingItemBinding>) (item, bind) -> mPresenter.dumpDetail(item.getId()));
mBind.recyclerView.setOnItemClickListener((OnItemClickListener<Order, FragmentOrderdoingItemBinding>) (item, bind) -> {
if (7 == item.getSource()){
mPresenter.dumpDetailClock(item.getId());
}else{
mPresenter.dumpDetail(item.getId());
}
});
}
@Override
......
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