From 5b48b501597fc8a91c4cd11ac68a3c6cc70b7474 Mon Sep 17 00:00:00 2001
From: wanjian <wanjian@MGJwanjian.lan>
Date: Sat, 8 Apr 2017 11:38:44 +0800
Subject: [PATCH] no message

---
 .idea/gradle.xml                              |  1 -
 .idea/misc.xml                                | 66 +++++++++++++++++++
 .idea/modules.xml                             |  1 -
 app/src/main/res/layout/x.xml                 | 22 +++++++
 build.gradle                                  |  1 -
 lib/src/main/java/com/client/Client.java      |  5 --
 lib/src/main/java/com/client/Install.java     |  3 -
 settings.gradle                               |  2 +-
 .../puppet/ExampleInstrumentedTest.java       |  2 +-
 .../main/java/com/wanjian/puppet/Main.java    |  6 --
 .../wanjian/puppet/VirtualDisplayFactory.java |  2 -
 .../com/wanjian/puppet/ExampleUnitTest.java   |  2 +-
 12 files changed, 91 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/res/layout/x.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 19fb99e..145f4f7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,7 +8,6 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/lib" />
             <option value="$PROJECT_DIR$/shareandcontrollib" />
           </set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d3f6743..a059ccb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,72 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="MarkdownProjectSettings">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true">
+      <PanelProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings>
+      <PegdownExtensions>
+        <option name="ABBREVIATIONS" value="false" />
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="AUTOLINKS" value="true" />
+        <option name="DEFINITIONS" value="false" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="FOOTNOTES" value="false" />
+        <option name="HARDWRAPS" value="false" />
+        <option name="INSERTED" value="false" />
+        <option name="QUOTES" value="false" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="SMARTS" value="false" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="SUBSCRIPT" value="false" />
+        <option name="SUPERSCRIPT" value="false" />
+        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
+        <option name="SUPPRESS_INLINE_HTML" value="false" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+        <option name="TOC" value="false" />
+        <option name="WIKILINKS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="COMMONMARK_LISTS" value="false" />
+        <option name="DUMMY" value="false" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="FLEXMARK_FRONT_MATTER" value="false" />
+        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="true" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="GITBOOK_URL_ENCODING" value="false" />
+        <option name="GITHUB_EMOJI_URL" value="false" />
+        <option name="GITHUB_LISTS" value="true" />
+        <option name="GITHUB_WIKI_LINKS" value="true" />
+        <option name="JEKYLL_FRONT_MATTER" value="false" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+    </CssSettings>
+    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6e3cba6..cd5b30f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/androidScreenShareAndControl.iml" filepath="$PROJECT_DIR$/androidScreenShareAndControl.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/lib/lib.iml" filepath="$PROJECT_DIR$/lib/lib.iml" />
       <module fileurl="file://$PROJECT_DIR$/shareandcontrollib/shareandcontrollib.iml" filepath="$PROJECT_DIR$/shareandcontrollib/shareandcontrollib.iml" />
     </modules>
