Skip to content

android / dayu

Go to a project
Commit 4ba89224 by wukun
Options

1017

parent 36906ffd
Expand all
Inline Side-by-side
Showing with 179 additions and 18 deletions
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
...@@ -89,6 +89,15 @@ public class OrderDetail implements Serializable { ...@@ -89,6 +89,15 @@ public class OrderDetail implements Serializable {
private String needShortVideo; private String needShortVideo;
private String teamName; private String teamName;
private String referenceTime; private String referenceTime;
private String spuSettlementPrice;
public String getSpuSettlementPrice() {
return spuSettlementPrice;
}
public void setSpuSettlementPrice(String spuSettlementPrice) {
this.spuSettlementPrice = spuSettlementPrice;
}
public String getReferenceTime() { public String getReferenceTime() {
return referenceTime; return referenceTime;
......
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
...@@ -75,6 +75,12 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -75,6 +75,12 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
} }
} }
public void refreshOrder() {
mPage = 1;
getOrders(mState, mUserId, mSiteId, mPage, Constants.PAGESIZE);
}
@Override @Override
public void loadMore() { public void loadMore() {
if (mView instanceof OrderDoneFragment) { if (mView instanceof OrderDoneFragment) {
...@@ -239,4 +245,21 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -239,4 +245,21 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
} }
public Observable<Integer> commit(Order order) {
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", order.getId());
params.put("esignatureImg", null);
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
return OrderApiFactory.commitOrder(body);
}
} }
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsClockActivity.java
package com.dayu.order.ui.activity; package com.dayu.order.ui.activity;
import android.view.View;
import android.view.ViewGroup;
import androidx.databinding.ObservableField; import androidx.databinding.ObservableField;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
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.BaseActivity;
import com.dayu.base.ui.activity.ImgGalleryActivty; import com.dayu.base.ui.activity.ImgGalleryActivty;
import com.dayu.order.R; import com.dayu.order.R;
...@@ -10,7 +16,6 @@ import com.dayu.order.api.protocol.OrderDetail; ...@@ -10,7 +16,6 @@ import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.databinding.ActivityOrderDetailsClockBinding; import com.dayu.order.databinding.ActivityOrderDetailsClockBinding;
import com.dayu.order.presenter.orderdetail.OrderDetailClockContract; import com.dayu.order.presenter.orderdetail.OrderDetailClockContract;
import com.dayu.order.presenter.orderdetail.OrderDetailClockPresenter; import com.dayu.order.presenter.orderdetail.OrderDetailClockPresenter;
import com.dayu.order.ui.adapter.OrderServerClockAdapter;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
import java.util.List; import java.util.List;
...@@ -21,7 +26,7 @@ import java.util.List; ...@@ -21,7 +26,7 @@ import java.util.List;
*/ */
@Route(path = RouterPath.PATH_ORDER_DETAIL_CLOCK) @Route(path = RouterPath.PATH_ORDER_DETAIL_CLOCK)
public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPresenter, ActivityOrderDetailsClockBinding> public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPresenter, ActivityOrderDetailsClockBinding>
implements OrderDetailClockContract.View{ implements OrderDetailClockContract.View {
public ObservableField<Object> mDatas = new ObservableField<>(); public ObservableField<Object> mDatas = new ObservableField<>();
public ObservableField<Boolean> isShowLine = new ObservableField<>(); public ObservableField<Boolean> isShowLine = new ObservableField<>();
...@@ -40,19 +45,80 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres ...@@ -40,19 +45,80 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
public void initView() { public void initView() {
mBind.titleBack.setOnClickListener(v -> dumpBack()); mBind.titleBack.setOnClickListener(v -> dumpBack());
OrderServerClockAdapter adapter = new OrderServerClockAdapter(false);
adapter.setOrderDetail(mPresenter.getDetail());
mBind.recyclerView.setAdapter(adapter);
} }
@Override @Override
public void checkSignature(String esignatureImg) { public void checkSignature(String esignatureImg) {
ImgGalleryActivty.launch(mActivity,esignatureImg); ImgGalleryActivty.launch(mActivity, esignatureImg);
} }
@Override @Override
public void init(OrderDetail detail) { public void init(OrderDetail detail) {
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(OrderDetailsClockActivity.this);
mBind.tvOrderNum.setText(detail.getOrderNum());
mBind.tvOrderState.setText(detail.getProvinceName() + detail.getCityName() + detail.getDistrictName());
mBind.tvServeName.setText(detail.getAddress());
mBind.tvName.setText(detail.getCustomerName());
mBind.tvPhoneNum.setText(detail.getCustomerMobile());
mBind.tvContent.setText(detail.getComment());
mBind.tvTime.setText(detail.getAppointmentTime());
mBind.tvDays.setText(detail.getReferenceTime());
mBind.tvPrice.setText(detail.getSpuSettlementPrice() + "元");
mBind.tvProvider.setText(detail.getCreatedProvider());
mBind.tvProName.setText(detail.getCreated());
mBind.tvProNum.setText(detail.getCustomerTelphome());
if (3 == detail.getStatus()) {
mBind.tvButton.setText(getString(R.string.begain_server));
} else if (4 == detail.getStatus()) {
if (7 != detail.getSubStatus()) {
// mBind.tvButton.setText("第" + detail.getFinishedDays() + "天打卡");
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());
List<OrderDetail.RecordBean> record = detail.getRecord();
BaseQuickAdapter<OrderDetail.RecordBean, BaseViewHolder> mAdapter = new BaseQuickAdapter<OrderDetail.RecordBean, BaseViewHolder>
(R.layout.serve_clock_item, record) {
@Override
protected void convert(BaseViewHolder helper, OrderDetail.RecordBean item) {
helper.setText(R.id.server_time, item.getCreateTime());
helper.setText(R.id.server_state, item.getOperation());
}
};
mBind.recyclerView.setAdapter(mAdapter);
mBind.recyclerView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
@Override
public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
int height = mBind.recyclerView.getHeight();
ViewGroup.LayoutParams layoutParams = mBind.dlLine.getLayoutParams();
layoutParams.height = height;
mBind.dlLine.setLayoutParams(layoutParams);
// 移除监听器以免重复触发
mBind.recyclerView.removeOnLayoutChangeListener(this);
}
});
mBind.dlLine.getLayoutParams().height = 300;
} }
@Override @Override
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -226,7 +226,6 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -226,7 +226,6 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvItemEnd.setVisibility(View.VISIBLE); holder.tvItemEnd.setVisibility(View.VISIBLE);
int source = item.getSource(); int source = item.getSource();
if (7 == source){ if (7 == source){
Log.e("TAG111", "initData: "+ item.getStatus()+"---"+ item.getSubStatus());
if (3 == item.getStatus()){ if (3 == item.getStatus()){
holder.tvItemEnd.setText(mContext.getString(R.string.begain_server)); holder.tvItemEnd.setText(mContext.getString(R.string.begain_server));
}else if (4 == item.getStatus()){ }else if (4 == item.getStatus()){
...@@ -477,12 +476,18 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -477,12 +476,18 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
mPresenter.clockIn(it.getId()) mPresenter.clockIn(it.getId())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(aBoolean -> { .subscribe(mPresenter.baseObserver(aBoolean -> {
mPresenter.refresh(); EventBus.getDefault().post(new RefreshServe(1));
}, responeThrowable -> { }, responeThrowable -> {
})); }));
}else{ }else{
mPresenter.commit(it)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(integer -> {
EventBus.getDefault().post(new RefreshServe(1));
}, responeThrowable -> {
}));
} }
} }
}else{ }else{
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderServerClockAdapter.java
...@@ -134,15 +134,15 @@ public class OrderServerClockAdapter extends CoreAdapter<OrderDetail.RecordBean, ...@@ -134,15 +134,15 @@ public class OrderServerClockAdapter extends CoreAdapter<OrderDetail.RecordBean,
if (UIUtils.getString(R.string.check_location).equals(item.getCommentName())) { if (UIUtils.getString(R.string.check_location).equals(item.getCommentName())) {
holder.serverCheck.setOnClickListener(v -> presenter.dumpMap(item.getLatitude(), item.getLongitude(), item.getAddress())); holder.serverCheck.setOnClickListener(v -> presenter.dumpMap(item.getLatitude(), item.getLongitude(), item.getAddress()));
} }
if (UIUtils.getString(R.string.check_reason).equals(item.getCommentName())) { // if (UIUtils.getString(R.string.check_reason).equals(item.getCommentName())) {
if (mDetail.getCreatedSource() == 2 || mDetail.getCreatedSource() == 3 || mDetail.getCreatedSource() == 4) { // if (mDetail.getCreatedSource() == 2 || mDetail.getCreatedSource() == 3 || mDetail.getCreatedSource() == 4) {
if (item.getCommentInfo() != null) { // if (item.getCommentInfo() != null) {
holder.serverCheck.setOnClickListener(v -> presenter.dumpToSop(Integer.parseInt(item.getCommentInfo()))); // holder.serverCheck.setOnClickListener(v -> presenter.dumpToSop(Integer.parseInt(item.getCommentInfo())));
} // }
} else { // } else {
holder.serverCheck.setOnClickListener(v -> presenter.dumpToSop(0)); // holder.serverCheck.setOnClickListener(v -> presenter.dumpToSop(0));
} // }
} // }
if (item.getServiceProgessTimeNum() == 9) { if (item.getServiceProgessTimeNum() == 9) {
holder.serverTimeComment.setVisibility(View.VISIBLE); holder.serverTimeComment.setVisibility(View.VISIBLE);
holder.serverTimeComment.setText(item.getCommentInfo()); holder.serverTimeComment.setText(item.getCommentInfo());
......
orderCenter/src/main/res/layout/serve_clock_item.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="17dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_circle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:src="@drawable/icon_circle_blue" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/server_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_12"
tools:text="砥砺奋进发酵"
android:layout_weight="1"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/server_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="杜绝浪费建安费"
android:layout_marginRight="@dimen/dp_10"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_16" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</layout>
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