Skip to content

S
supplier
Commit 786854c5 by 宁斌
Options

1、增加沽清恢復所有 

     2、食品剩餘總數控制數量後，但是套餐裏卻可以無限下單
     3、食品細項組最小/大數量設置是細項組選項已達上限，不用顯示售罄
     4、打印完PRJ閃退,,懷疑是EC-PM-80330 的問題
     5、針式打印機連接失敗問題
     6、餐檯管理有區域沒有餐檯沒有顯示+號
parent 11b05961
Showing with 156 additions and 122 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/function/FunctionStyleUtils.java
...@@ -109,7 +109,7 @@ public class FunctionStyleUtils { ...@@ -109,7 +109,7 @@ public class FunctionStyleUtils {
private int OrderNumberShowSize = 20; private int OrderNumberShowSize = 20;
private int OrderNumberFontSize = 7; private int OrderNumberFontSize = 7;
private int OrderNumberChildShowSize = 20; private int OrderNumberChildShowSize = 20;
private int OrderNumberChildFontSize = 7; private int OrderNumberChildFontSize = 10;
private int ShowPluPad = 0; private int ShowPluPad = 0;
//两次点击按钮之间的点击间隔不能少于200毫秒，防止快速点击食品导致不同步问题 //两次点击按钮之间的点击间隔不能少于200毫秒，防止快速点击食品导致不同步问题
private int ClickInterval = 200; private int ClickInterval = 200;
......
config.gradle
...@@ -5,8 +5,8 @@ ext { ...@@ -5,8 +5,8 @@ ext {
buildToolsVersion: '28.0.3', buildToolsVersion: '28.0.3',
minSdkVersion : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19 minSdkVersion : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19
targetSdkVersion : 28, targetSdkVersion : 28,
//正式版: 1.0.2 2 //正式版: 1.0.3 3
//內部測試版:1.1.2 12 //內部測試版:1.1.3 13
versionCode : 13, versionCode : 13,
versionName : "1.1.3" versionName : "1.1.3"
] ]
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
...@@ -256,11 +256,11 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl ...@@ -256,11 +256,11 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
functions.add(new Function((long) 151, 0, 5, "管理", 0, 0)); functions.add(new Function((long) 151, 0, 5, "管理", 0, 0));
functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0)); functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0));
// functions.add(new Function((long) 142, 151, 5, "外賣接單", R.drawable.ic_takeaway_orders, 0)); functions.add(new Function((long) 142, 151, 5, "外賣接單", R.drawable.ic_takeaway_orders, 0));
functions.add(new Function((long) 143, 151, 5, "餐檯管理", R.drawable.ic_dining_table_management, 0)); functions.add(new Function((long) 143, 151, 5, "餐檯管理", R.drawable.ic_dining_table_management, 0));
functions.add(new Function((long) 144, 151, 5, "打印管理", R.drawable.ic_print_management, 0)); functions.add(new Function((long) 144, 151, 5, "打印管理", R.drawable.ic_print_management, 0));
//// functions.add(new Function((long) 145, 151, 5, "支付管理", R.drawable.ic_pay_management_close, 1)); // functions.add(new Function((long) 145, 151, 5, "支付管理", R.drawable.ic_pay_management_close, 1));
//// functions.add(new Function((long) 146, 151, 5, "折扣管理", R.drawable.ic_discount_management_close, 1)); // functions.add(new Function((long) 146, 151, 5, "折扣管理", R.drawable.ic_discount_management_close, 1));
functions.add(new Function((long) 147, 151, 5, "沽清管理", R.drawable.ic_sell_off_manger, 0)); functions.add(new Function((long) 147, 151, 5, "沽清管理", R.drawable.ic_sell_off_manger, 0));
functions.add(new Function((long) 152, 0, 5, "員工", 0, 0)); functions.add(new Function((long) 152, 0, 5, "員工", 0, 0));
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/adapter/TableManageSectiontAdapter.java
...@@ -160,7 +160,7 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter< ...@@ -160,7 +160,7 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
} else { } else {
//未開檯空間足夠可換行顯示 //未開檯空間足夠可換行顯示
viewHolder.tv_table.setMaxLines(2); viewHolder.tv_table.setMaxLines(2);
viewHolder.tv_table.setTextSize(16); viewHolder.tv_table.setTextSize(22);
viewHolder.tv_people.setVisibility(View.GONE); viewHolder.tv_people.setVisibility(View.GONE);
} }
......
print-module/src/main/java/com/joe/print/mvp/print/EpsonPrint.java
...@@ -514,6 +514,8 @@ public class EpsonPrint implements ReceiveListener { ...@@ -514,6 +514,8 @@ public class EpsonPrint implements ReceiveListener {
printData(ipAddress, bitmaps.get(0)); printData(ipAddress, bitmaps.get(0));
} else { } else {
isPrint = false; isPrint = false;
disconnectPrinter();
finalizeObject();
if (receiveListener != null) { if (receiveListener != null) {
receiveListener.onPtrReceive(printer, i, printerStatusInfo, s); receiveListener.onPtrReceive(printer, i, printerStatusInfo, s);
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
...@@ -220,6 +220,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -220,6 +220,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
} }
myOrderManage.changeNumber(number); myOrderManage.changeNumber(number);
if (mMealStandPresenter != null) { if (mMealStandPresenter != null) {
mMealStandPresenter.updateMealSoldoutCtrData();
mMealStandPresenter.updateOrderFoodNumber(); mMealStandPresenter.updateOrderFoodNumber();
} }
updateOrderMoneyItem(); updateOrderMoneyItem();
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
...@@ -367,7 +367,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -367,7 +367,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
mPresenter.setRvMealClicked(false); mPresenter.setRvMealClicked(false);
mPresenter.changedMealByParentId(datasBean.getId()); mPresenter.changedMealByParentId(datasBean.getId());
mPresenter.updateFoodSoldoutCtrData(mPresenter.getSoldoutCtrList()); mPresenter.updateFoodSoldoutCtrData();
} }
}); });
...@@ -542,6 +542,11 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -542,6 +542,11 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
showViewModeVisibility(MealConstant.discount_ViewMode); showViewModeVisibility(MealConstant.discount_ViewMode);
} }
@OnClick(R2.id.btn_table)
void onClickTable() {
}
@OnClick(R2.id.btn_multiple_selection) @OnClick(R2.id.btn_multiple_selection)
void onClickMultipleSelection() { void onClickMultipleSelection() {
currentFinePage = 0; currentFinePage = 0;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/SoldoutCtrlActivity.java
...@@ -363,15 +363,16 @@ public class SoldoutCtrlActivity extends BaseFragmentActivity<SoldoutCtrlPresent ...@@ -363,15 +363,16 @@ public class SoldoutCtrlActivity extends BaseFragmentActivity<SoldoutCtrlPresent
recycle_food_group.setVisibility(View.VISIBLE); recycle_food_group.setVisibility(View.VISIBLE);
recycle_food.setVisibility(View.VISIBLE); recycle_food.setVisibility(View.VISIBLE);
} else if (id == R.id.tv_restore) { } else if (id == R.id.tv_restore) {
List<SoldoutCtrFood> soldoutCtrFoodList = getSoldoutCtrFoodList(); CommonTipDialog.showSurpisedDialog(this, "是否恢復所有食品?", SoldoutCtrlPresenter.class, mPresenter, "batchUpdatePrg", null, null);
if (soldoutCtrFoodList.size() == 0) { // List<SoldoutCtrFood> soldoutCtrFoodList = getSoldoutCtrFoodList();
return; // if (soldoutCtrFoodList.size() == 0) {
} // return;
if (soldoutCtrFoodList.size() == 1) { // }
executeSingleRestore(soldoutCtrFoodList.get(0)); // if (soldoutCtrFoodList.size() == 1) {
} else { // executeSingleRestore(soldoutCtrFoodList.get(0));
executeMultipleRestore(soldoutCtrFoodList); // } else {
} // executeMultipleRestore(soldoutCtrFoodList);
// }
} }
} }
...@@ -485,10 +486,10 @@ public class SoldoutCtrlActivity extends BaseFragmentActivity<SoldoutCtrlPresent ...@@ -485,10 +486,10 @@ public class SoldoutCtrlActivity extends BaseFragmentActivity<SoldoutCtrlPresent
String[] modifierIds = getStopSoldoutCtrModifierIds(selectSoldoutCtrFoodList); String[] modifierIds = getStopSoldoutCtrModifierIds(selectSoldoutCtrFoodList);
String ids = getNumberSoldoutIds(selectSoldoutCtrFoodList); String ids = getNumberSoldoutIds(selectSoldoutCtrFoodList);
if (!TextUtils.isEmpty(foodIds[0]) || !TextUtils.isEmpty(modifierIds[0])) { if (!TextUtils.isEmpty(foodIds[0]) || !TextUtils.isEmpty(modifierIds[0])) {
mPresenter.batchUpdateInvisible(foodIds, modifierIds, 2); // mPresenter.batchUpdateInvisible(foodIds, modifierIds, 2);
} }
if (ids.length() > 0) { if (ids.length() > 0) {
mPresenter.batchRestoreSoldoutCtrl(ids); // mPresenter.batchRestoreSoldoutCtrl(ids);
} }
}); });
dialogBuilder.addAction(com.gingersoft.gsa.cloud.base.R.drawable.shape_3c_cancel_btn_bg, "取消", (dialog, index) -> dialog.dismiss()); dialogBuilder.addAction(com.gingersoft.gsa.cloud.base.R.drawable.shape_3c_cancel_btn_bg, "取消", (dialog, index) -> dialog.dismiss());
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/FoodAdapter.java
...@@ -2,6 +2,7 @@ package com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal; ...@@ -2,6 +2,7 @@ package com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
...@@ -21,6 +22,7 @@ import com.jess.arms.base.BaseHolder; ...@@ -21,6 +22,7 @@ import com.jess.arms.base.BaseHolder;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.jess.arms.utils.DeviceUtils; import com.jess.arms.utils.DeviceUtils;
import com.qmuiteam.qmui.util.QMUIDrawableHelper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -177,19 +179,19 @@ public class FoodAdapter extends DefaultAdapter<Food> { ...@@ -177,19 +179,19 @@ public class FoodAdapter extends DefaultAdapter<Food> {
private void setStatus(Food datasBean) { private void setStatus(Food datasBean) {
tv_soldout.setMaxHeight(mOrderNumberShowSize); // tv_soldout.setMaxHeight(mOrderNumberShowSize);
tv_soldout.setMinHeight(mOrderNumberShowSize); // tv_soldout.setMinHeight(mOrderNumberShowSize);
tv_soldout.setTextSize(mOrderNumberFontSize); tv_soldout.setTextSize(mOrderNumberFontSize);
tv_soldout.setTextColor(Color.parseColor("#000000")); // tv_soldout.setTextColor(Color.parseColor("#000000"));
tv_soldout.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.ui_selector_white_rect)); tv_soldout.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.meal_shape_remaining_number_bg));
tv_soldout.setMinWidth(20); // tv_soldout.setMinWidth(20);
tv_soldout.setTextSize(10); // tv_soldout.setTextSize(10);
tv_soldout.setGravity(Gravity.CENTER); // tv_soldout.setGravity(Gravity.CENTER);
RelativeLayout.LayoutParams lp2 = new RelativeLayout.LayoutParams(new ViewGroup.MarginLayoutParams(60, 40)); // RelativeLayout.LayoutParams lp2 = new RelativeLayout.LayoutParams(new ViewGroup.MarginLayoutParams(60, 40));
lp2.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM); // lp2.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
lp2.addRule(RelativeLayout.ALIGN_PARENT_LEFT); // lp2.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
tv_soldout.setLayoutParams(lp2); // tv_soldout.setLayoutParams(lp2);
tv_soldout.setVisibility(View.INVISIBLE); tv_soldout.setVisibility(View.INVISIBLE);
iv_qtySold.setVisibility(View.INVISIBLE); iv_qtySold.setVisibility(View.INVISIBLE);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java
...@@ -403,10 +403,10 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -403,10 +403,10 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
if (orderItem != null && orderItem.isNew()) { if (orderItem != null && orderItem.isNew()) {
mInfos.remove(i); mInfos.remove(i);
notifyItemChanged(i); notifyItemChanged(i);
Food orderBean = mMealStandPresenter.getFoodByFid(orderItem.getId()); // Food orderBean = mMealStandPresenter.getFoodByFid(orderItem.getId());
if (orderBean != null) { // if (orderBean != null) {
mMealStandPresenter.setFoodMaxQty(orderBean); // mMealStandPresenter.setFoodMaxQty(orderBean);
} // }
} }
} }
......
table-module/src/main/res/drawable/meal_shape_remaining_number_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#D10035"/>
<corners android:bottomRightRadius="@dimen/dp_10" android:topRightRadius="@dimen/dp_10"/>
</shape>
\ No newline at end of file
table-module/src/main/res/layout/meal_activity_soldout_ctrl.xml
...@@ -39,20 +39,21 @@ ...@@ -39,20 +39,21 @@
android:textColor="@color/theme_white_color" /> android:textColor="@color/theme_white_color" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <!-- <LinearLayout-->
android:id="@+id/ll_meals_main" <!-- android:id="@+id/ll_meals_main"-->
android:layout_width="match_parent" <!-- android:layout_width="match_parent"-->
android:layout_height="0dp" <!-- android:layout_height="0dp"-->
android:layout_weight="1"> <!-- android:layout_weight="1">-->
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle_current_soldout_food" android:id="@+id/recycle_current_soldout_food"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="0dp"
android:layout_weight="1"
android:divider="@null" android:divider="@null"
app:spanCount="1" app:spanCount="1"
app:layoutManager="com.gingersoft.gsa.cloud.ui.recylcler.RecyclerViewNoBugLinearLayoutManager"/> app:layoutManager="com.gingersoft.gsa.cloud.ui.recylcler.RecyclerViewNoBugLinearLayoutManager"/>
</LinearLayout> <!-- </LinearLayout>-->
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
...@@ -160,7 +161,7 @@ ...@@ -160,7 +161,7 @@
android:text="沽清控制--食品" android:text="沽清控制--食品"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/theme_white_color" android:textColor="@color/theme_white_color"
android:textSize="@dimen/sp_20" /> android:textSize="@dimen/sp_16" />
<com.qmuiteam.qmui.alpha.QMUIAlphaTextView <com.qmuiteam.qmui.alpha.QMUIAlphaTextView
android:id="@+id/tv_restore" android:id="@+id/tv_restore"
...@@ -168,13 +169,13 @@ ...@@ -168,13 +169,13 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/theme_color" android:background="#D10035"
android:gravity="center" android:gravity="center"
android:text="恢復 " android:text="恢復所有"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/theme_white_color" android:textColor="@color/theme_white_color"
android:textSize="@dimen/sp_20" android:textSize="@dimen/sp_18"
android:visibility="gone"/> android:visibility="visible"/>
<com.qmuiteam.qmui.alpha.QMUIAlphaTextView <com.qmuiteam.qmui.alpha.QMUIAlphaTextView
android:id="@+id/tv_return" android:id="@+id/tv_return"
...@@ -186,6 +187,6 @@ ...@@ -186,6 +187,6 @@
android:text="返 回" android:text="返 回"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/theme_white_color" android:textColor="@color/theme_white_color"
android:textSize="@dimen/sp_20" /> android:textSize="@dimen/sp_18" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
table-module/src/main/res/layout/meal_item_food.xml
...@@ -30,13 +30,21 @@ ...@@ -30,13 +30,21 @@
android:id="@+id/tv_soldout" android:id="@+id/tv_soldout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_gravity="right" android:layout_gravity="right"
android:drawablePadding="@dimen/dp_2"
android:paddingTop="@dimen/dp_2"
android:paddingBottom="@dimen/dp_2"
android:paddingLeft="@dimen/dp_2"
android:paddingRight="@dimen/dp_8"
android:layout_marginRight="2px" android:layout_marginRight="2px"
android:layout_marginTop="2px" android:layout_marginTop="2px"
android:visibility="gone" android:visibility="invisible"
android:background="@drawable/ui_selector_white_rect" android:textColor="@color/theme_white_color"
android:text="sold" /> android:text="sold"
android:textStyle="bold"/>
<!--<TextView--> <!--<TextView-->
<!--android:id="@+id/tv_status"--> <!--android:id="@+id/tv_status"-->
<!--android:layout_width="wrap_content"--> <!--android:layout_width="wrap_content"-->
......
table-module/src/main/res/layout/meal_item_food_group.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
...@@ -40,6 +41,7 @@ ...@@ -40,6 +41,7 @@
android:layout_marginTop="2px" android:layout_marginTop="2px"
android:background="@drawable/ui_selector_white_rect" android:background="@drawable/ui_selector_white_rect"
android:text="sold" android:text="sold"
android:textStyle="bold"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
...@@ -55,6 +57,5 @@ ...@@ -55,6 +57,5 @@
android:layout_height="2px" android:layout_height="2px"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:background="@color/theme_black" /> android:background="@color/theme_black" />
</com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout> </com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout>
</RelativeLayout> </RelativeLayout>
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