Skip to content

S
supplier
Commit 1e5bffbd by Wyh
Options

7.04 修改打印一些數據。登陸頁面，加了billNo

parent 05241d29
Showing with 540 additions and 326 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/JsonUtils.java
......@@ -40,6 +40,21 @@ public class JsonUtils {
}
/**
* json字符串转换bean对象，异常捕捉
*/
public static <T> T parseObject(Object json, Class<T> classOfT) {
try {
if (null == json) {
return null;
}
return JSON.parseObject(JSONObject.toJSONString(json), classOfT);
} catch (JSONException e) {
e.printStackTrace();
}
return null;
}
/**
* object转换List对象，异常捕捉
*/
public static <T> List<T> parseArray(Object object, Class<T> classOfT) {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/okhttpUtils/OkHttp3Utils.java
......@@ -48,7 +48,7 @@ public class OkHttp3Utils {
.connectTimeout(GsaCloudApplication.REQUEST_TIMEOUT, TimeUnit.SECONDS)
.readTimeout(GsaCloudApplication.REQUEST_TIMEOUT, TimeUnit.SECONDS)
.addInterceptor(new UserAgentIntercepter())
.addInterceptor(new LoggingInterceptor())
// .addInterceptor(new LoggingInterceptor())
.build();
}
......
base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/PrinterDeviceBean.java
......@@ -20,51 +20,34 @@ public class PrinterDeviceBean implements Serializable {
@Property(nameInDb = "_id")
@Id(autoincrement = true)
private Long dbid;
private String name;
private Integer restaurantId;
private String ip;//ip
private Long uid;
private Integer port;//端口
// private int type;//打印機紙張類型 為1時是58mm，否則是88mm
private Integer status;//2為默認打印機，1為普通打印機
private Integer type;//2為默認打印機，1為普通打印機
private int printerModelId;//打印機機型id
private Long printerModelId;//打印機機型id
private String paperSpecification;//紙張規格
private String printerName;//打印機機型名稱
private String model;//打印機型號
private String noteContent;//備註
private Long printerDeviceDefaultId;
/**
* 飛單1打印機id
*/
private Long printerDeviceId;
private Long flyPrinterDeviceId;
/**
* 飛單2 打印機id
*/
private Long defaultPrinterDeviceId;
private Long flyPrinterDeviceId2;
@Generated(hash = 626885316)
public PrinterDeviceBean() {
}
public PrinterDeviceBean(String name, Long id, Integer restaurantId, String ip, Integer port, int type) {
this.name = name;
this.id = id;
this.restaurantId = restaurantId;
this.ip = ip;
this.port = port;
}
public PrinterDeviceBean(String name, Integer restaurantId, String ip, Integer port, int type) {
this.name = name;
this.restaurantId = restaurantId;
this.ip = ip;
this.port = port;
}
@Generated(hash = 1626972301)
public PrinterDeviceBean(Long id, Long dbid, String name, Integer restaurantId, String ip, Long uid, Integer port, Integer status, int printerModelId, String paperSpecification, String printerName, String model, Long printerDeviceId, Long defaultPrinterDeviceId) {
@Generated(hash = 1228354346)
public PrinterDeviceBean(Long id, Long dbid, String name, Integer restaurantId, String ip, Long uid, Integer port, Integer type, Long printerModelId, String paperSpecification, String printerName, String model, String noteContent, Long printerDeviceDefaultId, Long flyPrinterDeviceId, Long flyPrinterDeviceId2) {
this.id = id;
this.dbid = dbid;
this.name = name;
......@@ -72,25 +55,19 @@ public class PrinterDeviceBean implements Serializable {
this.ip = ip;
this.uid = uid;
this.port = port;
this.status = status;
this.type = type;
this.printerModelId = printerModelId;
this.paperSpecification = paperSpecification;
this.printerName = printerName;
this.model = model;
this.printerDeviceId = printerDeviceId;
this.defaultPrinterDeviceId = defaultPrinterDeviceId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
this.noteContent = noteContent;
this.printerDeviceDefaultId = printerDeviceDefaultId;
this.flyPrinterDeviceId = flyPrinterDeviceId;
this.flyPrinterDeviceId2 = flyPrinterDeviceId2;
}
public Long getId() {
return this.id;
return id;
}
public void setId(Long id) {
......@@ -98,74 +75,69 @@ public class PrinterDeviceBean implements Serializable {
}
public Long getDbid() {
return this.dbid;
return dbid;
}
public void setDbid(Long dbid) {
this.dbid = dbid;
}
public Integer getRestaurantId() {
return restaurantId;
public String getName() {
return name;
}
public String getIp() {
return this.ip;
public void setName(String name) {
this.name = name;
}
public void setIp(String ip) {
this.ip = ip;
public Integer getRestaurantId() {
return restaurantId;
}
public Integer getPort() {
return this.port;
public void setRestaurantId(Integer restaurantId) {
this.restaurantId = restaurantId;
}
public void setPort(Integer port) {
this.port = port;
public String getIp() {
return ip;
}
// public int getType() {
// return this.type;
// }
//
// public void setType(int type) {
// this.type = type;
// }
public void setRestaurantId(Integer restaurantId) {
this.restaurantId = restaurantId;
public void setIp(String ip) {
this.ip = ip;
}
public int getStatus() {
return this.status;
public Long getUid() {
return uid;
}
public void setStatus(Integer status) {
this.status = status;
public void setUid(Long uid) {
this.uid = uid;
}
public Long getPrinterDeviceId() {
return this.printerDeviceId;
public Integer getPort() {
return port;
}
public void setPrinterDeviceId(Long printerDeviceId) {
this.printerDeviceId = printerDeviceId;
public void setPort(Integer port) {
this.port = port;
}
public Long getDefaultPrinterDeviceId() {
return this.defaultPrinterDeviceId;
public Integer getType() {
if (type == null) {
return 0;
}
return type;
}
public void setDefaultPrinterDeviceId(Long defaultPrinterDeviceId) {
this.defaultPrinterDeviceId = defaultPrinterDeviceId;
public void setType(Integer type) {
this.type = type;
}
public int getPrinterModelId() {
public Long getPrinterModelId() {
return printerModelId;
}
public void setPrinterModelId(int printerModelId) {
public void setPrinterModelId(Long printerModelId) {
this.printerModelId = printerModelId;
}
......@@ -193,12 +165,35 @@ public class PrinterDeviceBean implements Serializable {
this.model = model;
}
public String getNoteContent() {
return noteContent;
}
public Long getUid() {
return uid;
public void setNoteContent(String noteContent) {
this.noteContent = noteContent;
}
public void setUid(Long uid) {
this.uid = uid;
public Long getFlyPrinterDeviceId() {
return flyPrinterDeviceId;
}
public void setFlyPrinterDeviceId(Long flyPrinterDeviceId) {
this.flyPrinterDeviceId = flyPrinterDeviceId;
}
public Long getFlyPrinterDeviceId2() {
return flyPrinterDeviceId2;
}
public void setFlyPrinterDeviceId2(Long flyPrinterDeviceId2) {
this.flyPrinterDeviceId2 = flyPrinterDeviceId2;
}
public Long getPrinterDeviceDefaultId() {
return printerDeviceDefaultId;
}
public void setPrinterDeviceDefaultId(Long printerDeviceDefaultId) {
this.printerDeviceDefaultId = printerDeviceDefaultId;
}
}
base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/PrinterListBean.java 0 → 100644
package com.gingersoft.gsa.cloud.database.bean;
import java.util.List;
public class PrinterListBean {
private int count;
private List<PrinterDeviceBean> list;
public int getCount() {
return count;
}
public void setCount(int count) {
this.count = count;
}
public List<PrinterDeviceBean> getList() {
return list;
}
public void setList(List<PrinterDeviceBean> list) {
this.list = list;
}
}
base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/PrinterDeviceBeanDao.java
......@@ -31,13 +31,15 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
public final static Property Ip = new Property(4, String.class, "ip", false, "IP");
public final static Property Uid = new Property(5, Long.class, "uid", false, "UID");
public final static Property Port = new Property(6, Integer.class, "port", false, "PORT");
public final static Property Status = new Property(7, Integer.class, "status", false, "STATUS");
public final static Property PrinterModelId = new Property(8, int.class, "printerModelId", false, "PRINTER_MODEL_ID");
public final static Property Type = new Property(7, Integer.class, "type", false, "TYPE");
public final static Property PrinterModelId = new Property(8, Long.class, "printerModelId", false, "PRINTER_MODEL_ID");
public final static Property PaperSpecification = new Property(9, String.class, "paperSpecification", false, "PAPER_SPECIFICATION");
public final static Property PrinterName = new Property(10, String.class, "printerName", false, "PRINTER_NAME");
public final static Property Model = new Property(11, String.class, "model", false, "MODEL");
public final static Property PrinterDeviceId = new Property(12, Long.class, "printerDeviceId", false, "PRINTER_DEVICE_ID");
public final static Property DefaultPrinterDeviceId = new Property(13, Long.class, "defaultPrinterDeviceId", false, "DEFAULT_PRINTER_DEVICE_ID");
public final static Property NoteContent = new Property(12, String.class, "noteContent", false, "NOTE_CONTENT");
public final static Property PrinterDeviceDefaultId = new Property(13, Long.class, "printerDeviceDefaultId", false, "PRINTER_DEVICE_DEFAULT_ID");
public final static Property FlyPrinterDeviceId = new Property(14, Long.class, "flyPrinterDeviceId", false, "FLY_PRINTER_DEVICE_ID");
public final static Property FlyPrinterDeviceId2 = new Property(15, Long.class, "flyPrinterDeviceId2", false, "FLY_PRINTER_DEVICE_ID2");
}
......@@ -60,13 +62,15 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
"\"IP\" TEXT," + // 4: ip
"\"UID\" INTEGER," + // 5: uid
"\"PORT\" INTEGER," + // 6: port
"\"STATUS\" INTEGER," + // 7: status
"\"PRINTER_MODEL_ID\" INTEGER NOT NULL ," + // 8: printerModelId
"\"TYPE\" INTEGER," + // 7: type
"\"PRINTER_MODEL_ID\" INTEGER," + // 8: printerModelId
"\"PAPER_SPECIFICATION\" TEXT," + // 9: paperSpecification
"\"PRINTER_NAME\" TEXT," + // 10: printerName
"\"MODEL\" TEXT," + // 11: model
"\"PRINTER_DEVICE_ID\" INTEGER," + // 12: printerDeviceId
"\"DEFAULT_PRINTER_DEVICE_ID\" INTEGER);"); // 13: defaultPrinterDeviceId
"\"NOTE_CONTENT\" TEXT," + // 12: noteContent
"\"PRINTER_DEVICE_DEFAULT_ID\" INTEGER," + // 13: printerDeviceDefaultId
"\"FLY_PRINTER_DEVICE_ID\" INTEGER," + // 14: flyPrinterDeviceId
"\"FLY_PRINTER_DEVICE_ID2\" INTEGER);"); // 15: flyPrinterDeviceId2
}
/** Drops the underlying database table. */
......@@ -114,11 +118,15 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
stmt.bindLong(7, port);
}
Integer status = entity.getStatus();
if (status != null) {
stmt.bindLong(8, status);
Integer type = entity.getType();
if (type != null) {
stmt.bindLong(8, type);
}
Long printerModelId = entity.getPrinterModelId();
if (printerModelId != null) {
stmt.bindLong(9, printerModelId);
}
stmt.bindLong(9, entity.getPrinterModelId());
String paperSpecification = entity.getPaperSpecification();
if (paperSpecification != null) {
......@@ -135,14 +143,24 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
stmt.bindString(12, model);
}
Long printerDeviceId = entity.getPrinterDeviceId();
if (printerDeviceId != null) {
stmt.bindLong(13, printerDeviceId);
String noteContent = entity.getNoteContent();
if (noteContent != null) {
stmt.bindString(13, noteContent);
}
Long printerDeviceDefaultId = entity.getPrinterDeviceDefaultId();
if (printerDeviceDefaultId != null) {
stmt.bindLong(14, printerDeviceDefaultId);
}
Long flyPrinterDeviceId = entity.getFlyPrinterDeviceId();
if (flyPrinterDeviceId != null) {
stmt.bindLong(15, flyPrinterDeviceId);
}
Long defaultPrinterDeviceId = entity.getDefaultPrinterDeviceId();
if (defaultPrinterDeviceId != null) {
stmt.bindLong(14, defaultPrinterDeviceId);
Long flyPrinterDeviceId2 = entity.getFlyPrinterDeviceId2();
if (flyPrinterDeviceId2 != null) {
stmt.bindLong(16, flyPrinterDeviceId2);
}
}
......@@ -185,11 +203,15 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
stmt.bindLong(7, port);
}
Integer status = entity.getStatus();
if (status != null) {
stmt.bindLong(8, status);
Integer type = entity.getType();
if (type != null) {
stmt.bindLong(8, type);
}
Long printerModelId = entity.getPrinterModelId();
if (printerModelId != null) {
stmt.bindLong(9, printerModelId);
}
stmt.bindLong(9, entity.getPrinterModelId());
String paperSpecification = entity.getPaperSpecification();
if (paperSpecification != null) {
......@@ -206,14 +228,24 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
stmt.bindString(12, model);
}
Long printerDeviceId = entity.getPrinterDeviceId();
if (printerDeviceId != null) {
stmt.bindLong(13, printerDeviceId);
String noteContent = entity.getNoteContent();
if (noteContent != null) {
stmt.bindString(13, noteContent);
}
Long printerDeviceDefaultId = entity.getPrinterDeviceDefaultId();
if (printerDeviceDefaultId != null) {
stmt.bindLong(14, printerDeviceDefaultId);
}
Long flyPrinterDeviceId = entity.getFlyPrinterDeviceId();
if (flyPrinterDeviceId != null) {
stmt.bindLong(15, flyPrinterDeviceId);
}
Long defaultPrinterDeviceId = entity.getDefaultPrinterDeviceId();
if (defaultPrinterDeviceId != null) {
stmt.bindLong(14, defaultPrinterDeviceId);
Long flyPrinterDeviceId2 = entity.getFlyPrinterDeviceId2();
if (flyPrinterDeviceId2 != null) {
stmt.bindLong(16, flyPrinterDeviceId2);
}
}
......@@ -232,13 +264,15 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // ip
cursor.isNull(offset + 5) ? null : cursor.getLong(offset + 5), // uid
cursor.isNull(offset + 6) ? null : cursor.getInt(offset + 6), // port
cursor.isNull(offset + 7) ? null : cursor.getInt(offset + 7), // status
cursor.getInt(offset + 8), // printerModelId
cursor.isNull(offset + 7) ? null : cursor.getInt(offset + 7), // type
cursor.isNull(offset + 8) ? null : cursor.getLong(offset + 8), // printerModelId
cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // paperSpecification
cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // printerName
cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // model
cursor.isNull(offset + 12) ? null : cursor.getLong(offset + 12), // printerDeviceId
cursor.isNull(offset + 13) ? null : cursor.getLong(offset + 13) // defaultPrinterDeviceId
cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // noteContent
cursor.isNull(offset + 13) ? null : cursor.getLong(offset + 13), // printerDeviceDefaultId
cursor.isNull(offset + 14) ? null : cursor.getLong(offset + 14), // flyPrinterDeviceId
cursor.isNull(offset + 15) ? null : cursor.getLong(offset + 15) // flyPrinterDeviceId2
);
return entity;
}
......@@ -252,13 +286,15 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
entity.setIp(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4));
entity.setUid(cursor.isNull(offset + 5) ? null : cursor.getLong(offset + 5));
entity.setPort(cursor.isNull(offset + 6) ? null : cursor.getInt(offset + 6));
entity.setStatus(cursor.isNull(offset + 7) ? null : cursor.getInt(offset + 7));
entity.setPrinterModelId(cursor.getInt(offset + 8));
entity.setType(cursor.isNull(offset + 7) ? null : cursor.getInt(offset + 7));
entity.setPrinterModelId(cursor.isNull(offset + 8) ? null : cursor.getLong(offset + 8));
entity.setPaperSpecification(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9));
entity.setPrinterName(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10));
entity.setModel(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11));
entity.setPrinterDeviceId(cursor.isNull(offset + 12) ? null : cursor.getLong(offset + 12));
entity.setDefaultPrinterDeviceId(cursor.isNull(offset + 13) ? null : cursor.getLong(offset + 13));
entity.setNoteContent(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12));
entity.setPrinterDeviceDefaultId(cursor.isNull(offset + 13) ? null : cursor.getLong(offset + 13));
entity.setFlyPrinterDeviceId(cursor.isNull(offset + 14) ? null : cursor.getLong(offset + 14));
entity.setFlyPrinterDeviceId2(cursor.isNull(offset + 15) ? null : cursor.getLong(offset + 15));
}
@Override
......
base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/OrderDetails.kt
......@@ -68,14 +68,16 @@ class OrderDetails {
var ID: Int = 0
var CREATE_TIME: String? = null
var takeFoodCode: String? = null
var billNo: String? = null
var RECEIVER: String? = null
var TOTAL_AMOUNT: String? = null
//後台不會返回
var order_type: Int = 0
var orderPayType: Int = 0//1為貨到付款，其他是在線支付
var orderPayType: Int = 0//0店內支付，1為貨到付款，2是在線支付
var isDelete: Int = 1 //默認為1，為0是第三方物流,其他則是本店配送
var payType: Int = 0//1:積分支付;2:支付寶;3:财付通;4:微信支付;5:貨到付款;6:其他支付
var payName: String? = null
var payTime: String? = null
var PRODUCT_NAME: List<PRODUCTNAMEBean>? = null
var couponList: List<CouponBean>? = null
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/bean/mode/BrandsBean.java
......@@ -8,7 +8,7 @@ public class BrandsBean {
private long sysTime;
private List<BrandsData> data;
public class BrandsData {
public static class BrandsData {
/**
* brandId : 242
* brandName : 莫拉塔
......
base-module/src/main/res/drawable/selector_checkbox_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_checkbox_checked" android:state_checked="true"/>
<item android:drawable="@drawable/ic_checkbox_uncheck" android:state_checked="false"/>
</selector>
\ No newline at end of file
base-module/src/main/res/drawable/shape_login_edit_border.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="@dimen/dp_0_5"
android:color="@color/color_aaa" />
<corners android:radius="@dimen/dp_4" />
</shape>
\ No newline at end of file
base-module/src/main/res/layout/print_kitchen.xml
......@@ -87,6 +87,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="人數："
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_kitchen_location" />
......
config.gradle
......@@ -7,8 +7,8 @@ ext {
targetSdkVersion : 28,
//正式版: 1.0.1 1
//內部測試版:1.1.1 11
versionCode : 12,
versionName : "1.1.2"
versionCode : 13,
versionName : "1.1.3"
]
version = [
......
login-module/src/main/res/layout/user_login_activity_login.xml
......@@ -4,14 +4,26 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/theme_white_color"
android:orientation="vertical"
android:fillViewport="true"
android:paddingLeft="@dimen/dp_18"
android:paddingRight="@dimen/dp_18">
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/img_login_top_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_19"
android:paddingRight="@dimen/dp_19"
android:orientation="vertical">
<TextView
android:id="@+id/login_title"
......@@ -20,8 +32,9 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="80dp"
android:text="@string/user_login_welcome_login"
android:textColor="@color/user_login_title_color"
android:textSize="@dimen/dp_26"
android:textColor="@color/theme_color"
android:textSize="@dimen/dp_20"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -33,89 +46,123 @@
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:text="賬戶"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/login_title" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_38"
android:layout_marginTop="@dimen/dp_70"
android:background="@drawable/shape_login_edit_border"
app:layout_constraintLeft_toLeftOf="parent">
<ImageView
android:id="@+id/iv_account"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_10"
android:src="@drawable/ic_account" />
<ImageView
android:id="@+id/iv_clear_account"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:padding="@dimen/dp_5"
android:src="@drawable/ic_clear_text"
android:visibility="gone" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/ed_login_user_account"
style="@style/user_login_edit_style"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toLeftOf="@id/iv_clear_account"
android:layout_toRightOf="@id/iv_account"
android:hint="請輸入賬戶名或手機號"
android:maxLength="16"
android:paddingRight="@dimen/dp_10"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/iv_clear_account"
app:layout_constraintTop_toBottomOf="@id/tv_account_text" />
android:paddingRight="@dimen/dp_10" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_38"
android:layout_marginTop="@dimen/dp_15"
android:background="@drawable/shape_login_edit_border"
app:layout_constraintLeft_toLeftOf="parent">
<ImageView
android:id="@+id/iv_clear_account"
android:id="@+id/iv_pwd"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_10"
android:src="@drawable/ic_pwd" />
<ImageView
android:id="@+id/iv_clear_pwd"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:padding="@dimen/dp_5"
android:src="@drawable/ic_clear_text"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/ed_login_user_account"
app:layout_constraintLeft_toRightOf="@id/ed_login_user_account"
app:layout_constraintBottom_toBottomOf="@id/ed_login_user_pwd"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/ed_login_user_account" />
<View
android:id="@+id/line_account"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:background="@color/user_login_line_color"
app:layout_constraintTop_toBottomOf="@id/ed_login_user_account" />
<TextView
android:id="@+id/tv_password_text"
style="@style/user_login_edit_title_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:text="密碼"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/line_account" />
app:layout_constraintTop_toTopOf="@id/ed_login_user_pwd" />
<ImageView
android:id="@+id/ic_look_pwd"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/iv_clear_pwd"
android:padding="@dimen/dp_5"
android:src="@mipmap/ic_password_hide"
android:visibility="gone" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/ed_login_user_pwd"
android:layout_width="0dp"
android:layout_height="wrap_content"
style="@style/user_login_edit_style"
android:layout_marginTop="@dimen/dp_5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toLeftOf="@id/ic_look_pwd"
android:layout_toRightOf="@id/iv_pwd"
android:hint="輸入6~20個字符"
android:inputType="textPassword"
android:maxLength="20"
android:paddingRight="@dimen/dp_10"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/ic_look_pwd"
app:layout_constraintTop_toBottomOf="@id/tv_password_text" />
android:paddingRight="@dimen/dp_10" />
</RelativeLayout>
<View
android:id="@+id/line_password"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:background="@color/user_login_line_color"
app:layout_constraintTop_toBottomOf="@id/ed_login_user_pwd" />
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:gravity="center_vertical"
android:orientation="horizontal">
<CheckBox
android:id="@+id/rb_auto_login"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_15"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/line_password" />
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_15"
android:background="@drawable/selector_checkbox_bg"
android:button="@null" />
<TextView
android:id="@+id/tv_auto_login_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_11"
android:text="自動登陸"
android:textColor="@color/theme_333_color"
android:textColor="@color/color_86"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="@id/rb_auto_login"
app:layout_constraintLeft_toRightOf="@id/rb_auto_login"
......@@ -124,9 +171,11 @@
<CheckBox
android:id="@+id/rb_remember_password"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_15"
android:layout_marginLeft="@dimen/dp_15"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
app:layout_constraintLeft_toRightOf="@id/tv_auto_login_text"
app:layout_constraintTop_toTopOf="@id/rb_auto_login" />
......@@ -134,64 +183,45 @@
android:id="@+id/tv_remember_pwd_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_11"
android:text="記住密碼"
android:textColor="@color/theme_333_color"
android:textColor="@color/color_86"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="@id/rb_remember_password"
app:layout_constraintLeft_toRightOf="@id/rb_remember_password"
app:layout_constraintTop_toTopOf="@id/rb_remember_password" />
<ImageView
android:id="@+id/ic_look_pwd"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:padding="@dimen/dp_5"
android:src="@mipmap/ic_password_hide"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/ed_login_user_pwd"
app:layout_constraintRight_toLeftOf="@id/iv_clear_pwd"
app:layout_constraintTop_toTopOf="@id/ed_login_user_pwd" />
<ImageView
android:id="@+id/iv_clear_pwd"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:padding="@dimen/dp_5"
android:src="@drawable/ic_clear_text"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/ed_login_user_pwd"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/ed_login_user_pwd" />
<TextView
android:id="@+id/tv_forget_pwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="找回密碼"
android:text="忘記密碼?"
android:textColor="@color/color_3c"
android:textSize="@dimen/dp_16"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="@id/rb_auto_login"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/rb_auto_login"
app:layout_constraintTop_toTopOf="@id/rb_auto_login" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<com.qmuiteam.qmui.alpha.QMUIAlphaButton
android:id="@+id/btn_gsa_user_login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_50"
android:background="@drawable/selector_login_btn"
android:gravity="center"
android:text="登錄"
android:textColor="@color/white"
app:layout_constraintVertical_bias="1"
app:layout_constraintTop_toBottomOf="@id/rb_auto_login"
android:textSize="@dimen/dp_16"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:textSize="@dimen/dp_16" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
login-module/src/main/res/values/strings.xml
<resources>
<string name="user_login_name" translatable="false">Ricepon POS</string>
<string name="user_login_welcome_login" translatable="false">歡迎登陸商戶端</string>
<string name="user_login_welcome_login" translatable="false">商戶端</string>
</resources>
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/service/MainService.java
......@@ -14,7 +14,6 @@ import retrofit2.http.POST;
*/
public interface MainService {
@Headers({"Domain-Name: system_url"})
@POST("user/logout" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<Object> loginOut(@Body RequestBody requestBody);
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/NewMainPresenter.java
......@@ -114,7 +114,6 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
public void loginOut() {
RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", GsaCloudApplication.getRestaurantId(mApplication) + "")
.add("type", "2")
.build();
clearHeartbeat();
......@@ -132,7 +131,6 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
mRootView.loginOut();
//清空用戶信息
GsaCloudApplication.clearMemberInfo();
}
});
}
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/LookLogActivity.kt
......@@ -34,7 +34,7 @@ class LookLogActivity : AppCompatActivity() {
}
rv_log.layoutManager = LinearLayoutManager(this)
val logAdapter = LogAdapter(ml)
logAdapter.setOnItemClickListener { adapter, view, position ->
logAdapter.setOnItemClickListener { _, _, position ->
scroll_log.visibility = View.VISIBLE
var x = ml[position]
if (!x.isDirectory) {
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt
......@@ -14,6 +14,7 @@ import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
import com.gingersoft.gsa.cloud.base.widget.DialogUtils
import com.gingersoft.gsa.cloud.constans.PrintConstans
......@@ -292,7 +293,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
}
BtnBuilder.printBtn -> {
//打印
printOrder(dataBean, listener)
printOrder(PrintCode, dataBean, listener)
}
BtnBuilder.ProductionCompletedBtn -> {
//製作完成
......@@ -307,10 +308,12 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
}
fun gsUpdateOrderStatus(orderDetails: OrderDetails.DataBean, payTypeId: Int = 0, listener: (Int, Boolean) -> Unit) {
fun gsUpdateOrderStatus(orderDetails: OrderDetails.DataBean, payTypeId: Int = 0, payName:String?, listener: (Int, Boolean) -> Unit) {
launch({
repository.gsUpdateOrderStatus(orderDetails.ID.toString(), 4, orderDetails.order_type, 3, "", "", "", "0", "", 1, 0, payTypeId).apply {
orderDetails.payType = payTypeId
orderDetails.payName = payName
orderDetails.payTime = TimeUtils.getCurrentTimeInString(TimeUtils.DEFAULT_DATE_FORMAT)
val bean = GsonUtils.GsonToBean(GsonUtils.GsonString(data), OrderClosingBean::class.java)
orderDetails.oldPoints = bean.oldPoints
orderDetails.nowPoints = bean.nowPoints
......@@ -456,16 +459,13 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
launch({
//單獨包起來，哪怕這接口報錯也不要影響到正常的邏輯
repository.addPrj(dataBean.Order_ID.toString(), restaurantId, ids.toString())
},{})
}, {})
if (this.code == "1") {
listener.invoke(OrderDelivery, true)
// 打印印單
// 初始化用於打印的view
// 送單成功後，再調用接口獲取取餐碼
getOrderInfo(dataBean.ID.toString()) {
if (it != null) {
printOrder(dataBean, listener)
}
repository.getOrderInfo(dataBean.ID.toString()).apply {
printOrder(OrderDelivery, data?.get(0)!!, listener)
}
} else {
listener.invoke(OrderDelivery, false)
......@@ -477,7 +477,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
/**
* 打印訂單
*/
private fun printOrder(dataBean: OrderDetails.DataBean, listener: (Int, Boolean) -> Unit) {
private fun printOrder(code: Int, dataBean: OrderDetails.DataBean, listener: (Int, Boolean) -> Unit) {
//訂單信息和廚房單
MyOrderManage.setDataBean(dataBean)
CC.obtainBuilder("Component.Print")
......@@ -486,7 +486,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
.build()
.callAsyncCallbackOnMainThread { _, result ->
MyOrderManage.setDataBean(null)
listener.invoke(PrintCode, result.isSuccess)
listener.invoke(code, result.isSuccess)
}
}
......@@ -709,7 +709,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
/**
* 取消訂單
*/
fun cancelOrder(memberId: String, memberName:String, orderId: String, reasonId: String, reasonDesc: String, listener: (Boolean) -> Unit) {
fun cancelOrder(memberId: String, memberName: String, orderId: String, reasonId: String, reasonDesc: String, listener: (Boolean) -> Unit) {
launch({
repository.updateOrderStates(memberId, orderId, "6", memberName, reasonId, reasonDesc).apply {
listener.invoke(code == "1")
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/OrderDetailsActivity.kt
......@@ -40,6 +40,7 @@ class OrderDetailsActivity : BaseActivity() {
private lateinit var orderId: String
private var orderType: Int = 0
private var orderPayType: Int = 0
private var isRead: Int = -1
lateinit var skeletonScreen: ViewSkeletonScreen
override fun onCreate(savedInstanceState: Bundle?) {
......@@ -58,10 +59,13 @@ class OrderDetailsActivity : BaseActivity() {
orderId = intent.getStringExtra("orderId")//訂單id
orderType = intent.getIntExtra("orderType", 0)//訂單類型
orderPayType = intent.getIntExtra("orderPayType", 0)//訂單支付方式
isRead = intent.getIntExtra("isRead", -1)//是否已讀訂單
pageViewModel = ViewModelProvider(this, InjectorUtil.getWeatherModelFactory())[PageViewModel::class.java].apply {
//設為已讀
if (isRead == 0) {
//如果是未讀，調用設為已讀接口
updateIsRead(orderId)
}
//獲取訂單詳情
getOrderDetails(orderId, binding)
}
......@@ -139,14 +143,8 @@ class OrderDetailsActivity : BaseActivity() {
tv_order_state.setTextColor(resources.getColor(R.color.order_state0_color))
}
}
binding.patMethod = when (orderDetails.payType) {
1 -> "積分支付"
2 -> "支付寶"
3 -> "财付通"
4 -> "微信支付"
5 -> "貨到付款"
6 -> "其他支付"
else -> ""
if (orderDetails.orderPayType == 2 && orderDetails.payName != null) {
binding.patMethod = orderDetails.payName
}
binding.orderStatus = type + orderStatusText
......@@ -176,7 +174,7 @@ class OrderDetailsActivity : BaseActivity() {
BtnBuilder.closingBtn -> {
//如果是在線支付的訂單，就直接修改訂單狀態
if (orderPayType != 1) {
gsUpdateOrderStatus(orderDetails, orderDetails.order_type) { status, isSuccess ->
gsUpdateOrderStatus(orderDetails, orderDetails.order_type, orderDetails.payName) { status, isSuccess ->
if (isSuccess) {
finish()
} else {
......@@ -210,7 +208,7 @@ class OrderDetailsActivity : BaseActivity() {
}
OrderDelivery -> {
//已確認訂單，重新刷新當前頁面
if(isSuccess){
if (isSuccess) {
finish()
ToastUtils.show(this@OrderDetailsActivity, "訂單已確認")
} else {
......@@ -226,7 +224,7 @@ class OrderDetailsActivity : BaseActivity() {
})
}
PageViewModel.ProductionComplete -> {
if(isSuccess){
if (isSuccess) {
finish()
}
ToastUtils.show(this@OrderDetailsActivity, if (isSuccess) {
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/PayActivity.kt
......@@ -63,7 +63,7 @@ class PayActivity : BaseActivity() {
other_pay_view.notifyBillMethodAdapter(PayTypeInfo.getPayMethodByPayType(it))
})
other_pay_view.setmOnSureClickLisenter {payMethods->
other_pay_view.setmOnSureClickLisenter { payMethods ->
//確認結賬，調用結賬接口
object : DialogUtils(this, R.layout.other_order_pause_orders) {
override fun initLayout(hepler: ViewHepler, dialog: Dialog) {
......@@ -71,7 +71,7 @@ class PayActivity : BaseActivity() {
hepler.getView<TextView>(R.id.tv_dialog_confirm).setOnClickListener {
dialog.dismiss()
showLoading()
pageViewModel.gsUpdateOrderStatus(orderDetails, payMethods[0].id) { _, _ ->
pageViewModel.gsUpdateOrderStatus(orderDetails, payMethods[0].id, payMethods[0].name) { _, _ ->
cancelDialogForLoading()
setResult(RESULT_OK)
finish()
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/OtherOrdersAdapter.kt
......@@ -69,7 +69,6 @@ class OtherOrdersAdapter(var context: Context) : Adapter<OtherOrdersAdapter.View
data.STATUS == 0 -> {
state = "待確認"
bg.setColor(getColor(R.color.order_state0_color))
//執行動畫
if (data.isRead == 0) {
holder.flBorder.visibility = View.VISIBLE//顯示邊框
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/PlaceholderFragment.kt
......@@ -60,6 +60,7 @@ class PlaceholderFragment : BaseFragment(R.layout.fragment_other_order) {
intent.putExtra("orderType", data.order_type)
intent.putExtra("orderStatus", data.STATUS)
intent.putExtra("orderPayType", data.orderPayType)
intent.putExtra("isRead", data.isRead)
startActivity(intent)
......
other_order_mode/src/main/res/layout/activity_order_details.xml
......@@ -189,6 +189,58 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
android:paddingLeft="@dimen/dp_7"
android:paddingRight="@dimen/dp_14"
android:visibility='@{(data.takeFoodCode==null||data.takeFoodCode.length()==0||data.takeFoodCode.equals("0"))?View.GONE:View.VISIBLE}'>
<TextView
android:id="@+id/tv_take_food_text"
style="@style/otherOrderReceiving_title_textStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="取餐碼：" />
<TextView
android:id="@+id/tv_take_food_code"
style="@style/otherOrderReceiving_information_textStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_toRightOf="@id/tv_take_food_text"
android:gravity="right"
android:text="@{data.takeFoodCode}" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
android:paddingLeft="@dimen/dp_7"
android:paddingRight="@dimen/dp_14"
android:visibility="@{(data.billNo==null||data.billNo.length()==0)?View.GONE:View.VISIBLE}">
<TextView
android:id="@+id/tv_bill_num_text"
style="@style/otherOrderReceiving_title_textStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="訂單號：" />
<TextView
android:id="@+id/tv_bill_num"
style="@style/otherOrderReceiving_information_textStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_toRightOf="@id/tv_bill_num_text"
android:gravity="right"
android:text="@{data.billNo}" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
android:paddingLeft="@dimen/dp_7"
android:paddingRight="@dimen/dp_14">
<TextView
......@@ -239,14 +291,15 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
android:paddingLeft="@dimen/dp_7"
android:paddingRight="@dimen/dp_14">
android:paddingRight="@dimen/dp_14"
android:visibility="@{isSelf?View.GONE:View.VISIBLE}">
<TextView
android:id="@+id/tv_receive_address_text"
style="@style/otherOrderReceiving_title_textStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{isSelf?@string/meal_code:@string/receiving_address}" />
android:text="@string/receiving_address" />
<TextView
android:id="@+id/tv_receive_address"
......@@ -256,7 +309,7 @@
android:layout_alignParentRight="true"
android:layout_toRightOf="@id/tv_receive_address_text"
android:gravity="right"
android:text="@{isSelf?data.takeFoodCode:data.addressDetail}" />
android:text="@{data.addressDetail}" />
</RelativeLayout>
......
print-module/src/main/java/com/joe/print/mvp/presenter/IpPrintListActivityPresenter.java
......@@ -6,6 +6,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.PrinterManger.PrinterManager;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.gingersoft.gsa.cloud.database.bean.PrinterListBean;
import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager;
......@@ -69,7 +70,9 @@ public class IpPrintListActivityPresenter extends BasePresenter<IpPrintListActiv
@Override
public void onNext(BaseResult baseResult) {
if (baseResult.isSuccess()) {
List<PrinterDeviceBean> deviceBeans = JsonUtils.parseArray(baseResult.getData(), PrinterDeviceBean.class);
PrinterListBean printerListBean = JsonUtils.parseObject(baseResult.getData(), PrinterListBean.class);
if(printerListBean != null) {
List<PrinterDeviceBean> deviceBeans = printerListBean.getList();
if (deviceBeans != null && deviceBeans.size() > 0) {
mRootView.loadPrinterList(deviceBeans);
PrinterManager.getPrinterManager().setDeviceBeans(deviceBeans);
......@@ -79,6 +82,9 @@ public class IpPrintListActivityPresenter extends BasePresenter<IpPrintListActiv
} else {
mRootView.loadFile();
}
} else {
mRootView.loadFile();
}
}
});
}
......
print-module/src/main/java/com/joe/print/mvp/presenter/PrintPresenter.java
......@@ -7,6 +7,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.PrinterManger.PrinterManager;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.gingersoft.gsa.cloud.database.bean.PrinterListBean;
import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager;
......@@ -78,10 +79,14 @@ public class PrintPresenter extends BasePresenter<PrintContract.Model, PrintCont
@Override
public void onNext(BaseResult baseResult) {
if (baseResult.isSuccess()) {
List<PrinterDeviceBean> deviceBeans = JsonUtils.parseArray(baseResult.getData(), PrinterDeviceBean.class);
PrinterListBean deviceBeans = JsonUtils.parseObject(baseResult.getData(), PrinterListBean.class);
if(deviceBeans != null){
//有打印機，返回true
PrinterManager.getPrinterManager().setDeviceBeans(deviceBeans);
mRootView.showPrinterList(deviceBeans);
PrinterManager.getPrinterManager().setDeviceBeans(deviceBeans.getList());
mRootView.showPrinterList(deviceBeans.getList());
} else {
mRootView.showPrinterList(null);
}
} else {
mRootView.showPrinterList(null);
}
......
print-module/src/main/java/com/joe/print/mvp/presenter/PrinterAddPresenter.java
......@@ -23,6 +23,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
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;
......@@ -91,8 +92,7 @@ public class PrinterAddPresenter extends BasePresenter<PrinterAddContract.Model,
* 添加打印機
*/
public void addPrinter(PrinterDeviceBean printerDeviceBean) {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), JsonUtils.toJson(printerDeviceBean));
mModel.addPrinter(requestBody)
mModel.addPrinter(getRequestBody(printerDeviceBean))
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(""))
.subscribeOn(AndroidSchedulers.mainThread())
......@@ -114,9 +114,8 @@ public class PrinterAddPresenter extends BasePresenter<PrinterAddContract.Model,
/**
* 更新打印機信息
*/
public void updatePrinterInfo(PrinterDeviceBean deviceBean) {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), Objects.requireNonNull(JsonUtils.toJson(deviceBean)));
mModel.updatePrinter(requestBody)
public void updatePrinterInfo(PrinterDeviceBean printerDeviceBean) {
mModel.updatePrinter(getRequestBody(printerDeviceBean))
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(""))
.subscribeOn(AndroidSchedulers.mainThread())
......@@ -128,13 +127,32 @@ public class PrinterAddPresenter extends BasePresenter<PrinterAddContract.Model,
public void onNext(BaseResult baseResult) {
if (baseResult.isSuccess()) {
mRootView.showMessage("保存成功");
mRootView.updatePrinterSuccess(deviceBean);
mRootView.updatePrinterSuccess(printerDeviceBean);
mRootView.killMyself();
}
}
});
}
private RequestBody getRequestBody(PrinterDeviceBean printerDeviceBean) {
FormBody.Builder builder = new FormBody.Builder()
.add("restaurantId", printerDeviceBean.getRestaurantId() + "")
.add("name", printerDeviceBean.getName())
.add("ip", printerDeviceBean.getIp())
.add("port", printerDeviceBean.getPort() + "")
.add("printerModelId", printerDeviceBean.getPrinterModelId() + "")
.add("type", printerDeviceBean.getType() + "")
.add("id", printerDeviceBean.getId() + "");
if (printerDeviceBean.getFlyPrinterDeviceId() != null) {
builder.add("flyPrinterDeviceId", printerDeviceBean.getFlyPrinterDeviceId() + "");
}
if (printerDeviceBean.getFlyPrinterDeviceId2() != null) {
builder.add("flyPrinterDeviceId2", printerDeviceBean.getFlyPrinterDeviceId2() + "");
}
return builder.build();
}
/**
* 獲取打印機機型列表
......
print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrder.java
......@@ -15,15 +15,14 @@ import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.base.utils.view.ImageUtils;
import com.gingersoft.gsa.cloud.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
import com.gingersoft.gsa.cloud.database.utils.ExpandInfoDaoUtils;
import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
import com.joe.print.R;
import com.joe.print.mvp.model.bean.PrintBillBean;
import com.joe.print.mvp.ui.adapter.BillItemAdapter;
import com.joe.print.mvp.ui.adapter.OtherOrderAdapter;
import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
import com.joe.print.R;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -210,6 +209,8 @@ public class PrintOtherOrder extends PrinterRoot {
private Bitmap initPrintView(Context context, OrderDetails.DataBean data) {
View view = LayoutInflater.from(context).inflate(R.layout.print_confirm_order_view, null, false);
TextView tvOrderClosing = view.findViewById(R.id.tv_order_closing);
TextView tvBillNumber = view.findViewById(R.id.tv_bill_number);
//品牌名
setText(view, R.id.tv_brand_name, GsaCloudApplication.getBrandName(context));
//餐廳名
......@@ -223,6 +224,11 @@ public class PrintOtherOrder extends PrinterRoot {
} else {
view.findViewById(R.id.tv_order_take_food_code).setVisibility(View.GONE);
}
if (data.getBillNo() == null || data.getBillNo().length() <= 0) {
tvBillNumber.setVisibility(View.GONE);
} else {
tvBillNumber.setText("訂單號：" + data.getBillNo());
}
//訂單創建時間
setText(view, R.id.tv_order_create, context.getString(R.string.create_order_time) + TimeUtils.parseTimeRepeat(data.getCREATE_TIME(), TimeUtils.DEFAULT_DATE_FORMAT));
String amountUnit = context.getString(R.string.amount_unit);
......@@ -257,27 +263,20 @@ public class PrintOtherOrder extends PrinterRoot {
setText(view, R.id.tv_total, amountUnit + data.getTOTAL_AMOUNT());
//支付金額
setText(view, R.id.tv_pay_amount_text, "支付金額：" + amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount()));
//支付類型：貨到付款，在線支付
String payType = "";
if (data.getPayType() == 1) {
payType = "：積分支付";
} else if (data.getPayType() == 2) {
payType = "：支付寶";
} else if (data.getPayType() == 3) {
payType = "：财付通";
} else if (data.getPayType() == 4) {
payType = "：微信支付";
} else if (data.getPayType() == 5) {
payType = "：貨到付款";
} else if (data.getPayType() == 6) {
payType = "：其他支付";
}
if (data.getOrderPayType() == 1) {
//貨到付款
setText(view, R.id.tv_pay_type, "貨到付款");
} else {
setText(view, R.id.tv_pay_type, "在線支付" + payType);
} else if (data.getOrderPayType() == 0) {
setText(view, R.id.tv_pay_type, "店內支付");
} else if (data.getOrderPayType() == 2) {
setText(view, R.id.tv_pay_type, "在線支付");
//顯示支付時間
if (data.getPayTime() != null) {
tvOrderClosing.setText("支付時間：" + data.getPayTime());
tvOrderClosing.setVisibility(View.VISIBLE);
}
}
setText(view, R.id.tv_pay_amount_text, "支付金額：" + amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount()));
//收貨時間
setText(view, R.id.tv_delivery_time, data.getOrder_type() == 2 ? data.getSEND_TIME() : data.getTakeTime());
if (data.getOrder_type() != 2) {
......@@ -294,7 +293,6 @@ public class PrintOtherOrder extends PrinterRoot {
setText(view, R.id.tv_phone, "手機號：" + data.getPHONE());
//底部時間
// setText(view, R.id.tv_bottom_time, "手機號：" + data.getPHONE());
//備註
if (data.getRemark() != null && !data.getRemark().isEmpty()) {
setText(view, R.id.tv_remark, "備註：" + data.getRemark());
......@@ -308,8 +306,6 @@ public class PrintOtherOrder extends PrinterRoot {
rvFoodList.setLayoutManager(new LinearLayoutManager(context));
rvFoodList.setAdapter(new OtherOrderAdapter(context, data.getPRODUCT_NAME(), true));
}
return viewToBitmap(context, view);
}
......
print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrderClosing.java
......@@ -70,6 +70,8 @@ public class PrintOtherOrderClosing extends PrinterRoot {
TextView tvAddPoints = view.findViewById(R.id.tv_addPoints);//本次添加積分
TextView tvOldPoints = view.findViewById(R.id.tv_oldPoints);//之前的積分
TextView lineMember = view.findViewById(R.id.line_member_info);
TextView tvOrderClosing = view.findViewById(R.id.tv_order_closing);
TextView tvBillNumber = view.findViewById(R.id.tv_bill_number);
//品牌名
setText(view, R.id.tv_brand_name, GsaCloudApplication.getBrandName(context));
//餐廳名
......@@ -83,6 +85,11 @@ public class PrintOtherOrderClosing extends PrinterRoot {
} else {
view.findViewById(R.id.tv_order_take_food_code).setVisibility(View.GONE);
}
if (data.getBillNo() == null || data.getBillNo().length() <= 0) {
tvBillNumber.setVisibility(View.GONE);
} else {
tvBillNumber.setText("訂單號：" + data.getBillNo());
}
//訂單創建時間
setText(view, R.id.tv_order_create, context.getString(R.string.create_order_time) + TimeUtils.parseTimeRepeat(data.getCREATE_TIME(), TimeUtils.DEFAULT_DATE_FORMAT));
String amountUnit = context.getString(R.string.amount_unit);
......@@ -106,28 +113,25 @@ public class PrintOtherOrderClosing extends PrinterRoot {
rvBill.setAdapter(adapter);
//總金額
setText(view, R.id.tv_total, amountUnit + data.getTOTAL_AMOUNT());
//支付金額
setText(view, R.id.tv_pay_amount_text, "支付金額：" + amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount()));
//支付類型：貨到付款，在線支付
String payType = "";
if (data.getPayType() == 1) {
payType = "：積分支付";
} else if (data.getPayType() == 2) {
payType = "：支付寶";
} else if (data.getPayType() == 3) {
payType = "：财付通";
} else if (data.getPayType() == 4) {
payType = "：微信支付";
} else if (data.getPayType() == 5) {
payType = "：貨到付款";
} else if (data.getPayType() == 6) {
payType = "：其他支付";
}
if (data.getOrderPayType() == 1) {
//貨到付款
setText(view, R.id.tv_pay_type, "貨到付款");
if (data.getPayName() != null) {
//支付金額
setText(view, R.id.tv_pay_amount_text, data.getPayName() + "：" + amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount()));
} else {
setText(view, R.id.tv_pay_type, "在線支付" + payType);
setIsShow(view, R.id.tv_pay_amount_text,false);
setIsShow(view, R.id.tv_pay_amount_line,false);
}
} else if (data.getOrderPayType() == 0) {
setText(view, R.id.tv_pay_type, "店內支付");
} else if (data.getOrderPayType() == 2) {
setText(view, R.id.tv_pay_type, "在線支付");
setText(view, R.id.tv_pay_amount_text, data.getPayName() + "：" + amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount()));
}
if (data.getPayTime() != null) {
tvOrderClosing.setText("結賬時間：" + data.getPayTime());
tvOrderClosing.setVisibility(View.VISIBLE);
}
//收貨時間
setText(view, R.id.tv_delivery_time, data.getOrder_type() == 2 ? data.getSEND_TIME() : data.getTakeTime());
......
print-module/src/main/java/com/joe/print/mvp/print/PrintPrjKitchen.java
......@@ -113,7 +113,10 @@ public class PrintPrjKitchen extends PrinterRoot {
tvTableNumber.setText(data.get(0).getTableName());
tvTableNumber2.setText(data.get(0).getTableName());
//人數
if(data.get(0).getPerson() != 0) {
tvPeople.setText(data.get(0).getPerson() + "");
view.findViewById(R.id.tv_people_text).setVisibility(View.VISIBLE);
}
//訂單號
tvOrderNumber.setText(data.get(0).getOrderNo());
//開台時間
......
print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
......@@ -105,6 +105,9 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
((TextView) parentView.findViewById(viewId)).setText(text);
}
public void setIsShow(View parentView, int viewId, boolean isShow) {
parentView.findViewById(viewId).setVisibility(isShow ? View.VISIBLE : View.GONE);
}
/**
* 把Map中Key相同，则各个value添加到一起，汇总值
......@@ -429,7 +432,7 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
private PrinterDeviceBean getDefaultPrintInList(List<PrinterDeviceBean> printerDeviceBeans) {
if (printerDeviceBeans != null) {
for (PrinterDeviceBean printerDeviceBean : printerDeviceBeans) {
if (printerDeviceBean.getStatus() == 2) {
if (printerDeviceBean.getPrinterDeviceDefaultId() != null) {
//默認打印機
return printerDeviceBean;
}
......@@ -496,6 +499,7 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
printWidth = 480;
printerDeviceBean.setPaperSpecification(printWidth + "");
}
Log.e("ccc", "紙張寬度：" + printWidth);
List<Bitmap> zoomBitmap = null;
if (bitmaps != null) {
zoomBitmap = new ArrayList<>();
......@@ -508,8 +512,8 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
return;
}
//獲取打印機機型，如果是EPSON的打印機，調用EPSON的打印方法
if (printerDeviceBean.getPrinterName().contains("EPSON")
|| printerDeviceBean.getModel().contains("EPSON")) {
if (printerDeviceBean.getPrinterName().toLowerCase().contains("EPSON".toLowerCase())
|| printerDeviceBean.getModel().toLowerCase().contains("EPSON".toLowerCase())) {
List<Bitmap> finalZoomBitmap = zoomBitmap;
mPrinter = new EpsonPrint();
mPrinter.initializeObject(mContext, this);
......@@ -519,11 +523,13 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
isSuccess = mPrinter.printData(printerDeviceBean.getIp(), finalZoomBitmap.get(j));
}
disconnectPrinter();
if (printListener != null) {
if (isSuccess) {
printListener.printSuccess();
} else {
printListener.printFile();
}
}
}).start();
} else {
PrintExecutor executor = new PrintExecutor(printerDeviceBean);
......
print-module/src/main/java/com/joe/print/mvp/print/service/PrjService.java
......@@ -124,7 +124,7 @@ public class PrjService extends Service implements PrintSocketHolder.OnStateChan
//請求到數據，停止輪詢，開始打印，在打印完之後再重新開始輪詢
startPrint(s);
//開啟另一個定時，三十秒之後自動請求，避免上面的打印成功或失敗時沒有回調。
Observable.timer(30, TimeUnit.SECONDS)
Observable.timer(10, TimeUnit.SECONDS)
.subscribe(new Observer<Long>() {
@Override
public void onSubscribe(Disposable d) {
......
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
......@@ -132,16 +132,6 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
finish();
}
} else {
// printerDeviceBeans = new ArrayList<>();
// PrinterDeviceBean printerDeviceBean = new PrinterDeviceBean();
// printerDeviceBean.setName("EPSON");
// printerDeviceBean.setIp("192.168.1.203");
// printerDeviceBean.setPort(9100);
// printerDeviceBean.setStatus(2);
// printerDeviceBean.setPaperSpecification("200");
// printerDeviceBean.setPrinterName("EPSON");
// printerDeviceBean.setModel("EPSON");
// printerDeviceBeans.add(printerDeviceBean);
if (printerDeviceBeans == null || printerDeviceBeans.size() <= 0) {
mPresenter.getPrinterList(GsaCloudApplication.getRestaurantId(mContext));
} else {
......
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrinterAddActivity.java
......@@ -116,22 +116,22 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem
mTvModel.setText(printerDeviceBean.getPrinterName() + "\u3000" + printerDeviceBean.getModel());
}
}
mSwitchDefalute.setChecked(printerDeviceBean.getStatus() == 2);
mSwitchDefalute.setChecked(printerDeviceBean.getType() == 2);
if (devicess != null && devicess.size() > 0) {
if (printerDeviceBean.getPrinterDeviceId() != null && printerDeviceBean.getPrinterDeviceId() != 0) {
if (printerDeviceBean.getFlyPrinterDeviceId() != null && printerDeviceBean.getFlyPrinterDeviceId() != 0) {
//有飛單
for (int i = 0; i < devicess.size(); i++) {
if (devicess.get(i).getId() == printerDeviceBean.getPrinterDeviceId()) {
if (devicess.get(i).getId() == printerDeviceBean.getFlyPrinterDeviceId()) {
mTvFailNameOne.setText(devicess.get(i).getName());
oneFailPosition = i;
mTvFailNameOne.setTextColor(getResources().getColor(R.color.color_3c));
}
}
}
if (printerDeviceBean.getDefaultPrinterDeviceId() != null && printerDeviceBean.getDefaultPrinterDeviceId() != 0) {
if (printerDeviceBean.getFlyPrinterDeviceId2() != null && printerDeviceBean.getFlyPrinterDeviceId2() != 0) {
//有飛單2222
for (int i = 0; i < devicess.size(); i++) {
if (devicess.get(i).getId() == printerDeviceBean.getDefaultPrinterDeviceId()) {
if (devicess.get(i).getId() == printerDeviceBean.getFlyPrinterDeviceId2()) {
mTvFailNameTwo.setText(devicess.get(i).getName());
twoFailPosition = i;
mTvFailNameTwo.setTextColor(getResources().getColor(R.color.color_3c));
......@@ -360,26 +360,33 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem
}
//飛單打印機
if (oneFailPosition != -1) {
deviceBean.setPrinterDeviceId(devicess.get(oneFailPosition).getId());
deviceBean.setFlyPrinterDeviceId(devicess.get(oneFailPosition).getId());
}
if (twoFailPosition != -1) {
deviceBean.setDefaultPrinterDeviceId(devicess.get(twoFailPosition).getId());
deviceBean.setFlyPrinterDeviceId2(devicess.get(twoFailPosition).getId());
}
//是否默認
deviceBean.setStatus(mSwitchDefalute.isChecked() ? 2 : 1);
deviceBean.setType(mSwitchDefalute.isChecked() ? 2 : 1);
//打印機機型
if (modelPosition < 0) {
//modelPosition小於0，說明用戶沒有選擇機型
if (printerDeviceBean != null) {
//如果打印機以前的信息不為空，則用之前的機型信息
deviceBean.setPrinterModelId(printerDeviceBean.getPrinterModelId());
deviceBean.setPaperSpecification(printerDeviceBean.getPaperSpecification());
}
} else {
//如果用戶選擇了打印機機型，判斷機型數據是否為空，不為空就設置機型信息
if (printModelBeans != null && printModelBeans.size() > modelPosition) {
deviceBean.setPrinterModelId(printModelBeans.get(modelPosition).getId());
deviceBean.setPrinterModelId((long) printModelBeans.get(modelPosition).getId());
deviceBean.setPaperSpecification(printModelBeans.get(modelPosition).getPaperSpecification());
}
}
if (deviceBean.getPrinterModelId() == null) {
ToastUtils.show(mContext, "請選擇打印機機型");
return;
}
//添加打印機
if (v.getId() == R.id.printer_add) {
if (isEditPrinter && printerDeviceBean != null) {
......@@ -389,6 +396,7 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem
mPresenter.updatePrinterInfo(deviceBean);
} else {
deviceBean.setUid(null);
deviceBean.setRestaurantId(GsaCloudApplication.getRestaurantId(mContext));
mPresenter.addPrinter(deviceBean);
}
} else if (v.getId() == R.id.print_test) {
......
print-module/src/main/java/com/joe/print/mvp/ui/adapter/PrinterListAdapter.java
......@@ -8,11 +8,8 @@ import androidx.annotation.Nullable;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.viewholder.BaseViewHolder;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.joe.print.R;
import com.gingersoft.gsa.cloud.constans.PrintConstans;
import java.util.List;
......@@ -26,6 +23,7 @@ public class PrinterListAdapter extends BaseQuickAdapter<PrinterDeviceBean, Base
public PrinterListAdapter(@Nullable List<PrinterDeviceBean> data, Context mContext) {
super(R.layout.printer_item, data);
this.mContext = mContext;
addChildClickViewIds(R.id.layout_delete);
}
@Override
......@@ -37,13 +35,8 @@ public class PrinterListAdapter extends BaseQuickAdapter<PrinterDeviceBean, Base
} else {
helper.setText(R.id.tv_printer_port, String.format(mContext.getString(R.string.print_port), item.getPort() + ""));
}
((RadioButton) helper.getView(R.id.cb_printer_item)).setChecked(item.getStatus() == 2);
helper.getView(R.id.tv_default_print).setVisibility(item.getStatus() == 2 ? View.VISIBLE : View.GONE);
// helper.setOnItemSelectedClickListener(R.id.layout_delete,)
// helper.addOnClickListener(R.id.layout_delete);
addChildClickViewIds(R.id.layout_delete);
((RadioButton) helper.getView(R.id.cb_printer_item)).setChecked(item.getType() == 2);
helper.getView(R.id.tv_default_print).setVisibility(item.getPrinterDeviceDefaultId() != null ? View.VISIBLE : View.GONE);
}
......
print-module/src/main/java/com/joe/print/mvp/ui/fragment/IpPrintListActivityFragment.java
......@@ -269,7 +269,6 @@ public class IpPrintListActivityFragment extends BaseFragment<IpPrintListActivit
// int position = adapterPosition - mRvPrintList.getHeaderCount();
}
});// 监听拖拽和侧滑删除，更新UI和数据源。
printListAdapter = new PrinterListAdapter(devicess, mContext);
printListAdapter.setOnItemChildClickListener((adapter, view, position) -> {
if (view.getId() == R.id.layout_delete) {
......
print-module/src/main/res/layout/print_confirm_order_view.xml
......@@ -91,6 +91,13 @@
android:text='單號：' />
<TextView
android:id="@+id/tv_bill_number"
style="@style/print_other_order_twenty_six_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text='訂單號：' />
<TextView
android:id="@+id/tv_order_take_food_code"
style="@style/print_other_order_thirty_style"
android:layout_width="wrap_content"
......@@ -106,6 +113,13 @@
android:text='開單時間' />
<TextView
android:id="@+id/tv_order_closing"
style="@style/print_other_order_twenty_six_style"
android:layout_width="wrap_content"
android:visibility="gone"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_remark"
style="@style/print_other_order_thirty_style"
android:layout_width="wrap_content"
......@@ -206,6 +220,7 @@
android:text="支付金額：" />
<TextView
android:id="@+id/tv_pay_amount_line"
style="@style/print_other_order_twenty_six_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
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