Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
machine
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hooloo
android
machine
Commits
68823a58
Commit
68823a58
authored
Apr 26, 2023
by
wjg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.0.11
parent
6092dd18
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
14 deletions
+11
-14
main_app/build.gradle
+3
-3
main_app/src/main/java/com/ihaoin/hooloo/device/base/MachineInfoSocket.java
+2
-3
main_app/src/main/java/com/ihaoin/hooloo/device/interaction/InteractionSocket.java
+2
-3
main_app/src/main/java/com/ihaoin/hooloo/device/kds/KDSSocket.java
+2
-3
main_app/src/main/java/com/ihaoin/hooloo/device/update/UpdateSocket.java
+2
-2
release-apk/main_app-release_11_1.0.11.apk
+0
-0
No files found.
main_app/build.gradle
View file @
68823a58
...
@@ -18,8 +18,8 @@ android {
...
@@ -18,8 +18,8 @@ android {
applicationId
"com.ihaoin.hooloo.device"
applicationId
"com.ihaoin.hooloo.device"
minSdkVersion
26
minSdkVersion
26
targetSdkVersion
30
targetSdkVersion
30
versionCode
9
versionCode
11
versionName
"1.0.
9
"
versionName
"1.0.
11
"
ndk
{
ndk
{
//选择要添加的对应 cpu 类型的 .so 库。
//选择要添加的对应 cpu 类型的 .so 库。
...
@@ -86,7 +86,7 @@ dependencies {
...
@@ -86,7 +86,7 @@ dependencies {
implementation
'com.umeng.umsdk:common:9.5.0'
// 版本号(必选)
implementation
'com.umeng.umsdk:common:9.5.0'
// 版本号(必选)
implementation
'com.umeng.umsdk:asms:1.6.3'
// asms包依赖(必选)
implementation
'com.umeng.umsdk:asms:1.6.3'
// asms包依赖(必选)
implementation
'com.umeng.umsdk:apm:1.6.2'
// U-APM产品包依赖(必选)
implementation
'com.umeng.umsdk:apm:1.6.2'
// U-APM产品包依赖(必选)
implementation
'io.socket:socket.io-client:
1.0
.0'
implementation
'io.socket:socket.io-client:
0.9
.0'
implementation
'com.blankj:utilcode:1.28.6'
implementation
'com.blankj:utilcode:1.28.6'
// implementation 'com.airbnb.android:lottie:5.2.0'
// implementation 'com.airbnb.android:lottie:5.2.0'
// debugImplementation 'com.github.getActivity:Logcat:10.6'
// debugImplementation 'com.github.getActivity:Logcat:10.6'
...
...
main_app/src/main/java/com/ihaoin/hooloo/device/base/MachineInfoSocket.java
View file @
68823a58
package
com
.
ihaoin
.
hooloo
.
device
.
base
;
package
com
.
ihaoin
.
hooloo
.
device
.
base
;
import
android.content.Context
;
import
android.content.Context
;
import
android.os.Handler
;
import
com.ihaoin.hooloo.device.data.vo.MachineInfoMsg
;
import
com.ihaoin.hooloo.device.data.vo.MachineInfoMsg
;
import
com.ihaoin.hooloo.device.util.CollectionUtils
;
import
com.ihaoin.hooloo.device.util.CollectionUtils
;
...
@@ -42,7 +41,7 @@ public class MachineInfoSocket extends Thread {
...
@@ -42,7 +41,7 @@ public class MachineInfoSocket extends Thread {
}
}
private
void
reconnect
()
{
private
void
reconnect
()
{
new
Handler
().
postDelayed
(()
->
{
//
new Handler().postDelayed(() -> {
try
{
try
{
mSocket
=
IO
.
socket
(
Base
.
NSP_MACHINE
);
mSocket
=
IO
.
socket
(
Base
.
NSP_MACHINE
);
mSocket
.
connect
();
mSocket
.
connect
();
...
@@ -50,7 +49,7 @@ public class MachineInfoSocket extends Thread {
...
@@ -50,7 +49,7 @@ public class MachineInfoSocket extends Thread {
Utils
.
i
(
"连接server失败,错误原因:"
+
e
.
getMessage
());
Utils
.
i
(
"连接server失败,错误原因:"
+
e
.
getMessage
());
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
},
1000
*
10
);
//
}, 1000 * 10);
}
}
private
Emitter
.
Listener
onConnect
=
args
->
Utils
.
i
(
"machine socket connected"
);
private
Emitter
.
Listener
onConnect
=
args
->
Utils
.
i
(
"machine socket connected"
);
...
...
main_app/src/main/java/com/ihaoin/hooloo/device/interaction/InteractionSocket.java
View file @
68823a58
package
com
.
ihaoin
.
hooloo
.
device
.
interaction
;
package
com
.
ihaoin
.
hooloo
.
device
.
interaction
;
import
android.content.Context
;
import
android.content.Context
;
import
android.os.Handler
;
import
com.ihaoin.hooloo.device.base.Base
;
import
com.ihaoin.hooloo.device.base.Base
;
import
com.ihaoin.hooloo.device.data.vo.InteractionMsg
;
import
com.ihaoin.hooloo.device.data.vo.InteractionMsg
;
...
@@ -43,7 +42,7 @@ public class InteractionSocket extends Thread {
...
@@ -43,7 +42,7 @@ public class InteractionSocket extends Thread {
}
}
private
void
reconnect
()
{
private
void
reconnect
()
{
new
Handler
().
postDelayed
(()
->
{
//
new Handler().postDelayed(() -> {
try
{
try
{
mSocket
=
IO
.
socket
(
Base
.
NSP_INTERACTION
);
mSocket
=
IO
.
socket
(
Base
.
NSP_INTERACTION
);
mSocket
.
connect
();
mSocket
.
connect
();
...
@@ -51,7 +50,7 @@ public class InteractionSocket extends Thread {
...
@@ -51,7 +50,7 @@ public class InteractionSocket extends Thread {
Utils
.
i
(
"连接server失败,错误原因:"
+
e
.
getMessage
());
Utils
.
i
(
"连接server失败,错误原因:"
+
e
.
getMessage
());
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
},
1000
*
10
);
//
}, 1000 * 10);
}
}
private
Emitter
.
Listener
onConnect
=
args
->
{
private
Emitter
.
Listener
onConnect
=
args
->
{
...
...
main_app/src/main/java/com/ihaoin/hooloo/device/kds/KDSSocket.java
View file @
68823a58
package
com
.
ihaoin
.
hooloo
.
device
.
kds
;
package
com
.
ihaoin
.
hooloo
.
device
.
kds
;
import
android.content.Context
;
import
android.content.Context
;
import
android.os.Handler
;
import
com.ihaoin.hooloo.device.base.Base
;
import
com.ihaoin.hooloo.device.base.Base
;
import
com.ihaoin.hooloo.device.data.vo.KDSMsg
;
import
com.ihaoin.hooloo.device.data.vo.KDSMsg
;
...
@@ -43,7 +42,7 @@ public class KDSSocket extends Thread {
...
@@ -43,7 +42,7 @@ public class KDSSocket extends Thread {
}
}
private
void
reconnect
()
{
private
void
reconnect
()
{
new
Handler
().
postDelayed
(()
->
{
//
new Handler().postDelayed(() -> {
try
{
try
{
mSocket
=
IO
.
socket
(
Base
.
NSP_KDS
);
mSocket
=
IO
.
socket
(
Base
.
NSP_KDS
);
mSocket
.
connect
();
mSocket
.
connect
();
...
@@ -51,7 +50,7 @@ public class KDSSocket extends Thread {
...
@@ -51,7 +50,7 @@ public class KDSSocket extends Thread {
Utils
.
i
(
"连接server失败,错误原因:"
+
e
.
getMessage
());
Utils
.
i
(
"连接server失败,错误原因:"
+
e
.
getMessage
());
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
},
1000
*
10
);
//
}, 1000 * 10);
}
}
private
Emitter
.
Listener
onConnect
=
args
->
{
private
Emitter
.
Listener
onConnect
=
args
->
{
...
...
main_app/src/main/java/com/ihaoin/hooloo/device/update/UpdateSocket.java
View file @
68823a58
...
@@ -54,7 +54,7 @@ public class UpdateSocket extends Thread {
...
@@ -54,7 +54,7 @@ public class UpdateSocket extends Thread {
}
}
private
void
reconnect
()
{
private
void
reconnect
()
{
new
Handler
().
postDelayed
(()
->
{
//
new Handler().postDelayed(() -> {
try
{
try
{
mSocket
=
IO
.
socket
(
Base
.
NSP_UPGRADE
);
mSocket
=
IO
.
socket
(
Base
.
NSP_UPGRADE
);
mSocket
.
connect
();
mSocket
.
connect
();
...
@@ -65,7 +65,7 @@ public class UpdateSocket extends Thread {
...
@@ -65,7 +65,7 @@ public class UpdateSocket extends Thread {
}
}
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
},
1000
*
10
);
//
}, 1000 * 10);
}
}
private
Emitter
.
Listener
onConnect
=
args
->
{
private
Emitter
.
Listener
onConnect
=
args
->
{
...
...
release-apk/main_app-release_11_1.0.11.apk
0 → 100644
View file @
68823a58
File added
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