Skip to content

android / dayu

Go to a project
Commit 725662a8 by wukun
Options

1025

parent 7369023b
Inline Side-by-side
Showing with 62 additions and 31 deletions
app/src/main/AndroidManifest.xml
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
android:launchMode="singleTask" android:launchMode="singleTask"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:configChanges="orientation|screenSize|keyboardHidden" android:configChanges="orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="stateHidden|adjustPan" android:windowSoftInputMode="stateHidden|adjustResize"
/> />
<activity <activity
android:name="com.dayu.bigfish.ui.ManagerActivity" android:name="com.dayu.bigfish.ui.ManagerActivity"
......
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -319,4 +319,6 @@ public class Constants { ...@@ -319,4 +319,6 @@ public class Constants {
public static boolean isPrivacy = false; public static boolean isPrivacy = false;
public static final String IS_SHOW_BTN = "isShowBtn";
} }
orderCenter/src/main/java/com/dayu/order/presenter/orderdetail/OrderDetailClockPresenter.java
...@@ -32,6 +32,7 @@ import java.util.List; ...@@ -32,6 +32,7 @@ import java.util.List;
public class OrderDetailClockPresenter extends OrderDetailClockContract.Presenter { public class OrderDetailClockPresenter extends OrderDetailClockContract.Presenter {
private int mOrderId; private int mOrderId;
private int mUserId; private int mUserId;
private boolean isShowBtn;
public ObservableField<Object> mDatas = new ObservableField<>(); public ObservableField<Object> mDatas = new ObservableField<>();
public ObservableField<Boolean> isShowLine = new ObservableField<>(); public ObservableField<Boolean> isShowLine = new ObservableField<>();
...@@ -43,6 +44,7 @@ public class OrderDetailClockPresenter extends OrderDetailClockContract.Presente ...@@ -43,6 +44,7 @@ public class OrderDetailClockPresenter extends OrderDetailClockContract.Presente
public void onAttached() { public void onAttached() {
Bundle bundle = mView.getBundle(); Bundle bundle = mView.getBundle();
mOrderId = bundle.getInt(Constants.ORDER_ID, 0); mOrderId = bundle.getInt(Constants.ORDER_ID, 0);
isShowBtn = bundle.getBoolean(Constants.IS_SHOW_BTN, false);
mView.showDialog(); mView.showDialog();
UserInfo info = UserManager.getInstance().getUser(); UserInfo info = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(info.getAccountId()); mUserId = Integer.parseInt(info.getAccountId());
...@@ -169,4 +171,7 @@ public class OrderDetailClockPresenter extends OrderDetailClockContract.Presente ...@@ -169,4 +171,7 @@ public class OrderDetailClockPresenter extends OrderDetailClockContract.Presente
return mDetails; return mDetails;
} }
public boolean getIsShowBtn() {
return isShowBtn;
}
} }
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
...@@ -222,6 +222,15 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -222,6 +222,15 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
public void dumpDetailClock(int orderId) { public void dumpDetailClock(int orderId) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, orderId); bundle.putInt(Constants.ORDER_ID, orderId);
bundle.putBoolean(Constants.IS_SHOW_BTN,false);
mView.startActivity(OrderDetailsClockActivity.class, bundle);
}
public void dumpDetailClockSecond(int orderId) {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, orderId);
bundle.putBoolean(Constants.IS_SHOW_BTN,true);
mView.startActivity(OrderDetailsClockActivity.class, bundle); mView.startActivity(OrderDetailsClockActivity.class, bundle);
} }
......
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsClockActivity.java
...@@ -94,6 +94,12 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres ...@@ -94,6 +94,12 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
mBind.tvProName.setText(detail.getCreated()); mBind.tvProName.setText(detail.getCreated());
mBind.tvProNum.setText(detail.getCustomerTelphome()); mBind.tvProNum.setText(detail.getCustomerTelphome());
boolean isShowBtn = mPresenter.getIsShowBtn();
if (isShowBtn){
mBind.tvButton.setVisibility(View.VISIBLE);
}else{
mBind.tvButton.setVisibility(View.GONE);
}
if (3 == detail.getStatus()) { if (3 == detail.getStatus()) {
mBind.tvButton.setText(getString(R.string.begain_server)); mBind.tvButton.setText(getString(R.string.begain_server));
...@@ -176,6 +182,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres ...@@ -176,6 +182,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
} else if (detail.getIsCheck() == 2) { } else if (detail.getIsCheck() == 2) {
ToastUtils.showShortToast("请等待商家验收"); ToastUtils.showShortToast("请等待商家验收");
} else { } else {
ToastUtils.showShortToast("等待验收");
UserInfo info = UserManager.getInstance().getUser(); UserInfo info = UserManager.getInstance().getUser();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + info.getAccountId() + bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + info.getAccountId() +
...@@ -193,6 +200,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres ...@@ -193,6 +200,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
OrderApiFactory.clockIn(body) OrderApiFactory.clockIn(body)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(aBoolean -> { .subscribe(mPresenter.baseObserver(aBoolean -> {
ToastUtils.showShortToast("打卡成功");
mPresenter.getOrderDetailInfo(detail.getId()); mPresenter.getOrderDetailInfo(detail.getId());
EventBus.getDefault().post(new RefreshServe(1)); EventBus.getDefault().post(new RefreshServe(1));
}, responeThrowable -> { }, responeThrowable -> {
...@@ -216,6 +224,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres ...@@ -216,6 +224,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
OrderApiFactory.commitOrder(body) OrderApiFactory.commitOrder(body)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(integer -> { .subscribe(mPresenter.baseObserver(integer -> {
ToastUtils.showShortToast("提交验收成功");
EventBus.getDefault().post(new RefreshServe(1)); EventBus.getDefault().post(new RefreshServe(1));
mPresenter.getOrderDetailInfo(detail.getId()); mPresenter.getOrderDetailInfo(detail.getId());
}, responeThrowable -> { }, responeThrowable -> {
...@@ -264,7 +273,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres ...@@ -264,7 +273,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
OrderApiFactory.startServer(body) OrderApiFactory.startServer(body)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(integer -> { .subscribe(mPresenter.baseObserver(integer -> {
ToastUtils.showShortToast("开始服务操作成功");
mPresenter.getOrderDetailInfo(detail.getId()); mPresenter.getOrderDetailInfo(detail.getId());
EventBus.getDefault().post(new RefreshServe(1)); EventBus.getDefault().post(new RefreshServe(1));
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -475,6 +475,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -475,6 +475,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} else if (item.getIsCheck() == 2) { } else if (item.getIsCheck() == 2) {
ToastUtils.showShortToast("请等待商家验收"); ToastUtils.showShortToast("请等待商家验收");
} else { } else {
ToastUtils.showShortToast("等待验收");
UserInfo info = UserManager.getInstance().getUser(); UserInfo info = UserManager.getInstance().getUser();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + info.getAccountId() + bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + info.getAccountId() +
...@@ -590,6 +591,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -590,6 +591,7 @@ 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 -> {
ToastUtils.showShortToast("打卡成功");
mPresenter.setPosition(position); mPresenter.setPosition(position);
EventBus.getDefault().post(new RefreshServe(1)); EventBus.getDefault().post(new RefreshServe(1));
}, responeThrowable -> { }, responeThrowable -> {
...@@ -599,6 +601,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -599,6 +601,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
mPresenter.commit(it) mPresenter.commit(it)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(integer -> { .subscribe(mPresenter.baseObserver(integer -> {
ToastUtils.showShortToast("提交验收成功");
mPresenter.setPosition(position); mPresenter.setPosition(position);
EventBus.getDefault().post(new RefreshServe(1)); EventBus.getDefault().post(new RefreshServe(1));
}, responeThrowable -> { }, responeThrowable -> {
...@@ -715,6 +718,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -715,6 +718,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(integer -> { .subscribe(mPresenter.baseObserver(integer -> {
if (mItem.getSource() == 7){ if (mItem.getSource() == 7){
ToastUtils.showShortToast("开始服务操作成功");
ProgressUtil.stopLoad(); ProgressUtil.stopLoad();
mPresenter.setPosition(position); mPresenter.setPosition(position);
mPresenter.refreshClear(); mPresenter.refreshClear();
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDoneFragment.java
...@@ -57,11 +57,11 @@ public class OrderDoneFragment extends BaseFragment<OrderDoingPresenter, Fragmen ...@@ -57,11 +57,11 @@ public class OrderDoneFragment extends BaseFragment<OrderDoingPresenter, Fragmen
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order, FragmentOrderdoingItemBinding>() { mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order, FragmentOrderdoingItemBinding>() {
@Override @Override
public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) { public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) {
// if (7 == item.getSource()){ if (7 == item.getSource()){
// mPresenter.dumpDetailClock(item.getId()); mPresenter.dumpDetailClock(item.getId());
// }else{ }else{
mPresenter.dumpDetail(item.getId()); mPresenter.dumpDetail(item.getId());
// } }
} }
}); });
} }
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderFirstTabFragment.java
...@@ -43,11 +43,11 @@ public class OrderFirstTabFragment extends BaseFragment<OrderDoingPresenter, Fra ...@@ -43,11 +43,11 @@ public class OrderFirstTabFragment extends BaseFragment<OrderDoingPresenter, Fra
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order, FragmentOrderdoingItemBinding>() { mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order, FragmentOrderdoingItemBinding>() {
@Override @Override
public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) { public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) {
// if (7 == item.getSource()){ if (7 == item.getSource()){
// mPresenter.dumpDetailClock(item.getId()); mPresenter.dumpDetailClock(item.getId());
// }else{ }else{
mPresenter.dumpDetail(item.getId()); mPresenter.dumpDetail(item.getId());
// } }
} }
}); });
} }
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderFourTabFragment.java
...@@ -36,11 +36,11 @@ public class OrderFourTabFragment extends BaseFragment<OrderDoingPresenter, Frag ...@@ -36,11 +36,11 @@ public class OrderFourTabFragment extends BaseFragment<OrderDoingPresenter, Frag
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order,FragmentOrderCancleItemBinding>() { mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order,FragmentOrderCancleItemBinding>() {
@Override @Override
public void OnItemClick(Order item, FragmentOrderCancleItemBinding bind) { public void OnItemClick(Order item, FragmentOrderCancleItemBinding bind) {
// if (7 == item.getSource()){ if (7 == item.getSource()){
// mPresenter.dumpDetailClock(item.getId()); mPresenter.dumpDetailClock(item.getId());
// }else{ }else{
mPresenter.dumpDetail(item.getId()); mPresenter.dumpDetail(item.getId());
// } }
} }
}); });
} }
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderReceivingFragment.java
...@@ -71,11 +71,11 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra ...@@ -71,11 +71,11 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
if (4 == item.getSource() && item.getReceiveOrderCommission() > 0) { if (4 == item.getSource() && item.getReceiveOrderCommission() > 0) {
showCashDialog(item.getReceiveOrderCommission(), mUserId, item.getId(), item.getAppointmentTime()); showCashDialog(item.getReceiveOrderCommission(), mUserId, item.getId(), item.getAppointmentTime());
} else { } else {
// if (7 == item.getSource()){ if (7 == item.getSource()){
// mPresenter.dumpDetailClock(item.getId()); mPresenter.dumpDetailClock(item.getId());
// }else{ }else{
mPresenter.dumpDetail(item.getId()); mPresenter.dumpDetail(item.getId());
// } }
} }
} else { } else {
showVerifyDialog(data.getSubCode(), data.getMsg(), data.getData()); showVerifyDialog(data.getSubCode(), data.getMsg(), data.getData());
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderRedeployFragment.java
...@@ -43,11 +43,11 @@ public class OrderRedeployFragment extends BaseFragment<RedeployPresenter, Fragm ...@@ -43,11 +43,11 @@ public class OrderRedeployFragment extends BaseFragment<RedeployPresenter, Fragm
mBind.recyclerView.setAdapter(mAdapter); mBind.recyclerView.setAdapter(mAdapter);
initListener(); initListener();
mBind.recyclerView.setOnItemClickListener((OnItemClickListener<Order, FragmentOrderdoingItemBinding>) (item, bind) -> { mBind.recyclerView.setOnItemClickListener((OnItemClickListener<Order, FragmentOrderdoingItemBinding>) (item, bind) -> {
// if (7 == item.getSource()){ if (7 == item.getSource()){
// mPresenter.dumpDetailClock(item.getId()); mPresenter.dumpDetailClock(item.getId());
// }else{ }else{
mPresenter.dumpDetail(item.getId()); mPresenter.dumpDetail(item.getId());
// } }
}); });
} }
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderSecondTabFragment.java
...@@ -60,7 +60,7 @@ public class OrderSecondTabFragment extends BaseFragment<OrderDoingPresenter, Fr ...@@ -60,7 +60,7 @@ public class OrderSecondTabFragment extends BaseFragment<OrderDoingPresenter, Fr
@Override @Override
public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) { public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) {
if (7 == item.getSource()){ if (7 == item.getSource()){
mPresenter.dumpDetailClock(item.getId()); mPresenter.dumpDetailClockSecond(item.getId());
}else{ }else{
mPresenter.dumpDetail(item.getId()); mPresenter.dumpDetail(item.getId());
} }
......
orderCenter/src/main/res/layout/activity_order_details_clock.xml
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
android:layout_below="@id/tv_five" android:layout_below="@id/tv_five"
android:layout_marginLeft="@dimen/dp_13" android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:text="工作时间:" android:text="用工时间:"
android:textColor="@color/cl_order_text_one" android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_14" /> android:textSize="@dimen/sp_14" />
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/tv_six" android:layout_toRightOf="@id/tv_six"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_tab_yellow"
android:textSize="@dimen/sp_14" /> android:textSize="@dimen/sp_14" />
<TextView <TextView
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
android:layout_below="@id/tv_six" android:layout_below="@id/tv_six"
android:layout_marginLeft="@dimen/dp_13" android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:text="工作天数:" android:text="用工天数:"
android:textColor="@color/cl_order_text_one" android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_14" /> android:textSize="@dimen/sp_14" />
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/tv_seven" android:layout_toRightOf="@id/tv_seven"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_tab_yellow"
android:textSize="@dimen/sp_14" /> android:textSize="@dimen/sp_14" />
<TextView <TextView
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
android:layout_below="@id/tv_seven" android:layout_below="@id/tv_seven"
android:layout_marginLeft="@dimen/dp_13" android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:text="公费总额:" android:text="工费总额:"
android:textColor="@color/cl_order_text_one" android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_14" /> android:textSize="@dimen/sp_14" />
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/tv_eight" android:layout_toRightOf="@id/tv_eight"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_tab_yellow"
android:textSize="@dimen/sp_14" /> android:textSize="@dimen/sp_14" />
<TextView <TextView
...@@ -344,7 +344,7 @@ ...@@ -344,7 +344,7 @@
android:layout_below="@id/tv_nine" android:layout_below="@id/tv_nine"
android:layout_marginLeft="@dimen/dp_13" android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:text="用户姓名:" android:text="派单人:"
android:textColor="@color/cl_order_text_one" android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_14" /> android:textSize="@dimen/sp_14" />
...@@ -433,6 +433,7 @@ ...@@ -433,6 +433,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/tv_work_order_four" android:text="@string/tv_work_order_four"
android:textColor="@color/cl_white" android:textColor="@color/cl_white"
android:textSize="@dimen/sp_16" /> android:textSize="@dimen/sp_16"
android:visibility="invisible"/>
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
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