Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
SocketDemo
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
朱世闯
SocketDemo
Commits
393af7a8
Commit
393af7a8
authored
Mar 09, 2022
by
UIUANG\Zsc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改传称
parent
3956d706
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
133 additions
and
72 deletions
+133
-72
vcs.xml
.idea/vcs.xml
+6
-0
build.gradle
DigiTransfer/build.gradle
+6
-5
DigiScaleTransfer.java
...main/java/com/wmdigit/digitransfer/DigiScaleTransfer.java
+9
-6
ObjectHandler.java
.../java/com/wmdigit/digitransfer/handler/ObjectHandler.java
+1
-1
Printer.java
...c/main/java/com/wmdigit/digitransfer/handler/Printer.java
+15
-0
ScalesApiHandler.java
...va/com/wmdigit/digitransfer/handler/ScalesApiHandler.java
+95
-60
build.gradle
app/build.gradle
+1
-0
No files found.
.idea/vcs.xml
0 → 100644
View file @
393af7a8
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"VcsDirectoryMappings"
>
<mapping
directory=
"$PROJECT_DIR$"
vcs=
"Git"
/>
</component>
</project>
\ No newline at end of file
DigiTransfer/build.gradle
View file @
393af7a8
...
...
@@ -8,8 +8,8 @@ android {
defaultConfig
{
minSdkVersion
21
targetSdkVersion
31
versionCode
1
versionName
"1.0.
0
"
versionCode
4
versionName
"1.0.
4
"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles
"consumer-rules.pro"
...
...
@@ -27,7 +27,7 @@ android {
}
android
.
libraryVariants
.
all
{
variant
->
variant
.
outputs
.
all
{
outputFileName
=
"${project.name}_v"
+
android
.
defaultConfig
.
versionName
+
'_sdk.
a
ar'
outputFileName
=
"${project.name}_v"
+
android
.
defaultConfig
.
versionName
+
'_sdk.
j
ar'
}
}
}
...
...
@@ -42,8 +42,9 @@ dependencies {
}
task
makeJar
(
type:
Copy
)
{
def
outAar
=
"${project.name}_v"
+
android
.
defaultConfig
.
versionName
+
"_sdk.jar"
//删除存在的
delete
'build/libs/
myjar.jar'
delete
'build/libs/
'
+
outAar
//设置拷贝的文件
from
(
'build/intermediates/aar_main_jar/release/'
)
//打进jar包后的文件目录
...
...
@@ -53,7 +54,7 @@ task makeJar(type: Copy) {
//(我们只关心classes.jar这个文件)
include
(
'classes.jar'
)
//重命名
rename
(
'classes.jar'
,
'myjar.jar'
)
rename
(
'classes.jar'
,
outAar
)
}
makeJar
.
dependsOn
(
build
)
\ No newline at end of file
DigiTransfer/src/main/java/com/wmdigit/digitransfer/DigiScaleTransfer.java
View file @
393af7a8
...
...
@@ -5,6 +5,7 @@ import android.util.Log;
import
com.wmdigit.digitransfer.exception.ErrCode
;
import
com.wmdigit.digitransfer.exception.ScalesApiException
;
import
com.wmdigit.digitransfer.handler.ObjectHandler
;
import
com.wmdigit.digitransfer.handler.Printer
;
import
com.wmdigit.digitransfer.util.NetWorkUtils
;
import
java.io.IOException
;
...
...
@@ -16,26 +17,28 @@ public class DigiScaleTransfer {
private
static
DigiScaleTransfer
instance
;
private
int
addressFour
;
private
ObjectHandler
scalesApiHandler
;
private
Printer
printer
;
private
final
String
TAG
=
DigiScaleTransfer
.
this
.
getClass
().
getSimpleName
();
private
ServerSocket
serverSocket
;
public
static
DigiScaleTransfer
getInstance
(
ObjectHandler
scalesApiHandler
)
{
public
static
DigiScaleTransfer
getInstance
(
ObjectHandler
scalesApiHandler
,
Printer
printer
)
{
if
(
instance
==
null
)
{
instance
=
new
DigiScaleTransfer
(
scalesApiHandler
);
instance
=
new
DigiScaleTransfer
(
scalesApiHandler
,
printer
);
}
return
instance
;
}
private
DigiScaleTransfer
(
ObjectHandler
scalesApiHandler
)
{
private
DigiScaleTransfer
(
ObjectHandler
scalesApiHandler
,
Printer
printer
)
{
this
.
scalesApiHandler
=
scalesApiHandler
;
this
.
printer
=
printer
;
String
hostAddress
=
null
;
hostAddress
=
NetWorkUtils
.
getLocalIp
();
int
of
=
hostAddress
.
lastIndexOf
(
"."
);
String
addressFourStr
=
hostAddress
.
substring
(
of
+
1
);
addressFour
=
Integer
.
parseInt
(
addressFourStr
);
Log
.
i
(
"AT"
,
hostAddress
);
printer
.
d
(
"ip地址:"
+
hostAddress
);
}
...
...
@@ -55,8 +58,8 @@ public class DigiScaleTransfer {
try
{
socket
=
serverSocket
.
accept
();
int
localPort
=
serverSocket
.
getLocalPort
();
Log
.
i
(
"port"
,
"端口号"
+
localPort
);
scalesApiHandler
.
setSocket
(
socket
,
addressFour
);
printer
.
i
(
"端口号"
+
localPort
);
scalesApiHandler
.
setSocket
(
socket
,
addressFour
,
printer
);
ThreadCacheManager
.
getExecutorService
().
execute
(
scalesApiHandler
);
// Thread thread = new Thread(this.scalesApiHandler);
// thread.start();
...
...
DigiTransfer/src/main/java/com/wmdigit/digitransfer/handler/ObjectHandler.java
View file @
393af7a8
...
...
@@ -10,6 +10,6 @@ public interface ObjectHandler extends Runnable{
void
downPlu
(
Commodity
commodity
);
void
setSocket
(
Socket
socket
,
int
addressFour
);
void
setSocket
(
Socket
socket
,
int
addressFour
,
Printer
printer
);
}
DigiTransfer/src/main/java/com/wmdigit/digitransfer/handler/Printer.java
0 → 100644
View file @
393af7a8
package
com
.
wmdigit
.
digitransfer
.
handler
;
public
interface
Printer
{
void
i
(
String
msg
);
void
v
(
String
msg
);
void
d
(
String
msg
);
void
w
(
String
msg
);
void
e
(
String
msg
);
// void v(String format, Object... args)
}
DigiTransfer/src/main/java/com/wmdigit/digitransfer/handler/ScalesApiHandler.java
View file @
393af7a8
This diff is collapsed.
Click to expand it.
app/build.gradle
View file @
393af7a8
...
...
@@ -39,6 +39,7 @@ dependencies {
implementation
project
(
path:
':Transfer'
)
implementation
files
(
'libs\\wintecscales.jar'
)
implementation
project
(
path:
':DigiTransfer'
)
implementation
files
(
'libs\\DigiTransfer_v1.0.3_sdk.jar'
)
testImplementation
'junit:junit:4.+'
androidTestImplementation
'androidx.test.ext:junit:1.1.1'
androidTestImplementation
'androidx.test.espresso:espresso-core:3.2.0'
...
...
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