release demo，删除不必要的输出日志

朱辉\harry · 朱辉\harry · commit 61bccfc15517 · 2017-05-05T20:38:12.000+08:00
diff --git a/README.md b/README.md
@@ -22,8 +22,11 @@
 
 ### 使用方法
 
-1. 使用Intellij Idea打开项目并运行
-2. 打开`web/index.html`
+1.  使用Gradle构建项目： `gradle jar`
+2.  进入到生成的目录：`cd build/libs`
+3.  运行服务器（这里使用本地服务器）：`java -jar AndroidControl.jar localserver 6655`
+4.  打开`web/index.html`
+5.  点击网页中的`设置`，配置IP和端口：`127.0.0.1` `6655`
 
 注意：
 
diff --git a/build.gradle b/build.gradle
@@ -1 +1 @@
-apply plugin: 'java'// UTF-8支持tasks.withType(JavaCompile) {    options.encoding = "UTF-8"}task "java-mkdirs" <<{	sourceSets*.java.srcDirs*.each{it.mkdirs()}	sourceSets*.resources.srcDirs*.each{it.mkdirs()}}// 依赖库仓库repositories {      mavenLocal()      mavenCentral()  }dependencies {  	compile group: 'com.android.tools.ddms', name: 'ddmlib', version: '25.3.0'    compile group: 'io.netty', name: 'netty-all', version: '4.1.9.Final'	compile group: 'com.alibaba', name: 'fastjson', version: '1.2.31'    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'    compile group: 'com.neovisionaries', name: 'nv-websocket-client', version: '1.31'}  jar {	manifest {        attributes("Main-Class": "com.yeetor.Main")    }    from {        configurations.compile.collect {            it.isDirectory() ? it : zipTree(it)        }    }    doLast {        def s = file("$libsDir/resources")        s.mkdirs()        copy {            from "$projectDir/resources"            into "$libsDir/resources"        }    }}apply plugin: 'application'run {    if ( project.hasProperty("appArgs") ) {        args Eval.me(appArgs)    }    doLast {        def s = file("$buildDir/classes/resources")        s.mkdirs()        copy {            from "$projectDir/resources"            into "$buildDir/classes/resources"        }    }}mainClassName= 'com.yeetor.Main'//task copyExtRes(type: Copy) {//    def src = file("$projectDir/resources")//    def dst = file("$buildDir/resources")////    from src//    into dst//}////distributions {//    main {//        contents {//            from (copyExtRes) {//                into "resources"//            }//        }//    }//}
+apply plugin: 'java'// UTF-8支持tasks.withType(JavaCompile) {    options.encoding = "UTF-8"}task "java-mkdirs" <<{	sourceSets*.java.srcDirs*.each{it.mkdirs()}	sourceSets*.resources.srcDirs*.each{it.mkdirs()}}// 依赖库仓库repositories {      mavenLocal()      mavenCentral()  }dependencies {  	compile group: 'com.android.tools.ddms', name: 'ddmlib', version: '25.3.0'    compile group: 'io.netty', name: 'netty-all', version: '4.1.9.Final'	compile group: 'com.alibaba', name: 'fastjson', version: '1.2.31'    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'    compile group: 'com.neovisionaries', name: 'nv-websocket-client', version: '1.31'}  jar {	manifest {        attributes("Main-Class": "com.yeetor.Main")    }    from {        configurations.compile.collect {            it.isDirectory() ? it : zipTree(it)        }    }    doLast {        def s = file("$libsDir/resources")        s.mkdirs()        copy {            from "$projectDir/resources"            into "$libsDir/resources"        }    }}apply plugin: 'application'run {    if ( project.hasProperty("appArgs") ) {        args Eval.me(appArgs)    }    doLast {        def s = file("$buildDir/classes/resources")        s.mkdirs()        copy {            from "$projectDir/resources"            into "$buildDir/classes/resources"        }    }}mainClassName= 'com.yeetor.Main'
diff --git a/src/main/java/com/yeetor/adb/AdbServer.java b/src/main/java/com/yeetor/adb/AdbServer.java
@@ -41,7 +41,8 @@ private String getADBPath(){
             if(adbPath != null){
                 adbPath += File.separator + adbPlatformTools;
             }else {
-                return null;
+                adbPath = "adb";
+                return adbPath;
             }
         }
         adbPath += File.separator + "adb";
