Commit 9bd837e6 by 王宇航

1、解決引用衝突,去除networkSecurityConfig

2、增加餐檯名稱
3、FoodInfoBean字段改為駝峰命名
parent 419c531f
......@@ -15,7 +15,7 @@
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-05-28T12:43:00.676406500Z" />
<timeTargetWasSelectedWithDropDown value="2024-05-29T08:01:27.843382700Z" />
</State>
</entry>
</value>
......
......@@ -31,7 +31,7 @@ class MainActivity : Activity() {
tvConnect.isClickable = false
connect = GingerSoftConnect()
msgSender = connect!!.connect(
"192.168.1.151",
"192.168.1.19",
12581,
object : GingerSoftConnect.SocketStateListener {
override fun onOpen() {
......
......@@ -55,7 +55,7 @@ afterEvaluate {
groupId = "com.gingersoft.connect"
artifactId = "Connect"
version = "1.4.0"
version = "1.4.2"
// 添加 POM 配置
// pom {
// name.set("GingerSoftConnect")
......
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:networkSecurityConfig="@xml/network_security_config" />
</manifest>
\ No newline at end of file
<manifest />
......@@ -5,11 +5,11 @@ public class FoodInfoBean {
/**
* 食品id
*/
private String FoodId;
private String foodId;
/**
* 打印用的id(RicePOS的prjId)
*/
private String PrintId;
private String printId;
/**
* 訂單ID
*/
......@@ -17,7 +17,7 @@ public class FoodInfoBean {
/**
* 食品名稱
*/
private String FoodName;
private String foodName;
/**
* 食品數量
*/
......@@ -49,19 +49,19 @@ public class FoodInfoBean {
}
public String getFoodId() {
return this.FoodId;
return this.foodId;
}
public void setFoodId(String FoodId) {
this.FoodId = FoodId;
this.foodId = FoodId;
}
public String getPrintId() {
return this.PrintId;
return this.printId;
}
public void setPrintId(String PrintId) {
this.PrintId = PrintId;
this.printId = PrintId;
}
public Long getOrderId() {
......@@ -73,11 +73,11 @@ public class FoodInfoBean {
}
public String getFoodName() {
return this.FoodName;
return this.foodName;
}
public void setFoodName(String FoodName) {
this.FoodName = FoodName;
this.foodName = FoodName;
}
public String getQuantity() {
......
......@@ -13,6 +13,10 @@ public class OrderInfoBean implements SendMsgType {
*/
private String orderNo;
/**
* 餐檯名稱
*/
private String tableName;
/**
* 訂單類型
*/
private int orderType;
......@@ -85,6 +89,14 @@ public class OrderInfoBean implements SendMsgType {
this.orderNo = orderNo;
}
public String getTableName() {
return tableName;
}
public void setTableName(String tableName) {
this.tableName = tableName;
}
public int getOrderType() {
return this.orderType;
}
......
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