From 482fe71a8680d5df50d99686fac9165a9f244a3c Mon Sep 17 00:00:00 2001
From: Wilson <milin411@163.com>
Date: Fri, 16 Sep 2016 23:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.name                                   |  1 -
 .idea/gradle.xml                              |  4 +-
 .idea/misc.xml                                | 69 +++++++++++++++++-
 .idea/modules.xml                             |  2 +-
 .idea/vcs.xml                                 |  6 --
 TestJenkins.iml                               | 19 +++++
 app/app.iml                                   | 70 +++++++++++++------
 .../mingwu/myapplication/MainActivity.java    |  1 +
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 10 files changed, 143 insertions(+), 35 deletions(-)
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/vcs.xml
 create mode 100644 TestJenkins.iml

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index b3405b3..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-My Application
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3ec5955..0e23f8e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,14 +5,14 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
-        <option name="gradleJvm" value="1.7" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e930905..ffccc1e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,46 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectInspectionProfilesVisibleTreeState">
+    <entry key="Project Default">
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id />
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>Android</id>
+          </State>
+        </selected-state>
+      </profile-state>
+    </entry>
+  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
@@ -13,10 +53,37 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.7</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ScopeChooserConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 54b7b3f..93fdf87 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/MyApplication.iml" filepath="$PROJECT_DIR$/MyApplication.iml" />
+      <module fileurl="file://$PROJECT_DIR$/TestJenkins.iml" filepath="$PROJECT_DIR$/TestJenkins.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/TestJenkins.iml b/TestJenkins.iml
new file mode 100644
index 0000000..8188e02
--- /dev/null
+++ b/TestJenkins.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="TestJenkins" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index eeaf694..f70c3ed 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,10 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assemble_360Debug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compile_360DebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generate_360DebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assemble_360DebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compile_360DebugAndroidTestSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generate_360DebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generate_360DebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,9 +23,9 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/_360/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/_360/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/_360/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/_360/debug" isTestSource="false" generated="true" />
@@ -34,7 +33,7 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/_360/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/_360/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/_360/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/_360/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/_360/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/_360Debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/_360Debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/_360Debug/assets" type="java-resource" />
@@ -42,12 +41,21 @@
       <sourceFolder url="file://$MODULE_DIR$/src/_360Debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/_360Debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/_360Debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/_360Debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/_360/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/_360/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/_360/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/_360/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/_360/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/_360/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/_360/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360Debug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360Debug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360Debug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360Debug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360Debug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360Debug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360Debug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360Debug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/_360/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/_360/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/_360/assets" type="java-resource" />
@@ -55,6 +63,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/_360/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/_360/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/_360/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/_360/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest_360/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest_360/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest_360/assets" type="java-test-resource" />
@@ -62,6 +71,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest_360/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest_360/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest_360/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest_360/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_360/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -69,6 +87,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -76,6 +103,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,33 +119,25 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mingwu/myapplication/MainActivity.java b/app/src/main/java/com/example/mingwu/myapplication/MainActivity.java
index 5852589..b1e6791 100644
--- a/app/src/main/java/com/example/mingwu/myapplication/MainActivity.java
+++ b/app/src/main/java/com/example/mingwu/myapplication/MainActivity.java
@@ -69,6 +69,7 @@ public String getUserName() {
 
     @Override
     public String getPassWord() {
+        
         return mEtPassword.getText().toString();
 
     }
diff --git a/build.gradle b/build.gradle
index 9b9ee56..2f60cad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.1.3'
         // `添加packer插件依赖`
         classpath 'com.mcxiaoke.gradle:packer:1.0.+'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..48db04c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Fri Sep 16 22:54:44 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip