From 909ee905bb025095dc73274a24c1e5572414ec5c Mon Sep 17 00:00:00 2001
From: 16rj133 <2350438011@qq.com>
Date: Fri, 23 Mar 2018 16:12:39 +0800
Subject: [PATCH] modify from yangting

---
 MySound/.idea/gradle.xml                      |  6 ---
 MySound/.idea/misc.xml                        | 45 +++++++------------
 MySound/.idea/modules.xml                     |  1 -
 .../java/com/zkr/mysound/MainActivity.java    |  2 +-
 4 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/MySound/.idea/gradle.xml b/MySound/.idea/gradle.xml
index 7ac24c7..76a4349 100644
--- a/MySound/.idea/gradle.xml
+++ b/MySound/.idea/gradle.xml
@@ -5,12 +5,6 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
diff --git a/MySound/.idea/misc.xml b/MySound/.idea/misc.xml
index 5d19981..81a282c 100644
--- a/MySound/.idea/misc.xml
+++ b/MySound/.idea/misc.xml
@@ -1,32 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <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="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
@@ -37,10 +10,26 @@
     <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.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" default="true" assert-keyword="false" jdk-15="false">
     <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.8</last-edited>
+          <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/MySound/.idea/modules.xml b/MySound/.idea/modules.xml
index 4108799..f3d8611 100644
--- a/MySound/.idea/modules.xml
+++ b/MySound/.idea/modules.xml
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/MySound.iml" filepath="$PROJECT_DIR$/MySound.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/MySound/app/src/main/java/com/zkr/mysound/MainActivity.java b/MySound/app/src/main/java/com/zkr/mysound/MainActivity.java
index 5e60218..fc3145b 100644
--- a/MySound/app/src/main/java/com/zkr/mysound/MainActivity.java
+++ b/MySound/app/src/main/java/com/zkr/mysound/MainActivity.java
@@ -8,7 +8,7 @@
 import android.view.View;
 
 import org.fmod.FMOD;
-
+import android.*;
 public class MainActivity extends AppCompatActivity {
 
     @Override