diff --git a/src/main/java/com/yeetor/androidcontrol/LocalClient.java b/src/main/java/com/yeetor/androidcontrol/LocalClient.java
@@ -30,7 +30,7 @@ public LocalClient(Protocol protocol) {
 
 
     public void executeCommand(ChannelHandlerContext ctx, Command command) {
-        if (command.getSchem() != Command.Schem.WAITTING) {
+        if (command.getSchem() != Command.Schem.WAITTING && command.getSchem() != Command.Schem.TOUCH) {
             System.out.println(command.getContent());
         }
         switch (command.getSchem()) {
diff --git a/src/main/java/com/yeetor/androidcontrol/LocalServer.java b/src/main/java/com/yeetor/androidcontrol/LocalServer.java
@@ -79,7 +79,6 @@ public void onDisconnect(ChannelHandlerContext ctx) {
         @Override
         public void onTextMessage(ChannelHandlerContext ctx, String text) {
             Command command = Command.ParseCommand(text);
-            System.out.println(text);
             if (command != null) {
                 switch (command.getSchem()) {
                     case WAIT:

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-apply plugin: 'java'// UTF-8支持tasks.withType(JavaCompile) { options.encoding = "UTF-8"}task "java-mkdirs" <<{ sourceSets.java.srcDirs.each{it.mkdirs()} sourceSets.resources.srcDirs.each{it.mkdirs()}}// 依赖库仓库repositories { mavenLocal() mavenCentral() }dependencies { compile group: 'com.android.tools.ddms', name: 'ddmlib', version: '25.3.0' compile group: 'io.netty', name: 'netty-all', version: '4.1.9.Final' compile group: 'com.alibaba', name: 'fastjson', version: '1.2.31' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.4' compile group: 'com.neovisionaries', name: 'nv-websocket-client', version: '1.31'} jar { manifest { attributes("Main-Class": "com.yeetor.Main") } from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } doLast { def s = file("$libsDir/resources") s.mkdirs() copy { from "$projectDir/resources" into "$libsDir/resources" } }}apply plugin: 'application'run { if ( project.hasProperty("appArgs") ) { args Eval.me(appArgs) } doLast { def s = file("$buildDir/classes/resources") s.mkdirs() copy { from "$projectDir/resources" into "$buildDir/classes/resources" } }}mainClassName= 'com.yeetor.Main'//task copyExtRes(type: Copy) {// def src = file("$projectDir/resources")// def dst = file("$buildDir/resources")//// from src// into dst//}////distributions {// main {// contents {// from (copyExtRes) {// into "resources"// }// }// }//}
	`1`	+apply plugin: 'java'// UTF-8支持tasks.withType(JavaCompile) { options.encoding = "UTF-8"}task "java-mkdirs" <<{ sourceSets.java.srcDirs.each{it.mkdirs()} sourceSets.resources.srcDirs.each{it.mkdirs()}}// 依赖库仓库repositories { mavenLocal() mavenCentral() }dependencies { compile group: 'com.android.tools.ddms', name: 'ddmlib', version: '25.3.0' compile group: 'io.netty', name: 'netty-all', version: '4.1.9.Final' compile group: 'com.alibaba', name: 'fastjson', version: '1.2.31' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.4' compile group: 'com.neovisionaries', name: 'nv-websocket-client', version: '1.31'} jar { manifest { attributes("Main-Class": "com.yeetor.Main") } from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } doLast { def s = file("$libsDir/resources") s.mkdirs() copy { from "$projectDir/resources" into "$libsDir/resources" } }}apply plugin: 'application'run { if ( project.hasProperty("appArgs") ) { args Eval.me(appArgs) } doLast { def s = file("$buildDir/classes/resources") s.mkdirs() copy { from "$projectDir/resources" into "$buildDir/classes/resources" } }}mainClassName= 'com.yeetor.Main'
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ private String getADBPath(){`
`41`	`41`	`if(adbPath != null){`
`42`	`42`	`adbPath += File.separator + adbPlatformTools;`
`43`	`43`	`}else {`
`44`		`- return null;`
	`44`	`+ adbPath = "adb";`
	`45`	`+ return adbPath;`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`adbPath += File.separator + "adb";`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public LocalClient(Protocol protocol) {`
`30`	`30`
`31`	`31`
`32`	`32`	`public void executeCommand(ChannelHandlerContext ctx, Command command) {`
`33`		`- if (command.getSchem() != Command.Schem.WAITTING) {`
	`33`	`+ if (command.getSchem() != Command.Schem.WAITTING && command.getSchem() != Command.Schem.TOUCH) {`
`34`	`34`	`System.out.println(command.getContent());`
`35`	`35`	`}`
`36`	`36`	`switch (command.getSchem()) {`