Skip to content

S
supplier
Commit f3a08642 by 宁斌
Options

1、新增yedpay事項頁面 2、修改部分頁面名稱

parent f85dede9
Showing with 815 additions and 745 deletions
component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/LoginPresenter.java
......@@ -76,13 +76,13 @@ public class LoginPresenter extends BaseLoginPresenter<LoginContract.Model, Logi
@Override
public void onRequestPermissionFailure(List<String> permissions) {
mRootView.showMessage(LanguageUtils.get_language_system(mApplication, "external.storage.permission.hint", ArmsUtils.getString(mApplication, R.string.queue_write_external_storage_permission_hint)));
mRootView.showMessage(LanguageUtils.get_language_system( "external.storage.permission.hint", ArmsUtils.getString(mApplication, R.string.queue_write_external_storage_permission_hint)));
mRootView.killMyself();
}
@Override
public void onRequestPermissionFailureWithAskNeverAgain(List<String> permissions) {
mRootView.showMessage(LanguageUtils.get_language_system(mApplication, "external.storage.permission.hint", ArmsUtils.getString(mApplication, R.string.queue_write_external_storage_permission_hint)));
mRootView.showMessage(LanguageUtils.get_language_system( "external.storage.permission.hint", ArmsUtils.getString(mApplication, R.string.queue_write_external_storage_permission_hint)));
mRootView.killMyself();
}
}, new RxPermissions(IAcitivty), mErrorHandler);
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/contract/HomeContract.java
......@@ -42,7 +42,7 @@ public interface HomeContract {
Observable<BaseResult> syncRestaurantExtendedConfiguration(int restaurantId);
Observable<CheckVersionRequest> checkAppVersion(String version);
Observable<CheckVersionRequest> checkAppVersion(String version,int brandId ,int restaurantId );
Observable<Object> loginOut(RequestBody requestBody);
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/contract/NewMainContract.java
......@@ -36,7 +36,7 @@ public interface NewMainContract {
Observable<BaseResult> syncRestaurantExtendedConfiguration(int restaurantId);
Observable<CheckVersionRequest> checkAppVersion(String version);
Observable<CheckVersionRequest> checkAppVersion(String version, int brandId, int restaurantId);
Observable<Object> loginOut(RequestBody requestBody);
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/HomeModel.java
......@@ -71,9 +71,9 @@ public class HomeModel extends BaseModel implements HomeContract.Model {
}
@Override
public Observable<CheckVersionRequest> checkAppVersion(String version) {
public Observable<CheckVersionRequest> checkAppVersion(String version, int brandId, int restaurantId) {
return mRepositoryManager.obtainRetrofitService(MainService.class)
.checkAppVersion(version);
.checkAppVersion(version,brandId,restaurantId);
}
@Override
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/NewMainModel.java
......@@ -57,9 +57,9 @@ public class NewMainModel extends BaseModel implements NewMainContract.Model {
}
@Override
public Observable<CheckVersionRequest> checkAppVersion(String version) {
public Observable<CheckVersionRequest> checkAppVersion(String version, int brandId, int restaurantId) {
return mRepositoryManager.obtainRetrofitService(MainService.class)
.checkAppVersion(version);
.checkAppVersion(version,brandId,restaurantId);
}
@Override
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/service/MainService.java
......@@ -23,7 +23,7 @@ public interface MainService {
@Headers({"Domain-Name: update_version"})
@GET("system/checkAppVersionGsa" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<CheckVersionRequest> checkAppVersion(@Query("version") String version);
Observable<CheckVersionRequest> checkAppVersion(@Query("version") String version,@Query("brandId") int brandId,@Query("restaurantId") int restaurantId );
@FormUrlEncoded
@POST(Api.sync_restaurant_base_table_configuration + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/HomePresenter.java
......@@ -67,7 +67,8 @@ public class HomePresenter extends BasePresenter<HomeContract.Model, HomeContrac
@Inject
public HomePresenter(HomeContract.Model model, HomeContract.View rootView) {
super(model, rootView);
HomeFragment homeFragment = (HomeFragment) rootView;;
HomeFragment homeFragment = (HomeFragment) rootView;
;
this.IActivity = (MainActivity) homeFragment.getActivity();
}
......@@ -158,11 +159,9 @@ public class HomePresenter extends BasePresenter<HomeContract.Model, HomeContrac
}
public void checkAppVersion() {
// RequestBody requestBody = new FormBody.Builder()
// .add("version", )
// .add("type", "2")
// .build();
mModel.checkAppVersion(DeviceUtils.getVersionName(mApplication) + "|" + DeviceUtils.getVersionCode(mApplication))
mModel.checkAppVersion(DeviceUtils.getVersionName(mApplication) + "|" + DeviceUtils.getVersionCode(mApplication),
RestaurantInfoManager.newInstance().getBrandId(),
RestaurantInfoManager.newInstance().getRestaurantId())
.subscribeOn(Schedulers.io())
.subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread())
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/NewMainPresenter.java
......@@ -97,7 +97,8 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
// .add("version", )
// .add("type", "2")
// .build();
mModel.checkAppVersion(DeviceUtils.getVersionName(mApplication) + "|" + DeviceUtils.getVersionCode(mApplication))
mModel.checkAppVersion(DeviceUtils.getVersionName(mApplication) + "|" + DeviceUtils.getVersionCode(mApplication),
RestaurantInfoManager.newInstance().getBrandId(), RestaurantInfoManager.newInstance().getRestaurantId())
.subscribeOn(Schedulers.io())
.subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread())
......@@ -326,7 +327,7 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
//
// @Override
// public void onRequestPermissionFailure(List<String> permissions) {
// mRootView.showMessage(LanguageUtils.get_language_system(mApplication, "external.storage.permission.hint", ArmsUtils.getString(mApplication, R.string.queue_write_external_storage_permission_hint)));
// mRootView.showMessage(LanguageUtils.get_language_system( "external.storage.permission.hint", ArmsUtils.getString(mApplication, R.string.queue_write_external_storage_permission_hint)));
// mRootView.killMyself();
// }
//
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/LanguageActivity.java
......@@ -111,7 +111,7 @@ public class LanguageActivity extends BaseActivity<LanguagePresenter> implements
killMyself();
}
});
mTopBar.setTitle(LanguageUtils.get_language_system(this, "funcSelect.settlement", "語言")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color));
mTopBar.setTitle(LanguageUtils.get_language_system( "funcSelect.settlement", "語言")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color));
}
@Override
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementActivity.java
......@@ -93,7 +93,7 @@ public class SettlementActivity extends BaseActivity<SettlementPresenter> implem
killMyself();
}
});
mTopBar.setTitle(LanguageUtils.get_language_system(this, "funcSelect.settlement", "清機")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color));
mTopBar.setTitle(LanguageUtils.get_language_system( "funcSelect.settlement", "清機")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color));
}
@OnClick({R2.id.btn_settlement_report})
......@@ -144,7 +144,7 @@ public class SettlementActivity extends BaseActivity<SettlementPresenter> implem
public void returnSettlementData(SettlementReport datasBean) {
this.mSettlementReportBean = datasBean;
if (mSettlementReportBean.getRestaurantOperation() != null) {
String lastSettlementText = LanguageUtils.get_language_system(this, "", "上次清機時間:");
String lastSettlementText = LanguageUtils.get_language_system( "", "上次清機時間:");
setLastTime(lastSettlementText + TimeUtils.getStringByFormat(mSettlementReportBean.getRestaurantOperation().getOperationTime(), TimeUtils.DEFAULT_DATE_FORMAT));
}
}
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementReportActivity.java
......@@ -198,7 +198,7 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
showMessage("暫無可印報表");
}
});
mTopBar.setTitle(LanguageUtils.get_language_system(this, "function.order.detail2", "清機報表")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color));
mTopBar.setTitle(LanguageUtils.get_language_system( "function.order.detail2", "清機報表")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color));
}
@OnClick({R2.id.btn_send_settlement})
......@@ -307,38 +307,38 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
List<SectionTextItem5> settlementReportItem5s = new ArrayList<>();
String lastSettlementText = LanguageUtils.get_language_system(this, "", "上次清機時間:");
String dailyBusinessReportText = LanguageUtils.get_language_system(this, "", "每日營業報表");
String byBusinessDateText = LanguageUtils.get_language_system(this, "", "由營業日期:");
String toBusinessDateText = LanguageUtils.get_language_system(this, "", "到營業日期:");
String headcountOrAverageConsumptionText = LanguageUtils.get_language_system(this, "", "統計:");
String totalText = LanguageUtils.get_language_system(this, "", "總計");
String canteenText = LanguageUtils.get_language_system(this, "", "堂食");
String takewayText = LanguageUtils.get_language_system(this, "", "外賣");
String selfFetchingText = LanguageUtils.get_language_system(this, "", "自取");
String projectTotalSalesText = LanguageUtils.get_language_system(this, "total.project.sales", "項目銷售總額");
String discountText = LanguageUtils.get_language_system(this, "", "折扣");
String serviceFeeText = LanguageUtils.get_language_system(this, "", "服務費");
String deliveryFeeText = LanguageUtils.get_language_system(this, "", "送貨費");
String orderCountallText = LanguageUtils.get_language_system(this, "order.countall_litter", "賬單小數");
String netTurnoverText = LanguageUtils.get_language_system(this, "net.turnover", "營業金額淨值");
String cashAuditText = LanguageUtils.get_language_system(this, "cash.audit", "現金核數");
String analysisStatisticsText = LanguageUtils.get_language_system(this, "analysis.statistics", "分析統計");
String totalbillAmountText = LanguageUtils.get_language_system(this, "total.bill.amount", "賬單金額總數");
String numberBillsOrAverageText = LanguageUtils.get_language_system(this, "number.bills.or.average", "賬單數目/平均");
String headcountAndAverageConsumptionText = LanguageUtils.get_language_system(this, "headcount.or.average.consumption", "人數/平均消費");
String billStatusText = LanguageUtils.get_language_system(this, "", "賬單現況");
// String outstandingBillText = LanguageUtils.get_language_system(this, "", "未完成賬單");
// String billsReceivedText = LanguageUtils.get_language_system(this, "", "已完成賬單");
String outstandingBillText = LanguageUtils.get_language_system(this, "", "未完成賬單");
String billsReceivedText = LanguageUtils.get_language_system(this, "", "已完成賬單");
String cumulativeTurnoverMonthText = LanguageUtils.get_language_system(this, "", "本月累計營業額");
String endReportText = LanguageUtils.get_language_system(this, "", "報表完結");
String readersText = LanguageUtils.get_language_system(this, "", "讀取人員");
String lastSettlementText = LanguageUtils.get_language_system( "", "上次清機時間:");
String dailyBusinessReportText = LanguageUtils.get_language_system( "", "每日營業報表");
String byBusinessDateText = LanguageUtils.get_language_system( "", "由營業日期:");
String toBusinessDateText = LanguageUtils.get_language_system( "", "到營業日期:");
String headcountOrAverageConsumptionText = LanguageUtils.get_language_system( "", "統計:");
String totalText = LanguageUtils.get_language_system( "", "總計");
String canteenText = LanguageUtils.get_language_system( "", "堂食");
String takewayText = LanguageUtils.get_language_system( "", "外賣");
String selfFetchingText = LanguageUtils.get_language_system( "", "自取");
String projectTotalSalesText = LanguageUtils.get_language_system( "total.project.sales", "項目銷售總額");
String discountText = LanguageUtils.get_language_system( "", "折扣");
String serviceFeeText = LanguageUtils.get_language_system( "", "服務費");
String deliveryFeeText = LanguageUtils.get_language_system( "", "送貨費");
String orderCountallText = LanguageUtils.get_language_system( "order.countall_litter", "賬單小數");
String netTurnoverText = LanguageUtils.get_language_system( "net.turnover", "營業金額淨值");
String cashAuditText = LanguageUtils.get_language_system( "cash.audit", "現金核數");
String analysisStatisticsText = LanguageUtils.get_language_system( "analysis.statistics", "分析統計");
String totalbillAmountText = LanguageUtils.get_language_system( "total.bill.amount", "賬單金額總數");
String numberBillsOrAverageText = LanguageUtils.get_language_system( "number.bills.or.average", "賬單數目/平均");
String headcountAndAverageConsumptionText = LanguageUtils.get_language_system( "headcount.or.average.consumption", "人數/平均消費");
String billStatusText = LanguageUtils.get_language_system( "", "賬單現況");
// String outstandingBillText = LanguageUtils.get_language_system( "", "未完成賬單");
// String billsReceivedText = LanguageUtils.get_language_system( "", "已完成賬單");
String outstandingBillText = LanguageUtils.get_language_system( "", "未完成賬單");
String billsReceivedText = LanguageUtils.get_language_system( "", "已完成賬單");
String cumulativeTurnoverMonthText = LanguageUtils.get_language_system( "", "本月累計營業額");
String endReportText = LanguageUtils.get_language_system( "", "報表完結");
String readersText = LanguageUtils.get_language_system( "", "讀取人員");
SettlementReport.RestaurantOperationBean restaurantOperationBean = datasBean.getRestaurantOperation();
if (restaurantOperationBean != null) {
......@@ -358,7 +358,7 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
settlementReportItem5s.add(new SectionTextItem5(netTurnoverText, null, null, null, cashStr + df.format(voBean.getTotamount())));
// if (voBean.getPayNum() > 0) {
// String creditCardText = LanguageUtils.get_language_system(this, "credit.card", "信用卡");
// String creditCardText = LanguageUtils.get_language_system( "credit.card", "信用卡");
// SectionTextItem5 printItem = new SectionTextItem5(creditCardText, String.valueOf(voBean.getPayNum()), null,null,"$" + df.format(voBean.getPayamount()));
// settlementReportItem5s.add(printItem);
// }
......@@ -380,8 +380,8 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
SettlementReport.CashBean cashBean = cashList.get(i);
if (cashBean.getPayType() == PayMethodContract.PAY_METHOD_ID_1001) {
/**現金詳情*/
String cashDetailText = LanguageUtils.get_language_system(this, "credit.cash.detail", "現金詳情");
String cashText = LanguageUtils.get_language_system(this, "credit.cash", "現金");
String cashDetailText = LanguageUtils.get_language_system( "credit.cash.detail", "現金詳情");
String cashText = LanguageUtils.get_language_system( "credit.cash", "現金");
settlementReportItem5s.add(new SectionTextItem5("==============================================================", null, null, null, null));
settlementReportItem5s.add(new SectionTextItem5(null, null, cashDetailText, null, null));
settlementReportItem5s.add(new SectionTextItem5(cashText, null, String.valueOf(cashBean.getPayNum()), null, cashStr + df.format(cashBean.getPayAmount())));
......
component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/activity/TableManageActivity.java
......@@ -288,7 +288,7 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent
case ADD_TABLE_SUCCESS:
case UPDATE_TABLE_SUCCESS:
AddTableFragment addTableFragment = (AddTableFragment) fragment;
addTableFragment.pop();
addTableFragment.killMyself();
if (tableListFragment != null) {
tableListFragment.updateTableData(mTableAreaList, tables);
}
......@@ -338,22 +338,4 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent
mPresenter.getGetTablesDataDisposable().dispose();
}
}
public List<TableArea> getTableAreaList() {
return mTableAreaList;
}
public List<TableManagerItem> getTableList() {
return mTableList;
}
public boolean isRadioEdit() {
TableListFragment tableListFragment = findFragment(TableListFragment.class);
if (tableListFragment != null) {
return tableListFragment.isRadioEdit();
} else {
return false;
}
}
}
component-pay/src/main/java/com/gingersoft/gsa/cloud/pay/mvp/ui/activity/PayResultActivity.java
......@@ -19,7 +19,7 @@ import com.gingersoft.gsa.cloud.common.constans.AppConstans;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.loadsir.pos.BasePosCallback;
import com.gingersoft.gsa.cloud.common.loadsir.pos.PosPayStatusExceptionCallback;
import com.gingersoft.gsa.cloud.common.loadsir.pos.PosPayMatterCallback;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.component.ComponentAction;
import com.gingersoft.gsa.cloud.component.ComponentName;
......@@ -183,7 +183,7 @@ public class PayResultActivity extends BaseFragmentActivity<PayResultPresenter>
llBottom.setVisibility(View.VISIBLE);
btnComplate.setVisibility(View.VISIBLE);
} else if (HywebActionStatusCode.withException(mSaleRespose.getSTATUS())) {
loadService.showCallback(PosPayStatusExceptionCallback.class);
loadService.showCallback(PosPayMatterCallback.class);
llBottom.setVisibility(View.INVISIBLE);
btnComplate.setVisibility(View.INVISIBLE);
}
......
component-print/src/main/java/com/joe/print/mvp/print/LocationPrintStatus.java
......@@ -28,34 +28,34 @@ public class LocationPrintStatus {
case 1://打印机?作正常
return true;
case 2://打印机准备中
ArmsUtils.makeText(context, LanguageUtils.get_language_system(context, "print.prepare", "打印機準備中"));
ArmsUtils.makeText(context, LanguageUtils.get_language_system( "print.prepare", "打印機準備中"));
break;
case 3://通讯异常
ArmsUtils.makeText(context, LanguageUtils.get_language_system(context, "printer.abnormal.communication", "打印機通訊異常"));
ArmsUtils.makeText(context, LanguageUtils.get_language_system( "printer.abnormal.communication", "打印機通訊異常"));
break;
case 4://缺纸
ArmsUtils.makeText(context, LanguageUtils.get_language_system(context, "print.out.of.paper", "打印機缺紙"));
ArmsUtils.makeText(context, LanguageUtils.get_language_system( "print.out.of.paper", "打印機缺紙"));
break;
case 5://过热
ArmsUtils.makeText(context, LanguageUtils.get_language_system(context, "print.overheat", "打印機過熱"));
ArmsUtils.makeText(context, LanguageUtils.get_language_system( "print.overheat", "打印機過熱"));
break;
case 6://开盖
ArmsUtils.makeText(context, LanguageUtils.get_language_system(context, "print.open.cover", "打印機開蓋"));
ArmsUtils.makeText(context, LanguageUtils.get_language_system( "print.open.cover", "打印機開蓋"));
break;
case 7://切?异常
ArmsUtils.makeText(context, LanguageUtils.get_language_system(context, "print.cutter.abnormality", "打印機切刀異常"));
ArmsUtils.makeText(context, LanguageUtils.get_language_system( "print.cutter.abnormality", "打印機切刀異常"));
break;
case 8://切?恢复
ArmsUtils.makeText(context, LanguageUtils.get_language_system(context, "print.cutter.recovery", "打印機切刀恢復"));
ArmsUtils.makeText(context, LanguageUtils.get_language_system( "print.cutter.recovery", "打印機切刀恢復"));
break;
case 9://未检测到?标
ArmsUtils.makeText(context, LanguageUtils.get_language_system(context, "print.not.black.mark", "打印機未檢測到黑標"));
ArmsUtils.makeText(context, LanguageUtils.get_language_system( "print.not.black.mark", "打印機未檢測到黑標"));
break;
case 505://未检测到打印机
ArmsUtils.makeText(context, LanguageUtils.get_language_system(context, "print.not.detected", "未檢測到打印機"));
ArmsUtils.makeText(context, LanguageUtils.get_language_system( "print.not.detected", "未檢測到打印機"));
break;
case 507://打印机固件升级失败
ArmsUtils.makeText(context, LanguageUtils.get_language_system(context, "print.fixed.upgrade.failed", "打印機固定升級失敗"));
ArmsUtils.makeText(context, LanguageUtils.get_language_system( "print.fixed.upgrade.failed", "打印機固定升級失敗"));
break;
}
return false;
......@@ -70,19 +70,19 @@ public class LocationPrintStatus {
// N5PrintCallback printCallBack = new N5PrintCallback(context);
return true;
case -1009: //打印未完成
String notCompleted = LanguageUtils.get_language_system(context, "print.not.completed", "打印未完成");
String notCompleted = LanguageUtils.get_language_system( "print.not.completed", "打印未完成");
ArmsUtils.makeText(context, notCompleted);
break;
case -1005: //打印机缺纸
String noPaper = LanguageUtils.get_language_system(context, "printer.no.paper", "打印機缺紙");
String noPaper = LanguageUtils.get_language_system( "printer.no.paper", "打印機缺紙");
ArmsUtils.makeText(context, noPaper);
break;
case -1008: //打印机过热
String printerOverheated = LanguageUtils.get_language_system(context, "printer.overheated", "打印機過熱");
String printerOverheated = LanguageUtils.get_language_system( "printer.overheated", "打印機過熱");
ArmsUtils.makeText(context, printerOverheated);
break;
case -1001: // 打印失败
String printFailed = LanguageUtils.get_language_system(context, "print.failed", "打印失敗");
String printFailed = LanguageUtils.get_language_system( "print.failed", "打印失敗");
ArmsUtils.makeText(context, printFailed);
break;
case -1: //其他错误
......
component-table/src/main/AndroidManifest.xml
......@@ -16,32 +16,32 @@
<activity android:name=".mvp.ui.activity.CoordinatorlayoutActivity" />
<activity
android:name=".mvp.ui.activity.TableActivity"
android:name=".mvp.ui.activity.table.TableActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.MealStandActivity"
android:name=".mvp.ui.activity.meal.MealStandActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.MealStandActivity2"
android:name=".mvp.ui.activity.meal.MealStandActivity2"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.OrderContentActivity"
android:name=".mvp.ui.activity.meal.MealBillActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.OrderPayActivity"
android:name=".mvp.ui.activity.meal.MealPayActivity"
android:screenOrientation="portrait"
android:launchMode="singleTop"/>
<activity
android:name=".mvp.ui.activity.orderManager.OrderDetailActivity"
android:name=".mvp.ui.activity.order.OrderDetailActivity"
android:screenOrientation="portrait"
android:launchMode="singleTop"/>
<activity
android:name=".mvp.ui.activity.orderManager.OrderCenterActivity"
android:name=".mvp.ui.activity.order.OrderCenterActivity"
android:screenOrientation="portrait"
android:launchMode="singleTop"/>
<activity
android:name=".mvp.ui.activity.SoldoutCtrlActivity"
android:name=".mvp.ui.activity.meal.MealSoldoutActivity"
android:screenOrientation="portrait" />
<meta-data
android:name="com.gingersoft.gsa.cloud.common.config.globalconfig.GlobalConfiguration"
......
component-table/src/main/debug/AndroidManifest.xml
......@@ -15,30 +15,29 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/table_app_name"
android:supportsRtl="true"
android:networkSecurityConfig="@xml/network_android"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".mvp.ui.activity.CoordinatorlayoutActivity" />
<activity
android:name=".mvp.ui.activity.MealStandActivity2"
android:name=".mvp.ui.activity.meal.MealStandActivity2"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.orderManager.OrderDetailActivity"
android:launchMode="singleTop"/>
<activity
android:name=".mvp.ui.activity.orderManager.OrderCenterActivity"
android:launchMode="singleTop"/>
android:name=".mvp.ui.activity.order.OrderDetailActivity"
android:launchMode="singleTop" />
<activity
android:name=".mvp.ui.activity.OrderPayActivity"
android:screenOrientation="portrait"
android:launchMode="singleTop"/>
android:name=".mvp.ui.activity.order.OrderCenterActivity"
android:launchMode="singleTop" />
<activity
android:name=".mvp.ui.activity.SoldoutCtrlActivity" />
android:name=".mvp.ui.activity.meal.MealPayActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity android:name=".mvp.ui.activity.meal.MealSoldoutActivity" />
<activity
android:name=".mvp.ui.activity.TableActivity"
android:name=".mvp.ui.activity.table.TableActivity"
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
......@@ -47,15 +46,16 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<meta-data
android:name="com.gingersoft.gsa.cloud.common.config.globalconfig.GlobalConfiguration"
android:value="ConfigModule" />
<meta-data
android:name="design_width_in_dp"
android:value="360"/>
android:value="360" />
<meta-data
android:name="design_height_in_dp"
android:value="640"/>
android:value="640" />
</application>
</manifest>
component-table/src/main/java/com/gingersoft/gsa/cloud/table/ComponentTable.java
package com.gingersoft.gsa.cloud.table;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import com.billy.cc.core.component.CC;
import com.billy.cc.core.component.CCResult;
import com.billy.cc.core.component.CCUtil;
import com.billy.cc.core.component.IComponent;
import com.etps.aca.lib.activity.CommandActivity;
import com.gingersoft.gsa.cloud.common.function.FModule;
import com.gingersoft.gsa.cloud.component.ComponentAction;
import com.gingersoft.gsa.cloud.order.order.DoshokuOrder;
import com.gingersoft.gsa.cloud.order.order.TakeawayOrder;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderDetailActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealBillActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealPayActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealSoldoutActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.order.OrderCenterActivity;
import com.jess.arms.integration.AppManager;
import com.jess.arms.utils.ArmsUtils;
......@@ -119,8 +115,8 @@ public class ComponentTable implements IComponent {
break;
case ComponentAction.Table.KILL_MEAL_ORDER_PAY:
AppManager appManager = ArmsUtils.obtainAppComponentFromContext(context).appManager();
appManager.killActivity(OrderPayActivity.class);
appManager.killActivity(OrderContentActivity.class);
appManager.killActivity(MealPayActivity.class);
appManager.killActivity(MealBillActivity.class);
appManager.killActivity(MealStandActivity.class);
break;
default:
......@@ -154,7 +150,7 @@ public class ComponentTable implements IComponent {
}
private void openSoldoutCtrlActivity(CC cc) {
CCUtil.navigateTo(cc, SoldoutCtrlActivity.class);
CCUtil.navigateTo(cc, MealSoldoutActivity.class);
CC.sendCCResult(cc.getCallId(), CCResult.success());
}
......@@ -169,7 +165,7 @@ public class ComponentTable implements IComponent {
}
private void openOrderPayActivity(CC cc) {
CCUtil.navigateTo(cc, OrderPayActivity.class);
CCUtil.navigateTo(cc, MealPayActivity.class);
CC.sendCCResult(cc.getCallId(), CCResult.success());
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/AllOrderComponent.java
......@@ -9,7 +9,7 @@ import com.gingersoft.gsa.cloud.table.di.module.AllOrderModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.AllOrderContract;
import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllOrderFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.order.AllOrderFragment;
/**
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/AllTableComponent.java
......@@ -9,7 +9,7 @@ import com.jess.arms.di.component.AppComponent;
import com.gingersoft.gsa.cloud.table.di.module.AllTableModule;
import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.RegionTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.table.RegionTableFragment;
/**
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/InputTableComponent.java
......@@ -9,7 +9,7 @@ import com.gingersoft.gsa.cloud.table.di.module.InputTableModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.InputTableContract;
import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.InputTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.table.InputTableFragment;
/**
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/OrderContentComponent.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/MealBillComponent.java
package com.gingersoft.gsa.cloud.table.di.component;
import com.gingersoft.gsa.cloud.table.di.module.OrderContentModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
import com.gingersoft.gsa.cloud.table.di.module.MealBillModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealBillContract;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealBillActivity;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.di.scope.ActivityScope;
......@@ -23,17 +23,17 @@ import dagger.Component;
* ================================================
*/
@ActivityScope
@Component(modules = OrderContentModule.class, dependencies = AppComponent.class)
public interface OrderContentComponent {
void inject(OrderContentActivity activity);
@Component(modules = MealBillModule.class, dependencies = AppComponent.class)
public interface MealBillComponent {
void inject(MealBillActivity activity);
@Component.Builder
interface Builder {
@BindsInstance
OrderContentComponent.Builder view(OrderContentContract.View view);
MealBillComponent.Builder view(MealBillContract.View view);
OrderContentComponent.Builder appComponent(AppComponent appComponent);
MealBillComponent.Builder appComponent(AppComponent appComponent);
OrderContentComponent build();
MealBillComponent build();
}
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/FineChildAllComponent.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/MealFineAllComponent.java
......@@ -5,11 +5,11 @@ import dagger.Component;
import com.jess.arms.di.component.AppComponent;
import com.gingersoft.gsa.cloud.table.di.module.FineChildAllModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineChildAllContract;
import com.gingersoft.gsa.cloud.table.di.module.MealFineAllModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineAllContract;
import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.mealstand.FineChildAllFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.mealstand.MealFineAllFragment;
/**
......@@ -25,17 +25,17 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.mealstand.FineChildAllFrag
* ================================================
*/
@FragmentScope
@Component(modules = FineChildAllModule.class, dependencies = AppComponent.class)
public interface FineChildAllComponent {
void inject(FineChildAllFragment fragment);
@Component(modules = MealFineAllModule.class, dependencies = AppComponent.class)
public interface MealFineAllComponent {
void inject(MealFineAllFragment fragment);
@Component.Builder
interface Builder {
@BindsInstance
FineChildAllComponent.Builder view(FineChildAllContract.View view);
MealFineAllComponent.Builder view(MealFineAllContract.View view);
FineChildAllComponent.Builder appComponent(AppComponent appComponent);
MealFineAllComponent.Builder appComponent(AppComponent appComponent);
FineChildAllComponent build();
MealFineAllComponent build();
}
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/FineComponent.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/MealFineComponent.java
......@@ -3,13 +3,13 @@ package com.gingersoft.gsa.cloud.table.di.component;
import dagger.BindsInstance;
import dagger.Component;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.mealstand.MealFineFragment;
import com.jess.arms.di.component.AppComponent;
import com.gingersoft.gsa.cloud.table.di.module.FineModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineContract;
import com.gingersoft.gsa.cloud.table.di.module.MealFineModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineContract;
import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.mealstand.FineFragment;
/**
......@@ -25,17 +25,17 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.mealstand.FineFragment;
* ================================================
*/
@FragmentScope
@Component(modules = FineModule.class, dependencies = AppComponent.class)
public interface FineComponent {
void inject(FineFragment fragment);
@Component(modules = MealFineModule.class, dependencies = AppComponent.class)
public interface MealFineComponent {
void inject(MealFineFragment fragment);
@Component.Builder
interface Builder {
@BindsInstance
FineComponent.Builder view(FineContract.View view);
MealFineComponent.Builder view(MealFineContract.View view);
FineComponent.Builder appComponent(AppComponent appComponent);
MealFineComponent.Builder appComponent(AppComponent appComponent);
FineComponent build();
MealFineComponent build();
}
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/FineChildOneselfComponent.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/MealFineOneselfComponent.java
......@@ -3,11 +3,11 @@ package com.gingersoft.gsa.cloud.table.di.component;
import dagger.BindsInstance;
import dagger.Component;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineChildOneselfContract;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.mealstand.FineChildOneselfFragment;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineOneselfContract;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.mealstand.MealFineOneselfFragment;
import com.jess.arms.di.component.AppComponent;
import com.gingersoft.gsa.cloud.table.di.module.FineChildOneselfModule;
import com.gingersoft.gsa.cloud.table.di.module.MealFineOneselfModule;
import com.jess.arms.di.scope.FragmentScope;
......@@ -25,17 +25,17 @@ import com.jess.arms.di.scope.FragmentScope;
* ================================================
*/
@FragmentScope
@Component(modules = FineChildOneselfModule.class, dependencies = AppComponent.class)
public interface FineChildOneselfComponent {
void inject(FineChildOneselfFragment fragment);
@Component(modules = MealFineOneselfModule.class, dependencies = AppComponent.class)
public interface MealFineOneselfComponent {
void inject(MealFineOneselfFragment fragment);
@Component.Builder
interface Builder {
@BindsInstance
FineChildOneselfComponent.Builder view(FineChildOneselfContract.View view);
MealFineOneselfComponent.Builder view(MealFineOneselfContract.View view);
FineChildOneselfComponent.Builder appComponent(AppComponent appComponent);
MealFineOneselfComponent.Builder appComponent(AppComponent appComponent);
FineChildOneselfComponent build();
MealFineOneselfComponent build();
}
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/OrderPayComponent.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/MealPayComponent.java
package com.gingersoft.gsa.cloud.table.di.component;
import com.gingersoft.gsa.cloud.table.di.module.OrderPayModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity;
import com.gingersoft.gsa.cloud.table.di.module.MealPayModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealPayContract;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealPayActivity;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.di.scope.ActivityScope;
......@@ -23,17 +23,17 @@ import dagger.Component;
* ================================================
*/
@ActivityScope
@Component(modules = OrderPayModule.class, dependencies = AppComponent.class)
public interface OrderPayComponent {
void inject(OrderPayActivity activity);
@Component(modules = MealPayModule.class, dependencies = AppComponent.class)
public interface MealPayComponent {
void inject(MealPayActivity activity);
@Component.Builder
interface Builder {
@BindsInstance
OrderPayComponent.Builder view(OrderPayContract.View view);
MealPayComponent.Builder view(MealPayContract.View view);
OrderPayComponent.Builder appComponent(AppComponent appComponent);
MealPayComponent.Builder appComponent(AppComponent appComponent);
OrderPayComponent build();
MealPayComponent build();
}
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/SoldoutCtrlComponent.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/MealSoldoutComponent.java
......@@ -2,9 +2,9 @@ package com.gingersoft.gsa.cloud.table.di.component;
import dagger.BindsInstance;
import dagger.Component;
import com.gingersoft.gsa.cloud.table.di.module.SoldoutCtrlModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.SoldoutCtrlContract;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity;
import com.gingersoft.gsa.cloud.table.di.module.MealSoldoutModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealSoldoutContract;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealSoldoutActivity;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.di.scope.ActivityScope;
......@@ -22,17 +22,17 @@ import com.jess.arms.di.scope.ActivityScope;
* ================================================
*/
@ActivityScope
@Component(modules = SoldoutCtrlModule.class, dependencies = AppComponent.class)
public interface SoldoutCtrlComponent {
void inject(SoldoutCtrlActivity activity);
@Component(modules = MealSoldoutModule.class, dependencies = AppComponent.class)
public interface MealSoldoutComponent {
void inject(MealSoldoutActivity activity);
@Component.Builder
interface Builder {
@BindsInstance
SoldoutCtrlComponent.Builder view(SoldoutCtrlContract.View view);
MealSoldoutComponent.Builder view(MealSoldoutContract.View view);
SoldoutCtrlComponent.Builder appComponent(AppComponent appComponent);
MealSoldoutComponent.Builder appComponent(AppComponent appComponent);
SoldoutCtrlComponent build();
MealSoldoutComponent build();
}
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/MealStand2Component.java
package com.gingersoft.gsa.cloud.table.di.component;
import com.gingersoft.gsa.cloud.table.di.module.MealStand2Module;
import com.gingersoft.gsa.cloud.table.di.module.MealStandModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract2;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity2;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealStandActivity2;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.di.scope.ActivityScope;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/MealStandComponent.java
......@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.table.di.component;
import com.gingersoft.gsa.cloud.table.di.module.MealStandModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealStandActivity;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.di.scope.ActivityScope;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/OrderCenterComponent.java
......@@ -9,7 +9,7 @@ import com.gingersoft.gsa.cloud.table.di.module.OrderCenterModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderCenterContract;
import com.jess.arms.di.scope.ActivityScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.order.OrderCenterActivity;
/**
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/OrderDetailComponent.java
......@@ -9,7 +9,7 @@ import com.gingersoft.gsa.cloud.table.di.module.OrderDetailModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderDetailContract;
import com.jess.arms.di.scope.ActivityScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderDetailActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.order.OrderDetailActivity;
/**
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/TableComponent.java
......@@ -9,7 +9,7 @@ import com.gingersoft.gsa.cloud.table.di.module.TableModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
import com.jess.arms.di.scope.ActivityScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity;
/**
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/component/TableModeComponent.java 0 → 100644
package com.gingersoft.gsa.cloud.table.di.component;
import dagger.BindsInstance;
import dagger.Component;
import com.jess.arms.di.component.AppComponent;
import com.gingersoft.gsa.cloud.table.di.module.TableModeModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableModeContract;
import com.jess.arms.di.scope.ActivityScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableModeActivity;
/**
* ================================================
* Description:
* <p>
* Created by MVPArmsTemplate on 04/08/2021 14:08
* <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
* <a href="https://github.com/JessYanCoding">Follow me</a>
* <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
* <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
@ActivityScope
@Component(modules = TableModeModule.class, dependencies = AppComponent.class)
public interface TableModeComponent {
void inject(TableModeActivity activity);
@Component.Builder
interface Builder {
@BindsInstance
TableModeComponent.Builder view(TableModeContract.View view);
TableModeComponent.Builder appComponent(AppComponent appComponent);
TableModeComponent build();
}
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/OrderContentModule.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/MealBillModule.java
package com.gingersoft.gsa.cloud.table.di.module;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
import com.gingersoft.gsa.cloud.table.mvp.model.OrderContentModel;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealBillContract;
import com.gingersoft.gsa.cloud.table.mvp.model.MealBillModel;
import dagger.Binds;
import dagger.Module;
......@@ -21,8 +21,8 @@ import dagger.Module;
* ================================================
*/
@Module
public abstract class OrderContentModule {
public abstract class MealBillModule {
@Binds
abstract OrderContentContract.Model bindOrderContentModel(OrderContentModel model);
abstract MealBillContract.Model bindMealBillModel(MealBillModel model);
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/FineChildAllModule.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/MealFineAllModule.java
......@@ -3,8 +3,8 @@ package com.gingersoft.gsa.cloud.table.di.module;
import dagger.Binds;
import dagger.Module;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineChildAllContract;
import com.gingersoft.gsa.cloud.table.mvp.model.FineChildAllModel;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineAllContract;
import com.gingersoft.gsa.cloud.table.mvp.model.MealFineAllModel;
/**
......@@ -20,8 +20,8 @@ import com.gingersoft.gsa.cloud.table.mvp.model.FineChildAllModel;
* ================================================
*/
@Module
public abstract class FineChildAllModule {
public abstract class MealFineAllModule {
@Binds
abstract FineChildAllContract.Model bindFineItemAllModel(FineChildAllModel model);
abstract MealFineAllContract.Model bindMealFineAllModel(MealFineAllModel model);
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/FineModule.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/MealFineModule.java
package com.gingersoft.gsa.cloud.table.di.module;
import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.gsa.cloud.table.mvp.model.MealFineModel;
import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineContract;
import com.gingersoft.gsa.cloud.table.mvp.model.FineModel;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineContract;
/**
......@@ -23,8 +21,8 @@ import com.gingersoft.gsa.cloud.table.mvp.model.FineModel;
* ================================================
*/
@Module
public abstract class FineModule {
public abstract class MealFineModule {
@Binds
abstract FineContract.Model bindFineModel(FineModel model);
abstract MealFineContract.Model bindFineModel(MealFineModel model);
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/FineChildOneselfModule.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/MealFineOneselfModule.java
......@@ -3,8 +3,8 @@ package com.gingersoft.gsa.cloud.table.di.module;
import dagger.Binds;
import dagger.Module;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineChildOneselfContract;
import com.gingersoft.gsa.cloud.table.mvp.model.FineChildOneselfModel;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineOneselfContract;
import com.gingersoft.gsa.cloud.table.mvp.model.MealFineOneselfModel;
/**
......@@ -20,8 +20,8 @@ import com.gingersoft.gsa.cloud.table.mvp.model.FineChildOneselfModel;
* ================================================
*/
@Module
public abstract class FineChildOneselfModule {
public abstract class MealFineOneselfModule {
@Binds
abstract FineChildOneselfContract.Model bindFineItemOneselfModel(FineChildOneselfModel model);
abstract MealFineOneselfContract.Model bindMealFineOneselfModel(MealFineOneselfModel model);
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/OrderPayModule.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/MealPayModule.java
package com.gingersoft.gsa.cloud.table.di.module;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
import com.gingersoft.gsa.cloud.table.mvp.model.OrderPayModel;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealPayContract;
import com.gingersoft.gsa.cloud.table.mvp.model.MealPayModel;
import dagger.Binds;
import dagger.Module;
......@@ -21,8 +21,8 @@ import dagger.Module;
* ================================================
*/
@Module
public abstract class OrderPayModule {
public abstract class MealPayModule {
@Binds
abstract OrderPayContract.Model bindOrderPayModel(OrderPayModel model);
abstract MealPayContract.Model bindMealPayModel(MealPayModel model);
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/SoldoutCtrlModule.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/MealSoldoutModule.java
package com.gingersoft.gsa.cloud.table.di.module;
import com.gingersoft.gsa.cloud.table.mvp.contract.SoldoutCtrlContract;
import com.gingersoft.gsa.cloud.table.mvp.model.SoldoutCtrlModel;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealSoldoutContract;
import com.gingersoft.gsa.cloud.table.mvp.model.MealSoldoutModel;
import dagger.Binds;
import dagger.Module;
......@@ -20,8 +20,8 @@ import dagger.Module;
* ================================================
*/
@Module
public abstract class SoldoutCtrlModule {
public abstract class MealSoldoutModule {
@Binds
abstract SoldoutCtrlContract.Model bindSoldoutCtrlModel(SoldoutCtrlModel model);
abstract MealSoldoutContract.Model bindMealSoldoutModel(MealSoldoutModel model);
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/SetMealModule.java
......@@ -6,36 +6,23 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.gingersoft.gsa.cloud.database.bean.ComboItem;
import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.order.billItem.BillItem;
import com.gingersoft.gsa.cloud.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.SetMealContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.SoldoutCtrFood;
import com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand.SetMealPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BillItemAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.ComboAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FoodAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FoodGroupAdapter;
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.table.mvp.ui.adapter.meal.SelectMealAdapter2;
import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.di.scope.FragmentScope;
import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import com.gingersoft.gsa.cloud.table.mvp.contract.SetMealContract;
import com.gingersoft.gsa.cloud.table.mvp.model.SetMealModel;
import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.mvp.IView;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
......@@ -57,18 +44,6 @@ public abstract class SetMealModule {
@Binds
abstract SetMealContract.Model bindSetMealModel(SetMealModel model);
// @FragmentScope
// @Provides
// static List<OrderDetail> provideOrderMealList() {
// return new ArrayList<>();
// }
//
// @FragmentScope
// @Provides
// static List<BillItem> provideBillItemList() {
// return new ArrayList<>();
// }
@FragmentScope
@Provides
@Named("foodGroupList")
......@@ -108,18 +83,6 @@ public abstract class SetMealModule {
return new ArrayList<>();
}
// @FragmentScope
// @Provides
// static SelectMealAdapter2 provideSelectMealAdapter2(SetMealContract.View IView, List<OrderDetail> orderMealList, BasePresenter presenter) {
// return new SelectMealAdapter2(IView.getActivity2(), orderMealList,presenter);
// }
//
// @FragmentScope
// @Provides
// static BillItemAdapter provideBillItemAdapter(SetMealContract.View IView, List<BillItem> billItems) {
// return new BillItemAdapter(IView.getActivity2(), billItems,"$");
// }
@FragmentScope
@Provides
static FoodGroupAdapter provideFoodGroupAdapter(SetMealContract.View IView, @Named("foodGroupList") List<Food> foodGroupList) {
......@@ -144,13 +107,6 @@ public abstract class SetMealModule {
return new ModifierAdapter(IView.getActivity2(), modifierList);
}
// @FragmentScope
// @Provides
// @Named("foodGridLayoutManager")
// static GridLayoutManager provideFoodRecycleLayoutManager(SetMealContract.View IView) {
// return new GridLayoutManager(IView.getActivity2(), 1, LinearLayoutManager.HORIZONTAL, false);
// }
@FragmentScope
@Provides
@Named("comboGridLayoutManager")
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/di/module/TableModeModule.java 0 → 100644
package com.gingersoft.gsa.cloud.table.di.module;
import com.jess.arms.di.scope.ActivityScope;
import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableModeContract;
import com.gingersoft.gsa.cloud.table.mvp.model.TableModeModel;
/**
* ================================================
* Description:
* <p>
* Created by MVPArmsTemplate on 04/08/2021 14:08
* <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
* <a href="https://github.com/JessYanCoding">Follow me</a>
* <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
* <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
@Module
public abstract class TableModeModule {
@Binds
abstract TableModeContract.Model bindTableModeModel(TableModeModel model);
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/discount/BillCouponAction.java
......@@ -58,7 +58,7 @@ public class BillCouponAction implements Strategy<MemberWalletCoupon> {
public interface OnCallBackListener {
void preformAddCoupon(MemberWalletCoupon discount);
void preformAddCoupon(MemberWalletCoupon walletCoupon);
}
}
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/order/CancelOrder.java
......@@ -89,12 +89,12 @@ public class CancelOrder implements Strategy<OrderManagerResponse> {
payType = orderPayBean.getPayType();
}
}
RequestParms build = RequestParms.builder()
.action(PayAction.REFUND)
.orderId(DoshokuOrder.getInstance().getOrderId())
.resturantId(RestaurantInfoManager.newInstance().getRestaurantId())
.payType(payType)
.orderId(datasBean.getId())
.tableId(datasBean.getTableId())
.tableExtId(datasBean.getTableNumber())
.payMoney(datasBean.getAmount())
.refundReason("客戶退款")
.resultCallback(new ResultCallback() {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/order/ModifyOrderAction.java
......@@ -10,8 +10,8 @@ import com.gingersoft.gsa.cloud.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.order.order.DoshokuOrder;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.order.OrderCenterActivity;
import com.jess.arms.base.BaseFragmentActivity;
import com.jess.arms.mvp.IView;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/table/MoveTableAction.java
......@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.table.mvp.action.table;
import android.app.Activity;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity;
/**
......@@ -10,7 +11,7 @@ import com.gingersoft.gsa.cloud.common.core.table.TableBean;
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯模式-轉台{@link com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity}
* 描述：餐檯模式-轉台{@link TableActivity}
*/
public class MoveTableAction extends TableAction {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/table/PrintServingPaperAction.java
......@@ -15,7 +15,8 @@ import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.action.OnNetworkCallbackListener;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil;
import com.gingersoft.gsa.cloud.table.mvp.presenter.TablePresenter;
import com.gingersoft.gsa.cloud.table.mvp.presenter.table.TablePresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
......@@ -28,7 +29,7 @@ import java.util.List;
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯模式-打印上菜紙{@link com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity}
* 描述：餐檯模式-打印上菜紙{@link TableActivity}
*/
public class PrintServingPaperAction extends TableAction {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/table/PrintSkyorderAction.java
......@@ -18,7 +18,8 @@ import com.gingersoft.gsa.cloud.component.ComponentName;
import com.gingersoft.gsa.cloud.table.mvp.action.OnNetworkCallbackListener;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodSummary;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.PrintQRCodeResponse;
import com.gingersoft.gsa.cloud.table.mvp.presenter.TablePresenter;
import com.gingersoft.gsa.cloud.table.mvp.presenter.table.TablePresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.SkyOrderDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.DialogAnimationListener;
......@@ -33,7 +34,7 @@ import java.util.List;
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯模式-打印skyorder碼{@link com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity}
* 描述：餐檯模式-打印skyorder碼{@link TableActivity}
*/
public class PrintSkyorderAction extends TableAction {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/table/ResetSkyorderAction.java
......@@ -4,6 +4,7 @@ import android.app.Activity;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
......@@ -12,7 +13,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯模式-重置skyorder餐檯{@link com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity}
* 描述：餐檯模式-重置skyorder餐檯{@link TableActivity}
*/
public class ResetSkyorderAction extends TableAction {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/table/ResetTableAction.java
......@@ -4,6 +4,7 @@ import android.app.Activity;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
......@@ -12,7 +13,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯模式-重置餐檯{@link com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity}
* 描述：餐檯模式-重置餐檯{@link TableActivity}
*/
public class ResetTableAction extends TableAction {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/table/SplitTableAction.java
......@@ -3,13 +3,14 @@ package com.gingersoft.gsa.cloud.table.mvp.action.table;
import android.app.Activity;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯模式-分檯{@link com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity}
* 描述：餐檯模式-分檯{@link TableActivity}
*/
public class SplitTableAction extends TableAction {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/constant/SkyOrderConstant.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/constant/SkyOrderConstant.java
package com.gingersoft.gsa.cloud.table.mvp.model.constant;
package com.gingersoft.gsa.cloud.table.mvp.constant;
/**
* @author : bin
......@@ -13,4 +13,5 @@ public interface SkyOrderConstant {
String delivery_time_hour = "delivery_time_hour";
String delivery_time_minute = "delivery_time_minute";
}
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderContentContract.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealBillContract.java
......@@ -5,13 +5,12 @@ import android.content.Intent;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.RegionTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.table.RegionTableFragment;
import com.jess.arms.base.DefaultAdapter;
import java.util.List;
import io.reactivex.Single;
import io.reactivex.Single;
import okhttp3.RequestBody;
......@@ -27,7 +26,7 @@ import okhttp3.RequestBody;
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
public interface OrderContentContract {
public interface MealBillContract {
//对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
interface View extends BaseOrderContract.View {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/FineChildAllContract.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealFineAllContract.java
......@@ -27,7 +27,7 @@ import io.reactivex.Single;
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
public interface FineChildAllContract {
public interface MealFineAllContract {
//对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
interface View extends IView {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/FineContract.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealFineContract.java
......@@ -16,7 +16,7 @@ import com.jess.arms.mvp.IModel;
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
public interface FineContract {
public interface MealFineContract {
//对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
interface View extends IView {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/FineChildOneselfContract.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealFineOneselfContract.java
......@@ -25,7 +25,7 @@ import io.reactivex.Single;
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
public interface FineChildOneselfContract {
public interface MealFineOneselfContract {
//对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
interface View extends IView {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderPayContract.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealPayContract.java
......@@ -21,7 +21,7 @@ import okhttp3.RequestBody;
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
public interface OrderPayContract {
public interface MealPayContract {
interface View extends BaseOrderContract.View {
void showTipDialog(String msg, String btnCancelInfo, String btnOkInfo);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/SoldoutCtrlContract.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealSoldoutContract.java
......@@ -24,7 +24,7 @@ import okhttp3.RequestBody;
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
public interface SoldoutCtrlContract {
public interface MealSoldoutContract {
//对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
interface View extends IView {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderCenterContract.java
......@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.table.mvp.contract;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllOrderFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.order.AllOrderFragment;
import com.jess.arms.mvp.IView;
import com.jess.arms.mvp.IModel;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/SetMealContract.java
package com.gingersoft.gsa.cloud.table.mvp.contract;
import android.app.Activity;
import android.app.Dialog;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.database.bean.ComboItem;
import com.gingersoft.gsa.cloud.database.bean.Food;
......@@ -10,23 +7,11 @@ import com.gingersoft.gsa.cloud.database.bean.FoodCombo;
import com.gingersoft.gsa.cloud.database.bean.FoodModifier;
import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity2;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.ComboAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FoodAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FoodGroupAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.ModifierAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealStandActivity2;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.CancelFoodDialog;
import com.jess.arms.mvp.IView;
import com.jess.arms.mvp.IModel;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import dagger.Lazy;
import io.reactivex.Observable;
import io.reactivex.Single;
import okhttp3.RequestBody;
......@@ -69,8 +54,6 @@ public interface SetMealContract {
void showModifyLayoutVisibility(boolean show);
void showBtnMealModifyRestoreVisibility(boolean show);
void setOrderFoodCount(String number);
int getCurrentViewMode();
......@@ -85,6 +68,8 @@ public interface SetMealContract {
void initFoodGroupAdapter(List<Food> foodGroupList);
void updateCouponSelects(boolean sticky);
void notifyFoodGroupAdapter();
void notifyFoodAdapter();
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/TableContract.java
......@@ -4,7 +4,7 @@ import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.action.table.TableAction;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.RegionTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.table.RegionTableFragment;
import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.jess.arms.base.DefaultAdapter;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/TableModeContract.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.contract;
import com.jess.arms.mvp.IView;
import com.jess.arms.mvp.IModel;
/**
* ================================================
* Description:
* <p>
* Created by MVPArmsTemplate on 04/08/2021 14:08
* <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
* <a href="https://github.com/JessYanCoding">Follow me</a>
* <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
* <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
public interface TableModeContract {
//对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
interface View extends IView {
}
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
interface Model extends IModel{
}
}
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealBillModel.java
......@@ -5,16 +5,13 @@ import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.rxjava.MyRxSchedulerUtils;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.database.utils.DiscountDaoUtils;
import com.gingersoft.gsa.cloud.order.order.DoshokuOrder;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealBillContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
import com.gingersoft.gsa.cloud.table.mvp.model.service.MemberService;
import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderPayService;
import com.gingersoft.gsa.cloud.table.mvp.model.service.TableService;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.MealConditionFilterUtils;
import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap;
import com.jess.arms.di.scope.ActivityScope;
......@@ -22,12 +19,10 @@ import com.jess.arms.integration.IRepositoryManager;
import com.jess.arms.mvp.BaseModel;
import java.util.Date;
import java.util.List;
import javax.inject.Inject;
import io.reactivex.Single;
import io.reactivex.Single;
import io.reactivex.functions.Function;
import okhttp3.RequestBody;
......@@ -45,14 +40,14 @@ import okhttp3.RequestBody;
* ================================================
*/
@ActivityScope
public class OrderContentModel extends BaseModel implements OrderContentContract.Model {
public class MealBillModel extends BaseModel implements MealBillContract.Model {
@Inject
Gson mGson;
@Inject
Application mApplication;
@Inject
public OrderContentModel(IRepositoryManager repositoryManager) {
public MealBillModel(IRepositoryManager repositoryManager) {
super(repositoryManager);
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/FineChildAllModel.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealFineAllModel.java
......@@ -2,11 +2,10 @@ package com.gingersoft.gsa.cloud.table.mvp.model;
import android.app.Application;
import com.gingersoft.gsa.cloud.common.rxjava.MyRxSchedulerUtils;
import com.gingersoft.gsa.cloud.common.rxjava.MyRxUtils;
import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineChildAllContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineAllContract;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.MealStyleUtils;
import com.google.gson.Gson;
import com.jess.arms.di.scope.FragmentScope;
......@@ -17,7 +16,6 @@ import java.util.List;
import javax.inject.Inject;
import io.reactivex.Flowable;
import io.reactivex.Single;
......@@ -34,14 +32,14 @@ import io.reactivex.Single;
* ================================================
*/
@FragmentScope
public class FineChildAllModel extends BaseModel implements FineChildAllContract.Model {
public class MealFineAllModel extends BaseModel implements MealFineAllContract.Model {
@Inject
Gson mGson;
@Inject
Application mApplication;
@Inject
public FineChildAllModel(IRepositoryManager repositoryManager) {
public MealFineAllModel(IRepositoryManager repositoryManager) {
super(repositoryManager);
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/FineModel.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealFineModel.java
......@@ -10,7 +10,7 @@ import com.jess.arms.di.scope.FragmentScope;
import javax.inject.Inject;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineContract;
/**
......@@ -26,14 +26,14 @@ import com.gingersoft.gsa.cloud.table.mvp.contract.FineContract;
* ================================================
*/
@FragmentScope
public class FineModel extends BaseModel implements FineContract.Model {
public class MealFineModel extends BaseModel implements MealFineContract.Model {
@Inject
Gson mGson;
@Inject
Application mApplication;
@Inject
public FineModel(IRepositoryManager repositoryManager) {
public MealFineModel(IRepositoryManager repositoryManager) {
super(repositoryManager);
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/FineChildOneselfModel.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealFineOneselfModel.java
......@@ -2,13 +2,12 @@ package com.gingersoft.gsa.cloud.table.mvp.model;
import android.app.Application;
import com.gingersoft.gsa.cloud.common.rxjava.MyRxSchedulerUtils;
import com.gingersoft.gsa.cloud.common.rxjava.MyRxUtils;
import com.gingersoft.gsa.cloud.database.bean.ComboItem;
import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.database.utils.ComboItemDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineChildOneselfContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineOneselfContract;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.MealStyleUtils;
import com.google.gson.Gson;
import com.jess.arms.integration.IRepositoryManager;
......@@ -36,14 +35,14 @@ import io.reactivex.Single;
* ================================================
*/
@FragmentScope
public class FineChildOneselfModel extends BaseModel implements FineChildOneselfContract.Model {
public class MealFineOneselfModel extends BaseModel implements MealFineOneselfContract.Model {
@Inject
Gson mGson;
@Inject
Application mApplication;
@Inject
public FineChildOneselfModel(IRepositoryManager repositoryManager) {
public MealFineOneselfModel(IRepositoryManager repositoryManager) {
super(repositoryManager);
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderPayModel.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealPayModel.java
......@@ -4,7 +4,7 @@ import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.rxjava.MyRxSchedulerUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealPayContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderPayService;
......@@ -32,14 +32,14 @@ import okhttp3.RequestBody;
* ================================================
*/
@ActivityScope
public class OrderPayModel extends BaseModel implements OrderPayContract.Model {
public class MealPayModel extends BaseModel implements MealPayContract.Model {
@Inject
Gson mGson;
@Inject
Application mApplication;
@Inject
public OrderPayModel(IRepositoryManager repositoryManager) {
public MealPayModel(IRepositoryManager repositoryManager) {
super(repositoryManager);
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/SoldoutCtrlModel.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealSoldoutModel.java
......@@ -6,7 +6,7 @@ import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.rxjava.MyRxSchedulerUtils;
import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.SoldoutCtrlContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealSoldoutContract;
import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.MealStyleUtils;
import com.google.gson.Gson;
......@@ -19,7 +19,6 @@ import java.util.List;
import javax.inject.Inject;
import io.reactivex.Single;
import io.reactivex.Single;
import okhttp3.RequestBody;
......@@ -36,14 +35,14 @@ import okhttp3.RequestBody;
* ================================================
*/
@ActivityScope
public class SoldoutCtrlModel extends BaseModel implements SoldoutCtrlContract.Model {
public class MealSoldoutModel extends BaseModel implements MealSoldoutContract.Model {
@Inject
Gson mGson;
@Inject
Application mApplication;
@Inject
public SoldoutCtrlModel(IRepositoryManager repositoryManager) {
public MealSoldoutModel(IRepositoryManager repositoryManager) {
super(repositoryManager);
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/TableModeModel.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model;
import android.app.Application;
import com.google.gson.Gson;
import com.jess.arms.integration.IRepositoryManager;
import com.jess.arms.mvp.BaseModel;
import com.jess.arms.di.scope.ActivityScope;
import javax.inject.Inject;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableModeContract;
/**
* ================================================
* Description:
* <p>
* Created by MVPArmsTemplate on 04/08/2021 14:08
* <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
* <a href="https://github.com/JessYanCoding">Follow me</a>
* <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
* <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
@ActivityScope
public class TableModeModel extends BaseModel implements TableModeContract.Model{
@Inject
Gson mGson;
@Inject
Application mApplication;
@Inject
public TableModeModel(IRepositoryManager repositoryManager) {
super(repositoryManager);
}
@Override
public void onDestroy() {
super.onDestroy();
this.mGson = null;
this.mApplication = null;
}
}
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/BaseOrderPresenter.java
package com.gingersoft.gsa.cloud.table.mvp.presenter;
package com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand;
import android.app.Activity;
import android.app.Application;
......@@ -39,9 +39,8 @@ import com.gingersoft.gsa.cloud.order.order.TakeawayOrder;
import com.gingersoft.gsa.cloud.table.mvp.contract.BaseOrderContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.AddOrderRequest;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.CreateOrderRequest;
import com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand.MealStandPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealBillActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BillItemAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.SelectMealAdapter;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
......@@ -68,7 +67,6 @@ import io.reactivex.functions.Consumer;
import io.reactivex.functions.Function;
import io.reactivex.schedulers.Schedulers;
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
import okhttp3.FormBody;
import okhttp3.RequestBody;
......@@ -99,7 +97,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
private Activity IActivity;
private MealStandActivity mMealStandActivity;
private OrderContentActivity mOrderContentActivity;
private MealBillActivity mOrderContentActivity;
private MealStandPresenter mMealStandPresenter;
/**
......@@ -168,8 +166,8 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
if (IActivity instanceof MealStandActivity) {
mMealStandActivity = (MealStandActivity) IActivity;
} else if (IActivity instanceof OrderContentActivity) {
mOrderContentActivity = (OrderContentActivity) IActivity;
} else if (IActivity instanceof MealBillActivity) {
mOrderContentActivity = (MealBillActivity) IActivity;
}
if (this instanceof MealStandPresenter) {
......@@ -468,7 +466,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
String title = null;
if (IActivity instanceof MealStandActivity) {
title = "掃描會員碼";
} else if (IActivity instanceof OrderContentActivity) {
} else if (IActivity instanceof MealBillActivity) {
title = "掃描優惠券碼";
}
CC.obtainBuilder(ComponentName.COMPONENT_SCAN)
......@@ -484,13 +482,13 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
@Override
public void onRequestPermissionFailure(List<String> permissions) {
DeviceUtils.startSetting(IActivity);
mRootView.showMessage(LanguageUtils.get_language_system(IActivity, "please.open.camera.permissions", "請前往設置開放照相機權限"));
mRootView.showMessage(LanguageUtils.get_language_system( "please.open.camera.permissions", "請前往設置開放照相機權限"));
}
@Override
public void onRequestPermissionFailureWithAskNeverAgain(List<String> permissions) {
DeviceUtils.startSetting(IActivity);
mRootView.showMessage(LanguageUtils.get_language_system(IActivity, "please.open.camera.permissions", "請前往設置開放照相機權限"));
mRootView.showMessage(LanguageUtils.get_language_system( "please.open.camera.permissions", "請前往設置開放照相機權限"));
}
}, new RxPermissions(IActivity), mErrorHandler);
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/FineChildAllPresenter.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/MealFineAllPresenter.java
......@@ -14,10 +14,10 @@ import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.order.order.DoshokuOrder;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineChildAllContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineAllContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.SoldoutCtrFood;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity2;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealStandActivity2;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FineItemOneAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FineItemTwoAdapter;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
......@@ -35,12 +35,9 @@ import java.util.List;
import javax.inject.Inject;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriberOfFlowable;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity.MODIFIER_TYPE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealSoldoutActivity.MODIFIER_TYPE;
/**
......@@ -56,7 +53,7 @@ import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity
* ================================================
*/
@FragmentScope
public class FineChildAllPresenter extends BasePresenter<FineChildAllContract.Model, FineChildAllContract.View> {
public class MealFineAllPresenter extends BasePresenter<MealFineAllContract.Model, MealFineAllContract.View> {
@Inject
RxErrorHandler mErrorHandler;
@Inject
......@@ -83,7 +80,7 @@ public class FineChildAllPresenter extends BasePresenter<FineChildAllContract.Mo
private Activity IActivity;
@Inject
public FineChildAllPresenter(FineChildAllContract.Model model, FineChildAllContract.View rootView) {
public MealFineAllPresenter(MealFineAllContract.Model model, MealFineAllContract.View rootView) {
super(model, rootView);
this.IActivity = (Activity) rootView.getCurrentActivity();
}
......@@ -164,7 +161,7 @@ public class FineChildAllPresenter extends BasePresenter<FineChildAllContract.Mo
isSoldout = Integer.parseInt(OR_Qty) <= Qty;
}
if (isSoldout) {
String msg = LanguageUtils.get_language_system(mApplication, "meal.Qty.short", "[" + datasBean.getModifierName() + "]數量不足");
String msg = LanguageUtils.get_language_system( "meal.Qty.short", "[" + datasBean.getModifierName() + "]數量不足");
CommonTipDialog.showSurpisedDialog(IActivity, msg, null, null, null, null, null);
} else {
EventBus.getDefault().post(datasBean, MealConstant.ADD_FOOD_MODIFIER);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/FineChildOneselfPresenter.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/MealFineOneselfPresenter.java
......@@ -7,13 +7,11 @@ import android.text.TextUtils;
import com.gingersoft.gsa.cloud.common.rxjava.ErrorHandleSingleSubscriber;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.database.bean.ComboItem;
import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineChildOneselfContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineOneselfContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.SoldoutCtrFood;
import com.gingersoft.gsa.cloud.table.mvp.presenter.SoldoutCtrlPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealSoldoutActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.ComboAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.ModifierAdapter;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
......@@ -31,8 +29,8 @@ import javax.inject.Inject;
import io.reactivex.disposables.Disposable;
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity.FOOD_TYPE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity.MODIFIER_TYPE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealSoldoutActivity.FOOD_TYPE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealSoldoutActivity.MODIFIER_TYPE;
/**
......@@ -48,7 +46,7 @@ import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity
* ================================================
*/
@FragmentScope
public class FineChildOneselfPresenter extends BasePresenter<FineChildOneselfContract.Model, FineChildOneselfContract.View> {
public class MealFineOneselfPresenter extends BasePresenter<MealFineOneselfContract.Model, MealFineOneselfContract.View> {
@Inject
RxErrorHandler mErrorHandler;
@Inject
......@@ -67,12 +65,12 @@ public class FineChildOneselfPresenter extends BasePresenter<FineChildOneselfCon
//所有沽清数据
private List<SoldoutCtrFood> mCurrentSoldoutFoodList_Full = null;
private SoldoutCtrlActivity IActivity;
private MealSoldoutActivity IActivity;
@Inject
public FineChildOneselfPresenter(FineChildOneselfContract.Model model, FineChildOneselfContract.View rootView) {
public MealFineOneselfPresenter(MealFineOneselfContract.Model model, MealFineOneselfContract.View rootView) {
super(model, rootView);
this.IActivity = (SoldoutCtrlActivity) rootView.getCurrentActivity();
this.IActivity = (MealSoldoutActivity) rootView.getCurrentActivity();
}
@Override
......@@ -145,16 +143,16 @@ public class FineChildOneselfPresenter extends BasePresenter<FineChildOneselfCon
isStopOpeart = true;
if (datasBean.getInvisible() == 2) {
//恢復暫停數量
String msg = LanguageUtils.get_language_system(IActivity, "whether.recover", "是否恢復[") + datasBean.getName() + "]";
String msg = LanguageUtils.get_language_system( "whether.recover", "是否恢復[") + datasBean.getName() + "]";
Class[] parameterTypes = {Long.class, int.class, int.class};
Object[] parameters = {datasBean.getId(), 2, 0};
CommonTipDialog.showDoubtDialog(IActivity, msg, SoldoutCtrlPresenter.class, IActivity.getSoldoutCtrlPresenter(), "updateInvisible", parameterTypes, parameters);
CommonTipDialog.showDoubtDialog(IActivity, msg, MealSoldoutPresenter.class, IActivity.getSoldoutCtrlPresenter(), "updateInvisible", parameterTypes, parameters);
} else {
//暂停或者售罄直接提示恢复
String msg = LanguageUtils.get_language_system(IActivity, "whether.recover", "是否恢復[") + datasBean.getName() + "]";
String msg = LanguageUtils.get_language_system( "whether.recover", "是否恢復[") + datasBean.getName() + "]";
Class[] parameterTypes = {long.class};
Object[] parameters = {csf.getId()};
CommonTipDialog.showDoubtDialog(IActivity, msg, SoldoutCtrlPresenter.class, IActivity.getSoldoutCtrlPresenter(), "restoreSoldoutCtrl", parameterTypes, parameters);
CommonTipDialog.showDoubtDialog(IActivity, msg, MealSoldoutPresenter.class, IActivity.getSoldoutCtrlPresenter(), "restoreSoldoutCtrl", parameterTypes, parameters);
}
break;
}
......@@ -174,15 +172,15 @@ public class FineChildOneselfPresenter extends BasePresenter<FineChildOneselfCon
isStopOpeart = true;
if (datasBean.getInvisible() == 2) {
//恢復暫停數量
String msg = LanguageUtils.get_language_system(IActivity, "whether.recover", "是否恢復[") + datasBean.getModifierName() + "]";
String msg = LanguageUtils.get_language_system( "whether.recover", "是否恢復[") + datasBean.getModifierName() + "]";
Class[] parameterTypes = {Long.class, int.class, int.class};
Object[] parameters = {datasBean.getMid(), 3, 0};
CommonTipDialog.showDoubtDialog(IActivity, msg, SoldoutCtrlPresenter.class, IActivity.getSoldoutCtrlPresenter(), "updateInvisible", parameterTypes, parameters);
CommonTipDialog.showDoubtDialog(IActivity, msg, MealSoldoutPresenter.class, IActivity.getSoldoutCtrlPresenter(), "updateInvisible", parameterTypes, parameters);
} else {
String msg = LanguageUtils.get_language_system(IActivity, "whether.recover", "是否恢復[") + datasBean.getModifierName() + "]";
String msg = LanguageUtils.get_language_system( "whether.recover", "是否恢復[") + datasBean.getModifierName() + "]";
Class[] parameterTypes = {long.class};
Object[] parameters = {csf.getId()};
CommonTipDialog.showDoubtDialog(IActivity, msg, SoldoutCtrlPresenter.class, IActivity.getSoldoutCtrlPresenter(), "restoreSoldoutCtrl", parameterTypes, parameters);
CommonTipDialog.showDoubtDialog(IActivity, msg, MealSoldoutPresenter.class, IActivity.getSoldoutCtrlPresenter(), "restoreSoldoutCtrl", parameterTypes, parameters);
}
break;
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/FinePresenter.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/MealFinePresenter.java
......@@ -2,6 +2,7 @@ package com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand;
import android.app.Application;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealFineContract;
import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.mvp.BasePresenter;
......@@ -11,8 +12,6 @@ import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import javax.inject.Inject;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineContract;
/**
* ================================================
......@@ -27,7 +26,7 @@ import com.gingersoft.gsa.cloud.table.mvp.contract.FineContract;
* ================================================
*/
@FragmentScope
public class FinePresenter extends BasePresenter<FineContract.Model, FineContract.View> {
public class MealFinePresenter extends BasePresenter<MealFineContract.Model, MealFineContract.View> {
@Inject
RxErrorHandler mErrorHandler;
@Inject
......@@ -38,7 +37,7 @@ public class FinePresenter extends BasePresenter<FineContract.Model, FineContrac
AppManager mAppManager;
@Inject
public FinePresenter(FineContract.Model model, FineContract.View rootView) {
public MealFinePresenter(MealFineContract.Model model, MealFineContract.View rootView) {
super(model, rootView);
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/MealPayPresenter.java
package com.gingersoft.gsa.cloud.table.mvp.presenter;
package com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand;
import android.app.Application;
import android.text.TextUtils;
......@@ -17,9 +17,9 @@ import com.gingersoft.gsa.cloud.order.bean.request.MealOrderPayRequest;
import com.gingersoft.gsa.cloud.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.pay.bean.PayMethod;
import com.gingersoft.gsa.cloud.pay.contract.PayMethodContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealPayContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderPayResponse;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealPayActivity;
import com.gingersoft.gsa.cloud.ui.view.OrderPayView;
import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.http.imageloader.ImageLoader;
......@@ -34,7 +34,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull;
import io.reactivex.schedulers.Schedulers;
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
import okhttp3.MediaType;
import okhttp3.RequestBody;
......@@ -52,7 +51,7 @@ import okhttp3.RequestBody;
* ================================================
*/
@ActivityScope
public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model, OrderPayContract.View> {
public class MealPayPresenter extends BaseOrderPresenter2<MealPayContract.Model, MealPayContract.View> {
@Inject
RxErrorHandler mErrorHandler;
@Inject
......@@ -62,7 +61,7 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
@Inject
AppManager mAppManager;
private OrderPayActivity IActivity;
private MealPayActivity IActivity;
private List<PayMethod> mBillMoneyList;
/**
......@@ -74,9 +73,9 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
@Inject
public OrderPayPresenter(OrderPayContract.Model model, OrderPayContract.View rootView) {
public MealPayPresenter(MealPayContract.Model model, MealPayContract.View rootView) {
super(model, rootView);
this.IActivity = (OrderPayActivity) rootView;
this.IActivity = (MealPayActivity) rootView;
}
@Override
......@@ -97,8 +96,8 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
}
public void initAdapter() {
if (mSelectMealAdapter != null) {
mRootView.setFoodAdapter(mSelectMealAdapter);
if (mMealCartAdapter != null) {
mRootView.setFoodAdapter(mMealCartAdapter);
}
if (mBillItemAdapter != null) {
mRootView.setOrderDetailAdapter(mBillItemAdapter);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/MealStandPresenter.java
......@@ -43,8 +43,7 @@ import com.gingersoft.gsa.cloud.table.mvp.model.bean.SoldoutCtrFood;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.AddOrderRequest;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.CreateOrderRequest;
import com.gingersoft.gsa.cloud.table.mvp.action.discount.MealDiscountAction;
import com.gingersoft.gsa.cloud.table.mvp.presenter.BaseOrderPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.ComboAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.DiscountAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FoodAdapter;
......@@ -81,15 +80,14 @@ 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;
import me.yokeyword.fragmentation.ISupportFragment;
import okhttp3.FormBody;
import okhttp3.MediaType;
import okhttp3.RequestBody;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity.FOOD_GROUP_TYPE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity.FOOD_TYPE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity.MODIFIER_TYPE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealSoldoutActivity.FOOD_GROUP_TYPE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealSoldoutActivity.FOOD_TYPE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealSoldoutActivity.MODIFIER_TYPE;
/**
......@@ -1600,7 +1598,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
String User_Qty = foodBean.getCurrentMaxNumber();
if (!TextUtils.isEmpty(User_Qty)) {
String msg = "[" + foodBean.getFoodName() + "]" + LanguageUtils.get_language_system(IActivity, "Comm.pause", "已暫停");
String msg = "[" + foodBean.getFoodName() + "]" + LanguageUtils.get_language_system( "Comm.pause", "已暫停");
CommonTipDialog.showSurpisedDialog(IActivity, msg, null, null, null, null, null);
return false;
}
......@@ -1610,7 +1608,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
private boolean foodConditionFilter(Food foodBean) {
long Invisible = foodBean.getInvisible();
if (Invisible == 2) {
String msg = "[" + foodBean.getFoodName() + "]" + LanguageUtils.get_language_system(IActivity, "Comm.pause", "已暫停");
String msg = "[" + foodBean.getFoodName() + "]" + LanguageUtils.get_language_system( "Comm.pause", "已暫停");
CommonTipDialog.showSurpisedDialog(IActivity, msg, null, null, null, null, null);
return false;
}
......@@ -1631,7 +1629,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
private boolean comboConditionFilter(ComboItem comboItem) {
long Invisible = comboItem.getInvisible();
if (Invisible == 2) {
String msg = "[" + comboItem.getName() + "]" + LanguageUtils.get_language_system(IActivity, "Comm.pause", "已暫停");
String msg = "[" + comboItem.getName() + "]" + LanguageUtils.get_language_system( "Comm.pause", "已暫停");
CommonTipDialog.showSurpisedDialog(IActivity, msg, null, null, null, null, null);
return false;
}
......@@ -1664,7 +1662,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
if (memberInfo == null) {
//当前食品需要会员积分
if (pointsRedeem > 0) {
mRootView.showMessage(LanguageUtils.get_language_system(mApplication, "unused_members_can.not.order.food", "積分食品，未使用會員，不可點選") + "\"" + foodName + "\"");
mRootView.showMessage(LanguageUtils.get_language_system( "unused_members_can.not.order.food", "積分食品，未使用會員，不可點選") + "\"" + foodName + "\"");
return false;
}
} else {
......@@ -1673,7 +1671,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
//此時call pointsredeem=5 的食物 不給過
//點選pointsadd=5的食物 0+5 是正數 這個給過
if (pointsRedeem > 0 && memberInfo.getMemberPoint() < pointsRedeem) {
mRootView.showMessage(LanguageUtils.get_language_system(mApplication, "insufficient.points.can.not.selected", "積分食品，會員積分不足，不可點選") + "\"" + foodName + "\"");
mRootView.showMessage(LanguageUtils.get_language_system( "insufficient.points.can.not.selected", "積分食品，會員積分不足，不可點選") + "\"" + foodName + "\"");
return false;
}
}
......@@ -1683,7 +1681,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
private boolean modifierConditionFilter(Modifier modifier) {
long Invisible = modifier.getInvisible();
if (Invisible == 2) {
String msg = "[" + modifier.getName() + "]" + LanguageUtils.get_language_system(IActivity, "Comm.pause", "已暫停");
String msg = "[" + modifier.getName() + "]" + LanguageUtils.get_language_system( "Comm.pause", "已暫停");
CommonTipDialog.showSurpisedDialog(IActivity, msg, null, null, null, null, null);
return false;
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/MealStandPresenter2.java
package com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand;
import android.app.Application;
import android.text.TextUtils;
import android.util.SparseArray;
import android.view.View;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans;
import com.gingersoft.gsa.cloud.common.constans.MealConstant;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.component.ComponentName;
import com.gingersoft.gsa.cloud.database.bean.ComboItem;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.bean.FoodCombo;
import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
import com.gingersoft.gsa.cloud.order.bean.request.DeleteOrderRequest;
import com.gingersoft.gsa.cloud.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.order.order.BaseOrder;
import com.gingersoft.gsa.cloud.order.order.DoshokuOrder;
import com.gingersoft.gsa.cloud.print.bean.PrintContent;
import com.gingersoft.gsa.cloud.print.bean.adapter.PrintContentAdapter;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.action.discount.MealDiscountAction;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract2;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodReason;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.SoldoutCtrFood;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.AddOrderRequest;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.CreateOrderRequest;
import com.gingersoft.gsa.cloud.table.mvp.presenter.BaseOrderPresenter;
import com.gingersoft.gsa.cloud.table.mvp.presenter.BaseOrderPresenter2;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity2;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.ComboAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.DiscountAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FoodAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FoodGroupAdapter;
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.table.mvp.ui.widget.CancelFoodDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
import com.google.gson.internal.LinkedTreeMap;
import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager;
import com.jess.arms.utils.RxLifecycleUtils;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import org.simple.eventbus.Subscriber;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.Observer;
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;
import okhttp3.FormBody;
import okhttp3.MediaType;
import okhttp3.RequestBody;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity.FOOD_GROUP_TYPE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity.FOOD_TYPE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity.MODIFIER_TYPE;
/**
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/RiceponMemberDialogPresenter.java
......@@ -2,35 +2,25 @@ package com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand;
import android.app.Application;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.rxjava.ErrorHandleSingleSubscriber;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.component.ComponentName;
import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem;
import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.http.imageloader.ImageLoader;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull;
import io.reactivex.schedulers.Schedulers;
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
import javax.inject.Inject;
import com.gingersoft.gsa.cloud.table.mvp.contract.RiceponMemberDialogContract;
import com.jess.arms.utils.DeviceUtils;
import com.jess.arms.utils.PermissionUtil;
import com.jess.arms.utils.RxLifecycleUtils;
import com.tbruyelle.rxpermissions2.RxPermissions;
import java.util.ArrayList;
import java.util.List;
......@@ -82,7 +72,7 @@ public class RiceponMemberDialogPresenter extends BasePresenter<RiceponMemberDia
public void onSuccess(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
MemberInfo memberInfo = JsonUtils.parseObject(info.getData(), MemberInfo.class);
MemberInfo memberInfo = GsonUtils.GsonToBean(info.getData(), MemberInfo.class);
if (memberInfo != null && memberInfo.getId() != 0) {
mRootView.returnMemberInfo(memberInfo);
} else {
......@@ -98,4 +88,13 @@ public class RiceponMemberDialogPresenter extends BasePresenter<RiceponMemberDia
});
}
public List<SectionTextItem> getMemberInfoItem(MemberInfo memberInfo) {
List<SectionTextItem> textItems = new ArrayList<>();
textItems.add(new SectionTextItem("會員號碼: " + memberInfo.getMemberNo()));
textItems.add(new SectionTextItem("會員電話: " + memberInfo.getPhone()));
textItems.add(new SectionTextItem("會員名稱: " + memberInfo.getMemberName()));
textItems.add(new SectionTextItem("會員等級: " + memberInfo.getLevelName()));
textItems.add(new SectionTextItem("積分: " + memberInfo.getMemberPoint()));
return textItems;
}
}
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/orderManager/AllOrderPresenter.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/order/AllOrderPresenter.java
package com.gingersoft.gsa.cloud.table.mvp.presenter.orderManager;
package com.gingersoft.gsa.cloud.table.mvp.presenter.order;
import android.app.Application;
import android.content.Context;
import android.content.Intent;
import com.gingersoft.gsa.cloud.pay.bean.PosActionStatusExceptionParam;
import com.gingersoft.gsa.cloud.pay.device.pos.base.fragment.PosActionStatusExceptionFragment;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.contract.AllOrderContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderDetailActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.order.OrderCenterActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.order.OrderDetailActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderCenterAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllOrderFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.order.AllOrderFragment;
import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager;
......@@ -98,19 +95,19 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
@Override
public void onReloadExceptionStatus(OrderManagerResponse orderBean, String txnId) {
PosActionStatusExceptionFragment statusExceptionFragment = IActivity.findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
statusExceptionParam.setTxnId(txnId);
statusExceptionParam.setAmount(orderBean.getTotalAmount());
statusExceptionParam.setOrderId(orderBean.getId());
statusExceptionParam.setOrderNo(orderBean.getOrderNo());
statusExceptionParam.setPayMethodName(orderBean.getPayNames());
statusExceptionParam.setPosAction(orderBean.getPosActionByMatterId());
IActivity.loadRootFragment(R.id.fl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
}else {
IActivity.start(statusExceptionFragment);
}
// PosMatterExceptionFragment statusExceptionFragment = IActivity.findFragment(PosMatterExceptionFragment.class);
// if (statusExceptionFragment == null) {
// PosMatterExceptionParam statusExceptionParam = new PosMatterExceptionParam();
// statusExceptionParam.setTxnId(txnId);
// statusExceptionParam.setAmount(orderBean.getTotalAmount());
// statusExceptionParam.setOrderId(orderBean.getId());
// statusExceptionParam.setOrderNo(orderBean.getOrderNo());
// statusExceptionParam.setPayMethodName(orderBean.getPayNames());
// statusExceptionParam.setPosAction(orderBean.getPosActionByMatterId());
// IActivity.loadRootFragment(R.id.fl_container, PosMatterExceptionFragment.newInstance(statusExceptionParam));
// }else {
// IActivity.start(statusExceptionFragment);
// }
}
});
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/orderManager/OrderCenterPresenter.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/order/OrderCenterPresenter.java
package com.gingersoft.gsa.cloud.table.mvp.presenter.orderManager;
package com.gingersoft.gsa.cloud.table.mvp.presenter.order;
import android.app.Application;
......@@ -6,16 +6,11 @@ import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.rxjava.ErrorHandleSingleSubscriber;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.order.contract.OrderStatusContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderCenterContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity;
import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager;
import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.utils.RxLifecycleUtils;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
......@@ -23,12 +18,9 @@ import java.util.List;
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;
/**
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/orderManager/OrderDetailPresenter.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/order/OrderDetailPresenter.java
package com.gingersoft.gsa.cloud.table.mvp.presenter.orderManager;
package com.gingersoft.gsa.cloud.table.mvp.presenter.order;
import android.app.Application;
......@@ -10,7 +10,7 @@ import com.gingersoft.gsa.cloud.order.bean.response.OrderDiscountResponse;
import com.gingersoft.gsa.cloud.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.pay.bean.PayMethod;
import com.gingersoft.gsa.cloud.pay.contract.PayMethodContract;
import com.gingersoft.gsa.cloud.pay.device.pos.base.fragment.PosActionStatusExceptionFragment;
import com.gingersoft.gsa.cloud.pay.device.pos.base.lifecycle.fragment.PosMatterFragment;
import com.gingersoft.gsa.cloud.pay.util.PayMethodUtils;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderDetailContract;
......@@ -32,7 +32,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull;
import io.reactivex.schedulers.Schedulers;
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
/**
......@@ -114,7 +113,7 @@ public class OrderDetailPresenter extends BaseOrderConterPresenter<OrderDetailCo
OrderManagerResponse orderDetailItem = JsonUtils.parseObject(JsonUtils.toJson(result.getData()), OrderManagerResponse.class);
mRootView.returnOrderDetail(orderDetailItem);
//刷新訂單列表
EventBus.getDefault().post(true, PosActionStatusExceptionFragment.REFREAFSH_ORDER_EVENT);
EventBus.getDefault().post(true, PosMatterFragment.REFREAFSH_ORDER_EVENT);
} else {
mRootView.showMessage("獲取賬單失敗");
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/InputTablePresenter.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/table/InputTablePresenter.java
package com.gingersoft.gsa.cloud.table.mvp.presenter;
package com.gingersoft.gsa.cloud.table.mvp.presenter.table;
import android.app.Application;
import com.gingersoft.gsa.cloud.table.mvp.contract.InputTableContract;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/RegionTablePresenter.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/table/RegionTablePresenter.java
package com.gingersoft.gsa.cloud.table.mvp.presenter;
package com.gingersoft.gsa.cloud.table.mvp.presenter.table;
import android.app.Activity;
import android.app.Application;
......@@ -6,11 +6,11 @@ import android.content.Context;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.utils.VibratorUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.RegionTableContract;
import com.gingersoft.gsa.cloud.table.mvp.model.constant.TableActionConstant;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.constant.TableActionConstant;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealBillActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.TableAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.RegionTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.table.RegionTableFragment;
import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager;
......@@ -49,7 +49,7 @@ public class RegionTablePresenter extends BasePresenter<RegionTableContract.Mode
AppManager mAppManager;
private TableActivity mTableActivity;
private OrderContentActivity mOrderContentActivity;
private MealBillActivity mOrderContentActivity;
private RegionTableFragment IView;
......@@ -65,8 +65,8 @@ public class RegionTablePresenter extends BasePresenter<RegionTableContract.Mode
Activity activity = IView.getCurrentActivity();
if (activity instanceof TableActivity) {
mTableActivity = (TableActivity) activity;
} else if (activity instanceof OrderContentActivity) {
mOrderContentActivity = (OrderContentActivity) activity;
} else if (activity instanceof MealBillActivity) {
mOrderContentActivity = (MealBillActivity) activity;
}
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/table/TableModePresenter.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.presenter.table;
import android.app.Application;
import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.http.imageloader.ImageLoader;
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import javax.inject.Inject;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableModeContract;
/**
* ================================================
* Description:
* <p>
* Created by MVPArmsTemplate on 04/08/2021 14:08
* <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
* <a href="https://github.com/JessYanCoding">Follow me</a>
* <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
* <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
@ActivityScope
public class TableModePresenter extends BasePresenter<TableModeContract.Model, TableModeContract.View> {
@Inject
RxErrorHandler mErrorHandler;
@Inject
Application mApplication;
@Inject
ImageLoader mImageLoader;
@Inject
AppManager mAppManager;
@Inject
public TableModePresenter (TableModeContract.Model model, TableModeContract.View rootView) {
super(model, rootView);
}
@Override
public void onDestroy() {
super.onDestroy();
this.mErrorHandler = null;
this.mAppManager = null;
this.mImageLoader = null;
this.mApplication = null;
}
}
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/table/TablePresenter.java
package com.gingersoft.gsa.cloud.table.mvp.presenter;
package com.gingersoft.gsa.cloud.table.mvp.presenter.table;
import android.app.Activity;
import android.app.Application;
......@@ -30,15 +30,13 @@ import com.gingersoft.gsa.cloud.order.order.BaseOrder;
import com.gingersoft.gsa.cloud.order.order.DoshokuOrder;
import com.gingersoft.gsa.cloud.pay.PaymentCommand;
import com.gingersoft.gsa.cloud.pay.RequestParms;
import com.gingersoft.gsa.cloud.pay.ResultCallback;
import com.gingersoft.gsa.cloud.pay.bean.PayMethod;
import com.gingersoft.gsa.cloud.pay.PayAction;
import com.gingersoft.gsa.cloud.table.FunctionTable;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodSummary;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.constant.SkyOrderConstant;
import com.gingersoft.gsa.cloud.table.mvp.constant.SkyOrderConstant;
import com.gingersoft.gsa.cloud.table.mvp.action.table.MoveTableAction;
import com.gingersoft.gsa.cloud.table.mvp.action.OnNetworkCallbackListener;
import com.gingersoft.gsa.cloud.table.mvp.action.table.PrintServingPaperAction;
......@@ -48,7 +46,7 @@ import com.gingersoft.gsa.cloud.table.mvp.action.table.ResetTableAction;
import com.gingersoft.gsa.cloud.table.mvp.action.table.SplitTableAction;
import com.gingersoft.gsa.cloud.table.mvp.action.table.TableAction;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BottomFunctionAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.SplitTableDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog;
......@@ -171,12 +169,6 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}
}
// @OnLifecycleEvent(Lifecycle.Event.ON_CREATE)
// void onCreate() {
// XFunctionManager.inJect(this, FunctionTable.class);
// startTablePolling();
// }
@Inject
public TablePresenter(TableContract.Model model, TableContract.View rootView) {
super(model, rootView);
......@@ -489,46 +481,14 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
if (!TextUtils.isEmpty(txnId)) {
//有支付異常事項需要處理
RequestParms parms = RequestParms.builder()
.action(PayAction.RETRIEVAL)
.action(PayAction.SALE)
.txnId(txnId)
.resultCallback(new ResultCallback() {
@Override
public void onSuccess() {
}
@Override
public void onFailure(Throwable t) {
}
@Override
public void fakePayment() {
}
@Override
public void hybridPayment(List<PayMethod> payMethods) {
}
})
.orderId(orderBean.getId())
.payMoney(orderBean.getTotalAmount())
.payMethodName(orderBean.getPayName())
.build();
PaymentCommand.newInstance().matter(IActivity.getSupportFragmentManager(), parms);
// PosActionStatusExceptionFragment statusExceptionFragment = IActivity.findFragment(PosActionStatusExceptionFragment.class);
// if (statusExceptionFragment == null) {
// PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
// statusExceptionParam.setTxnId(orderBean.getTxnId());
// statusExceptionParam.setAmount(orderBean.getTotalAmount());
// statusExceptionParam.setOrderId(orderBean.getId());
// statusExceptionParam.setOrderNo(orderBean.getOrderNo());
// statusExceptionParam.setPayMethodName(orderBean.getPayName());
// statusExceptionParam.setPosAction(PayAction.RETRIEVAL);
// IActivity.loadRootFragment(R.id.fl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
// } else {
// IActivity.start(statusExceptionFragment);
// }
// return;
return;
}
if (respose.getData().getCreateTime() != null && openTableBean != null) {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderContentActivity.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/meal/MealBillActivity.java
package com.gingersoft.gsa.cloud.table.mvp.ui.activity;
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal;
import android.app.Activity;
import android.content.Intent;
......@@ -22,7 +22,6 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager2.widget.ViewPager2;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
......@@ -39,16 +38,15 @@ import com.gingersoft.gsa.cloud.order.order.BaseOrder;
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.DaggerOrderContentComponent;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
import com.gingersoft.gsa.cloud.table.di.component.DaggerMealBillComponent;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealBillContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.event.InitTableEvent;
import com.gingersoft.gsa.cloud.table.mvp.model.constant.OrderConentActionConstant;
import com.gingersoft.gsa.cloud.table.mvp.model.constant.TableActionConstant;
import com.gingersoft.gsa.cloud.table.mvp.presenter.OrderContentPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.RegionTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.InputTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.constant.OrderConentActionConstant;
import com.gingersoft.gsa.cloud.table.mvp.constant.TableActionConstant;
import com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand.MealBillPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.table.RegionTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.table.InputTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.ChooseNumberDialog;
import com.gingersoft.gsa.cloud.ui.adapter.IQMUIFragmentPagerAdapter;
import com.gingersoft.gsa.cloud.ui.adapter.ViewPager2Adapter;
import com.gingersoft.gsa.cloud.ui.utils.QMUITabSegmentUtils;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
......@@ -60,13 +58,11 @@ import com.jess.arms.integration.AppManager;
import com.jess.arms.utils.ArmsUtils;
import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
import com.qmuiteam.qmui.alpha.QMUIAlphaTextView;
import com.qmuiteam.qmui.arch.QMUIFragmentPagerAdapter;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.popup.QMUIPopup;
import com.qmuiteam.qmui.widget.popup.QMUIPopups;
import com.qmuiteam.qmui.widget.tab.QMUITab;
import com.qmuiteam.qmui.widget.tab.QMUITabBuilder;
import com.qmuiteam.qmui.widget.tab.QMUITabIndicator;
import com.qmuiteam.qmui.widget.tab.QMUITabSegment;
import com.qmuiteam.qmui.widget.tab.QMUITabSegment2;
import com.qmuiteam.qmui.widget.tab.QMUITabView;
......@@ -75,8 +71,6 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
import org.simple.eventbus.EventBus;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
......@@ -87,8 +81,8 @@ import javax.inject.Inject;
import butterknife.BindView;
import butterknife.OnClick;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity.FUNCTION_ALL_TABLE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity.FUNCTION_STATE_TABLE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity.FUNCTION_ALL_TABLE;
import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.table.TableActivity.FUNCTION_STATE_TABLE;
import static com.jess.arms.utils.Preconditions.checkNotNull;
......@@ -104,7 +98,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
public class OrderContentActivity extends BaseFragmentActivity<OrderContentPresenter> implements OrderContentContract.View {
public class MealBillActivity extends BaseFragmentActivity<MealBillPresenter> implements MealBillContract.View {
@Inject
AppManager mAppManager;
......@@ -132,7 +126,6 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
@BindView(R2.id.rv_order_detail)
RecyclerView rv_order_detail;
@BindView(R2.id.btn_order_count)
Button btn_order_count;
@BindView(R2.id.tv_whole)
......@@ -142,15 +135,15 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
@BindView(R2.id.vs_transfer_food)
ViewStub vs_transfer_food;
private TextView tv_table_name, tv_show_popup;
private QMUITabSegment2 mTabSegment;
private ViewPager2 mContentViewPager;
public static final int BILL_CODE = 1002;
private ChooseNumberDialog chooseNumberDialog;
private TextView tv_table_name, tv_show_popup;
private QMUITabSegment2 mTabSegment;
private ViewPager2 mContentViewPager;
private InputTableFragment inputTableFragment;
private RegionTableFragment allTableFragment, stateTableFragment;
private String[] mTabList = {"編號", "全部", "狀態:全部"};
......@@ -181,7 +174,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
@Override
public void setupActivityComponent(@NonNull AppComponent appComponent) {
DaggerOrderContentComponent //如找不到该类,请编译一下项目
DaggerMealBillComponent //如找不到该类,请编译一下项目
.builder()
.appComponent(appComponent)
.view(this)
......@@ -204,7 +197,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
@Override
public int initView(@Nullable Bundle savedInstanceState) {
return R.layout.table_activity_order_content; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
return R.layout.meal_activity_bill; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
}
@Override
......@@ -242,8 +235,8 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
tvOrderNo.setVisibility(View.GONE);
} else {
TableBean.DataBean tableInfo = mDoshokuOrder.getOpenTableInfo();
// Date dd = mDoshokuOrder.getOpenTableTime();
// String openTime = String.format("%tH:%tM", dd, dd);
Date dd = mDoshokuOrder.getOpenTableTime();
String openTime = String.format("%tH:%tM", dd, dd);
String tableno;
if (tableInfo.getSplitStatus() != 0) {
tableno = tableInfo.getTableName().trim() + "-" + tableInfo.getTableNumber().trim();
......@@ -253,7 +246,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
btn_table.setText(tableno);
tvOrderNo.setText(String.format(getString(R.string.meal_order_number), DoshokuOrder.getInstance().getOrderNo()));
btn_people_num.setText(String.format(getString(R.string.meal_numberman_colon), tableInfo.getPerson()));
// tv_time.setText("時間:" + openTime);
tv_time.setText("時間:" + openTime);
tv_server_main.setText(UserContext.newInstance().getMemberName());
}
}
......@@ -436,9 +429,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
chooseNumberDialog = new ChooseNumberDialog(this);
chooseNumberDialog.builder();
chooseNumberDialog.setValueHint("請輸入人數");
// mInputNumberDialog2.setTitle(LanguageUtils.get_language_system(this, "Meal.Mannumber", "Number"));
// mInputNumberDialog2.setHeadLayoutVisibility(View.VISIBLE);
if (!isNeedCancel)
if (!isNeedCancel) {
chooseNumberDialog.setOnBackClickListener(new ChooseNumberDialog.OnBackClickListener() {
@Override
......@@ -446,21 +437,12 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
recordOperat(true);
}
});
int backPageBtnVisibility;
if (isNeedCancel) {
backPageBtnVisibility = View.GONE;
} else {
backPageBtnVisibility = View.VISIBLE;
}
// mInputNumberDialog2.setBackPageBtnVisibility(backPageBtnVisibility);
chooseNumberDialog.setOnClickListener(new ChooseNumberDialog.OnClickListener() {
@Override
public void onComfirmClick(String number) {
recordOperat(true);
//选择的人数大于0
// if (Integer.parseInt(number) > 0) {
// }
mPresenter.updateOrderPerson(number, btn_people_num);
}
......@@ -527,7 +509,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
@Override
public void showMessage(@NonNull String message) {
checkNotNull(message);
ArmsUtils.makeText(OrderContentActivity.this, message);
ArmsUtils.makeText(MealBillActivity.this, message);
}
@Override
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/meal/MealPayActivity.java
package com.gingersoft.gsa.cloud.table.mvp.ui.activity;
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal;
import android.content.Context;
import android.content.Intent;
......@@ -7,11 +7,9 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC;
import com.billy.cc.core.component.CCResult;
import com.billy.cc.core.component.IComponentCallback;
......@@ -44,10 +42,10 @@ import com.gingersoft.gsa.cloud.print.bean.PrintContent;
import com.gingersoft.gsa.cloud.print.bean.adapter.PrintContentAdapter;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.di.component.DaggerOrderPayComponent;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
import com.gingersoft.gsa.cloud.table.di.component.DaggerMealPayComponent;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealPayContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.event.InitTableEvent;
import com.gingersoft.gsa.cloud.table.mvp.presenter.OrderPayPresenter;
import com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand.MealPayPresenter;
import com.gingersoft.gsa.cloud.ui.view.OrderPayView;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.gyf.immersionbar.ImmersionBar;
......@@ -60,19 +58,15 @@ import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.xuexiang.rxutil2.rxjava.RxJavaUtils;
import org.simple.eventbus.EventBus;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import butterknife.BindView;
import butterknife.OnClick;
import butterknife.OnLongClick;
import io.reactivex.functions.Consumer;
import static com.jess.arms.utils.Preconditions.checkNotNull;
......@@ -88,7 +82,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
public class OrderPayActivity extends BaseFragmentActivity<OrderPayPresenter> implements OrderPayContract.View, View.OnLongClickListener {
public class MealPayActivity extends BaseFragmentActivity<MealPayPresenter> implements MealPayContract.View, View.OnLongClickListener {
@Inject
AppManager mAppManager;
......@@ -128,7 +122,7 @@ public class OrderPayActivity extends BaseFragmentActivity<OrderPayPresenter> im
private double memberPointRedeemCash = 0;
public static void startOrderPayActivityFormSale(Context context, String response) {
Intent intent = new Intent(context, OrderPayActivity.class);
Intent intent = new Intent(context, MealPayActivity.class);
intent.setAction("SALE_RESP");
intent.putExtra("SALE_DATA", response);
context.startActivity(intent);
......@@ -136,7 +130,7 @@ public class OrderPayActivity extends BaseFragmentActivity<OrderPayPresenter> im
@Override
public void setupActivityComponent(@NonNull AppComponent appComponent) {
DaggerOrderPayComponent //如找不到该类,请编译一下项目
DaggerMealPayComponent //如找不到该类,请编译一下项目
.builder()
.appComponent(appComponent)
.view(this)
......@@ -151,7 +145,7 @@ public class OrderPayActivity extends BaseFragmentActivity<OrderPayPresenter> im
@Override
public int initView(@Nullable Bundle savedInstanceState) {
return R.layout.table_activity_order_pay; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
return R.layout.meal_activity_pay; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
}
@Override
......@@ -206,8 +200,8 @@ public class OrderPayActivity extends BaseFragmentActivity<OrderPayPresenter> im
TableBean.DataBean tableInfo = DoshokuOrder.getInstance().getOpenTableInfo();
// Date dd = DoshokuOrder.getInstance().getOpenTableTime();
// String openTime = String.format("%tH:%tM", dd, dd);
Date dd = DoshokuOrder.getInstance().getOpenTableTime();
String openTime = String.format("%tH:%tM", dd, dd);
String tableno = "";
if (tableInfo.getSplitStatus() != 0) {
......@@ -216,7 +210,7 @@ public class OrderPayActivity extends BaseFragmentActivity<OrderPayPresenter> im
tableno = tableInfo.getTableName();
}
btn_table.setText(tableno);
// tv_time.setText("時間:" + openTime);
tv_time.setText("時間:" + openTime);
btn_people_num.setText(tableInfo.getPerson() + "");
tv_server_main.setText(UserContext.newInstance().getMemberName());
......@@ -255,7 +249,7 @@ public class OrderPayActivity extends BaseFragmentActivity<OrderPayPresenter> im
String memberInfo;
String memberName = memberBean.getMemberName();
String LevelName1 = memberBean.getLevelName1();
memberInfo = LanguageUtils.get_language_system(this, "meal.info.member.name", "會員:") + memberName;
memberInfo = LanguageUtils.get_language_system( "meal.info.member.name", "會員:") + memberName;
memberIntegral = memberBean.getMemberPoint();
memberPointRedeemCash = memberBean.getPointRedeemCash();
//獲取積分支付抵扣金額
......@@ -341,7 +335,7 @@ public class OrderPayActivity extends BaseFragmentActivity<OrderPayPresenter> im
@Override
public void showMessage(@NonNull String message) {
checkNotNull(message);
ArmsUtils.makeText(OrderPayActivity.this, message);
ArmsUtils.makeText(MealPayActivity.this, message);
}
@Override
......@@ -479,7 +473,7 @@ public class OrderPayActivity extends BaseFragmentActivity<OrderPayPresenter> im
hideLoading();
mAppManager.killActivity("PrintActivity");
mAppManager.killActivity(MealStandActivity.class);
mAppManager.killActivity(OrderContentActivity.class);
mAppManager.killActivity(MealBillActivity.class);
killMyself();
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/meal/MealStandActivity.java
package com.gingersoft.gsa.cloud.table.mvp.ui.activity;
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal;
import android.app.Activity;
import android.content.Intent;
......@@ -68,7 +68,7 @@ import com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand.MealStandPresenter
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BaseFragmentAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FoodGroupAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.SelectMealAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.mealstand.FineChildAllFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.mealstand.MealFineAllFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.ChooseNumberDialog;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.CustomFoodDialog;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.UseMemberDialog;
......@@ -252,7 +252,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
@BindView(R2.id.tv_fine_type)
TextView tv_fine_type;
private FineChildAllFragment modMsgFineItemFragment, modSasteFineItemFragment;
private MealFineAllFragment modMsgFineItemFragment, modSasteFineItemFragment;
private ChooseNumberDialog mChooseNumberDialog;
private UseMemberDialog mUseMemberDialog;
......@@ -493,8 +493,8 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
FragmentManager fm = getSupportFragmentManager();
List<Fragment> fragmentList = new ArrayList<>();
// Fragment标签
modSasteFineItemFragment = FineChildAllFragment.newInstance();
modMsgFineItemFragment = FineChildAllFragment.newInstance();
modSasteFineItemFragment = MealFineAllFragment.newInstance();
modMsgFineItemFragment = MealFineAllFragment.newInstance();
fragmentList.add(modSasteFineItemFragment);
fragmentList.add(modMsgFineItemFragment);
// fragmentList.add(modCommFineItemFragment);
......@@ -810,7 +810,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
// });
} else if (id == R.id.tv_order_content) {
//如果打印成功會回調
Intent intent = new Intent(mContext, OrderContentActivity.class);
Intent intent = new Intent(mContext, MealBillActivity.class);
startActivityForResult(intent, ORDER_CONTENT_CODE);
} else if (id == R.id.tv_no_save_return) {
returnTableActivity(true);
......@@ -827,7 +827,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
}
} else if (id == R.id.btn_end) {
if (mPresenter.getDiscountFragment() != null) {
mPresenter.getDiscountFragment().pop();
mPresenter.getDiscountFragment().killMyself();
}
mPresenter.getSelectMealAdapter().setSelectedMode(SelectMealAdapter.SINGLE_SELECTED);
btn_delete.setVisibility(View.VISIBLE);
......@@ -900,7 +900,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
public void returnTableActivity(boolean initTable) {
if (mPresenter.hasNesOrderFoods()) {
//没有过重复下单提示且有未送单食品，提示用户
String tip = LanguageUtils.get_language_system(this, "food.not.delivered.tip", "有食品未送單, 確認離開?");
String tip = LanguageUtils.get_language_system( "food.not.delivered.tip", "有食品未送單, 確認離開?");
Class[] parameterTypes = {boolean.class};
Object[] parameters = {initTable};
CommonTipDialog.showSurpisedDialog(this, tip, MealStandActivity.class, this,
......@@ -968,7 +968,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
mChooseNumberDialog = new ChooseNumberDialog(this);
mChooseNumberDialog.builder();
mChooseNumberDialog.setValueHint("請輸入人數");
// mInputNumberDialog2.setTitle(LanguageUtils.get_language_system(this, "Meal.Mannumber", "Number"));
// mInputNumberDialog2.setTitle(LanguageUtils.get_language_system( "Meal.Mannumber", "Number"));
// mInputNumberDialog2.setHeadLayoutVisibility(View.VISIBLE);
if (!isNeedCancel)
mChooseNumberDialog.setOnBackClickListener(new ChooseNumberDialog.OnBackClickListener() {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity2.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/meal/MealStandActivity2.java
package com.gingersoft.gsa.cloud.table.mvp.ui.activity;
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal;
import android.app.Activity;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.SparseArray;
import android.view.View;
import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.Chronometer;
import android.widget.FrameLayout;
......@@ -17,35 +14,24 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans;
import com.gingersoft.gsa.cloud.common.constans.MealConstant;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.scan.ScanHelper;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.common.utils.VibratorUtils;
import com.gingersoft.gsa.cloud.component.ComponentName;
import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.order.order.BaseOrder;
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.DaggerMealStand2Component;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract2;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.event.InitTableEvent;
import com.gingersoft.gsa.cloud.table.mvp.presenter.mealstand.MealStandPresenter2;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.mealstand.SetMealFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.CustomFoodDialog;
import com.gingersoft.gsa.cloud.ui.recylcler.Indicator.PagerGridLayoutManager;
import com.gingersoft.gsa.cloud.ui.view.SearchKeyBoardView;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.gyf.immersionbar.ImmersionBar;
......@@ -56,10 +42,9 @@ import com.jess.arms.utils.ArmsUtils;
import org.simple.eventbus.EventBus;
import java.util.List;
import butterknife.BindView;
import butterknife.OnClick;
import me.yokeyword.fragmentation.ISupportFragment;
import static com.jess.arms.utils.Preconditions.checkNotNull;
......@@ -162,7 +147,7 @@ public class MealStandActivity2 extends BaseFragmentActivity<MealStandPresenter2
}
} else if (id == R.id.tv_order_content) {
//如果打印成功會回調
Intent intent = new Intent(mContext, OrderContentActivity.class);
Intent intent = new Intent(mContext, MealBillActivity.class);
startActivityForResult(intent, MealStandActivity2.ORDER_CONTENT_CODE);
} else if (id == R.id.tv_no_save_return) {
returnTableActivity(true);
......@@ -171,13 +156,14 @@ public class MealStandActivity2 extends BaseFragmentActivity<MealStandPresenter2
@Override
public void onBackPressedSupport() {
final ISupportFragment topFragment = getTopFragment();
returnTableActivity(true);
}
public void returnTableActivity(boolean initTable) {
if (mPresenter.hasNesOrderFoods()) {
//没有过重复下单提示且有未送单食品，提示用户
String tip = LanguageUtils.get_language_system(this, "food.not.delivered.tip", "有食品未送單, 確認離開?");
String tip = LanguageUtils.get_language_system( "food.not.delivered.tip", "有食品未送單, 確認離開?");
Class[] parameterTypes = {boolean.class};
Object[] parameters = {initTable};
CommonTipDialog.showSurpisedDialog(this, tip, MealStandActivity2.class, this,
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderCenterActivity.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/order/OrderCenterActivity.java
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager;
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.order;
import android.content.Intent;
import android.os.Build;
......@@ -14,12 +14,11 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager2.widget.ViewPager2;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.order.contract.OrderStatusContract;
import com.gingersoft.gsa.cloud.pay.device.pos.base.fragment.PosActionStatusExceptionFragment;
import com.gingersoft.gsa.cloud.pay.device.pos.base.lifecycle.fragment.PosMatterFragment;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.di.component.DaggerOrderCenterComponent;
......@@ -28,9 +27,8 @@ import com.gingersoft.gsa.cloud.table.mvp.action.order.RefundOrder;
import com.gingersoft.gsa.cloud.table.mvp.action.order.TipsOrder;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderCenterContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse;
import com.gingersoft.gsa.cloud.table.mvp.presenter.orderManager.OrderCenterPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllOrderFragment;
import com.gingersoft.gsa.cloud.ui.adapter.IQMUIFragmentPagerAdapter;
import com.gingersoft.gsa.cloud.table.mvp.presenter.order.OrderCenterPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.order.AllOrderFragment;
import com.gingersoft.gsa.cloud.ui.adapter.ViewPager2Adapter;
import com.gingersoft.gsa.cloud.ui.utils.QMUITabSegmentUtils;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
......@@ -38,13 +36,10 @@ import com.jess.arms.base.BaseFragmentActivity;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils;
import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
import com.qmuiteam.qmui.arch.QMUIFragmentPagerAdapter;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.util.QMUIResHelper;
import com.qmuiteam.qmui.widget.QMUITopBar;
import com.qmuiteam.qmui.widget.tab.QMUITab;
import com.qmuiteam.qmui.widget.tab.QMUITabBuilder;
import com.qmuiteam.qmui.widget.tab.QMUITabIndicator;
import com.qmuiteam.qmui.widget.tab.QMUITabSegment;
import com.qmuiteam.qmui.widget.tab.QMUITabSegment2;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
......@@ -52,8 +47,6 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
import org.simple.eventbus.Subscriber;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import butterknife.BindView;
......@@ -133,7 +126,7 @@ public class OrderCenterActivity extends BaseFragmentActivity<OrderCenterPresent
mPresenter.loadOrderList(OrderManagerResponse.ORDER_TYPE_DOSHOKU + "", getStatusByFragmentIndex(), 0, 10, null, false);
}
@Subscriber(tag = PosActionStatusExceptionFragment.REFREAFSH_ORDER_EVENT)
@Subscriber(tag = PosMatterFragment.REFREAFSH_ORDER_EVENT)
private void refreafshOrder(boolean refreafsh) {
refeshOrderList(getStatusByFragmentIndex());
}
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderDetailActivity.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/order/OrderDetailActivity.java
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager;
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.order;
import android.content.Intent;
import android.os.Build;
......@@ -24,8 +24,7 @@ import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.order.contract.OrderStatusContract;
import com.gingersoft.gsa.cloud.pay.bean.PayMethod;
import com.gingersoft.gsa.cloud.pay.bean.PosActionStatusExceptionParam;
import com.gingersoft.gsa.cloud.pay.device.pos.base.fragment.PosActionStatusExceptionFragment;
import com.gingersoft.gsa.cloud.pay.device.pos.base.lifecycle.fragment.PosMatterFragment;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.di.component.DaggerOrderDetailComponent;
......@@ -35,7 +34,7 @@ import com.gingersoft.gsa.cloud.table.mvp.action.order.TipsOrder;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderDetailContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil;
import com.gingersoft.gsa.cloud.table.mvp.presenter.orderManager.OrderDetailPresenter;
import com.gingersoft.gsa.cloud.table.mvp.presenter.order.OrderDetailPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderCenterDetailFoodAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderCenterMoneyAdapter;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem3;
......@@ -176,7 +175,7 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent
}
}
@Subscriber(tag = PosActionStatusExceptionFragment.REFREAFSH_ORDER_EVENT)
@Subscriber(tag = PosMatterFragment.REFREAFSH_ORDER_EVENT)
private void refreafshOrder(boolean refreafsh) {
refreafshOrderDetail();
}
......@@ -227,11 +226,11 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent
}
private void initOrderDetail(OrderManagerResponse orderDetailItem) {
String payBill = LanguageUtils.get_language_system(this, "opentable.paybill", "結賬") + "：" + TimeUtils.getStringByFormat(new Date(orderDetailItem.getEndTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM);
String pax = LanguageUtils.get_language_system(this, "Meal.Mannumber", "人數") + "：" + orderDetailItem.getPerson();
String openTable = LanguageUtils.get_language_system(this, "open.table", "開台") + "：" + TimeUtils.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM);
String orderCode = LanguageUtils.get_language_system(mContext, "order.code", "訂單碼") + ": ";
String mealCode = LanguageUtils.get_language_system(mContext, "meal.code", "取餐碼") + ": ";
String payBill = LanguageUtils.get_language_system( "opentable.paybill", "結賬") + "：" + TimeUtils.getStringByFormat(new Date(orderDetailItem.getEndTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM);
String pax = LanguageUtils.get_language_system( "Meal.Mannumber", "人數") + "：" + orderDetailItem.getPerson();
String openTable = LanguageUtils.get_language_system( "open.table", "開台") + "：" + TimeUtils.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM);
String orderCode = LanguageUtils.get_language_system( "order.code", "訂單碼") + ": ";
String mealCode = LanguageUtils.get_language_system( "meal.code", "取餐碼") + ": ";
if (orderDetailItem.getOrderType() == OrderTypeConstans.order_type_2) {
tv_table_name.setText("外賣");
......@@ -240,8 +239,8 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent
tv_table_name.setText("自取");
tv_order_num.setText(orderCode + orderDetailItem.getBillNo() + " " + mealCode + orderDetailItem.getTakeFoodCode());
} else {
String tableName = LanguageUtils.get_language_system(this, "table.number", "檯號") + ": ";
String orderNumber = LanguageUtils.get_language_system(this, "order.number", "單號") + ": ";
String tableName = LanguageUtils.get_language_system( "table.number", "檯號") + ": ";
String orderNumber = LanguageUtils.get_language_system( "order.number", "單號") + ": ";
tv_table_name.setText(tableName + orderDetailItem.getTableName());
tv_order_num.setText(orderNumber + orderDetailItem.getOrderNo());
}
......@@ -343,20 +342,20 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent
// overridePendingTransition(R.anim.slide_still, R.anim.slide_out_right);
}
});
mTopBar.setTitle(LanguageUtils.get_language_system(this, "function.order.detail", "賬單詳情")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color));
mTopBar.setTitle(LanguageUtils.get_language_system( "function.order.detail", "賬單詳情")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color));
}
@Override
public void initLanguage() {
tv_food_detail_text.setText(LanguageUtils.get_language_system(this, "food.detail.text", "食品詳情"));
tv_total_text.setText(LanguageUtils.get_language_system(this, "total.text", "合計"));
// tv_server_money_text.setText(LanguageUtils.get_language_system(this, "service.fee.text", "服務費"));
tv_total_money_text.setText(LanguageUtils.get_language_system(this, "order.countall_all", "總金額"));
tv_food_detail_text.setText(LanguageUtils.get_language_system( "food.detail.text", "食品詳情"));
tv_total_text.setText(LanguageUtils.get_language_system( "total.text", "合計"));
// tv_server_money_text.setText(LanguageUtils.get_language_system( "service.fee.text", "服務費"));
tv_total_money_text.setText(LanguageUtils.get_language_system( "order.countall_all", "總金額"));
btn_print_order.setText(LanguageUtils.get_language_system(this, "print.order", "打印賬單"));
btn_tips.setText(LanguageUtils.get_language_system(this, "public.tips", "貼士"));
btn_modify_order.setText(LanguageUtils.get_language_system(this, "modify.order", "修改訂單"));
btn_print_order.setText(LanguageUtils.get_language_system( "print.order", "打印賬單"));
btn_tips.setText(LanguageUtils.get_language_system( "public.tips", "貼士"));
btn_modify_order.setText(LanguageUtils.get_language_system( "modify.order", "修改訂單"));
}
@Override
......@@ -416,19 +415,19 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent
tv_reload_exception_status.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
PosActionStatusExceptionFragment statusExceptionFragment = findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
statusExceptionParam.setTxnId(mOrderDetailItem.getMatterTxnId());
statusExceptionParam.setAmount(mOrderDetailItem.getTotalAmount());
statusExceptionParam.setOrderId(mOrderDetailItem.getId());
statusExceptionParam.setOrderNo(mOrderDetailItem.getOrderNo());
statusExceptionParam.setPayMethodName(mOrderDetailItem.getPayNames());
statusExceptionParam.setPosAction(mOrderDetailItem.getPosActionByMatterId());
loadRootFragment(R.id.fl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
} else {
start(statusExceptionFragment);
}
// PosMatterExceptionFragment statusExceptionFragment = findFragment(PosMatterExceptionFragment.class);
// if (statusExceptionFragment == null) {
// PosMatterExceptionParam statusExceptionParam = new PosMatterExceptionParam();
// statusExceptionParam.setTxnId(mOrderDetailItem.getMatterTxnId());
// statusExceptionParam.setAmount(mOrderDetailItem.getTotalAmount());
// statusExceptionParam.setOrderId(mOrderDetailItem.getId());
// statusExceptionParam.setOrderNo(mOrderDetailItem.getOrderNo());
// statusExceptionParam.setPayMethodName(mOrderDetailItem.getPayNames());
// statusExceptionParam.setPosAction(mOrderDetailItem.getPosActionByMatterId());
// loadRootFragment(R.id.fl_container, PosMatterExceptionFragment.newInstance(statusExceptionParam));
// } else {
// start(statusExceptionFragment);
// }
}
});
rl_container.setVisibility(View.VISIBLE);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java → component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/table/TableActivity.java
package com.gingersoft.gsa.cloud.table.mvp.ui.activity;
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.table;
import android.content.Intent;
import android.os.Bundle;
......@@ -20,7 +20,6 @@ import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager2.widget.ViewPager2;
import com.billy.cc.core.component.CC;
......@@ -36,13 +35,13 @@ import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.di.component.DaggerTableComponent;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.event.InitTableEvent;
import com.gingersoft.gsa.cloud.table.mvp.model.constant.TableActionConstant;
import com.gingersoft.gsa.cloud.table.mvp.constant.TableActionConstant;
import com.gingersoft.gsa.cloud.table.mvp.action.table.PrintSkyorderAction;
import com.gingersoft.gsa.cloud.table.mvp.action.table.TableAction;
import com.gingersoft.gsa.cloud.table.mvp.presenter.TablePresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.RegionTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.InputTableFragment;
import com.gingersoft.gsa.cloud.ui.adapter.IQMUIFragmentPagerAdapter;
import com.gingersoft.gsa.cloud.table.mvp.presenter.table.TablePresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealStandActivity2;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.table.RegionTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.table.InputTableFragment;
import com.gingersoft.gsa.cloud.ui.adapter.ViewPager2Adapter;
import com.gingersoft.gsa.cloud.ui.utils.QMUITabSegmentUtils;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
......@@ -50,9 +49,7 @@ import com.jess.arms.base.BaseFragmentActivity;
import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils;
import com.kingja.loadsir.core.LoadService;
import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton;
import com.qmuiteam.qmui.arch.QMUIFragmentPagerAdapter;
import com.qmuiteam.qmui.layout.QMUIButton;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.QMUITopBar;
......@@ -61,7 +58,6 @@ import com.qmuiteam.qmui.widget.popup.QMUIPopups;
import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundRelativeLayout;
import com.qmuiteam.qmui.widget.tab.QMUITab;
import com.qmuiteam.qmui.widget.tab.QMUITabBuilder;
import com.qmuiteam.qmui.widget.tab.QMUITabIndicator;
import com.qmuiteam.qmui.widget.tab.QMUITabSegment;
import com.qmuiteam.qmui.widget.tab.QMUITabSegment2;
import com.qmuiteam.qmui.widget.tab.QMUITabView;
......@@ -70,8 +66,6 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
import org.simple.eventbus.Subscriber;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/table/TableModeActivity.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.table;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.service.IServiceManager;
import com.gingersoft.gsa.cloud.component.ComponentName;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.di.component.DaggerTableModeComponent;
import com.jess.arms.base.BaseActivity;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableModeContract;
import com.gingersoft.gsa.cloud.table.mvp.presenter.table.TableModePresenter;
import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton;
import com.qmuiteam.qmui.widget.QMUITopBar;
import butterknife.BindView;
import static com.jess.arms.utils.Preconditions.checkNotNull;
/**
* ================================================
* Description:
* <p>
* Created by MVPArmsTemplate on 04/08/2021 14:08
* <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
* <a href="https://github.com/JessYanCoding">Follow me</a>
* <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
* <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
* <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
* ================================================
*/
public class TableModeActivity extends BaseActivity<TableModePresenter> implements TableModeContract.View {
@BindView(R2.id.topbar)
QMUITopBar mTopBar;
@Override
public void setupActivityComponent(@NonNull AppComponent appComponent) {
DaggerTableModeComponent //如找不到该类,请编译一下项目
.builder()
.appComponent(appComponent)
.view(this)
.build()
.inject(this);
}
@Override
public int initView(@Nullable Bundle savedInstanceState) {
return R.layout.meal_activity_table_mode; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
}
@Override
public void initData(@Nullable Bundle savedInstanceState) {
}
@Override
public void initIntent() {
}
@Override
public void initTopBar() {
// mTopBar.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_color));
// mTopBar.removeAllLeftViews();
// mTopBar.addLeftBackImageButton().setOnClickListener(new View.OnClickListener() {
//
// @Override
// public void onClick(View v) {
// killMyself();
// }
// });
// QMUIAlphaImageButton rightButton = mTopBar.addRightImageButton(R.drawable.icon_refresh, R.id.btn_right);
// QMUIAlphaImageButton rightButton2 = mTopBar.addRightImageButton(R.mipmap.meal_down, R.id.btn_fid);
// rightButton.setOnClickListener(new View.OnClickListener() {
//
// @Override
// public void onClick(View v) {
// LoganManager.w_tableMode(TAG, "手動刷新餐檯數據");
//// launchActivity(new Intent(mContext, CoordinatorlayoutActivity.class));
// getTables(true, null);
// IServiceManager.startICommandService(GsaCloudApplication.getAppContext());
// }
// });
// rightButton2.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// CC.obtainBuilder(ComponentName.COMPONENT_DOWNLOAD)
// .setActionName("showDownloadActivity")
// .addParam("fromPage", 2)
// .build()
// .call();
// }
// });
// mTopBar.setTitle("餐檯模式");
}
@Override
public void initLanguage() {
}
@Override
public void initLayoutParams() {
}
@Override
public void initLayoutVisible() {
}
@Override
public void showLoading(String message) {
}
@Override
public void hideLoading() {
}
@Override
public void showMessage(@NonNull String message) {
checkNotNull(message);
ArmsUtils.snackbarText(message);
}
@Override
public void launchActivity(@NonNull Intent intent) {
checkNotNull(intent);
ArmsUtils.startActivity(intent);
}
@Override
public void killMyself() {
finish();
}
}
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/BillItemAdapter.java
......@@ -12,14 +12,12 @@ import com.gingersoft.gsa.cloud.order.billItem.BillOrderMoney;
import com.gingersoft.gsa.cloud.order.billItem.ServiceChargeItem;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.meal.MealBillActivity;
import com.jess.arms.base.BaseHolder;
import com.jess.arms.base.DefaultAdapter;
import java.util.List;
import javax.inject.Inject;
import butterknife.BindView;
/**
......@@ -119,7 +117,7 @@ public class BillItemAdapter extends DefaultAdapter<BillItem> {
// (datasBean.getType() == BillOrderMoney.NOMAL_DISCOUNT_TYPE || datasBean.getType() == BillOrderMoney.COUPON_DISCOUNT_TYPE) &&
// datasBean.getType() != BillOrderMoney.MEMBER_DISCOUNT_TYPE &&
// datasBean.getStatus() == 0) {
if (mContext instanceof OrderContentActivity &&
if (mContext instanceof MealBillActivity &&
(datasBean.getType() == BillOrderMoney.NOMAL_DISCOUNT_TYPE || datasBean.getType() == BillOrderMoney.COUPON_DISCOUNT_TYPE) &&
datasBean.getType() != BillOrderMoney.MEMBER_DISCOUNT_TYPE) {
iv_delete.setVisibility(View.VISIBLE);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderCenterAdapter.java
......@@ -126,12 +126,12 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
}
private void setOrderItemDetail(OrderManagerResponse orderBean) {
String pax = LanguageUtils.get_language_system(mContext, "Meal.Mannumber", "人數") + "：";
String openTable = LanguageUtils.get_language_system(mContext, "open.table", "開台") + "：";
String payTable = LanguageUtils.get_language_system(mContext, "open.table", "結賬") + "：";
String amountText = LanguageUtils.get_language_system(mContext, "amount", "金額:");
String orderCode = LanguageUtils.get_language_system(mContext, "order.code", "訂單碼") + ": ";
String mealCode = LanguageUtils.get_language_system(mContext, "meal.code", "取餐碼") + ": ";
String pax = LanguageUtils.get_language_system( "Meal.Mannumber", "人數") + "：";
String openTable = LanguageUtils.get_language_system( "open.table", "開台") + "：";
String payTable = LanguageUtils.get_language_system( "open.table", "結賬") + "：";
String amountText = LanguageUtils.get_language_system( "amount", "金額:");
String orderCode = LanguageUtils.get_language_system( "order.code", "訂單碼") + ": ";
String mealCode = LanguageUtils.get_language_system( "meal.code", "取餐碼") + ": ";
tv_people_num.setText(pax + orderBean.getPerson());
tv_open_time.setText(openTable + TimeUtils.getStringByFormat(new Date(orderBean.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM));
......@@ -140,10 +140,10 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
}
tv_pay_money_text.setText(amountText);
tv_pay_money.setText(AppConstans.CARSH_STR + orderBean.getTotalAmount());
// btn_print_order.setText(LanguageUtils.get_language_system(mContext, "print.order", "打印賬單"));
// btn_tips.setText(LanguageUtils.get_language_system(mContext, "public.tips", "貼士"));
// btn_modify_order.setText(LanguageUtils.get_language_system(mContext, "modify.order", "修改訂單"));
// btn_cancel_order.setText(LanguageUtils.get_language_system(mContext, "cancel.order", "取消訂單"));
// btn_print_order.setText(LanguageUtils.get_language_system( "print.order", "打印賬單"));
// btn_tips.setText(LanguageUtils.get_language_system( "public.tips", "貼士"));
// btn_modify_order.setText(LanguageUtils.get_language_system( "modify.order", "修改訂單"));
// btn_cancel_order.setText(LanguageUtils.get_language_system( "cancel.order", "取消訂單"));
if (orderBean.getOrderType() == OrderTypeConstans.order_type_2) {
tv_table_name.setText("外賣");
tv_order_num.setText(orderCode + orderBean.getTakeFoodCode());
......@@ -151,8 +151,8 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
tv_table_name.setText("自取");
tv_order_num.setText(orderCode + orderBean.getBillNo() + " " + mealCode + orderBean.getTakeFoodCode());
} else {
String tableName = LanguageUtils.get_language_system(mContext, "table.number", "檯號") + ": ";
String orderNumber = LanguageUtils.get_language_system(mContext, "order.number", "單號") + ": ";
String tableName = LanguageUtils.get_language_system( "table.number", "檯號") + ": ";
String orderNumber = LanguageUtils.get_language_system( "order.number", "單號") + ": ";
tv_table_name.setText(tableName + orderBean.getTableName());
tv_order_num.setText(orderNumber + orderBean.getOrderNo());
}
......
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