Skip to content

Commit 7a2f01e

Browse files
author
Deng
committed
修改读取消息机制
1 parent d28cfcb commit 7a2f01e

14 files changed

Lines changed: 754 additions & 168 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,11 @@
1-
# Built application files
2-
*.apk
3-
*.ap_
4-
5-
# Files for the Dalvik VM
6-
*.dex
7-
8-
# Java class files
9-
*.class
10-
11-
# Generated files
12-
bin/
13-
gen/
14-
15-
# Gradle files
16-
.gradle/
17-
build/
18-
19-
# Local configuration file (sdk path, etc)
20-
local.properties
21-
22-
# Proguard folder generated by Eclipse
23-
proguard/
24-
25-
# Log Files
26-
*.log
27-
28-
# Android Studio Navigation editor temp files
29-
.navigation/
30-
31-
# Android Studio captures folder
32-
captures/
33-
341
# Android Studio
352
*.iml
363
.idea
374
#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
385
.gradle
396
build/
40-
41-
# Eclipse project files
42-
.classpath
43-
.project
44-
45-
#NDK
46-
obj/
7+
/local.properties
8+
/captures
479

4810
# OSX files
4911
.DS_Store

‎.idea/gradle.xml‎

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
2825
</component>
2926
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3027
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3229
<exclude-output />
3330
<content url="file://$MODULE_DIR$">
3431
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -50,6 +47,13 @@
5047
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5148
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5357
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5458
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5559
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -64,8 +68,17 @@
6468
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6569
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6670
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
6778
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6879
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6982
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7083
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
7184
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -76,10 +89,16 @@
7689
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
7790
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.vilyever/AndroidLogger/1.0.0/jars" />
7891
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
7996
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8097
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8198
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
82100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
83102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
84103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
85104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />

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

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66

77
import com.vilyever.logger.Logger;
88
import com.vilyever.socketclient.SocketClient;
9-
import com.vilyever.socketclient.SocketPacket;
9+
import com.vilyever.socketclient.SocketResponsePacket;
1010
import com.vilyever.socketclient.server.SocketServer;
1111
import com.vilyever.socketclient.server.SocketServerClient;
1212
import com.vilyever.socketclient.util.IPUtil;
1313

14+
import java.io.UnsupportedEncodingException;
15+
1416
public class MainActivity extends AppCompatActivity {
1517
final MainActivity self = this;
1618

@@ -45,29 +47,39 @@ protected void onCreate(Bundle savedInstanceState) {
4547
setContentView(R.layout.activity_main);
4648

4749
getSocketServer().registerSocketServerDelegate(new SocketServer.SocketServerDelegate() {
50+
@Override
51+
public void onServerBeginListen(SocketServer socketServer, int port) {
52+
Logger.log("begin listen " + port);
53+
}
54+
55+
@Override
56+
public void onServerStopListen(SocketServer socketServer, int port) {
57+
Logger.log("stop listen " + port);
58+
}
59+
4860
@Override
4961
public void onClientConnected(SocketServer socketServer, SocketServerClient socketServerClient) {
5062
Logger.log("socketServer onClientConnected");
51-
63+
5264
self.setServerListeningSocketServerClient(socketServerClient);
5365
socketServerClient.registerSocketDelegate(new SocketClient.SocketDelegate() {
5466
@Override
5567
public void onConnected(SocketClient client) {
56-
68+
5769
}
58-
70+
5971
@Override
6072
public void onDisconnected(SocketClient client) {
6173
Logger.log("serverListeningSocketServerClient onDisconnected");
6274
}
63-
75+
6476
@Override
65-
public void onResponse(SocketClient client, @NonNull String response) {
66-
Logger.log("serverListeningSocketServerClient onResponse \n" + response);
77+
public void onResponse(SocketClient client, @NonNull SocketResponsePacket responsePacket) {
78+
Logger.log("serverListeningSocketServerClient onResponse \n" + responsePacket.getMessage());
6779
}
6880
});
6981
}
70-
82+
7183
@Override
7284
public void onClientDisconnected(SocketServer socketServer, SocketServerClient socketServerClient) {
7385
Logger.log("socketServer onClientDisconnected");
@@ -80,6 +92,7 @@ public void onClientDisconnected(SocketServer socketServer, SocketServerClient s
8092
@Override
8193
public void onConnected(SocketClient client) {
8294
Logger.log("localSocketClient onConnected");
95+
getLocalSocketClient().send("再见");
8396
}
8497

8598
@Override
@@ -88,8 +101,8 @@ public void onDisconnected(SocketClient client) {
88101
}
89102

90103
@Override
91-
public void onResponse(SocketClient client, @NonNull String response) {
92-
Logger.log("localSocketClient onResponse \n" + response);
104+
public void onResponse(SocketClient client, @NonNull SocketResponsePacket responsePacket) {
105+
Logger.log("localSocketClient onResponse \n" + responsePacket.getMessage());
93106
}
94107
});
95108

@@ -98,16 +111,15 @@ public void onResponse(SocketClient client, @NonNull String response) {
98111
getWindow().getDecorView().postDelayed(new Runnable() {
99112
@Override
100113
public void run() {
101-
getLocalSocketClient().send("haha test");
102-
}
103-
}, 15 * 1000);
104-
getWindow().getDecorView().postDelayed(new Runnable() {
105-
@Override
106-
public void run() {
107-
getLocalSocketClient().send(SocketPacket.DefaultPollingQueryMessage);
108-
// getLocalSocketClient().disconnect();
114+
getLocalSocketClient().send("你好");
115+
try {
116+
getLocalSocketClient().send("HELLO".getBytes("UTF-8"));
117+
}
118+
catch (UnsupportedEncodingException e) {
119+
e.printStackTrace();
120+
}
109121
}
110-
}, 30 * 1000);
122+
}, 5 * 1000);
111123
}
112124

113125
}

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.5.0'
8+
classpath 'com.android.tools.build:gradle:2.0.0'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Sep 15 11:05:12 CST 2015
1+
#Mon Apr 11 11:00:21 CST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

‎socketclient/socketclient.iml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":socketclient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.vilyever" external.system.module.version="1.2.4" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":socketclient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.vilyever" external.system.module.version="1.2.5" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -29,7 +26,7 @@
2926
</component>
3027
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3128
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
32-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3330
<exclude-output />
3431
<content url="file://$MODULE_DIR$">
3532
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -51,13 +48,27 @@
5148
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5350
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5458
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5559
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5660
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5761
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5862
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5963
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6064
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
6172
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6273
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6374
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />

0 commit comments

Comments
 (0)