9.04 1、關閉追加服務費 2、冷鏈問題修復

Signed-off-by: Wyh <1239658231>

9.04 1、關閉追加服務費 2、冷鏈問題修復
Signed-off-by: Wyh <1239658231>
fa8153f6 · Wyh · 1905e41d · fa8153f6 · fa8153f6 · fa8153f6
Commit fa8153f6 authored Sep 04, 2020 by Wyh
7 changed files
--- a/coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderDetailsPresenter.java
+++ b/coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderDetailsPresenter.java
@@ -71,16 +71,16 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
    }
    public void findOrderDetails(int orderId, int isRead) {
-        //startTime  endTime
+        //startTime  endTime  //mRootView.showLoading("獲取訂單詳情...")  mRootView.hideLoading()
        RequestBody requestBody = new FormBody.Builder()
                .add("orderId", orderId + "")
                .build();
        mModel.findOrderDetails(requestBody)
                .subscribeOn(Schedulers.io())
-                .doOnSubscribe(disposable -> mRootView.showLoading("獲取訂單詳情..."))
+                .doOnSubscribe(disposable -> {})
                .subscribeOn(AndroidSchedulers.mainThread())
                .observeOn(AndroidSchedulers.mainThread())
-                .doAfterTerminate(() -> mRootView.hideLoading())
+                .doAfterTerminate(() -> {})
                .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
                .subscribe(new ErrorHandleSubscriber<OrderDetails>(mErrorHandler) {
@@ -161,7 +161,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
                .doOnSubscribe(disposable -> mRootView.showLoading("確認訂單中，請稍候..."))
                .subscribeOn(AndroidSchedulers.mainThread())
                .observeOn(AndroidSchedulers.mainThread())
-                .doAfterTerminate(() -> mRootView.hideLoading())
+                .doAfterTerminate(() -> {})
                .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
                .subscribe(new ErrorHandleSubscriber<ShipAnyOrdersNewBean>(mErrorHandler) {
@@ -205,10 +205,9 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
                .build();
        mModel.updateOrderStatus(requestBody)
                .subscribeOn(Schedulers.io())
-                .doOnSubscribe(disposable -> mRootView.showLoading("請稍候..."))
+                .doOnSubscribe(disposable -> {})
                .subscribeOn(AndroidSchedulers.mainThread())
                .observeOn(AndroidSchedulers.mainThread())
-                .doAfterTerminate(() -> mRootView.hideLoading())
                .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
                .subscribe(new ErrorHandleSubscriber<UpdateOrderStatusBean>(mErrorHandler) {
@@ -332,7 +331,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
                });
            }).subscribeOn(Schedulers.io())
-                    .doOnSubscribe(disposable -> {})
+                    .doOnSubscribe(disposable -> mRootView.showLoading("獲取打印文件"))
                    .subscribeOn(AndroidSchedulers.mainThread())
                    .observeOn(AndroidSchedulers.mainThread())
                    .doAfterTerminate(() -> mRootView.hideLoading())

--- a/coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderListPresenter.java
+++ b/coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderListPresenter.java
@@ -18,6 +18,7 @@ import javax.inject.Inject;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
@@ -51,10 +52,12 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O
    }
    private List<OrderList.DataBeanX.DataBean> orderList = new ArrayList<>();
+    private Disposable disposable;
    public void getOrderList(int restaurantId, int page, String status, String type) {
-        if (page == 1) {
+        if(disposable != null){
-            orderList.clear();
+            if(!disposable.isDisposed()){
+                return;
+            }
        }
        RequestBody requestBody = new FormBody.Builder()
                .add("restaurantId", restaurantId + "")
@@ -71,9 +74,18 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O
                .doAfterTerminate(() -> mRootView.hideLoading())
                .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
                .subscribe(new ErrorHandleSubscriber<OrderList>(mErrorHandler) {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+                        super.onSubscribe(d);
+                        disposable = d;
+                    }
                    @Override
                    public void onNext(@NonNull OrderList info) {
+                        disposable.dispose();
+                        if (page == 1) {
+                            orderList.clear();
+                        }
                        if (info != null && info.isSuccess() && info.getData() != null) {
                            if (info.getData().getData() != null && info.getData().getData().size() > 0) {
                                List<OrderList.DataBeanX.DataBean> dataBeans = info.getData().getData();
@@ -89,6 +101,9 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O
                    @Override
                    public void onError(Throwable t) {
                        super.onError(t);
+                        if (page == 1) {
+                            orderList.clear();
+                        }
                        mRootView.loadOrderList(null);
                    }
                });

--- a/coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/SupplementOrderPresenter.java
+++ b/coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/SupplementOrderPresenter.java
@@ -140,7 +140,7 @@ public class SupplementOrderPresenter extends BasePresenter<SupplementOrderContr
            object.put("posFid", -222);
            object.put("productId", -223);
            object.put("productName", "補單食品");
-            object.put("number", 0);
+            object.put("number", 1);
            object.put("price", 0);
            object.put("lunchboxPrice", 0);

--- a/config.gradle
+++ b/config.gradle
@@ -7,8 +7,8 @@ ext {
            targetSdkVersion : 28,
            //正式版:    1.0.3  3
            //內部測試版:1.2.0  20
-            versionCode      : 6,
+            versionCode      : 7,
-            versionName      : "1.0.6"
+            versionName      : "1.0.7"
    ]
    version = [

--- a/delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
+++ b/delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
@@ -336,6 +336,7 @@ class OrderDetailsActivity : BaseActivity() {
                                        showIsUpdateTransportation(it, orderDetails, true)
                                    }
                                }
+                                else ->ToastUtils.show(this@OrderDetailsActivity, "未知的物流類型")
                            }
                        }
                        BtnBuilder.PrintBtn -> {

--- a/delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/OtherOrdersAdapter.kt
+++ b/delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/OtherOrdersAdapter.kt
@@ -55,14 +55,14 @@ class OtherOrdersAdapter(var context: Context, var outTime: Int) : Adapter<Other
                10 -> "已指派另一位配送員"
                else -> ""
            }
-            if (data.curStat < 2) {
+//            if (data.curStat < 2) {
-                //是否超時
+//                //是否超時
-                if (outTime == 0) {
+//                if (outTime == 0) {
-                    holder.binding.isTimeOut = false
+//                    holder.binding.isTimeOut = false
-                } else {
+//                } else {
-                    holder.binding.isTimeOut = data.timeSecond < outTime
+//                    holder.binding.isTimeOut = data.timeSecond < outTime
-                }
+//                }
-            }
+//            }
        } else {
            holder.binding.deliveryState = ""
            holder.binding.isTimeOut = false

--- a/delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/PlaceholderFragment.kt
+++ b/delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/PlaceholderFragment.kt
@@ -54,14 +54,14 @@ class PlaceholderFragment : BaseFragment(R.layout.fragment_other_order) {
            intent.putExtra("orderPayType", data.orderPayType)
            intent.putExtra("isRead", data.isRead)
            //已指派物流 並且 狀態為未接單  才判斷是否超時
-            if (data.isDelete == 0 && data.curStat < 2) {
+//            if (data.isDelete == 0 && data.curStat < 2) {
-                if (pageViewModel.timeOut == 0) {
+//                if (pageViewModel.timeOut == 0) {
-                    //為0時沒配置，不顯示追加服務費按鈕
+//                    //為0時沒配置，不顯示追加服務費按鈕
-                    intent.putExtra("isTimeOut", false)
+//                    intent.putExtra("isTimeOut", false)
-                } else {
+//                } else {
-                    intent.putExtra("isTimeOut", data.timeSecond < pageViewModel.timeOut * 60 * 1000)
+//                    intent.putExtra("isTimeOut", data.timeSecond < pageViewModel.timeOut * 60 * 1000)
-                }
+//                }
-            }
+//            }
            startActivity(intent)
        }
        rv_other_order.adapter = adapter