Skip to content

S
supplier
Commit 90a3fc05 by 宁斌
Options

添加skyorder打印類

parent 7a38c978
Showing with 283 additions and 66 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/GlobalConfiguration.java
......@@ -35,8 +35,8 @@ public class GlobalConfiguration implements ConfigModule {
.okhttpConfiguration(new MyOkhttpConfiguration())
.retrofitConfiguration(new MyRetrofitConfiguration())
.globalHttpHandler(new MyGlobalHttpHandler())
.rxCacheConfiguration(new MyRxCacheConfiguration())
.responseErrorListener(new MyResponseErrorListener())
.rxCacheConfiguration(new MyRxCacheConfiguration())
.cacheFile(new File(DataHelper.getCacheFile(context), "rxCache"))
.gsonConfiguration(new MyGsonConfiguration());
}
......
base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/PrintQRCodeContent.java
package com.gingersoft.gsa.cloud.print.bean;
import android.os.Parcel;
import android.os.Parcelable;
import java.io.Serializable;
import lombok.Getter;
......@@ -13,7 +16,7 @@ import lombok.Setter;
* */
@Getter
@Setter
public class PrintQRCodeContent implements Serializable,PrintContent {
public class PrintQRCodeContent implements PrintContent, Parcelable {
private String printTableName;
private String printTopInfo;
......@@ -24,4 +27,47 @@ public class PrintQRCodeContent implements Serializable,PrintContent {
private String printMealEndTime;
private String printBottonInfo;
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(this.printTableName);
dest.writeString(this.printTopInfo);
dest.writeString(this.BottonInfo);
dest.writeString(this.printQrcode);
dest.writeString(this.printTime);
dest.writeString(this.printPeopleNum);
dest.writeString(this.printMealEndTime);
dest.writeString(this.printBottonInfo);
}
public PrintQRCodeContent() {
}
protected PrintQRCodeContent(Parcel in) {
this.printTableName = in.readString();
this.printTopInfo = in.readString();
this.BottonInfo = in.readString();
this.printQrcode = in.readString();
this.printTime = in.readString();
this.printPeopleNum = in.readString();
this.printMealEndTime = in.readString();
this.printBottonInfo = in.readString();
}
public static final Parcelable.Creator<PrintQRCodeContent> CREATOR = new Parcelable.Creator<PrintQRCodeContent>() {
@Override
public PrintQRCodeContent createFromParcel(Parcel source) {
return new PrintQRCodeContent(source);
}
@Override
public PrintQRCodeContent[] newArray(int size) {
return new PrintQRCodeContent[size];
}
};
}
print-module/src/main/java/com/joe/print/mvp/print/PrintQRCode.java
......@@ -9,6 +9,7 @@ import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.utils.view.QRCodeUtil;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.gingersoft.gsa.cloud.print.bean.PrintQRCodeContent;
import com.google.zxing.WriterException;
import com.joe.print.R;
import java.util.ArrayList;
......@@ -68,7 +69,12 @@ public class PrintQRCode extends PrinterRoot {
printMealEndTime.setText(mQRCodeBean.getPrintMealEndTime());
printBottonInfo.setText(mQRCodeBean.getBottonInfo());
Bitmap QRImage = QRCodeUtil.createQRImage(mQRCodeBean.getPrintQrcode(), 180, 180);
Bitmap QRImage = null;
try {
QRImage = QRCodeUtil.makeQRImage(mQRCodeBean.getPrintQrcode(), 250, 250);
} catch (WriterException e) {
e.printStackTrace();
}
if (QRImage != null) {
printQrcode.setImageBitmap(QRImage);
}
......
print-module/src/main/res/layout/print_skyorder_qrcode.xml
......@@ -13,7 +13,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:gravity="center"
android:textSize="@dimen/dp_18"
android:textSize="@dimen/dp_20"
android:text="餐檯:108" />
<TextView
......@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:textSize="@dimen/dp_20"
android:textSize="@dimen/dp_25"
android:text="頂部打印可配置文字以及字體大小" />
<ImageView
......@@ -31,15 +31,14 @@
android:layout_width="@dimen/dp_250"
android:layout_height="@dimen/dp_250"
android:layout_gravity="center"
android:layout_margin="@dimen/dp_30"
android:src="@drawable/ic_launcher_background"/>
android:layout_margin="@dimen/dp_30" />
<TextView
android:id="@+id/print_time"
style="@style/Print_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp_16"
android:textSize="@dimen/dp_20"
android:text="打印時間:2020-11-05 12:00" />
<TextView
......@@ -47,7 +46,7 @@
style="@style/Print_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp_16"
android:textSize="@dimen/dp_20"
android:text="人數:5" />
<TextView
......@@ -55,7 +54,7 @@
style="@style/Print_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp_16"
android:textSize="@dimen/dp_20"
android:text="交檯時間: 16:00" />
<TextView
......@@ -63,6 +62,6 @@
style="@style/Print_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp_20"
android:textSize="@dimen/dp_25"
android:text="底部打印可配置文字以及字體大小" />
</LinearLayout>
\ No newline at end of file
ss 0 → 100644
7a38c978 (HEAD -> dev, origin/dev, skyorder) HEAD@{0}: merge skyorder: Fast-forward
9ca88b20 HEAD@{1}: checkout: moving from skyorder to dev
7a38c978 (HEAD -> dev, origin/dev, skyorder) HEAD@{2}: commit: 添加滴滴 哆啦A夢框架，skyorder打印二維碼
9ca88b20 HEAD@{3}: checkout: moving from dev to skyorder
9ca88b20 HEAD@{4}: merge skyorder: Fast-forward
fa4a065d HEAD@{5}: checkout: moving from skyorder to dev
9ca88b20 HEAD@{6}: commit: skyorder打印處理 新增哆啦A夢:滴滴開源工具（辅助开发工具、测试效率工具、视觉辅助工具）
654437d8 HEAD@{7}: commit: 修改餐廳操作相關類
fa4a065d HEAD@{8}: checkout: moving from dev to skyorder
fa4a065d HEAD@{9}: checkout: moving from skyorder to dev
fa4a065d HEAD@{10}: checkout: moving from dev to skyorder
fa4a065d HEAD@{11}: commit: 增加skyorder打印頁
a1867471 HEAD@{12}: commit: 添加skyokrder打印頁面UI
6e91dc54 HEAD@{13}: commit (merge): Merge branch 'youhua' into dev
8366fd1e HEAD@{14}: merge master: Merge made by the 'recursive' strategy.
4cce725c HEAD@{15}: checkout: moving from youhua to dev
ce4cd6d7 (youhua) HEAD@{16}: checkout: moving from dev to youhua
4cce725c HEAD@{17}: merge origin/dev: Fast-forward
e75ec7a3 HEAD@{18}: checkout: moving from master to dev
547e42b5 (origin/master, origin/HEAD, master) HEAD@{19}: pull --progress --no-stat -v --progress origin master: Fast-forward
5c281d9e HEAD@{20}: checkout: moving from youhua to master
ce4cd6d7 (youhua) HEAD@{21}: commit: 引入rxjava工具類
0d0fc54b HEAD@{22}: commit: 1、按返回沒有彈出提示 尚有食物未送單,是否不保存返回 2、修改沒有找到會員提示 3、美化一下，按進細項，這數字建盤飛起來了
525c4def HEAD@{23}: commit: 折扣增加：上限，獨佔，暫停，只一次，最小賬單金額邏輯
aa04da1b HEAD@{24}: commit: 增加折扣邏輯
5dd12608 HEAD@{25}: commit: 添加loadsir頁面反饋管理
a40f7acb HEAD@{26}: commit: 修改數量調整
f47767b0 HEAD@{27}: commit: 賬單優化處理
1a28da3b HEAD@{28}: commit: 餐檯下單優化
d6728069 HEAD@{29}: commit: order-base模塊代碼遷移
27732b86 HEAD@{30}: commit: 拆分database模塊
e75ec7a3 HEAD@{31}: checkout: moving from dev to youhua
e75ec7a3 HEAD@{32}: checkout: moving from youhua_order to dev
93346fc8 HEAD@{33}: commit: 部分頁面報錯處理
b1ed7e54 HEAD@{34}: checkout: moving from dev to youhua_order
e75ec7a3 HEAD@{35}: commit: 餐牌默認字體大小調整
aa267293 HEAD@{36}: checkout: moving from youhua_order to dev
b1ed7e54 HEAD@{37}: checkout: moving from dev to youhua_order
aa267293 HEAD@{38}: checkout: moving from discount to dev
aa267293 HEAD@{39}: merge dev: Fast-forward
81e309bb HEAD@{40}: checkout: moving from dev to discount
aa267293 HEAD@{41}: commit: 餐廳擴展同步完善
81e309bb HEAD@{42}: checkout: moving from discount to dev
81e309bb HEAD@{43}: checkout: moving from dev to discount
81e309bb HEAD@{44}: checkout: moving from youhua_order to dev
b1ed7e54 HEAD@{45}: checkout: moving from discount to youhua_order
81e309bb HEAD@{46}: checkout: moving from dev to discount
81e309bb HEAD@{47}: checkout: moving from youhua_order to dev
b1ed7e54 HEAD@{48}: checkout: moving from dev to youhua_order
81e309bb HEAD@{49}: commit: 餐廳庫擴類拆分
d56efe83 HEAD@{50}: checkout: moving from youhua_order to dev
b1ed7e54 HEAD@{51}: checkout: moving from dev to youhua_order
d56efe83 HEAD@{52}: checkout: moving from youhua_order to dev
b1ed7e54 HEAD@{53}: checkout: moving from dev to youhua_order
d56efe83 HEAD@{54}: checkout: moving from youhua_order to dev
b1ed7e54 HEAD@{55}: commit: 擴展同步調整
1167588f HEAD@{56}: checkout: moving from dev to youhua_order
d56efe83 HEAD@{57}: merge origin/dev: Fast-forward
f4ee4cd0 HEAD@{58}: checkout: moving from youhua_order to dev
1167588f HEAD@{59}: checkout: moving from dev to youhua_order
f4ee4cd0 HEAD@{60}: checkout: moving from youhua_order to dev
1167588f HEAD@{61}: commit: 計算折扣調整
7cd416c8 HEAD@{62}: checkout: moving from dev to youhua_order
f4ee4cd0 HEAD@{63}: commit: 1、餐檯模式餐種過濾
5064a31b HEAD@{64}: merge origin/dev: Fast-forward
24b6de23 HEAD@{65}: commit: 1、新增餐檯模式餐種 2、細項/套餐組要可以 一起滑動 3、獲取支付方式接口新增上傳 payType字段
5f1d9219 HEAD@{66}: merge origin/dev: Fast-forward
52ac7855 HEAD@{67}: reset: moving to HEAD
52ac7855 HEAD@{68}: checkout: moving from youhua_order to dev
7cd416c8 HEAD@{69}: commit: 優化調整
e5e4e2e3 HEAD@{70}: checkout: moving from pre-master to youhua_order
0e7eee97 (origin/pre-master, pre-master) HEAD@{71}: checkout: moving from dev to pre-master
52ac7855 HEAD@{72}: checkout: moving from pre-master to dev
0e7eee97 (origin/pre-master, pre-master) HEAD@{73}: commit: 預發佈分支測試
52ac7855 HEAD@{74}: checkout: moving from dev to pre-master
52ac7855 HEAD@{75}: commit: 解決沽清食品組高度問題
bc78c384 HEAD@{76}: commit: 1、所有activity默認設置成豎屏 如果是平板根據系統走
02eff0af HEAD@{77}: merge origin/dev: Fast-forward
7b53780d HEAD@{78}: reset: moving to HEAD
7b53780d HEAD@{79}: merge origin/dev: Fast-forward
a425afdd HEAD@{80}: reset: moving to HEAD
a425afdd HEAD@{81}: checkout: moving from youhua_order to dev
e5e4e2e3 HEAD@{82}: checkout: moving from dev to youhua_order
a425afdd HEAD@{83}: commit: 1、設置手機不可橫屏
9c26422f HEAD@{84}: commit: 1、餐牌送單信息不跳轉新增訂單頁 2、新增訂單彈出選擇人數框
1ee70207 HEAD@{85}: checkout: moving from youhua_order to dev
e5e4e2e3 HEAD@{86}: commit: 提交下修改
a67d4d52 HEAD@{87}: checkout: moving from dev to youhua_order
1ee70207 HEAD@{88}: commit: 修改table-module下包名
750a0147 HEAD@{89}: commit: 增加其他組件跳轉餐牌頁
012c9448 HEAD@{90}: commit: 新增外賣訂單跳轉
cc2bb8ac HEAD@{91}: checkout: moving from youhua_order to dev
a67d4d52 HEAD@{92}: commit: 優化餐檯下單流程中...
c4d8a6b5 HEAD@{93}: commit: 新增餐牌下單相關類
e0116d7f HEAD@{94}: checkout: moving from dev to youhua_order
cc2bb8ac HEAD@{95}: checkout: moving from youhua_order to dev
e0116d7f HEAD@{96}: commit: -m餐廳擴展調整
cc2bb8ac HEAD@{97}: checkout: moving from dev to youhua_order
cc2bb8ac HEAD@{98}: commit: 1、食品組 食品 細項 折扣寬高行列字體大小可配置
f142c320 HEAD@{99}: commit: 1、修改餐廳擴展類
a5b63f95 HEAD@{100}: merge origin/dev: Fast-forward
b3a9216f HEAD@{101}: reset: moving to HEAD
b3a9216f HEAD@{102}: commit: 1、點1個單點食物>正常
d2117b69 HEAD@{103}: checkout: moving from master to dev
5c281d9e HEAD@{104}: reset: moving to HEAD
5c281d9e HEAD@{105}: clone: from http://gitlab.ricepon.com/ningbin/GSA-Cloud.git
table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableBean.java
......@@ -81,6 +81,7 @@ public class TableBean {
* minSeatCount : 2
* maxSeatCount : 8
* SplitStatus : 0
* skyQRCode：
*/
private int id;
......@@ -88,6 +89,7 @@ public class TableBean {
private int restaurantId;
private Long orderId;
private String qrCode;
private String qrCodeImg;
private int seatCount;
/**
* 最大就餐人數
......@@ -99,7 +101,6 @@ public class TableBean {
private int minSeatCount;
private String createTime;
private String createBy;
private String qrCodeImg;
private int posTableId;
private int serviceCharge;
private long memberId;
......@@ -141,6 +142,11 @@ public class TableBean {
*/
private String tableNumber = "";
/**
* skyorder QRCode內容
*/
private String skyQRCode;
public DataBean() {
}
......@@ -167,6 +173,7 @@ public class TableBean {
this.type = dataBean.type;
this.splitStatus = dataBean.splitStatus;
this.tableNumber = dataBean.tableNumber;
this.skyQRCode = dataBean.skyQRCode;
}
public int getId() {
......@@ -336,6 +343,14 @@ public class TableBean {
public void setTableNumber(String tableNumber) {
this.tableNumber = tableNumber;
}
public String getSkyQRCode() {
return skyQRCode;
}
public void setSkyQRCode(String skyQRCode) {
this.skyQRCode = skyQRCode;
}
}
public static TableBean.DataBean splitTableTransformTable(TableBean.DataBean mainTable,TableExtBean.DataBean dataBean) {
......@@ -355,6 +370,7 @@ public class TableBean {
tableBean.setTableNumber(dataBean.getTableNumber());
tableBean.setServiceCharge(dataBean.getServiceCharge());
tableBean.setSplitStatus(0);
tableBean.setSkyQRCode(dataBean.getSkyQrCode());
return tableBean;
}
......@@ -375,6 +391,7 @@ public class TableBean {
tableBean.setTableNumber(dataBean.getTableNumber());
tableBean.setServiceCharge(dataBean.getServiceCharge());
tableBean.setSplitStatus(0);
tableBean.setSkyQRCode(dataBean.getSkyQrCode());
return tableBean;
}
......
table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableExtBean.java
......@@ -48,6 +48,10 @@ public class TableExtBean {
private long updateTime;
private long createTime;
/**
* skyorder QRCode內容
*/
private String skyQrCode;
public int getId() {
return id;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/TableContract.java
......@@ -4,6 +4,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResultOld;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.PrintQRCodeRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.gingersoft.gsa.cloud.table.mvp.model.table.action.TableAction;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllTableFragment;
......@@ -96,6 +97,6 @@ public interface TableContract {
Observable<BaseResult> getFoodSummarys(int restaurantId,boolean isDefault, byte businessType);
Observable<BaseResultOld> addScan(RequestBody requestBody);
Observable<PrintQRCodeRespose> addScan(RequestBody requestBody);
}
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/TableModel.java
......@@ -7,6 +7,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.BaseResultOld;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.PrintQRCodeRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderService;
import com.gingersoft.gsa.cloud.table.mvp.model.service.TableService;
......@@ -131,7 +132,7 @@ public class TableModel extends BaseModel implements TableContract.Model {
}
@Override
public Observable<BaseResultOld> addScan(RequestBody requestBody) {
public Observable<PrintQRCodeRespose> addScan(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.addScan(requestBody);
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/PrintQRCodeRespose.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model.bean;
import lombok.Getter;
import lombok.Setter;
/**
* @author : bin
* @create date: 2020-11-06
* @update date: 2020-11-06
* @description:
*/
@Getter
@Setter
public class PrintQRCodeRespose {
private String code;
private String errMsg;
private String qrcode ="ASDDFFGFHGH";
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/TableService.java
......@@ -4,9 +4,13 @@ import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResultOld;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.PrintQRCodeRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.rx_cache2.LifeCache;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
import okhttp3.RequestBody;
import retrofit2.http.Body;
......@@ -51,5 +55,5 @@ public interface TableService {
@Headers({"Domain-Name: ricepon_restaurant"})
@POST("scan/addScan" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResultOld> addScan(@Body RequestBody requestBody);
Observable<PrintQRCodeRespose> addScan(@Body RequestBody requestBody);
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/table/action/PrintSkyOrderAction.java
......@@ -13,6 +13,7 @@ import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.constans.PrintConstans;
import com.gingersoft.gsa.cloud.print.bean.PrintQRCodeContent;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodSummary;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.PrintQRCodeRespose;
import com.gingersoft.gsa.cloud.table.mvp.presenter.TablePresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.SkyOrderDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog;
......@@ -90,22 +91,22 @@ public class PrintSkyOrderAction extends TableAction {
@Override
public void onPrint(FoodSummary foodSummary, int person, String endTime) {
mTablePresenter.addScan(GsaCloudApplication.getGsPosShopId(), tableBean.getId(), tableBean.getTableNumber(), tableBean.getTableName(),
person, GsaCloudApplication.getMemberName(), endTime, foodSummary.getId(), new OnNetworkCallbackListener<BaseResultOld>() {
person, GsaCloudApplication.getMemberName(), endTime, foodSummary.getId(), new OnNetworkCallbackListener<PrintQRCodeRespose>() {
@Override
public void onResult(BaseResultOld resultBean) {
public void onResult(PrintQRCodeRespose resultBean) {
// if ("0".equals(resultOld.getCode())) {
String printTime = TimeUtils.getStringByFormat(System.currentTimeMillis(), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM);
PrintQRCodeContent printQRCodeBean = new PrintQRCodeContent();
printQRCodeBean.setPrintTableName(tableBean.getTableName());
printQRCodeBean.setPrintTableName("餐檯:" + tableBean.getTableName());
printQRCodeBean.setPrintTopInfo("頂部打印可配置文字以及字體大小");
printQRCodeBean.setBottonInfo("底部打印可配置文字以及字體大小");
printQRCodeBean.setPrintQrcode(resultBean.getErrMsg());
printQRCodeBean.setPrintTime(printTime);
printQRCodeBean.setPrintPeopleNum(String.valueOf(tableBean.getPerson()));
printQRCodeBean.setPrintMealEndTime(endTime);
printQRCodeBean.setPrintQrcode(resultBean.getQrcode());
printQRCodeBean.setPrintTime("打印時間:" + printTime);
printQRCodeBean.setPrintPeopleNum("人數:" + tableBean.getPerson());
printQRCodeBean.setPrintMealEndTime("交檯時間:" + endTime);
CC.obtainBuilder("Component.Print")
.setActionName("printActivity")
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
......@@ -21,6 +21,7 @@ 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.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodSummary;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.PrintQRCodeRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.gingersoft.gsa.cloud.table.mvp.model.constant.SkyOrderConstant;
import com.gingersoft.gsa.cloud.table.mvp.model.table.action.MoveTableAction;
......@@ -769,10 +770,10 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
.subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<BaseResultOld>(mErrorHandler) {
.subscribe(new ErrorHandleSubscriber<PrintQRCodeRespose>(mErrorHandler) {
@Override
public void onNext(@NonNull BaseResultOld result) {
public void onNext(@NonNull PrintQRCodeRespose result) {
if (networkCallBackListener != null) {
networkCallBackListener.onResult(result);
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/TableAdapter.java
......@@ -216,7 +216,7 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
} else {
iv_vip.setVisibility(View.GONE);
}
if (!TextUtils.isEmpty(item.getQrCode())) {
if (!TextUtils.isEmpty(item.getSkyQRCode())) {
setTableFlagDispalyLayout(item);
tv_scan_flag.setVisibility(View.VISIBLE);
} else {
......@@ -323,31 +323,29 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
tv_scan_flag.setText(skyQRCodeTableFlagText);
tv_scan_flag.setTextSize(skyQRCodeTableFlagTextSize);
if (!TextUtils.isEmpty(item.getQrCode())) {
if (item.getMemberId() == 0) {
//未登入会员
if (item.getOrderId() != null) {
//已送单（橙色底黑色“S”）
//橙色底黑色字“S”=SKY ORDER未登錄會員
tv_scan_flag.setTextColor(Color.parseColor("#000000"));
tv_scan_flag.setBackgroundColor(Color.parseColor("#FF7F04"));
} else {
//未送单（蓝色底黑色“S”）
//藍色底黑色字“S”=SKY ORDER未登錄會員
tv_scan_flag.setTextColor(Color.parseColor("#000000"));
tv_scan_flag.setBackgroundColor(Color.parseColor("#0404FF"));
}
if (item.getMemberId() == 0) {
//未登入会员
if (item.getOrderId() != null) {
//已送单（橙色底黑色“S”）
//橙色底黑色字“S”=SKY ORDER未登錄會員
tv_scan_flag.setTextColor(Color.parseColor("#000000"));
tv_scan_flag.setBackgroundColor(Color.parseColor("#FF7F04"));
} else {
//已登入会员
if (item.getOrderId() != null) {
//已送单（橙色底白色“S”）
tv_scan_flag.setTextColor(Color.parseColor("#FFFFFF"));
tv_scan_flag.setBackgroundColor(Color.parseColor("#FF7F04"));
} else {
//未送单（蓝色底白色“S”）
tv_scan_flag.setTextColor(Color.parseColor("#FFFFFF"));
tv_scan_flag.setBackgroundColor(Color.parseColor("#0404FF"));
}
//未送单（蓝色底黑色“S”）
//藍色底黑色字“S”=SKY ORDER未登錄會員
tv_scan_flag.setTextColor(Color.parseColor("#000000"));
tv_scan_flag.setBackgroundColor(Color.parseColor("#0404FF"));
}
} else {
//已登入会员
if (item.getOrderId() != null) {
//已送单（橙色底白色“S”）
tv_scan_flag.setTextColor(Color.parseColor("#FFFFFF"));
tv_scan_flag.setBackgroundColor(Color.parseColor("#FF7F04"));
} else {
//未送单（蓝色底白色“S”）
tv_scan_flag.setTextColor(Color.parseColor("#FFFFFF"));
tv_scan_flag.setBackgroundColor(Color.parseColor("#0404FF"));
}
}
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/widget/SkyOrderDialog.java
......@@ -314,9 +314,6 @@ public class SkyOrderDialog extends BaseRetryDialog implements View.OnClickListe
btnClear.setOnClickListener(this);
btnDelte.setOnClickListener(this);
btnSure.setOnClickListener(this);
boolean lockedCheckState = (boolean) SPUtils.get(SkyOrderConstant.check_status, false);
cb_title.setChecked(lockedCheckState);
return view;
}
......@@ -328,6 +325,7 @@ public class SkyOrderDialog extends BaseRetryDialog implements View.OnClickListe
callbackListener.lockState(isChecked);
}
SPUtils.put(SkyOrderConstant.check_status, isChecked);
saveMealTime(isChecked);
}
});
}
......@@ -360,8 +358,13 @@ public class SkyOrderDialog extends BaseRetryDialog implements View.OnClickListe
tvMealHours.setText(String.valueOf(chooseMealTimes[0]));
}
if (minuteSelectPosition != -1) {
tvMealMinute.setText(String.valueOf(chooseMealTimes[1]));
if (chooseMealTimes[1] == 0) {
tvMealMinute.setText(chooseMealTimes[1] + "0");
} else {
tvMealMinute.setText(String.valueOf(chooseMealTimes[1]));
}
}
cb_title.setChecked(lockedCheckState);
}
private void setLockedMealTime() {
......@@ -510,7 +513,7 @@ public class SkyOrderDialog extends BaseRetryDialog implements View.OnClickListe
return foodSummary;
}
}
return null;
return foodSummaryList.get(0);
}
/**
......@@ -524,6 +527,21 @@ public class SkyOrderDialog extends BaseRetryDialog implements View.OnClickListe
}
}
private void saveMealTime(boolean isChecked) {
if (isChecked) {
SPUtils.put(SkyOrderConstant.delivery_time_hour, String.valueOf(chooseMealTimes[0]));
if (chooseMealTimes[1] == 0) {
SPUtils.put(SkyOrderConstant.delivery_time_minute, chooseMealTimes[1] + "0");
} else {
SPUtils.put(SkyOrderConstant.delivery_time_minute, String.valueOf(chooseMealTimes[1]));
}
} else {
SPUtils.put(SkyOrderConstant.delivery_time_hour, "");
SPUtils.put(SkyOrderConstant.delivery_time_minute, "");
}
SPUtils.put(SkyOrderConstant.check_status, isChecked);
}
private void initRvSummaryAdapter() {
mFoodSummaryAdapter = new FoodSummaryAdapter(mFoodSummaryList);
rvSummary.setAdapter(mFoodSummaryAdapter);
......@@ -565,22 +583,16 @@ public class SkyOrderDialog extends BaseRetryDialog implements View.OnClickListe
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
boolean lockedCheckState = (boolean) SPUtils.get(SkyOrderConstant.check_status, false);
if (lockedCheckState) {
SPUtils.put(SkyOrderConstant.delivery_time_hour, String.valueOf(chooseMealTimes[0]));
SPUtils.put(SkyOrderConstant.delivery_time_minute, String.valueOf(chooseMealTimes[1]));
} else {
SPUtils.put(SkyOrderConstant.delivery_time_hour, "");
SPUtils.put(SkyOrderConstant.delivery_time_minute, "");
}
SPUtils.put(SkyOrderConstant.check_status, lockedCheckState);
if (textView.getId() == R.id.tv_meal_hours) {
int viewId = textView.getId();
if (viewId == R.id.tv_meal_hours) {
chooseMealTimes[0] = mMealHours.get(position);
} else if (textView.getId() == R.id.tv_meal_hours) {
} else if (viewId == R.id.tv_meal_minute) {
chooseMealTimes[1] = mMealMinute.get(position);
}
boolean lockedCheckState = (boolean) SPUtils.get(SkyOrderConstant.check_status, false);
saveMealTime(lockedCheckState);
textView.setText(lists.get(position).get("text").toString());
mTimePopup.dismiss();
......
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