Skip to content

android / dayu

Go to a project
Commit 38b1a882 by wukun
Options

1023

parent bf11fbf8
Inline Side-by-side
Showing with 160 additions and 52 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -172,7 +172,7 @@ public class Constants { ...@@ -172,7 +172,7 @@ public class Constants {
/***********************其他配置**********************************/ /***********************其他配置**********************************/
public final static int PAGESIZE = 200; public final static int PAGESIZE = 20;
public final static int NOT_LOGIN = -1; public final static int NOT_LOGIN = -1;
/** /**
* 店长. * 店长.
......
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
...@@ -103,6 +103,9 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -103,6 +103,9 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
if (requestPage >= page && page != 1) if (requestPage >= page && page != 1)
return; return;
requestPage = page; requestPage = page;
if (mView instanceof OrderSecondTabFragment && 0 != position){
pageSize = 200;
}
OrderApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(baseObserver( OrderApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(baseObserver(
orderBasePageBean -> { orderBasePageBean -> {
datas.set(orderBasePageBean); datas.set(orderBasePageBean);
......
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsClockActivity.java
...@@ -3,6 +3,7 @@ package com.dayu.order.ui.activity; ...@@ -3,6 +3,7 @@ package com.dayu.order.ui.activity;
import android.Manifest; import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -141,14 +142,25 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres ...@@ -141,14 +142,25 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
mBind.ivUser.setOnClickListener(new View.OnClickListener() { mBind.ivUser.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
CommonUtils.dialPhone(OrderDetailsClockActivity.this, detail.getCustomerMobile()); String customerMobile = detail.getCustomerMobile();
if (TextUtils.isEmpty(customerMobile)){
ToastUtils.showShortToast("号码异常");
}else{
CommonUtils.dialPhone(OrderDetailsClockActivity.this, customerMobile);
}
} }
}); });
mBind.ivServer.setOnClickListener(new View.OnClickListener() { mBind.ivServer.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
CommonUtils.dialPhone(OrderDetailsClockActivity.this, detail.getCustomerTelphome()); String customerTelphome = detail.getCustomerTelphome();
if (TextUtils.isEmpty(customerTelphome)){
ToastUtils.showShortToast("号码异常");
}else{
CommonUtils.dialPhone(OrderDetailsClockActivity.this, customerTelphome);
}
} }
}); });
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -208,10 +208,41 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -208,10 +208,41 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvItemEnd.setText(mContext.getString(R.string.submit_order)); holder.tvItemEnd.setText(mContext.getString(R.string.submit_order));
} }
} }
holder.tvItemEnd.setVisibility(View.VISIBLE);
holder.itemTextPhone.setVisibility(View.GONE); holder.itemTextPhone.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.GONE); holder.orderLineOne.setVisibility(View.GONE);
holder.rlItemMid.setVisibility(View.GONE); holder.rlItemMid.setVisibility(View.GONE);
holder.orderLineTwo.setVisibility(View.GONE); holder.orderLineTwo.setVisibility(View.GONE);
if (item.getSubStatus() == 6) {
holder.tvErrorState.setText(mContext.getString(R.string.check_upon_delivery));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_line));
holder.tvErrorState.setVisibility(View.VISIBLE);
holder.itemUpdataTime.setVisibility(View.VISIBLE);
holder.rlItemEnd.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.VISIBLE);
holder.orderLineTwo.setVisibility(View.GONE);
holder.rlItemMid.setVisibility(View.VISIBLE);
holder.itemTextPhone.setVisibility(View.VISIBLE);
// holder.itemUpdataTime.setText(mContext.getString(R.string.customer_acceptance));
if (item.getIsCheck() == 0) {
holder.itemUpdataTime.setText("待自动验收");
} else if (item.getIsCheck() == 2) {
holder.itemUpdataTime.setText("待商家验收");
} else {
holder.itemUpdataTime.setText("客户验收");
}
if (!haveCustomer) {
holder.llBottom.setVisibility(View.GONE);
holder.itemBottomLine.setVisibility(View.GONE);
} else {
holder.llBottom.setVisibility(View.VISIBLE);
holder.itemBottomLine.setVisibility(View.VISIBLE);
}
} else {
holder.rlItemEnd.setVisibility(View.VISIBLE);
// holder.orderLineTwo.setVisibility(View.VISIBLE);
}
}else{ }else{
holder.itemTextPhone.setVisibility(View.VISIBLE); holder.itemTextPhone.setVisibility(View.VISIBLE);
...@@ -225,8 +256,37 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -225,8 +256,37 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} else if (item.getSubStatus() == 2) { } else if (item.getSubStatus() == 2) {
holder.tvItemProcess.setText(mContext.getString(R.string.begain_server)); holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
} }
if (item.getSubStatus() == 6) {
holder.tvErrorState.setText(mContext.getString(R.string.check_upon_delivery));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_line));
holder.tvErrorState.setVisibility(View.VISIBLE);
holder.itemUpdataTime.setVisibility(View.VISIBLE);
holder.rlItemEnd.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.VISIBLE);
holder.orderLineTwo.setVisibility(View.GONE);
// holder.itemUpdataTime.setText(mContext.getString(R.string.customer_acceptance));
if (item.getIsCheck() == 0) {
holder.itemUpdataTime.setText("待自动验收");
} else if (item.getIsCheck() == 2) {
holder.itemUpdataTime.setText("待商家验收");
} else {
holder.itemUpdataTime.setText("客户验收");
}
if (!haveCustomer) {
holder.llBottom.setVisibility(View.GONE);
holder.itemBottomLine.setVisibility(View.GONE);
} else {
holder.llBottom.setVisibility(View.VISIBLE);
holder.itemBottomLine.setVisibility(View.VISIBLE);
}
} else {
holder.rlItemEnd.setVisibility(View.VISIBLE);
// holder.orderLineTwo.setVisibility(View.VISIBLE);
}
} }
time = item.getConfirmDoorTime(); time = item.getConfirmDoorTime();
setTimeStatus(holder, item, time); setTimeStatus(holder, item, time);
break; break;
...@@ -234,6 +294,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -234,6 +294,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvItemProcess.setVisibility(View.GONE); holder.tvItemProcess.setVisibility(View.GONE);
holder.tvItemEnd.setVisibility(View.VISIBLE); holder.tvItemEnd.setVisibility(View.VISIBLE);
int source1 = item.getSource(); int source1 = item.getSource();
if (7 == source1){ if (7 == source1){
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));
...@@ -244,10 +305,42 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -244,10 +305,42 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvItemEnd.setText(mContext.getString(R.string.submit_order)); holder.tvItemEnd.setText(mContext.getString(R.string.submit_order));
} }
} }
holder.tvItemEnd.setVisibility(View.VISIBLE);
holder.itemTextPhone.setVisibility(View.GONE); holder.itemTextPhone.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.GONE); holder.orderLineOne.setVisibility(View.GONE);
holder.rlItemMid.setVisibility(View.GONE); holder.rlItemMid.setVisibility(View.GONE);
holder.orderLineTwo.setVisibility(View.GONE); holder.orderLineTwo.setVisibility(View.GONE);
if (item.getSubStatus() == 6) {
holder.tvErrorState.setText(mContext.getString(R.string.check_upon_delivery));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_line));
holder.tvErrorState.setVisibility(View.VISIBLE);
holder.itemUpdataTime.setVisibility(View.VISIBLE);
holder.rlItemEnd.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.VISIBLE);
holder.orderLineTwo.setVisibility(View.GONE);
holder.rlItemMid.setVisibility(View.VISIBLE);
holder.itemTextPhone.setVisibility(View.VISIBLE);
// holder.itemUpdataTime.setText(mContext.getString(R.string.customer_acceptance));
if (item.getIsCheck() == 0) {
holder.itemUpdataTime.setText("待自动验收");
} else if (item.getIsCheck() == 2) {
holder.itemUpdataTime.setText("待商家验收");
} else {
holder.itemUpdataTime.setText("客户验收");
}
if (!haveCustomer) {
holder.llBottom.setVisibility(View.GONE);
holder.itemBottomLine.setVisibility(View.GONE);
} else {
holder.llBottom.setVisibility(View.VISIBLE);
holder.itemBottomLine.setVisibility(View.VISIBLE);
}
} else {
holder.rlItemEnd.setVisibility(View.VISIBLE);
// holder.orderLineTwo.setVisibility(View.VISIBLE);
}
}else{ }else{
holder.itemTextPhone.setVisibility(View.VISIBLE); holder.itemTextPhone.setVisibility(View.VISIBLE);
...@@ -263,45 +356,45 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -263,45 +356,45 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvItemProcess.setText(mContext.getString(R.string.begain_server)); holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
holder.tvItemEnd.setText(mContext.getString(R.string.begain_server)); holder.tvItemEnd.setText(mContext.getString(R.string.begain_server));
} }
} holder.itemUpdataTime.setText(mContext.getString(R.string.need_again_door));
holder.tvItemProcess.setText(mContext.getString(R.string.process_order));
holder.itemUpdataTime.setText(mContext.getString(R.string.need_again_door)); if (!haveCustomer) {
holder.tvItemProcess.setText(mContext.getString(R.string.process_order)); holder.itemTextPhone.setVisibility(View.GONE);
if (!haveCustomer) { holder.orderLineOne.setVisibility(View.GONE);
holder.itemTextPhone.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.GONE);
} else {
holder.itemTextPhone.setVisibility(View.VISIBLE);
holder.orderLineOne.setVisibility(View.VISIBLE);
}
if (item.getSubStatus() == 6) {
holder.tvErrorState.setText(mContext.getString(R.string.check_upon_delivery));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_line));
holder.tvErrorState.setVisibility(View.VISIBLE);
holder.itemUpdataTime.setVisibility(View.VISIBLE);
holder.rlItemEnd.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.VISIBLE);
holder.orderLineTwo.setVisibility(View.GONE);
// holder.itemUpdataTime.setText(mContext.getString(R.string.customer_acceptance));
if (item.getIsCheck() == 0) {
holder.itemUpdataTime.setText("待自动验收");
} else if (item.getIsCheck() == 2) {
holder.itemUpdataTime.setText("待商家验收");
} else { } else {
holder.itemUpdataTime.setText("客户验收"); holder.itemTextPhone.setVisibility(View.VISIBLE);
holder.orderLineOne.setVisibility(View.VISIBLE);
} }
if (item.getSubStatus() == 6) {
holder.tvErrorState.setText(mContext.getString(R.string.check_upon_delivery));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_line));
holder.tvErrorState.setVisibility(View.VISIBLE);
holder.itemUpdataTime.setVisibility(View.VISIBLE);
holder.rlItemEnd.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.VISIBLE);
holder.orderLineTwo.setVisibility(View.GONE);
// holder.itemUpdataTime.setText(mContext.getString(R.string.customer_acceptance));
if (item.getIsCheck() == 0) {
holder.itemUpdataTime.setText("待自动验收");
} else if (item.getIsCheck() == 2) {
holder.itemUpdataTime.setText("待商家验收");
} else {
holder.itemUpdataTime.setText("客户验收");
}
if (!haveCustomer) { if (!haveCustomer) {
holder.llBottom.setVisibility(View.GONE); holder.llBottom.setVisibility(View.GONE);
holder.itemBottomLine.setVisibility(View.GONE); holder.itemBottomLine.setVisibility(View.GONE);
} else {
holder.llBottom.setVisibility(View.VISIBLE);
holder.itemBottomLine.setVisibility(View.VISIBLE);
}
} else { } else {
holder.llBottom.setVisibility(View.VISIBLE); holder.rlItemEnd.setVisibility(View.VISIBLE);
holder.itemBottomLine.setVisibility(View.VISIBLE); holder.orderLineTwo.setVisibility(View.VISIBLE);
} }
} else {
holder.rlItemEnd.setVisibility(View.VISIBLE);
holder.orderLineTwo.setVisibility(View.VISIBLE);
} }
time = item.getConfirmDoorTime(); time = item.getConfirmDoorTime();
setTimeStatus(holder, item, time); setTimeStatus(holder, item, time);
break; break;
...@@ -491,7 +584,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -491,7 +584,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if (7 == it.getSource()){ if (7 == it.getSource()){
if (3 == it.getStatus()){ if (3 == it.getStatus()){
startServer(h, posiiton); startServer(h, position);
}else if (4 == it.getStatus()){ }else if (4 == it.getStatus()){
if (7 != it.getSubStatus()){ if (7 != it.getSubStatus()){
mPresenter.clockIn(it.getId()) mPresenter.clockIn(it.getId())
...@@ -518,22 +611,22 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -518,22 +611,22 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if ((mItem.getCreatedSource() == 2 || mItem.getCreatedSource() == 3 || mItem.getCreatedSource() == 4) && mItem.getStatus() == 4) { if ((mItem.getCreatedSource() == 2 || mItem.getCreatedSource() == 3 || mItem.getCreatedSource() == 4) && mItem.getStatus() == 4) {
dumpServerActivity(mItem); dumpServerActivity(mItem);
} else if (mItem.getStatus() == 4 && mItem.getSubStatus() == 3) { } else if (mItem.getStatus() == 4 && mItem.getSubStatus() == 3) {
dumpProcessActivity(mItem, posiiton); dumpProcessActivity(mItem, position);
} else if (mItem.getStatus() == 4 && mItem.getSubStatus() == 4) { } else if (mItem.getStatus() == 4 && mItem.getSubStatus() == 4) {
if (mItem.getSopStatus() == 1) {//sop启用 if (mItem.getSopStatus() == 1) {//sop启用
dumpSOPActivity(mItem, posiiton); dumpSOPActivity(mItem, position);
} else if (mItem.getSopStatus() == 0) { } else if (mItem.getSopStatus() == 0) {
dumpProcessActivity(mItem, posiiton); dumpProcessActivity(mItem, position);
} }
} else if (mItem.getStatus() == 4 && mItem.getSubStatus() == 5) { } else if (mItem.getStatus() == 4 && mItem.getSubStatus() == 5) {
dumpProcessActivity(mItem, posiiton); dumpProcessActivity(mItem, position);
} }
if (mItem.getStatus() == 4) { if (mItem.getStatus() == 4) {
return; return;
} }
if (mItem.getStatus() == 3) { if (mItem.getStatus() == 3) {
startServer(h, posiiton); startServer(h, position);
} }
} }
} }
......
orderCenter/src/main/res/layout/activity_order_details_clock.xml
...@@ -371,16 +371,6 @@ ...@@ -371,16 +371,6 @@
android:textColor="@color/cl_order_text_one" android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_14" /> android:textSize="@dimen/sp_14" />
<ImageView
android:id="@+id/iv_server"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_20"
android:src="@drawable/icon_order_phone"
android:layout_toRightOf="@id/text_eleven"
android:layout_below="@id/tv_nine"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"/>
<TextView <TextView
android:id="@+id/tv_pro_num" android:id="@+id/tv_pro_num"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -391,6 +381,16 @@ ...@@ -391,6 +381,16 @@
android:layout_toRightOf="@id/text_eleven" android:layout_toRightOf="@id/text_eleven"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_14" /> android:textSize="@dimen/sp_14" />
<ImageView
android:id="@+id/iv_server"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_20"
android:layout_below="@id/tv_nine"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/tv_pro_num"
android:src="@drawable/icon_order_phone" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
......
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