diff --git a/app/src/main/res/layout/x.xml b/app/src/main/res/layout/x.xml
new file mode 100644
index 0000000..272ea26
--- /dev/null
+++ b/app/src/main/res/layout/x.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="#e1e1e1"
+              android:orientation="vertical">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="#fff"
+        android:weightSum="5">
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="2"
+            android:background="#f00"
+            />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a3330d4..a39204a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,6 @@ buildscript {
         classpath 'com.android.tools.build:gradle:2.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
diff --git a/lib/src/main/java/com/client/Client.java b/lib/src/main/java/com/client/Client.java
index ee1d702..e8b37aa 100644
--- a/lib/src/main/java/com/client/Client.java
+++ b/lib/src/main/java/com/client/Client.java
@@ -89,7 +89,6 @@ public class Client extends JFrame {
             @Override
             public void mouseClicked(MouseEvent mouseEvent) {
                 super.mouseClicked(mouseEvent);
-//                System.out.println("down    " + mouseEvent);
                 int x = mouseEvent.getX();
                 int y = mouseEvent.getY();
                 try {
@@ -106,7 +105,6 @@ public class Client extends JFrame {
             @Override
             public void mouseReleased(MouseEvent mouseEvent) {
                 super.mouseReleased(mouseEvent);
-//                System.out.println("up   mouseReleased");
                 try {
                     int x = mouseEvent.getX();
                     int y = mouseEvent.getY();
@@ -128,11 +126,9 @@ public class Client extends JFrame {
                     int y = mouseEvent.getY();
                     if (!isMove) {
                         isMove = true;
-//                        System.out.println("down  mouseDragged " + mouseEvent.getX() + "  " + mouseEvent.getY());
 
                         writer.write("DOWN" + (x * 1.0f / label.getWidth()) + "#" + (y * 1.0f / label.getHeight()));
                     } else {
-//                        System.out.println("move   mouseDragged " + mouseEvent.getX() + "  " + mouseEvent.getY());
 
                         writer.write("MOVE" + (x * 1.0f / label.getWidth()) + "#" + (y * 1.0f / label.getHeight()));
                     }
@@ -260,7 +256,6 @@ public class Client extends JFrame {
                         label.setIcon(new ScaleIcon(new ImageIcon(image)));
                         long s3 = System.currentTimeMillis();
 
-                        //    System.out.println("读取: " + (s2 - s1) + "    解码: " + (s3 - s2) + "  " + length);
                     }
 
                 } catch (IOException e) {
diff --git a/lib/src/main/java/com/client/Install.java b/lib/src/main/java/com/client/Install.java
index f5bb703..8324fb1 100644
--- a/lib/src/main/java/com/client/Install.java
+++ b/lib/src/main/java/com/client/Install.java
@@ -2,13 +2,10 @@ package com.client;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.DataOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.io.Reader;
 import java.util.Arrays;
 
 /**
diff --git a/settings.gradle b/settings.gradle
index b140ba8..f5050fc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':lib', ':shareandcontrollib'
+include ':lib', ':shareandcontrollib'
diff --git a/shareandcontrollib/src/androidTest/java/com/wanjian/puppet/ExampleInstrumentedTest.java b/shareandcontrollib/src/androidTest/java/com/wanjian/puppet/ExampleInstrumentedTest.java
index 0c9612d..3254158 100644
--- a/shareandcontrollib/src/androidTest/java/com/wanjian/puppet/ExampleInstrumentedTest.java
+++ b/shareandcontrollib/src/androidTest/java/com/wanjian/puppet/ExampleInstrumentedTest.java
@@ -7,7 +7,7 @@ import android.support.test.runner.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumentation test, which will execute on an Android device.
diff --git a/shareandcontrollib/src/main/java/com/wanjian/puppet/Main.java b/shareandcontrollib/src/main/java/com/wanjian/puppet/Main.java
index 8c563de..87327f5 100644
--- a/shareandcontrollib/src/main/java/com/wanjian/puppet/Main.java
+++ b/shareandcontrollib/src/main/java/com/wanjian/puppet/Main.java
@@ -1,14 +1,12 @@
 package com.wanjian.puppet;
 
 import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Point;
 import android.hardware.input.InputManager;
 import android.net.LocalServerSocket;
 import android.net.LocalSocket;
 import android.os.Build;
-import android.os.Handler;
 import android.os.IBinder;
 import android.os.SystemClock;
 import android.support.v4.view.InputDeviceCompat;
@@ -19,11 +17,7 @@ import android.view.MotionEvent;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
diff --git a/shareandcontrollib/src/main/java/com/wanjian/puppet/VirtualDisplayFactory.java b/shareandcontrollib/src/main/java/com/wanjian/puppet/VirtualDisplayFactory.java
index c547096..e82bdf3 100644
--- a/shareandcontrollib/src/main/java/com/wanjian/puppet/VirtualDisplayFactory.java
+++ b/shareandcontrollib/src/main/java/com/wanjian/puppet/VirtualDisplayFactory.java
@@ -3,8 +3,6 @@ package com.wanjian.puppet;
 import android.os.Handler;
 import android.view.Surface;
 
-import com.wanjian.puppet.VirtualDisplay;
-
 public interface VirtualDisplayFactory {
     VirtualDisplay createVirtualDisplay(String str, int i, int i2, int i3, int i4, Surface surface, Handler handler);
 
diff --git a/shareandcontrollib/src/test/java/com/wanjian/puppet/ExampleUnitTest.java b/shareandcontrollib/src/test/java/com/wanjian/puppet/ExampleUnitTest.java
index 74a07b5..792c469 100644
--- a/shareandcontrollib/src/test/java/com/wanjian/puppet/ExampleUnitTest.java
+++ b/shareandcontrollib/src/test/java/com/wanjian/puppet/ExampleUnitTest.java
@@ -2,7 +2,7 @@ package com.wanjian.puppet;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Example local unit test, which will execute on the development machine (host).