1、setmeal頁 R2問題

11f6afca · 宁斌 · f476ea4c · 11f6afca · 11f6afca · 11f6afca
Commit 11f6afca authored Apr 20, 2021 by 宁斌
8 changed files
--- a/component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/SetMealModule.java
+++ b/component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/SetMealModule.java
@@ -104,18 +104,21 @@ public abstract class SetMealModule {
        return new ModifierAdapter(IView.getActivity(), modifierList);
    }
+    @Named("foodGridLayoutManager")
    @ActivityScope
    @Provides
    static GridLayoutManager provideFoodRecycleLayoutManager(SetMealContract.View IView) {
        return new GridLayoutManager(IView.getActivity2(), 1, LinearLayoutManager.HORIZONTAL, false);
    }
+    @Named("comboGridLayoutManager")
    @ActivityScope
    @Provides
    static GridLayoutManager provideComboRecycleLayoutManager(SetMealContract.View IView) {
        return new GridLayoutManager(IView.getActivity2(), 1, LinearLayoutManager.HORIZONTAL, false);
    }
+    @Named("modifierGridLayoutManager")
    @ActivityScope
    @Provides
    static GridLayoutManager provideModifierRecycleLayoutManager(SetMealContract.View IView) {

--- a/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/SetMealContract.java
+++ b/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/SetMealContract.java
@@ -87,6 +87,7 @@ public interface SetMealContract {
        Single<List<FoodModifier>> queryDB_FoodModifierList(long fid);
    }
-    interface
 }
--- a/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/SetMealPresenter.java
+++ b/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/SetMealPresenter.java
@@ -3,9 +3,6 @@ package com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand;
 import android.app.Application;
 import android.text.TextUtils;
 import android.util.SparseArray;
-import androidx.annotation.NonNull;
 import com.gingersoft.gsa.cloud.common.constans.MealConstant;
 import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
 import com.gingersoft.gsa.cloud.common.logan.LoganManager;
@@ -29,7 +26,6 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.ModifierAdapter;
 import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.SelectMealAdapter;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
 import com.jess.arms.base.delegate.IActivity;
-import com.jess.arms.base.delegate.mRootView.getActivity2();
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.FragmentScope;
 import com.jess.arms.mvp.BasePresenter;
@@ -117,6 +113,16 @@ public class SetMealPresenter extends BaseOrderPresenter<SetMealContract.Model, 
    }
    @Override
+    public void createOrder(boolean isPrint, Class<?> afterToActivity) {
+    }
+    @Override
+    public void addOrderFood(boolean isPrint, Class<?> afterToActivity) {
+    }
+    @Override
    public void onDestroy() {
        super.onDestroy();
        this.mErrorHandler = null;
@@ -138,7 +144,7 @@ public class SetMealPresenter extends BaseOrderPresenter<SetMealContract.Model, 
        addModifierItem(datasBean);
        //更新賬單數
-        updateOrderFoodNumber();
+//        updateOrderFoodNumber();
        //沽清細項沽清數
        updateModifierSoldoutCtrData();
    }
@@ -164,7 +170,7 @@ public class SetMealPresenter extends BaseOrderPresenter<SetMealContract.Model, 
        //更新賬單金額
        updateBillInfo();
        //更新賬單數
-        updateOrderFoodNumber();
+//        updateOrderFoodNumber();
    }
    public void foodItemClick(Food datasBean) {
@@ -183,7 +189,7 @@ public class SetMealPresenter extends BaseOrderPresenter<SetMealContract.Model, 
            int customType = datasBean.ableDiscountCastCustomType();
            if (customType != Food.CUSTOM_TYPE_100) {
                //自定義食品
-                mRootView.setCustomFoodDialog(customType, mCurrentOrderDetailBean);
+//                mRootView.setCustomFoodDialog(customType, mCurrentOrderDetailBean);
            } else {
                //加載套餐食品
                loadComboData(mCurrentOrderDetailBean, false);
@@ -259,7 +265,7 @@ public class SetMealPresenter extends BaseOrderPresenter<SetMealContract.Model, 
        //更新賬單金額
        updateBillInfo();
-        IActivity.setFineItemSlodoutListFull(mSoldoutCtrList);
+//        IActivity.setFineItemSlodoutListFull(mSoldoutCtrList);
        mRootView.setMealRvScrollToPosition(addPosition);
    }
@@ -274,7 +280,7 @@ public class SetMealPresenter extends BaseOrderPresenter<SetMealContract.Model, 
                id = mSelectMealAdapter.getCurrentMainOrderDetail().getId();
            }
        }
-        mCurrentOrderDetailBean = OrderDetail.discountTransOrderDetail(datasBean, true, id, getDisountSourcePrice());
+//        mCurrentOrderDetailBean = OrderDetail.discountTransOrderDetail(datasBean, true, id, getDisountSourcePrice());
        int addPosition = mSelectMealAdapter.addFoodItem(mCurrentOrderDetailBean);
        mRootView.setMealRvScrollToPosition(addPosition);
@@ -292,13 +298,13 @@ public class SetMealPresenter extends BaseOrderPresenter<SetMealContract.Model, 
                List<ComboItem> comboItemList = new ArrayList<>();
                if (itemType == 1) {
                    //获取套餐细项数据
-                    List<ComboItem> comboItems = mModel.queryDB_ComboList(fid, BaseOrder.orderType);
+//                    List<ComboItem> comboItems = mModel.queryDB_ComboList(fid, BaseOrder.orderType);
-                    comboItemList.addAll(comboItems);
+//                    comboItemList.addAll(comboItems);
                }
