Skip to content

android / dayu

Go to a project
Commit bf11fbf8 by wukun
Options

1023

parent 205944c3
Inline Side-by-side
Showing with 123 additions and 44 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 = 20; public final static int PAGESIZE = 200;
public final static int NOT_LOGIN = -1; public final static int NOT_LOGIN = -1;
/** /**
* 店长. * 店长.
......
baseSDK/src/main/java/com/dayu/widgets/LRecyclerView.java
...@@ -331,6 +331,10 @@ public class LRecyclerView<M, B> extends FrameLayout { ...@@ -331,6 +331,10 @@ public class LRecyclerView<M, B> extends FrameLayout {
recyclerview.smoothScrollToPosition(mCoreAdapter.getItemCount() - 1); recyclerview.smoothScrollToPosition(mCoreAdapter.getItemCount() - 1);
} }
public void scrollToPosition(int position) {
recyclerview.scrollToPosition(position);
}
public void setOnEndListener(onEndListener listener) { public void setOnEndListener(onEndListener listener) {
onEndListener = listener; onEndListener = listener;
} }
......
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
...@@ -21,6 +21,7 @@ import com.dayu.order.ui.activity.OrderDetailsActivity; ...@@ -21,6 +21,7 @@ import com.dayu.order.ui.activity.OrderDetailsActivity;
import com.dayu.order.ui.activity.OrderDetailsClockActivity; import com.dayu.order.ui.activity.OrderDetailsClockActivity;
import com.dayu.order.ui.activity.SopWebViewActivity; import com.dayu.order.ui.activity.SopWebViewActivity;
import com.dayu.order.ui.fragment.OrderDoneFragment; import com.dayu.order.ui.fragment.OrderDoneFragment;
import com.dayu.order.ui.fragment.OrderSecondTabFragment;
import com.dayu.order.ui.fragment.OrderThreeTabFragment; import com.dayu.order.ui.fragment.OrderThreeTabFragment;
import com.dayu.provider.event.RefreshTab; import com.dayu.provider.event.RefreshTab;
import com.dayu.utils.AppManager; import com.dayu.utils.AppManager;
...@@ -51,6 +52,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -51,6 +52,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
private int requestPage; private int requestPage;
UserInfo userInfo; UserInfo userInfo;
public int sopOrderVersion; public int sopOrderVersion;
private int position = 0;
@Override @Override
public void onAttached() { public void onAttached() {
...@@ -105,6 +107,10 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -105,6 +107,10 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
orderBasePageBean -> { orderBasePageBean -> {
datas.set(orderBasePageBean); datas.set(orderBasePageBean);
mPage++; mPage++;
if (mView instanceof OrderSecondTabFragment && 0 != position){
((OrderSecondTabFragment)mView).recyclerViewScroll(position);
position = 0;
}
EventBus.getDefault().post(new RefreshTab(-1)); EventBus.getDefault().post(new RefreshTab(-1));
}, responeThrowable -> { }, responeThrowable -> {
requestPage = 0; requestPage = 0;
...@@ -262,4 +268,9 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -262,4 +268,9 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()); RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
return OrderApiFactory.commitOrder(body); return OrderApiFactory.commitOrder(body);
} }
public void setPosition(int position) {
this.position = position;
}
} }
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/orderDoingContract.java
...@@ -19,6 +19,7 @@ public interface orderDoingContract { ...@@ -19,6 +19,7 @@ public interface orderDoingContract {
* @return * @return
*/ */
int getState(); int getState();
} }
abstract class Presenter extends BaseOrderPresenter<View> { abstract class Presenter extends BaseOrderPresenter<View> {
......
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsClockActivity.java
...@@ -26,6 +26,7 @@ import com.dayu.order.presenter.orderdetail.OrderDetailClockPresenter; ...@@ -26,6 +26,7 @@ import com.dayu.order.presenter.orderdetail.OrderDetailClockPresenter;
import com.dayu.provider.event.RefreshServe; import com.dayu.provider.event.RefreshServe;
import com.dayu.provider.event.RefreshTab; import com.dayu.provider.event.RefreshTab;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.ProgressUtil; import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
...@@ -100,7 +101,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres ...@@ -100,7 +101,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
mBind.tvButton.setText(getString(R.string.check_upon_delivery)); mBind.tvButton.setText(getString(R.string.check_upon_delivery));
} else if (7 != detail.getSubStatus()) { } else if (7 != detail.getSubStatus()) {
// mBind.tvButton.setText("第" + detail.getFinishedDays() + "天打卡"); // mBind.tvButton.setText("第" + detail.getFinishedDays() + "天打卡");
mBind.tvButton.setText("第" + "天打卡"); mBind.tvButton.setText("工作打卡");
} else { } else {
mBind.tvButton.setText(getString(R.string.submit_order)); mBind.tvButton.setText(getString(R.string.submit_order));
} }
...@@ -137,6 +138,19 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres ...@@ -137,6 +138,19 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
mBind.dlLine.getLayoutParams().height = 300; mBind.dlLine.getLayoutParams().height = 300;
mBind.ivUser.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
CommonUtils.dialPhone(OrderDetailsClockActivity.this, detail.getCustomerMobile());
}
});
mBind.ivServer.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
CommonUtils.dialPhone(OrderDetailsClockActivity.this, detail.getCustomerTelphome());
}
});
mBind.tvButton.setOnClickListener(new View.OnClickListener() { mBind.tvButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -208,7 +208,17 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -208,7 +208,17 @@ 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.itemTextPhone.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.GONE);
holder.rlItemMid.setVisibility(View.GONE);
holder.orderLineTwo.setVisibility(View.GONE);
}else{ }else{
holder.itemTextPhone.setVisibility(View.VISIBLE);
holder.orderLineOne.setVisibility(View.VISIBLE);
holder.rlItemMid.setVisibility(View.VISIBLE);
holder.orderLineTwo.setVisibility(View.VISIBLE);
if (item.getSubStatus() == 1) { if (item.getSubStatus() == 1) {
// holder.tvItemProcess.setText(mContext.getString(R.string.have_go_on)); // holder.tvItemProcess.setText(mContext.getString(R.string.have_go_on));
holder.tvItemProcess.setText(mContext.getString(R.string.begain_server)); holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
...@@ -234,7 +244,17 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -234,7 +244,17 @@ 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.itemTextPhone.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.GONE);
holder.rlItemMid.setVisibility(View.GONE);
holder.orderLineTwo.setVisibility(View.GONE);
}else{ }else{
holder.itemTextPhone.setVisibility(View.VISIBLE);
holder.orderLineOne.setVisibility(View.VISIBLE);
holder.rlItemMid.setVisibility(View.VISIBLE);
holder.orderLineTwo.setVisibility(View.VISIBLE);
if (item.getSubStatus() == 1) { if (item.getSubStatus() == 1) {
// holder.tvItemProcess.setText(mContext.getString(R.string.have_go_on)); // holder.tvItemProcess.setText(mContext.getString(R.string.have_go_on));
holder.tvItemProcess.setText(mContext.getString(R.string.begain_server)); holder.tvItemProcess.setText(mContext.getString(R.string.begain_server));
...@@ -464,7 +484,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -464,7 +484,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
dumpProcessActivity(mItem, posiiton); dumpProcessActivity(mItem, posiiton);
} }
private void processClick(Order it, FragmentOrderdoingItemBinding h, int posiiton) { private void processClick(Order it, FragmentOrderdoingItemBinding h, int position) {
mItem = it; mItem = it;
mBind = h; mBind = h;
...@@ -477,6 +497,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -477,6 +497,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 -> {
mPresenter.setPosition(position);
EventBus.getDefault().post(new RefreshServe(1)); EventBus.getDefault().post(new RefreshServe(1));
}, responeThrowable -> { }, responeThrowable -> {
...@@ -485,6 +506,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -485,6 +506,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 -> {
mPresenter.setPosition(position);
EventBus.getDefault().post(new RefreshServe(1)); EventBus.getDefault().post(new RefreshServe(1));
}, responeThrowable -> { }, responeThrowable -> {
...@@ -594,19 +616,20 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -594,19 +616,20 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
// }); // });
} }
private void startFirstServe(FragmentOrderdoingItemBinding h, int posiiton) { private void startFirstServe(FragmentOrderdoingItemBinding h, int position) {
if (mItem.getSubStatus() == 1 || mItem.getSubStatus() == 2 || (mItem.getSource() == 7)) { if (mItem.getSubStatus() == 1 || mItem.getSubStatus() == 2 || (mItem.getSource() == 7)) {
mPresenter.startServer(mItem.getId()) mPresenter.startServer(mItem.getId())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(integer -> { .subscribe(mPresenter.baseObserver(integer -> {
if (mItem.getSource() == 7){ if (mItem.getSource() == 7){
ProgressUtil.stopLoad(); ProgressUtil.stopLoad();
mPresenter.setPosition(position);
mPresenter.refreshClear(); mPresenter.refreshClear();
}else{ }else{
ProgressUtil.stopLoad(); ProgressUtil.stopLoad();
mItem.setStatus(4); mItem.setStatus(4);
mItem.setSubStatus(integer); mItem.setSubStatus(integer);
processClick(mItem, h, posiiton); processClick(mItem, h, position);
mBind.tvItemProcess.setText(mContext.getString(R.string.process_order)); mBind.tvItemProcess.setText(mContext.getString(R.string.process_order));
mBind.itemUpdataTime.setText(mContext.getString(R.string.need_again_door)); mBind.itemUpdataTime.setText(mContext.getString(R.string.need_again_door));
getLocation(); getLocation();
......
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
...@@ -116,4 +116,8 @@ public class OrderSecondTabFragment extends BaseFragment<OrderDoingPresenter, Fr ...@@ -116,4 +116,8 @@ public class OrderSecondTabFragment extends BaseFragment<OrderDoingPresenter, Fr
public void afterCheck(SubmitCheckEvent event){ public void afterCheck(SubmitCheckEvent event){
mBind.recyclerView.Refresh(); mBind.recyclerView.Refresh();
} }
public void recyclerViewScroll(int position) {
mBind.recyclerView.scrollToPosition(position);
}
} }
orderCenter/src/main/res/layout/activity_order_details_clock.xml
...@@ -64,7 +64,8 @@ ...@@ -64,7 +64,8 @@
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="0dp"
android:layout_weight="1">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -200,7 +201,17 @@ ...@@ -200,7 +201,17 @@
android:layout_marginTop="@dimen/dp_13" android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/text_four" android:layout_toRightOf="@id/text_four"
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_user"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_20"
android:src="@drawable/icon_order_phone"
android:layout_toRightOf="@id/tv_phone_num"
android:layout_below="@id/tv_serve_name"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"/>
<TextView <TextView
android:id="@+id/tv_five" android:id="@+id/tv_five"
...@@ -360,6 +371,16 @@ ...@@ -360,6 +371,16 @@
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"
...@@ -393,24 +414,25 @@ ...@@ -393,24 +414,25 @@
android:background="@color/transparent" /> android:background="@color/transparent" />
</RelativeLayout> </RelativeLayout>
<TextView
android:id="@+id/tv_button"
android:layout_width="@dimen/dp_125"
android:layout_height="@dimen/dp_50"
android:layout_marginLeft="10dp"
android:layout_marginTop="15dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="@dimen/dp_30"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:layout_gravity="center"
android:text="@string/tv_work_order_four"
android:textColor="@color/cl_white"
android:textSize="@dimen/sp_16" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>
<TextView
android:id="@+id/tv_button"
android:layout_width="@dimen/dp_125"
android:layout_height="@dimen/dp_50"
android:layout_marginLeft="10dp"
android:layout_marginTop="15dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="@dimen/dp_30"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:layout_gravity="center"
android:text="@string/tv_work_order_four"
android:textColor="@color/cl_white"
android:textSize="@dimen/sp_16" />
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
...@@ -437,8 +437,7 @@ ...@@ -437,8 +437,7 @@
android:gravity="center" android: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_15" android:textSize="@dimen/sp_15" />
android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
......
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