Skip to content

S
supplier
Commit 11f6afca by 宁斌
Options

1、setmeal頁 R2問題

parent f476ea4c
Showing with 228 additions and 226 deletions
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) {
......
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
}
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);
comboItemList.addAll(comboItems);
// List<ComboItem> comboItems = mModel.queryDB_ComboList(fid, BaseOrder.orderType);
// comboItemList.addAll(comboItems);
}
List<Modifier> modifierList = mModel.queryDB_ModifierList(fid, ModifierDaoUtils.modifierMode_All);
emitter.onNext(comboItemList);
emitter.onNext(modifierList);
// List<Modifier> modifierList = mModel.queryDB_ModifierList(fid, ModifierDaoUtils.modifierMode_All);
//
// emitter.onNext(comboItemList);
// 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) {
mRootView.setModifierTop(10);
} else {
mRootView.setModifierTop(0);
}
// if (comboItemList.size() > 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();
}
/**
......
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;
......
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
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/mealstand/SetMealFragment.java
......@@ -93,44 +93,44 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
*/
public class SetMealFragment extends BaseFragment<SetMealPresenter> implements SetMealContract.View {
@BindView(R.id.btn_table)
@BindView(R2.id.btn_table)
Button btnTable;
@BindView(R.id.btn_numberman)
@BindView(R2.id.btn_numberman)
Button btnNumberman;
@BindView(R.id.btn_fid)
@BindView(R2.id.btn_fid)
TextView btnFid;
@BindView(R.id.btn_meal_delete)
@BindView(R2.id.btn_meal_delete)
TextView btnMealDelete;
@BindView(R.id.btn_meal_modify_restore)
@BindView(R2.id.btn_meal_modify_restore)
TextView btnMealModifyRestore;
@BindView(R.id.btn_meal_discount)
@BindView(R2.id.btn_meal_discount)
TextView btnMealDiscount;
@BindView(R.id.btn_multiple_selection)
@BindView(R2.id.btn_multiple_selection)
TextView btnMultipleSelection;
@BindView(R.id.ll_mm)
@BindView(R2.id.ll_mm)
LinearLayout llMm;
@BindView(R.id.rv_select_meal)
@BindView(R2.id.rv_select_meal)
RecyclerView rvSelectMeal;
@BindView(R.id.ll_meals_main)
@BindView(R2.id.ll_meals_main)
LinearLayout llMealsMain;
@BindView(R.id.btn_key1)
@BindView(R2.id.btn_key1)
Button btnKey1;
@BindView(R.id.btn_key2)
@BindView(R2.id.btn_key2)
Button btnKey2;
@BindView(R.id.btn_key3)
@BindView(R2.id.btn_key3)
Button btnKey3;
@BindView(R.id.btn_key4)
@BindView(R2.id.btn_key4)
Button btnKey4;
@BindView(R.id.btn_key5)
@BindView(R2.id.btn_key5)
Button btnKey5;
@BindView(R.id.btn_keys)
@BindView(R2.id.btn_keys)
ImageButton btnKeys;
@BindView(R.id.ll_Keys)
@BindView(R2.id.ll_Keys)
LinearLayout llKeys;
@BindView(R.id.ll_meals)
@BindView(R2.id.ll_meals)
LinearLayout llMeals;
@BindView(R.id.fl_container)
@BindView(R2.id.fl_container)
FrameLayout flContainer;
@BindView(R2.id.rv_food_group)
......@@ -176,10 +176,13 @@ public class SetMealFragment extends BaseFragment<SetMealPresenter> implements S
@Inject
Lazy<ModifierAdapter> mModifierAdapter;
@Named("foodGridLayoutManager")
@Inject
GridLayoutManager mFoodRecycleLayoutManager;
@Named("comboGridLayoutManager")
@Inject
Lazy<GridLayoutManager> mComboRecycleLayoutManager;
@Named("modifierGridLayoutManager")
@Inject
Lazy<GridLayoutManager> mModifierRecycleLayoutManager;
......@@ -582,46 +585,46 @@ public class SetMealFragment extends BaseFragment<SetMealPresenter> implements S
public boolean onLongClick1(View view) {
//记录操作 并且震动
recordOperat(true);
int id = view.getId();
if (id == R.id.btn_meal_delete) {
mPresenter.deleteFoodItem(2);
} else if (id == R.id.btn_order_printer) {
}
// recordOperat(true);
//
// int id = view.getId();
// if (id == R.id.btn_meal_delete) {
// mPresenter.deleteFoodItem(2);
// } else if (id == R.id.btn_order_printer) {
//
// }
return false;
}
@OnClick(R2.id.btn_meal_discount)
void onClickDiscount() {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK + "食品折扣");
OrderDetail mainOrderDetail = mPresenter.getSelectMealAdapter().getCurrentMainOrderDetail();
if (mainOrderDetail != null && mainOrderDetail.getAblediscount() == 0) {
showMessage("此食品不能參與折扣!");
return;
}
//更新折扣数据
mPresenter.loadDiscountData();
showViewModeVisibility(MealConstant.discount_ViewMode);
// LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK + "食品折扣");
// OrderDetail mainOrderDetail = mPresenter.getSelectMealAdapter().getCurrentMainOrderDetail();
// if (mainOrderDetail != null && mainOrderDetail.getAblediscount() == 0) {
// showMessage("此食品不能參與折扣!");
// return;
// }
// //更新折扣数据
// mPresenter.loadDiscountData();
// showViewModeVisibility(MealConstant.discount_ViewMode);
}
@OnClick(R2.id.btn_multiple_selection)
void onClickMultipleSelection() {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK, "多选");
currentFinePage = 0;
if (mPresenter.getSelectMealAdapter().getSelectedMode() == SelectMealAdapter.MULTIPLE_SELECTED) {
mPresenter.getSelectMealAdapter().setSelectedMode(SelectMealAdapter.SINGLE_SELECTED);
btn_delete.setVisibility(View.VISIBLE);
setSelectFunctionVisibility(View.GONE);
} else {
mPresenter.getSelectMealAdapter().setSelectedMode(SelectMealAdapter.MULTIPLE_SELECTED);
btn_delete.setVisibility(View.GONE);
setSelectFunctionVisibility(View.VISIBLE);
loadFineItemData();
}
showRemarkLayout();
// LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK, "多选");
// currentFinePage = 0;
// if (mPresenter.getSelectMealAdapter().getSelectedMode() == SelectMealAdapter.MULTIPLE_SELECTED) {
// mPresenter.getSelectMealAdapter().setSelectedMode(SelectMealAdapter.SINGLE_SELECTED);
// btn_delete.setVisibility(View.VISIBLE);
// setSelectFunctionVisibility(View.GONE);
// } else {
// mPresenter.getSelectMealAdapter().setSelectedMode(SelectMealAdapter.MULTIPLE_SELECTED);
// btn_delete.setVisibility(View.GONE);
// setSelectFunctionVisibility(View.VISIBLE);
// loadFineItemData();
// }
// showRemarkLayout();
}
@OnClick(R2.id.btn_select_all)
......@@ -641,141 +644,141 @@ public class SetMealFragment extends BaseFragment<SetMealPresenter> implements S
R2.id.btn_taste, R2.id.btn_msg, R2.id.btn_delete, R2.id.btn_end, R2.id.iv_fine_back})
public void onClick(View v) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
String text = null;
if (v instanceof Button) {
Button button = (Button) v;
text = button.getText().toString();
} else if (v instanceof TextView) {
TextView textView = (TextView) v;
text = textView.getText().toString();
}
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK, text);
}
recordOperat(true);
//防抖處理
int id = v.getId();
if (id == R.id.btn_numberman) {
if (!BaseOrder.isTableToMeal()) {
return;
}
showChoosePeopleNumDialog(true);
} else if (id == R.id.btn_fid) {
//搜索
if (mCurrentViewMode == MealConstant.ViewMode_keys) {
showViewModeVisibility(MealConstant.food_group_ViewMode, MealConstant.food_ViewMode);
SPUtils.put(MealConstant.EXIT_IS_PLU_MODE, false);
} else {
showViewModeVisibility(MealConstant.ViewMode_keys);
SPUtils.put(MealConstant.EXIT_IS_PLU_MODE, true);
}
setPluMode();
} else if (id == R.id.btn_meal_delete) {
if (mPresenter.getSelectMealAdapter().getSelectedMode() == SelectMealAdapter.MULTIPLE_SELECTED) {
return;
}
mPresenter.deleteFoodItem(1);
showViewModeVisibility(MealConstant.food_group_ViewMode, MealConstant.food_ViewMode);
SPUtils.put(MealConstant.EXIT_IS_PLU_MODE, false);
setPluMode();
} else if (id == R.id.btn_meal_modify_restore) {
mPresenter.restoreDeleteFood();
showBtnMealModifyRestoreVisibility(false);
} else if (id == R.id.btn_send_order) {
// RxBindingUtils.setViewClicks(v)
// .subscribe(new Consumer<Object>() {
// @Override
// public void accept(Object o) throws Exception {
if (BaseOrder.isCurrentOrderType(FoodSummaryConstans.TAKEAWAY_TYPE)) {
CC.obtainBuilder(ComponentName.COMPONENT_DELIVERYPICK)
.setActionName("SendOrder")
.build()
.call();
return;
}
mPresenter.sendOrder(false, null);
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
// String text = null;
// if (v instanceof Button) {
// Button button = (Button) v;
// text = button.getText().toString();
// } else if (v instanceof TextView) {
// TextView textView = (TextView) v;
// text = textView.getText().toString();
// }
// LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK, text);
// }
//
// recordOperat(true);
//
// //防抖處理
// int id = v.getId();
// if (id == R.id.btn_numberman) {
// if (!BaseOrder.isTableToMeal()) {
// return;
// }
// showChoosePeopleNumDialog(true);
// } else if (id == R.id.btn_fid) {
// //搜索
// if (mCurrentViewMode == MealConstant.ViewMode_keys) {
// showViewModeVisibility(MealConstant.food_group_ViewMode, MealConstant.food_ViewMode);
// SPUtils.put(MealConstant.EXIT_IS_PLU_MODE, false);
// } else {
// showViewModeVisibility(MealConstant.ViewMode_keys);
// SPUtils.put(MealConstant.EXIT_IS_PLU_MODE, true);
// }
// setPluMode();
// } else if (id == R.id.btn_meal_delete) {
// if (mPresenter.getSelectMealAdapter().getSelectedMode() == SelectMealAdapter.MULTIPLE_SELECTED) {
// return;
// }
// mPresenter.deleteFoodItem(1);
//
// showViewModeVisibility(MealConstant.food_group_ViewMode, MealConstant.food_ViewMode);
// SPUtils.put(MealConstant.EXIT_IS_PLU_MODE, false);
// setPluMode();
// } else if (id == R.id.btn_meal_modify_restore) {
// mPresenter.restoreDeleteFood();
// showBtnMealModifyRestoreVisibility(false);
// } else if (id == R.id.btn_send_order) {
//// RxBindingUtils.setViewClicks(v)
//// .subscribe(new Consumer<Object>() {
//// @Override
//// public void accept(Object o) throws Exception {
// if (BaseOrder.isCurrentOrderType(FoodSummaryConstans.TAKEAWAY_TYPE)) {
// CC.obtainBuilder(ComponentName.COMPONENT_DELIVERYPICK)
// .setActionName("SendOrder")
// .build()
// .call();
// return;
// }
// mPresenter.sendOrder(false, null);
//// }
//// });
// } else if (id == R.id.tv_order_content) {
// //如果打印成功會回調
// Intent intent = new Intent(mContext, OrderContentActivity.class);
// startActivityForResult(intent, ORDER_CONTENT_CODE);
// } else if (id == R.id.tv_no_save_return) {
// returnTableActivity(true);
// } else if (id == R.id.btn_taste) {
// currentFinePage = 0;
// showRemarkLayout();
// } else if (id == R.id.btn_msg) {
// currentFinePage = 1;
// showRemarkLayout();
// } else if (id == R.id.btn_delete) {
// if (mPresenter.getSelectMealAdapter().getSelectedMode() == SelectMealAdapter.SINGLE_SELECTED) {
// //只有單選操作的時候可以刪除子項
// mPresenter.deleteChildItem();
// }
// } else if (id == R.id.btn_end) {
// mPresenter.getSelectMealAdapter().setSelectedMode(SelectMealAdapter.SINGLE_SELECTED);
// btn_delete.setVisibility(View.VISIBLE);
// setSelectFunctionVisibility(View.GONE);
// //從多選頁離開 重置選中
// mPresenter.resetSelected();
// showViewModeVisibility(MealConstant.food_group_ViewMode, MealConstant.food_ViewMode);
// } else if (id == R.id.btn_key1 || id == R.id.btn_key2 || id == R.id.btn_key3 || id == R.id.btn_key4 || id == R.id.btn_key5 || id == R.id.btn_keys) {
//
// int i = Integer.parseInt(v.getTag().toString());
// switch (i) {
// case 0:
// case 1:
// case 2:
// case 3:
// case 4:
// case 5:
// if (BuildConfig.DEBUG && BaseOrder.isTableToMeal()) {
// if (i == 1) {
// OrderResponse order = DoshokuOrder.getInstance().getOrderPlaced();
// if (order != null) {
// ArmsUtils.snackbarText("訂單ID:" + order.getId());
// }
// } else if (i == 2) {
// MemberInfo memberInfo = DoshokuOrder.getInstance().getMemberInfo();
// if (memberInfo != null) {
// showMessage("積分兌現金比例: " + memberInfo.getPointRedeemCash());
// }
// }
// }
// });
} else if (id == R.id.tv_order_content) {
//如果打印成功會回調
Intent intent = new Intent(mContext, OrderContentActivity.class);
startActivityForResult(intent, ORDER_CONTENT_CODE);
} else if (id == R.id.tv_no_save_return) {
returnTableActivity(true);
} else if (id == R.id.btn_taste) {
currentFinePage = 0;
showRemarkLayout();
} else if (id == R.id.btn_msg) {
currentFinePage = 1;
showRemarkLayout();
} else if (id == R.id.btn_delete) {
if (mPresenter.getSelectMealAdapter().getSelectedMode() == SelectMealAdapter.SINGLE_SELECTED) {
//只有單選操作的時候可以刪除子項
mPresenter.deleteChildItem();
}
} else if (id == R.id.btn_end) {
mPresenter.getSelectMealAdapter().setSelectedMode(SelectMealAdapter.SINGLE_SELECTED);
btn_delete.setVisibility(View.VISIBLE);
setSelectFunctionVisibility(View.GONE);
//從多選頁離開 重置選中
mPresenter.resetSelected();
showViewModeVisibility(MealConstant.food_group_ViewMode, MealConstant.food_ViewMode);
} else if (id == R.id.btn_key1 || id == R.id.btn_key2 || id == R.id.btn_key3 || id == R.id.btn_key4 || id == R.id.btn_key5 || id == R.id.btn_keys) {
int i = Integer.parseInt(v.getTag().toString());
switch (i) {
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
if (BuildConfig.DEBUG && BaseOrder.isTableToMeal()) {
if (i == 1) {
OrderResponse order = DoshokuOrder.getInstance().getOrderPlaced();
if (order != null) {
ArmsUtils.snackbarText("訂單ID:" + order.getId());
}
} else if (i == 2) {
MemberInfo memberInfo = DoshokuOrder.getInstance().getMemberInfo();
if (memberInfo != null) {
showMessage("積分兌現金比例: " + memberInfo.getPointRedeemCash());
}
}
}
mPresenter.changeNumber(i);
break;
case 99:
ChooseNumberDialog mChooseNumberDialog = new ChooseNumberDialog(mContext);
mChooseNumberDialog.builder();
mChooseNumberDialog.setOnClickListener(new ChooseNumberDialog.OnClickListener() {
@Override
public void onComfirmClick(String number) {
int inumber = Integer.parseInt(number);
if (inumber == 0) {
return;
}
mPresenter.changeNumber(inumber);
}
@Override
public void onBackPage() {
}
});
mChooseNumberDialog.setValueHint("請輸入數量");
mChooseNumberDialog.setCancelable(true);
mChooseNumberDialog.show();
break;
default:
break;
}
} else if (id == R.id.iv_fine_back) {
showViewModeVisibility(MealConstant.combo_ViewMode);
}
// mPresenter.changeNumber(i);
// break;
// case 99:
// ChooseNumberDialog mChooseNumberDialog = new ChooseNumberDialog(mContext);
// mChooseNumberDialog.builder();
// mChooseNumberDialog.setOnClickListener(new ChooseNumberDialog.OnClickListener() {
//
// @Override
// public void onComfirmClick(String number) {
// int inumber = Integer.parseInt(number);
// if (inumber == 0) {
// return;
// }
// mPresenter.changeNumber(inumber);
// }
//
// @Override
// public void onBackPage() {
// }
// });
// mChooseNumberDialog.setValueHint("請輸入數量");
// mChooseNumberDialog.setCancelable(true);
// mChooseNumberDialog.show();
// break;
// default:
// break;
// }
// } else if (id == R.id.iv_fine_back) {
// showViewModeVisibility(MealConstant.combo_ViewMode);
// }
}
}
}
component-table/src/main/res/layout/table_activity_meal_stand.xml
......@@ -335,16 +335,16 @@
</RelativeLayout>
</androidx.core.widget.NestedScrollView>
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_discount"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_above="@+id/ll_stand_oper"-->
<!-- android:layout_below="@+id/ll_meals"-->
<!-- android:divider="@null"-->
<!-- android:fadeScrollbars="false"-->
<!-- android:orientation="vertical"-->
<!-- android:visibility="gone" />-->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_discount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/ll_stand_oper"
android:layout_below="@+id/ll_meals"
android:divider="@null"
android:fadeScrollbars="false"
android:orientation="vertical"
android:visibility="gone" />
<FrameLayout
android:id="@+id/fl_container"
......
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;
......
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 to comment