Skip to content

S
supplier
Commit c5329aba by 宁斌
Options

1、新增轉台

parent 0659130c
Showing with 299 additions and 84 deletions
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/MainTopFragment.java
...@@ -12,7 +12,6 @@ import android.view.LayoutInflater; ...@@ -12,7 +12,6 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import com.daivd.chart.component.axis.BaseAxis; import com.daivd.chart.component.axis.BaseAxis;
import com.daivd.chart.component.axis.HorizontalAxis; import com.daivd.chart.component.axis.HorizontalAxis;
import com.daivd.chart.component.axis.VerticalAxis; import com.daivd.chart.component.axis.VerticalAxis;
...@@ -30,30 +29,25 @@ import com.daivd.chart.utils.DensityUtils; ...@@ -30,30 +29,25 @@ import com.daivd.chart.utils.DensityUtils;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.main.R2; import com.gingersoft.gsa.cloud.main.R2;
import com.gingersoft.gsa.cloud.main.di.component.DaggerMainTopComponent;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.HomeTurnoverBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.HomeTurnoverBean;
import com.gingersoft.gsa.cloud.main.mvp.ui.activity.MainActivity; import com.gingersoft.gsa.cloud.main.mvp.ui.activity.MainActivity;
import com.gingersoft.gsa.cloud.main.mvp.ui.view.CustomMarkView; import com.gingersoft.gsa.cloud.main.mvp.ui.view.CustomMarkView;
import com.jess.arms.base.BaseFragment; import com.jess.arms.base.BaseFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.gingersoft.gsa.cloud.main.di.component.DaggerMainTopComponent;
import com.gingersoft.gsa.cloud.main.mvp.contract.MainTopContract; import com.gingersoft.gsa.cloud.main.mvp.contract.MainTopContract;
import com.gingersoft.gsa.cloud.main.mvp.presenter.MainTopPresenter; import com.gingersoft.gsa.cloud.main.mvp.presenter.MainTopPresenter;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.sxu.shadowdrawable.ShadowDrawable; import com.sxu.shadowdrawable.ShadowDrawable;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dpToPx; import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dpToPx;
......
print-module/build.gradle
...@@ -40,6 +40,7 @@ android { ...@@ -40,6 +40,7 @@ android {
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation files('libs/nexgon5lib.jar')
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
...@@ -53,5 +54,4 @@ dependencies { ...@@ -53,5 +54,4 @@ dependencies {
testImplementation rootProject.ext.dependencies["canary-release"] testImplementation rootProject.ext.dependencies["canary-release"]
testImplementation rootProject.ext.dependencies["junit"] testImplementation rootProject.ext.dependencies["junit"]
implementation 'com.sunmi:printerlibrary:1.0.7' implementation 'com.sunmi:printerlibrary:1.0.7'
implementation files('libs/nexgon5lib.jar')
} }
public-base/build.gradle
...@@ -79,6 +79,4 @@ dependencies { ...@@ -79,6 +79,4 @@ dependencies {
implementation 'org.greenrobot:greendao-generator:3.2.2' implementation 'org.greenrobot:greendao-generator:3.2.2'
implementation rootProject.ext.dependencies["BaseRecyclerViewAdapter"] implementation rootProject.ext.dependencies["BaseRecyclerViewAdapter"]
implementation files('libs/ecracalib.jar')
implementation files('libs/nexgon5lib.jar')
} }
public-base/src/main/java/com/gingersoft/gsa/cloud/base/adapter/print/KitChenPrintFoodAdapter.java
...@@ -22,6 +22,6 @@ public class KitChenPrintFoodAdapter extends BaseQuickAdapter<OrderDetail, BaseV ...@@ -22,6 +22,6 @@ public class KitChenPrintFoodAdapter extends BaseQuickAdapter<OrderDetail, BaseV
@Override @Override
protected void convert(BaseViewHolder helper, OrderDetail item) { protected void convert(BaseViewHolder helper, OrderDetail item) {
helper.setText(R.id.tv_food_number, item.getNumber() +""); helper.setText(R.id.tv_food_number, item.getNumber() +"");
helper.setText(R.id.tv_food_name, item.getName()); helper.setText(R.id.tv_food_name, item.getProductName());
} }
} }
public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableBean.java
...@@ -69,6 +69,7 @@ public class TableBean { ...@@ -69,6 +69,7 @@ public class TableBean {
* serviceCharge : 0 * serviceCharge : 0
* memberId : 0 * memberId : 0
* status : 0 * status : 0
* useStatus: 0
*/ */
private int id; private int id;
...@@ -91,6 +92,7 @@ public class TableBean { ...@@ -91,6 +92,7 @@ public class TableBean {
* 连台 6 * 连台 6
*/ */
private int status; private int status;
/**使用狀態*/
private int useStatus; private int useStatus;
......
public-base/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DaoMaster.java
...@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; ...@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/** /**
* Master of DAO (schema version 1): knows all DAOs. * Master of DAO (schema version 13): knows all DAOs.
*/ */
public class DaoMaster extends AbstractDaoMaster { public class DaoMaster extends AbstractDaoMaster {
public static final int SCHEMA_VERSION = 1; public static final int SCHEMA_VERSION = 13;
/** Creates underlying database table using DAOs. */ /** Creates underlying database table using DAOs. */
public static void createAllTables(Database db, boolean ifNotExists) { public static void createAllTables(Database db, boolean ifNotExists) {
......
table-mode/build.gradle
...@@ -52,6 +52,7 @@ android { ...@@ -52,6 +52,7 @@ android {
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation files('libs/ecracalib.jar')
if (project.ext.runAsApp) { if (project.ext.runAsApp) {
annotationProcessor rootProject.ext.dependencies["dagger2-compiler"] annotationProcessor rootProject.ext.dependencies["dagger2-compiler"]
debugImplementation rootProject.ext.dependencies["canary-debug"] debugImplementation rootProject.ext.dependencies["canary-debug"]
...@@ -66,5 +67,4 @@ dependencies { ...@@ -66,5 +67,4 @@ dependencies {
// test // test
testImplementation rootProject.ext.dependencies["junit"] testImplementation rootProject.ext.dependencies["junit"]
implementation rootProject.ext.dependencies["BaseRecyclerViewAdapter"] implementation rootProject.ext.dependencies["BaseRecyclerViewAdapter"]
implementation files('libs/ecracalib.jar')
} }
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/callback/CommandImpl.java
...@@ -3,12 +3,10 @@ package com.gingersoft.gsa.cloud.table.app.payment.callback; ...@@ -3,12 +3,10 @@ package com.gingersoft.gsa.cloud.table.app.payment.callback;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
import com.elvishew.xlog.XLog; import com.elvishew.xlog.XLog;
import com.etps.aca.lib.action.ICommand; import com.etps.aca.lib.action.ICommand;
import com.etps.aca.lib.constant.Constant; import com.etps.aca.lib.constant.Constant;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.table.app.payment.N5CallbackManage;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity; import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
...@@ -78,30 +76,30 @@ public class CommandImpl implements ICommand { ...@@ -78,30 +76,30 @@ public class CommandImpl implements ICommand {
appManager.killActivity(currentActivity.getClass()); appManager.killActivity(currentActivity.getClass());
OrderPayActivity.startOrderPayActivityFormSale(context, response); OrderPayActivity.startOrderPayActivityFormSale(context, response);
break; break;
case Constant.EVENT.NAME.VOID_RESP: // case Constant.EVENT.NAME.VOID_RESP:
N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.VOID_RESP); // N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.VOID_RESP);
break; // break;
case Constant.EVENT.NAME.REFUND_RESP: // case Constant.EVENT.NAME.REFUND_RESP:
// N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.REFUND_RESP); //// N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.REFUND_RESP);
appManager.killActivity(currentActivity.getClass()); // appManager.killActivity(currentActivity.getClass());
// if (currentActivity.getClass().getName().equals(OrderDetailActivity.class.getName())) { //// if (currentActivity.getClass().getName().equals(OrderDetailActivity.class.getName())) {
// OrderDetailActivity.startOrderDetailActivityFormRefund(context, response); //// OrderDetailActivity.startOrderDetailActivityFormRefund(context, response);
// } else { //// } else {
// OrderManagementActivity.startOrderManageActivityFormRefund(context, response); //// OrderManagementActivity.startOrderManageActivityFormRefund(context, response);
// } //// }
break; // break;
case Constant.EVENT.NAME.PRINT_RESP: // case Constant.EVENT.NAME.PRINT_RESP:
N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.PRINT_RESP); // N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.PRINT_RESP);
break; // break;
case Constant.EVENT.NAME.ADJUST_RESP: // case Constant.EVENT.NAME.ADJUST_RESP:
N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.ADJUST_RESP); // N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.ADJUST_RESP);
break; // break;
case "RETRIEVAL_RESP": // case "RETRIEVAL_RESP":
N5CallbackManage.getInstance().post(currentActivity, response, "RETRIEVAL_RESP"); // N5CallbackManage.getInstance().post(currentActivity, response, "RETRIEVAL_RESP");
break; // break;
case "SETTLE_RESP": // case "SETTLE_RESP":
N5CallbackManage.getInstance().post(currentActivity, response, "SETTLE_RESP"); // N5CallbackManage.getInstance().post(currentActivity, response, "SETTLE_RESP");
break; // break;
} }
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/TableContract.java
package com.gingersoft.gsa.cloud.table.mvp.contract; package com.gingersoft.gsa.cloud.table.mvp.contract;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose; import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.mvp.IView; import com.jess.arms.mvp.IView;
import com.jess.arms.mvp.IModel; import com.jess.arms.mvp.IModel;
...@@ -44,6 +46,8 @@ public interface TableContract { ...@@ -44,6 +46,8 @@ public interface TableContract {
void setOperatContentText(String contentText); void setOperatContentText(String contentText);
String getOperatContentText();
void canceOperat(); void canceOperat();
void startMealStandActivity(); void startMealStandActivity();
...@@ -54,8 +58,12 @@ public interface TableContract { ...@@ -54,8 +58,12 @@ public interface TableContract {
Observable<TableBean> getTables(int restaurantId); Observable<TableBean> getTables(int restaurantId);
Observable<TableDetail> getTable(int tableId);
Observable<BaseRespose> openTable(RequestBody requestBody); Observable<BaseRespose> openTable(RequestBody requestBody);
Observable<BaseRespose> turnTable(RequestBody requestBody);
Observable<BaseRespose> initTable(RequestBody requestBody); Observable<BaseRespose> initTable(RequestBody requestBody);
} }
} }
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/TableModel.java
...@@ -2,8 +2,10 @@ package com.gingersoft.gsa.cloud.table.mvp.model; ...@@ -2,8 +2,10 @@ package com.gingersoft.gsa.cloud.table.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose; import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.gingersoft.gsa.cloud.table.mvp.model.service.TableService; import com.gingersoft.gsa.cloud.table.mvp.model.service.TableService;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jess.arms.integration.IRepositoryManager; import com.jess.arms.integration.IRepositoryManager;
...@@ -51,9 +53,15 @@ public class TableModel extends BaseModel implements TableContract.Model { ...@@ -51,9 +53,15 @@ public class TableModel extends BaseModel implements TableContract.Model {
} }
@Override @Override
public Observable<TableBean> getTables(int restaurantId) { public Observable<TableBean> getTables(int tableId) {
return mRepositoryManager.obtainRetrofitService(TableService.class) return mRepositoryManager.obtainRetrofitService(TableService.class)
.getTables(restaurantId); .getTables(tableId);
}
@Override
public Observable<TableDetail> getTable(int tableId) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.getTable(tableId);
} }
@Override @Override
...@@ -63,6 +71,12 @@ public class TableModel extends BaseModel implements TableContract.Model { ...@@ -63,6 +71,12 @@ public class TableModel extends BaseModel implements TableContract.Model {
} }
@Override @Override
public Observable<BaseRespose> turnTable(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.turnTable(requestBody);
}
@Override
public Observable<BaseRespose> initTable(RequestBody requestBody) { public Observable<BaseRespose> initTable(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(TableService.class) return mRepositoryManager.obtainRetrofitService(TableService.class)
.initTable(requestBody); .initTable(requestBody);
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/TableDetail.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model.bean;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-02-22
* 修订历史：2020-02-22
* 描述：
*/
public class TableDetail {
/**
* success : true
* sysTime : 1582369492823
* data : {"id":26221,"tableName":"107","restaurantId":26,"qrCode":"27655b6228307f6f5a6c501152d92b32","seatCount":7,"createTime":"Jan 16, 2020 12:00:00 AM","createBy":"GSPOS","qrCodeImg":"http://192.168.1.77/qrcode/tableQrcode-26-1509.jpg","posTableId":1509,"serviceCharge":10,"memberId":1,"status":2,"orderId":40642,"useStatus":0}
*/
private boolean success;
private String errMsg;
private long sysTime;
private TableBean.DataBean data;
public boolean isSuccess() {
return success;
}
public void setSuccess(boolean success) {
this.success = success;
}
public String getErrMsg() {
return errMsg;
}
public void setErrMsg(String errMsg) {
this.errMsg = errMsg;
}
public long getSysTime() {
return sysTime;
}
public void setSysTime(long sysTime) {
this.sysTime = sysTime;
}
public TableBean.DataBean getData() {
return data;
}
public void setData(TableBean.DataBean data) {
this.data = data;
}
}
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/TableService.java
package com.gingersoft.gsa.cloud.table.mvp.model.service; package com.gingersoft.gsa.cloud.table.mvp.model.service;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose; import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import io.reactivex.Observable; import io.reactivex.Observable;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager; import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
...@@ -23,9 +25,15 @@ public interface TableService { ...@@ -23,9 +25,15 @@ public interface TableService {
@GET("restaurantTable/list" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @GET("restaurantTable/list" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<TableBean> getTables(@Query("restaurantId") int restaurantId); Observable<TableBean> getTables(@Query("restaurantId") int restaurantId);
@GET("restaurantTable/get" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<TableDetail> getTable(@Query("id") int table);
@POST("restaurantTable/kickOff" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @POST("restaurantTable/kickOff" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseRespose> openTable(@Body RequestBody requestBody); Observable<BaseRespose> openTable(@Body RequestBody requestBody);
@POST("restaurantTable/update/table" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseRespose> turnTable(@Body RequestBody requestBody);
@POST("restaurantTable/set/status" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @POST("restaurantTable/set/status" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseRespose> initTable(@Body RequestBody requestBody); Observable<BaseRespose> initTable(@Body RequestBody requestBody);
} }
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
...@@ -10,6 +10,7 @@ import com.gingersoft.gsa.cloud.table.mvp.contract.BaseOrderContract; ...@@ -10,6 +10,7 @@ import com.gingersoft.gsa.cloud.table.mvp.contract.BaseOrderContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BillOrderMoney; import com.gingersoft.gsa.cloud.table.mvp.model.bean.BillOrderMoney;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.OrderRequest; import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.OrderRequest;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderMoneyAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderMoneyAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.SelectMealAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.SelectMealAdapter;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
...@@ -50,6 +51,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -50,6 +51,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
protected V mRootView; protected V mRootView;
private Activity IActivity; private Activity IActivity;
private OrderContentActivity mOrderContentActivity;
//订单数据管理类 //订单数据管理类
protected MyOrderManage myOrderManage; protected MyOrderManage myOrderManage;
...@@ -81,6 +83,10 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -81,6 +83,10 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
this.myOrderManage = MyOrderManage.getInstance(); this.myOrderManage = MyOrderManage.getInstance();
this.orderFoodList = myOrderManage.getOrderFoodList(); this.orderFoodList = myOrderManage.getOrderFoodList();
if (IActivity instanceof OrderContentActivity) {
mOrderContentActivity = (OrderContentActivity) IActivity;
}
foodCount = initFoodCount(); foodCount = initFoodCount();
totalMoney = initFoodTotalMoney(); totalMoney = initFoodTotalMoney();
...@@ -125,12 +131,20 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -125,12 +131,20 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
} else { } else {
MyOrderManage.getInstance().changeNumber(datasBean.getNumber() - 1); MyOrderManage.getInstance().changeNumber(datasBean.getNumber() - 1);
} }
mSelectMealAdapter.notifyItemChanged(position);
// recalcOrderMoneyCount(false, true); // recalcOrderMoneyCount(false, true);
if (mOrderContentActivity != null) {
mOrderContentActivity.initOrderDetail();
}
} }
@Override @Override
public void onMealCountAdd(OrderDetail datasBean, int position) { public void onMealCountAdd(OrderDetail datasBean, int position) {
MyOrderManage.getInstance().changeNumber(datasBean.getNumber() + 1); MyOrderManage.getInstance().changeNumber(datasBean.getNumber() + 1);
mSelectMealAdapter.notifyItemChanged(position);
if (mOrderContentActivity != null) {
mOrderContentActivity.initOrderDetail();
}
// recalcOrderMoneyCount(false, true); // recalcOrderMoneyCount(false, true);
} }
}); });
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
...@@ -319,7 +319,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -319,7 +319,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
public void onNext(@NonNull BaseResult info) { public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) { if (info != null && info.isSuccess()) {
mRootView.showMessage("送單成功"); mRootView.showMessage("送單成功");
printSendOrder(MyOrderManage.getInstance().getOrderFoodList()); // printSendOrder(MyOrderManage.getInstance().getOrderFoodList());
IActivity.returnTableActivity(true); IActivity.returnTableActivity(true);
} else { } else {
mRootView.showMessage("送單失敗"); mRootView.showMessage("送單失敗");
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
...@@ -253,12 +253,6 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra ...@@ -253,12 +253,6 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
return request; return request;
} }
protected OrderRequest getAddOrderFoodRequest(List<OrderDetail> foodList) {
OrderRequest request = new OrderRequest();
request.setOrderDetails(orderDetailBeanToFoodRequest(foodList));
return request;
}
private List<OrderBean.OrderDetailsBean> orderDetailBeanToFoodRequest(List<OrderDetail> foodList) { private List<OrderBean.OrderDetailsBean> orderDetailBeanToFoodRequest(List<OrderDetail> foodList) {
List<OrderBean.OrderDetailsBean> requests = new ArrayList<>(); List<OrderBean.OrderDetailsBean> requests = new ArrayList<>();
if (foodList != null) { if (foodList != null) {
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
...@@ -5,10 +5,12 @@ import android.os.CountDownTimer; ...@@ -5,10 +5,12 @@ import android.os.CountDownTimer;
import android.view.View; import android.view.View;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.OrderBean; import com.gingersoft.gsa.cloud.base.common.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.database.bean.Food; import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose; import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
import com.gingersoft.gsa.cloud.database.bean.Function; import com.gingersoft.gsa.cloud.database.bean.Function;
...@@ -16,6 +18,7 @@ import com.gingersoft.gsa.cloud.table.R; ...@@ -16,6 +18,7 @@ import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.app.GoldConstants; import com.gingersoft.gsa.cloud.table.app.GoldConstants;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant; import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity; import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BottomFunctionAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BottomFunctionAdapter;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
...@@ -89,6 +92,16 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -89,6 +92,16 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
* 10：餐檯模式 * 10：餐檯模式
*/ */
private int currentChooseOperatType = -1; private int currentChooseOperatType = -1;
/**
* 选中操作的台名、id
*/
private String originalTableName = "";
private int originalTableId;
/**
* 转台需要转到台名、id
*/
private String targetTableName = "";
private int targetTableId;
@Inject @Inject
...@@ -128,6 +141,10 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -128,6 +141,10 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
mRootView.setCurrentOperatType(TableOperatTypeConstant.init_table_3); mRootView.setCurrentOperatType(TableOperatTypeConstant.init_table_3);
return; return;
} }
if (mBottomFunctionList.get(position).getResName().equals("轉檯")) {
mRootView.setCurrentOperatType(TableOperatTypeConstant.move_table_4);
return;
}
if (mBottomFunctionList.get(position).getResName().equals("↑")) { if (mBottomFunctionList.get(position).getResName().equals("↑")) {
mBottomFunctionList.add(new Function((long) 5, 1, 2025, "skyorder", "", "")); mBottomFunctionList.add(new Function((long) 5, 1, 2025, "skyorder", "", ""));
mBottomFunctionList.add(new Function((long) 6, 1, 2025, "上菜紙", "", "")); mBottomFunctionList.add(new Function((long) 6, 1, 2025, "上菜紙", "", ""));
...@@ -159,14 +176,12 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -159,14 +176,12 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
} }
public void getTables(boolean show) { public void getTables(boolean show) {
int restaurantId = GsaCloudApplication.getRestaurantId(mApplication); int restaurantId = GsaCloudApplication.getRestaurantId(mApplication);
mModel.getTables(restaurantId)
mModel.getTables(337)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> { .doOnSubscribe(disposable -> {
if (show) if (show)
mRootView.showLoading(""); mRootView.showLoading(null);
}) })
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
...@@ -201,12 +216,12 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -201,12 +216,12 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
public void openTable(int id) { public void openTable(int id) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("id", id + "") .add("id", String.valueOf(id))
.build(); .build();
mModel.openTable(requestBody) mModel.openTable(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("")) .doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -240,6 +255,68 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -240,6 +255,68 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}); });
} }
public void getTable(int tableId) {
mModel.getTable(tableId)
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<TableDetail>(mErrorHandler) {
@Override
public void onNext(@NonNull TableDetail result) {
if (result.isSuccess()) {
TableBean.DataBean tableBean = result.getData();
if (originalTableId == 0) {
originalTableName = tableBean.getTableName();
originalTableId = tableBean.getId();
mRootView.setOperatContentText("由: " + originalTableName + " 轉到 ");
} else {
targetTableName = tableBean.getTableName();
targetTableId = tableBean.getId();
mRootView.setOperatContentText("由: " + originalTableName + " 轉到 " +
targetTableName + " 號檯");
showOperatTipDialog(tableBean);
}
} else {
mRootView.showMessage(result.getErrMsg());
}
}
});
}
public void turnTable(int originalTableId, int targetTableId) {
RequestBody requestBody = new FormBody.Builder()
.add("id", String.valueOf(originalTableId))
.add("tableId", String.valueOf(targetTableId))
.build();
mModel.turnTable(requestBody)
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<BaseRespose>(mErrorHandler) {
@Override
public void onNext(@NonNull BaseRespose respose) {
if (respose.isSuccess()) {
mRootView.showMessage("轉檯成功");
mRootView.canceOperat();
//立即獲取餐檯數據
getTables(false);
} else {
mRootView.showMessage(respose.getErrMsg());
}
}
});
}
public void initTable(int tableId, boolean showMessage) { public void initTable(int tableId, boolean showMessage) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
...@@ -248,7 +325,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -248,7 +325,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
mModel.initTable(requestBody) mModel.initTable(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("")) .doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -311,13 +388,12 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -311,13 +388,12 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
} }
} }
break; break;
// case TableOperatTypeConstant.move_table_4:
// break;
// case TableOperatTypeConstant.skyorder_mode_5: // case TableOperatTypeConstant.skyorder_mode_5:
// for (int i = 0; i < datasBeans.size(); i++) { // for (int i = 0; i < datasBeans.size(); i++) {
// mTableList.add(datasBeans.get(i)); // mTableList.add(datasBeans.get(i));
// } // }
// break; // break;
case TableOperatTypeConstant.move_table_4:
case -1: //正常餐檯模式下顯示所有餐檯數據 case -1: //正常餐檯模式下顯示所有餐檯數據
filterTableBeanList.addAll(mTableList); filterTableBeanList.addAll(mTableList);
break; break;
...@@ -325,7 +401,6 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -325,7 +401,6 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
IActivity.nofilyFragmentUpdateTableData(filterTableBeanList, status); IActivity.nofilyFragmentUpdateTableData(filterTableBeanList, status);
} }
public void showOperatTipDialog(TableBean.DataBean dataBean) { public void showOperatTipDialog(TableBean.DataBean dataBean) {
QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(IActivity); QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(IActivity);
dialogBuilder.setTitle("溫馨提示"); dialogBuilder.setTitle("溫馨提示");
...@@ -340,7 +415,8 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -340,7 +415,8 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
dialogBuilder.setMessage("是否確認重置" + dataBean.getTableName() + "號檯?"); dialogBuilder.setMessage("是否確認重置" + dataBean.getTableName() + "號檯?");
break; break;
case TableOperatTypeConstant.move_table_4: case TableOperatTypeConstant.move_table_4:
String message = "是否由%s號檯轉到%s號檯";
dialogBuilder.setMessage(String.format(message, originalTableName, targetTableName));
break; break;
case TableOperatTypeConstant.skyorder_mode_5: case TableOperatTypeConstant.skyorder_mode_5:
...@@ -367,7 +443,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -367,7 +443,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
initTable(dataBean.getId(), true); initTable(dataBean.getId(), true);
break; break;
case TableOperatTypeConstant.move_table_4: case TableOperatTypeConstant.move_table_4:
turnTable(originalTableId, targetTableId);
break; break;
case TableOperatTypeConstant.skyorder_mode_5: case TableOperatTypeConstant.skyorder_mode_5:
...@@ -378,6 +454,15 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -378,6 +454,15 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
dialogBuilder.create(R.style.MyDialogTheme2).show(); dialogBuilder.create(R.style.MyDialogTheme2).show();
} }
/**
* 初始化操作參數
*/
public void initTableParameter() {
originalTableName = "";
originalTableId = 0;
targetTableName = "";
targetTableId = 0;
}
private TableBean.DataBean getTableById(int id) { private TableBean.DataBean getTableById(int id) {
if (mTableList != null) { if (mTableList != null) {
...@@ -404,6 +489,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -404,6 +489,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
tableTimer.start(); tableTimer.start();
} }
} }
public void cancelTableTimer() { public void cancelTableTimer() {
if (tableTimer != null) { if (tableTimer != null) {
tableTimer.cancel(); tableTimer.cancel();
...@@ -444,4 +530,35 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -444,4 +530,35 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
this.currentChooseOperatType = currentChooseOperatType; this.currentChooseOperatType = currentChooseOperatType;
} }
public String getOriginalTableName() {
return originalTableName;
}
public void setOriginalTableName(String originalTableName) {
this.originalTableName = originalTableName;
}
public int getOriginalTableId() {
return originalTableId;
}
public void setOriginalTableId(int originalTableId) {
this.originalTableId = originalTableId;
}
public String getTargetTableName() {
return targetTableName;
}
public void setTargetTableName(String targetTableName) {
this.targetTableName = targetTableName;
}
public int getTargetTableId() {
return targetTableId;
}
public void setTargetTableId(int targetTableId) {
this.targetTableId = targetTableId;
}
} }
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
...@@ -12,6 +12,7 @@ import android.widget.LinearLayout; ...@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2; import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.app.GoldConstants; import com.gingersoft.gsa.cloud.table.app.GoldConstants;
...@@ -90,6 +91,7 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table ...@@ -90,6 +91,7 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
TextView tv_operat_content; TextView tv_operat_content;
public static boolean isRefreshData = true; public static boolean isRefreshData = true;
private boolean firstFlag = true;
public static final int FUNCTION_ALL_TABLE = 1; public static final int FUNCTION_ALL_TABLE = 1;
public static final int FUNCTION_STATE_TABLE = 2; public static final int FUNCTION_STATE_TABLE = 2;
...@@ -108,6 +110,7 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table ...@@ -108,6 +110,7 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
//记录当前页面下标 //记录当前页面下标
private int mPosition = 1; private int mPosition = 1;
@Override @Override
public void setupActivityComponent(@NonNull AppComponent appComponent) { public void setupActivityComponent(@NonNull AppComponent appComponent) {
DaggerTableComponent //如找不到该类,请编译一下项目 DaggerTableComponent //如找不到该类,请编译一下项目
...@@ -171,7 +174,7 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table ...@@ -171,7 +174,7 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
@Override @Override
public void showLoading(String message) { public void showLoading(String message) {
if (!TextUtils.isEmpty(message)) if (message != null)
LoadingDialog.showDialogForLoading(this, message, true); LoadingDialog.showDialogForLoading(this, message, true);
else else
LoadingDialog.showDialogForLoading(this); LoadingDialog.showDialogForLoading(this);
...@@ -185,7 +188,7 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table ...@@ -185,7 +188,7 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
@Override @Override
public void showMessage(@NonNull String message) { public void showMessage(@NonNull String message) {
if (message != null) if (message != null)
ArmsUtils.makeText(this,message); ArmsUtils.makeText(this, message);
} }
@Override @Override
...@@ -222,7 +225,8 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table ...@@ -222,7 +225,8 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
mPresenter.showOperatTipDialog(dataBean); mPresenter.showOperatTipDialog(dataBean);
break; break;
case TableOperatTypeConstant.move_table_4: case TableOperatTypeConstant.move_table_4:
//獲取餐檯狀態
mPresenter.getTable(dataBean.getId());
break; break;
case TableOperatTypeConstant.skyorder_mode_5: case TableOperatTypeConstant.skyorder_mode_5:
...@@ -255,7 +259,8 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table ...@@ -255,7 +259,8 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
mTopBar.setTitle("重置檯號"); mTopBar.setTitle("重置檯號");
break; break;
case TableOperatTypeConstant.move_table_4: case TableOperatTypeConstant.move_table_4:
tv_operat_hint.setText("請選擇檯號");
mTopBar.setTitle("轉檯");
break; break;
case TableOperatTypeConstant.skyorder_mode_5: case TableOperatTypeConstant.skyorder_mode_5:
...@@ -280,6 +285,7 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table ...@@ -280,6 +285,7 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
ll_table_operat_content.setVisibility(View.INVISIBLE); ll_table_operat_content.setVisibility(View.INVISIBLE);
rv_bottom_function.setVisibility(View.VISIBLE); rv_bottom_function.setVisibility(View.VISIBLE);
mPresenter.initTableParameter();
mPresenter.filterTableByOperatType(1); mPresenter.filterTableByOperatType(1);
} }
...@@ -294,6 +300,11 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table ...@@ -294,6 +300,11 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
} }
@Override @Override
public String getOperatContentText() {
return tv_operat_content.getText().toString();
}
@Override
public void onStartRefreshTableData() { public void onStartRefreshTableData() {
isRefreshData = true; isRefreshData = true;
mPresenter.startTableTimer(); mPresenter.startTableTimer();
...@@ -402,29 +413,29 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table ...@@ -402,29 +413,29 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
@Override @Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
// if (!firstFlag) { if (!firstFlag) {
// //防止滑动页面 滑动的过程中不让刷新数据 //防止滑动页面 滑动的过程中不让刷新数据
// GSAApplication.isRefreshData = false; TableActivity.isRefreshData = false;
// LogUtil.d(TAG, "position: " + position + " positionOffset: " + positionOffset + " positionOffsetPixels: " + positionOffsetPixels); LogUtil.d(TAG, "position: " + position + " positionOffset: " + positionOffset + " positionOffsetPixels: " + positionOffsetPixels);
// } }
// firstFlag = false; firstFlag = false;
} }
@Override @Override
public void onPageSelected(int position) { public void onPageSelected(int position) {
// if (position == 0) { if (position == 0) {
// //标号输入页面 暂停获取餐台数据 //标号输入页面 暂停获取餐台数据
// onPauseRefreshTableData(); onPauseRefreshTableData();
// } else { } else {
// //页面切换完成区域，状态页面恢复获取餐台数据 //页面切换完成区域，状态页面恢复获取餐台数据
// if (mPosition == 0) { if (mPosition == 0) {
// //是从输入编号页面回到全部，使用状态页面 直接刷新餐台数据 //是从输入编号页面回到全部，使用状态页面 直接刷新餐台数据
// onStartRefreshTableData(); onStartRefreshTableData();
// } else { } else {
// GSAApplication.isRefreshData = true; TableActivity.isRefreshData = true;
// } }
// } }
// mPosition = position; mPosition = position;
// //设置当前显示Fragment页面 // //设置当前显示Fragment页面
// mPresenter.setCurrentShowFragment(fragmentList.get(position)); // mPresenter.setCurrentShowFragment(fragmentList.get(position));
} }
......
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