-                List<Modifier> modifierList = mModel.queryDB_ModifierList(fid, ModifierDaoUtils.modifierMode_All);
+//                List<Modifier> modifierList = mModel.queryDB_ModifierList(fid, ModifierDaoUtils.modifierMode_All);
+//
-                emitter.onNext(comboItemList);
+//                emitter.onNext(comboItemList);
-                emitter.onNext(modifierList);
+//                emitter.onNext(modifierList);
                emitter.onComplete();
            }
        }).subscribeOn(Schedulers.io())//在IO线程执行数据库处理操作
@@ -342,11 +348,7 @@ public class SetMealPresenter extends BaseOrderPresenter<SetMealContract.Model, 
                    public void onComplete() {
                        boolean autoMod = false;
                        if (comboItemList != null) {
-                            if (comboItemList.size() > 0) {
+//                            if (comboItemList.size() > 0) {
-                                mRootView.setModifierTop(10);
-                            } else {
-                                mRootView.setModifierTop(0);
-                            }
                            if (modifierList != null) {
                                autoMod = food.getAutoMod() == 1 && (comboItemList.size() > 0 || modifierList.size() > 0);
                            } else {
@@ -370,7 +372,7 @@ public class SetMealPresenter extends BaseOrderPresenter<SetMealContract.Model, 
            //更新賬單金額
            updateBillInfo();
        }
-        updateOrderFoodNumber();
+//        updateOrderFoodNumber();
    }
    /**

--- a/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/AllOrderFragment.java
+++ b/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/AllOrderFragment.java
@@ -26,19 +26,14 @@ import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.qmuiteam.qmui.widget.QMUIEmptyView;
-import com.qmuiteam.qmui.widget.QMUIWindowInsetLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import org.json.JSONException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.util.List;
 import butterknife.BindView;
 import static com.jess.arms.utils.Preconditions.checkNotNull;

--- a/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/mealstand/MealDiscountFragment.java
+++ b/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/mealstand/MealDiscountFragment.java
@@ -15,6 +15,8 @@ import androidx.viewpager2.widget.ViewPager2;
 import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
 import com.gingersoft.gsa.cloud.order.order.DoshokuOrder;
 import com.gingersoft.gsa.cloud.table.R;
+import com.gingersoft.gsa.cloud.table.R2;
+import com.gingersoft.gsa.cloud.table.di.component.DaggerMealDiscountComponent;
 import com.gingersoft.gsa.cloud.table.mvp.contract.MealDiscountContract;
 import com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand.MealDiscountPresenter;
 import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.discount.CouponFragment;
@@ -51,9 +53,9 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
 */
 public class MealDiscountFragment extends BaseFragment<MealDiscountPresenter> implements MealDiscountContract.View {
-    @BindView(R.id.tab_segment)
+    @BindView(R2.id.tab_segment)
    MyTableView tabSegment;
-    @BindView(R.id.viewPager)
+    @BindView(R2.id.viewPager)
    ViewPager viewPager;
    @Inject

--- a/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/mealstand/SetMealFragment.java
+++ b/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/mealstand/SetMealFragment.java
--- a/component-table/src/main/res/layout/table_activity_meal_stand.xml
+++ b/component-table/src/main/res/layout/table_activity_meal_stand.xml
@@ -335,16 +335,16 @@
        </RelativeLayout>
    </androidx.core.widget.NestedScrollView>
-<!--    <androidx.recyclerview.widget.RecyclerView-->
+    <androidx.recyclerview.widget.RecyclerView
-<!--        android:id="@+id/rv_discount"-->
+        android:id="@+id/rv_discount"
-<!--        android:layout_width="match_parent"-->
+        android:layout_width="match_parent"
-<!--        android:layout_height="wrap_content"-->
+        android:layout_height="wrap_content"
-<!--        android:layout_above="@+id/ll_stand_oper"-->
+        android:layout_above="@+id/ll_stand_oper"
-<!--        android:layout_below="@+id/ll_meals"-->
+        android:layout_below="@+id/ll_meals"
-<!--        android:divider="@null"-->
+        android:divider="@null"
-<!--        android:fadeScrollbars="false"-->
+        android:fadeScrollbars="false"
-<!--        android:orientation="vertical"-->
+        android:orientation="vertical"
-<!--        android:visibility="gone" />-->
+        android:visibility="gone" />
    <FrameLayout
        android:id="@+id/fl_container"

--- a/library-order/src/main/java/com/gingersoft/gsa/cloud/pay/lifecycle/fragment/PayFlowFragment.java
+++ b/library-order/src/main/java/com/gingersoft/gsa/cloud/pay/lifecycle/fragment/PayFlowFragment.java
@@ -13,10 +13,8 @@ import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.gingersoft.gsa.cloud.common.logan.LoganManager;
 import com.gingersoft.gsa.cloud.order.R;
 import com.gingersoft.gsa.cloud.order.R2;
@@ -33,9 +31,7 @@ import com.jess.arms.utils.ArmsUtils;
 import com.gingersoft.gsa.cloud.pay.lifecycle.contract.PayFlowContract;
 import com.gingersoft.gsa.cloud.pay.lifecycle.presenter.PayFlowPresenter;
 import com.qmuiteam.qmui.util.QMUIDisplayHelper;
 import butterknife.BindView;
 import static com.jess.arms.utils.Preconditions.checkNotNull;