Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
GingerSoftLANInterconnection
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王宇航
GingerSoftLANInterconnection
Commits
9bd837e6
Commit
9bd837e6
authored
May 29, 2024
by
王宇航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、解決引用衝突,去除networkSecurityConfig
2、增加餐檯名稱 3、FoodInfoBean字段改為駝峰命名
parent
419c531f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
17 deletions
+25
-17
.idea/deploymentTargetDropDown.xml
+1
-1
app/src/main/java/com/example/demo/MainActivity.kt
+1
-1
mylibrary/build.gradle.kts
+1
-1
mylibrary/src/main/AndroidManifest.xml
+1
-5
mylibrary/src/main/java/com/gingersoft/connect/bean/FoodInfoBean.java
+9
-9
mylibrary/src/main/java/com/gingersoft/connect/bean/OrderInfoBean.java
+12
-0
No files found.
.idea/deploymentTargetDropDown.xml
View file @
9bd837e6
...
...
@@ -15,7 +15,7 @@
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown
value=
"2024-05-2
8T12:43:00.6764065
00Z"
/>
<timeTargetWasSelectedWithDropDown
value=
"2024-05-2
9T08:01:27.8433827
00Z"
/>
</State>
</entry>
</value>
...
...
app/src/main/java/com/example/demo/MainActivity.kt
View file @
9bd837e6
...
...
@@ -31,7 +31,7 @@ class MainActivity : Activity() {
tvConnect
.
isClickable
=
false
connect
=
GingerSoftConnect
()
msgSender
=
connect
!!
.
connect
(
"192.168.1.1
51
"
,
"192.168.1.1
9
"
,
12581
,
object
:
GingerSoftConnect
.
SocketStateListener
{
override
fun
onOpen
()
{
...
...
mylibrary/build.gradle.kts
View file @
9bd837e6
...
...
@@ -55,7 +55,7 @@ afterEvaluate {
groupId = "com.gingersoft.connect"
artifactId = "Connect"
version = "1.4.
0
"
version = "1.4.
2
"
// 添加 POM 配置
// pom {
// name.set("GingerSoftConnect")
...
...
mylibrary/src/main/AndroidManifest.xml
View file @
9bd837e6
<?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
/>
mylibrary/src/main/java/com/gingersoft/connect/bean/FoodInfoBean.java
View file @
9bd837e6
...
...
@@ -5,11 +5,11 @@ public class FoodInfoBean {
/**
* 食品id
*/
private
String
F
oodId
;
private
String
f
oodId
;
/**
* 打印用的id(RicePOS的prjId)
*/
private
String
P
rintId
;
private
String
p
rintId
;
/**
* 訂單ID
*/
...
...
@@ -17,7 +17,7 @@ public class FoodInfoBean {
/**
* 食品名稱
*/
private
String
F
oodName
;
private
String
f
oodName
;
/**
* 食品數量
*/
...
...
@@ -49,19 +49,19 @@ public class FoodInfoBean {
}
public
String
getFoodId
()
{
return
this
.
F
oodId
;
return
this
.
f
oodId
;
}
public
void
setFoodId
(
String
FoodId
)
{
this
.
F
oodId
=
FoodId
;
this
.
f
oodId
=
FoodId
;
}
public
String
getPrintId
()
{
return
this
.
P
rintId
;
return
this
.
p
rintId
;
}
public
void
setPrintId
(
String
PrintId
)
{
this
.
P
rintId
=
PrintId
;
this
.
p
rintId
=
PrintId
;
}
public
Long
getOrderId
()
{
...
...
@@ -73,11 +73,11 @@ public class FoodInfoBean {
}
public
String
getFoodName
()
{
return
this
.
F
oodName
;
return
this
.
f
oodName
;
}
public
void
setFoodName
(
String
FoodName
)
{
this
.
F
oodName
=
FoodName
;
this
.
f
oodName
=
FoodName
;
}
public
String
getQuantity
()
{
...
...
mylibrary/src/main/java/com/gingersoft/connect/bean/OrderInfoBean.java
View file @
9bd837e6
...
...
@@ -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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment