CNLive Android Team / CNVideoDemo · Commits

Commit e0279fb25a9151c953babbfcc15a7c45d34d9e70

Authored by 朱显松
1 parent e3fab650

降低SDK版本

Inline Side-by-side
Showing 5 changed files with 48 additions and 7 deletions
.idea/.name
  View file @e0279fb
1 -CNLiveVideoDemo  
2 \ No newline at end of file 1 \ No newline at end of file
  2 +CNVideoDemo
3 \ No newline at end of file 3 \ No newline at end of file
.idea/misc.xml
  View file @e0279fb
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
  3 + <component name="NullableNotNullManager">
  4 + <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
  5 + <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
  6 + <option name="myNullables">
  7 + <value>
  8 + <list size="4">
  9 + <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
  10 + <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
  11 + <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
  12 + <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
  13 + </list>
  14 + </value>
  15 + </option>
  16 + <option name="myNotNulls">
  17 + <value>
  18 + <list size="4">
  19 + <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
  20 + <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
  21 + <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
  22 + <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
  23 + </list>
  24 + </value>
  25 + </option>
  26 + </component>
3 <component name="ProjectLevelVcsManager" settingsEditedManually="false"> 27 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
4 <OptionsSetting value="true" id="Add" /> 28 <OptionsSetting value="true" id="Add" />
5 <OptionsSetting value="true" id="Remove" /> 29 <OptionsSetting value="true" id="Remove" />
@@ -10,10 +34,26 @@ @@ -10,10 +34,26 @@
10 <ConfirmationsSetting value="0" id="Add" /> 34 <ConfirmationsSetting value="0" id="Add" />
11 <ConfirmationsSetting value="0" id="Remove" /> 35 <ConfirmationsSetting value="0" id="Remove" />
12 </component> 36 </component>
13 - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> 37 + <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">
14 <output url="file://$PROJECT_DIR$/build/classes" /> 38 <output url="file://$PROJECT_DIR$/build/classes" />
15 </component> 39 </component>
16 <component name="ProjectType"> 40 <component name="ProjectType">
17 <option name="id" value="Android" /> 41 <option name="id" value="Android" />
18 </component> 42 </component>
  43 + <component name="masterDetails">
  44 + <states>
  45 + <state key="ProjectJDKs.UI">
  46 + <settings>
  47 + <last-edited>1.8</last-edited>
  48 + <splitter-proportions>
  49 + <option name="proportions">
  50 + <list>
  51 + <option value="0.2" />
  52 + </list>
  53 + </option>
  54 + </splitter-proportions>
  55 + </settings>
  56 + </state>
  57 + </states>
  58 + </component>
19 </project> 59 </project>
20 \ No newline at end of file 60 \ No newline at end of file
.idea/modules.xml
  View file @e0279fb
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ProjectModuleManager"> 3 <component name="ProjectModuleManager">
4 <modules> 4 <modules>
5 - <module fileurl="file://$PROJECT_DIR$/CNLiveVideoDemo.iml" filepath="$PROJECT_DIR$/CNLiveVideoDemo.iml" /> 5 + <module fileurl="file://$PROJECT_DIR$/CNVideoDemo.iml" filepath="$PROJECT_DIR$/CNVideoDemo.iml" />
6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> 6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
7 </modules> 7 </modules>
8 </component> 8 </component>
.idea/vcs.xml
  View file @e0279fb
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="VcsDirectoryMappings"> 3 <component name="VcsDirectoryMappings">
4 - <mapping directory="$PROJECT_DIR$" vcs="Git" /> 4 + <mapping directory="" vcs="Git" />
5 </component> 5 </component>
6 </project> 6 </project>
7 \ No newline at end of file 7 \ No newline at end of file
app/build.gradle
  View file @e0279fb
1 apply plugin: 'com.android.application' 1 apply plugin: 'com.android.application'
2 2
3 android { 3 android {
4 - compileSdkVersion 24  
5 - buildToolsVersion "24.0.0" 4 + compileSdkVersion 23
  5 + buildToolsVersion "23.0.3"
  6 +
6 7
7 defaultConfig { 8 defaultConfig {
8 applicationId "com.cnlive.demo.video" 9 applicationId "com.cnlive.demo.video"
@@ -26,5 +27,5 @@ android { @@ -26,5 +27,5 @@ android {
26 dependencies { 27 dependencies {
27 compile fileTree(dir: 'libs', include: ['*.jar']) 28 compile fileTree(dir: 'libs', include: ['*.jar'])
28 testCompile 'junit:junit:4.12' 29 testCompile 'junit:junit:4.12'
29 - compile 'com.android.support:appcompat-v7:24.0.0' 30 + compile 'com.android.support:appcompat-v7:23.4.0'
30 } 31 }