Skip to content

Commit 8ddf06a

Browse files
author
Deng
committed
refactor
1 parent e4f4302 commit 8ddf06a

12 files changed

Lines changed: 606 additions & 436 deletions

File tree

‎app/app.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7567
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -80,6 +72,14 @@
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />

‎app/src/main/java/com/vilyever/androidsocketclient/MainActivity.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import com.vilyever.jsonmodel.JsonModel;
1010
import com.vilyever.logger.Logger;
1111
import com.vilyever.socketclient.SocketClient;
12-
import com.vilyever.socketclient.SocketPacket;
13-
import com.vilyever.socketclient.SocketResponsePacket;
12+
import com.vilyever.socketclient.helper.SocketPacket;
13+
import com.vilyever.socketclient.helper.SocketResponsePacket;
1414
import com.vilyever.socketclient.server.SocketServer;
1515
import com.vilyever.socketclient.server.SocketServerClient;
1616
import com.vilyever.socketclient.util.IPUtil;
@@ -54,42 +54,41 @@ protected void onCreate(Bundle savedInstanceState) {
5454
getSocketServer().registerSocketServerDelegate(new SocketServer.SocketServerDelegate() {
5555
@Override
5656
public void onServerBeginListen(SocketServer socketServer, int port) {
57-
Logger.log("begin listen " + port);
57+
Logger.log("SocketServer: begin listen " + port);
5858
}
5959

6060
@Override
6161
public void onServerStopListen(SocketServer socketServer, int port) {
62-
Logger.log("stop listen " + port);
62+
Logger.log("SocketServer: stop listen " + port);
6363
}
6464

6565
@Override
6666
public void onClientConnected(SocketServer socketServer, SocketServerClient socketServerClient) {
67-
Logger.log("socketServer onClientConnected");
67+
Logger.log("SocketServer: onClientConnected");
6868

6969
self.setServerListeningSocketServerClient(socketServerClient);
7070
socketServerClient.registerSocketDelegate(new SocketClient.SocketDelegate() {
7171
@Override
7272
public void onConnected(SocketClient client) {
73-
7473
}
7574

7675
@Override
7776
public void onDisconnected(SocketClient client) {
78-
Logger.log("serverListeningSocketServerClient onDisconnected");
7977
}
8078

8179
@Override
8280
public void onResponse(SocketClient client, @NonNull SocketResponsePacket responsePacket) {
8381
// Logger.log("serverListeningSocketServerClient onResponse \n" + responsePacket.getMessage());
84-
Logger.log("serverListeningSocketServerClient onResponse length " + responsePacket.getMessage().length());
85-
Log.d("Logger", "serverListeningSocketServerClient onResponse \n" + responsePacket.getMessage());
82+
// Logger.log("serverListeningSocketServerClient onResponse length " + responsePacket.getMessage().length());
83+
// Log.d("Logger", "serverListeningSocketServerClient onResponse \n" + responsePacket.getMessage());
84+
Log.d("Logger", "size " + responsePacket.getData().length + " ->" + responsePacket.getMessage().replaceAll("\\r", ""));
8685
}
8786
});
8887
}
8988

9089
@Override
9190
public void onClientDisconnected(SocketServer socketServer, SocketServerClient socketServerClient) {
92-
Logger.log("socketServer onClientDisconnected");
91+
Logger.log("SocketServer: onClientDisconnected");
9392
self.setServerListeningSocketServerClient(null);
9493
}
9594
});
@@ -98,18 +97,19 @@ public void onClientDisconnected(SocketServer socketServer, SocketServerClient s
9897
getLocalSocketClient().registerSocketDelegate(new SocketClient.SocketDelegate() {
9998
@Override
10099
public void onConnected(SocketClient client) {
101-
Logger.log("localSocketClient onConnected");
102-
getLocalSocketClient().send("再见");
100+
Logger.log("SocketClient: internalOnConnected");
101+
getLocalSocketClient().send("helo");
102+
getLocalSocketClient().send("再见\r\nle\r\nbaichi\r\nwahaha123\niii");
103103
}
104104

105105
@Override
106106
public void onDisconnected(SocketClient client) {
107-
Logger.log("localSocketClient onDisconnected");
107+
Logger.log("SocketClient: internalOnDisconnected");
108108
}
109109

110110
@Override
111111
public void onResponse(SocketClient client, @NonNull SocketResponsePacket responsePacket) {
112-
Logger.log("localSocketClient onResponse \n" + responsePacket.getMessage());
112+
Logger.log("SocketClient: onResponse \n" + responsePacket.getMessage());
113113
}
114114
});
115115

@@ -132,6 +132,11 @@ public void onPollingResponse(SocketClient socketClient, SocketResponsePacket po
132132
}
133133
});
134134

135+
getLocalSocketClient().getSocketPacketHelper().setSendTailString("\r\n");
136+
getLocalSocketClient().getSocketPacketHelper().setReceiveTailString("\r\n");
137+
getSocketServer().getSocketPacketHelper().setSendTailString("\r\n");
138+
getSocketServer().getSocketPacketHelper().setReceiveTailString("\r\n");
139+
135140
getLocalSocketClient().connect();
136141

137142
getWindow().getDecorView().postDelayed(new Runnable() {
@@ -145,13 +150,8 @@ public void run() {
145150
e.printStackTrace();
146151
}
147152

148-
getLocalSocketClient().send(SocketPacket.DefaultPollingQueryMessage);
149-
150153
getLocalSocketClient().send("你也好");
151154

152-
153-
154-
155155
new AsyncTask<Void, Void, Void>() {
156156
@Override
157157
protected Void doInBackground(Void... params) {

‎socketclient/socketclient.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -81,6 +73,14 @@
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />

0 commit comments

Comments
 (0)