CNLive Android Team / CNVideoDemo · Commits

Commit 5654cbc123647e6f6c71c23153483beff7f59b2c

Authored by 王琳
1 parent 20feb81d

播放SDK升级版本

Inline Side-by-side
Showing 6 changed files with 46 additions and 19 deletions
.idea/inspectionProfiles/Project_Default.xml 0 → 100644
  View file @5654cbc
  1 +<component name="InspectionProjectProfileManager">
  2 + <profile version="1.0">
  3 + <option name="myName" value="Project Default" />
  4 + <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
  5 + <option name="TOP_LEVEL_CLASS_OPTIONS">
  6 + <value>
  7 + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
  8 + <option name="REQUIRED_TAGS" value="" />
  9 + </value>
  10 + </option>
  11 + <option name="INNER_CLASS_OPTIONS">
  12 + <value>
  13 + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
  14 + <option name="REQUIRED_TAGS" value="" />
  15 + </value>
  16 + </option>
  17 + <option name="METHOD_OPTIONS">
  18 + <value>
  19 + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
  20 + <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
  21 + </value>
  22 + </option>
  23 + <option name="FIELD_OPTIONS">
  24 + <value>
  25 + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
  26 + <option name="REQUIRED_TAGS" value="" />
  27 + </value>
  28 + </option>
  29 + <option name="IGNORE_DEPRECATED" value="false" />
  30 + <option name="IGNORE_JAVADOC_PERIOD" value="true" />
  31 + <option name="IGNORE_DUPLICATED_THROWS" value="false" />
  32 + <option name="IGNORE_POINT_TO_ITSELF" value="false" />
  33 + <option name="myAdditionalJavadocTags" value="date" />
  34 + </inspection_tool>
  35 + </profile>
  36 +</component>
0 \ No newline at end of file 37 \ No newline at end of file
.idea/misc.xml
  View file @5654cbc
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="EntryPointsManager">  
4 - <entry_points version="2.0" />  
5 - </component>  
6 <component name="NullableNotNullManager"> 3 <component name="NullableNotNullManager">
7 <option name="myDefaultNullable" value="android.support.annotation.Nullable" /> 4 <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
8 <option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> 5 <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@ @@ -27,17 +24,7 @@
27 </value> 24 </value>
28 </option> 25 </option>
29 </component> 26 </component>
30 - <component name="ProjectLevelVcsManager" settingsEditedManually="false">  
31 - <OptionsSetting value="true" id="Add" />  
32 - <OptionsSetting value="true" id="Remove" />  
33 - <OptionsSetting value="true" id="Checkout" />  
34 - <OptionsSetting value="true" id="Update" />  
35 - <OptionsSetting value="true" id="Status" />  
36 - <OptionsSetting value="true" id="Edit" />  
37 - <ConfirmationsSetting value="0" id="Add" />  
38 - <ConfirmationsSetting value="0" id="Remove" />  
39 - </component>  
40 - <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"> 27 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
41 <output url="file://$PROJECT_DIR$/build/classes" /> 28 <output url="file://$PROJECT_DIR$/build/classes" />
42 </component> 29 </component>
43 <component name="ProjectType"> 30 <component name="ProjectType">
.idea/modules.xml
  View file @5654cbc
@@ -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://E:\AndroidPro\CNVideoDemo\CNLiveVideoDemo.iml" filepath="E:\AndroidPro\CNVideoDemo\CNLiveVideoDemo.iml" />
6 <module fileurl="file://$PROJECT_DIR$/CNVideoDemo.iml" filepath="$PROJECT_DIR$/CNVideoDemo.iml" /> 6 <module fileurl="file://$PROJECT_DIR$/CNVideoDemo.iml" filepath="$PROJECT_DIR$/CNVideoDemo.iml" />
7 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> 7 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
8 </modules> 8 </modules>
app/build.gradle
  View file @5654cbc
@@ -27,6 +27,10 @@ dependencies { @@ -27,6 +27,10 @@ dependencies {
27 compile 'com.android.support.constraint:constraint-layout:1.0.1' 27 compile 'com.android.support.constraint:constraint-layout:1.0.1'
28 compile 'com.android.support:design:25.0.0' 28 compile 'com.android.support:design:25.0.0'
29 29
30 - compile 'com.cnlive:lib_cnvideo2.0:2.2.3' 30 + compile 'com.cnlive:lib_cnvideo2.0:3.0'
  31 + compile 'com.cnlive:lib_cnutil:3.0.3'
  32 + compile 'com.cnlive:lib_cnuser:1.0.1'
  33 + compile 'com.cnlive:lib_analytics:1.0.1'
  34 + compile 'com.cnlive:lib_cnchat_tc:3.0.1'
31 35
32 } 36 }
app/src/main/java/com/cnlive/demo/video/MainActivity.java
  View file @5654cbc
@@ -42,7 +42,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe @@ -42,7 +42,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
42 startActivity(intent); 42 startActivity(intent);
43 break; 43 break;
44 case R.id.active_info: 44 case R.id.active_info:
45 - GetActiveInfoUtil.getActiveInfo(this, "60_50430"); 45 + GetActiveInfoUtil.getActiveInfo(this, "androidtest");
46 break; 46 break;
47 } 47 }
48 } 48 }
app/src/main/java/com/cnlive/demo/video/model/ProgramVod.java
  View file @5654cbc
@@ -12,13 +12,13 @@ public class ProgramVod implements IDataSource { @@ -12,13 +12,13 @@ public class ProgramVod implements IDataSource {
12 //返回点播视频ID 12 //返回点播视频ID
13 @Override 13 @Override
14 public String getDataSourceId() { 14 public String getDataSourceId() {
15 - return "117_0005701481101785734a"; 15 + return "androidtest";
16 } 16 }
17 17
18 //返回视频类型 vod 18 //返回视频类型 vod
19 @Override 19 @Override
20 public String getDataSourceType() { 20 public String getDataSourceType() {
21 - return Config.TYPE_VOD; 21 + return Config.TYPE_LIVE;
22 } 22 }
23 23
24 //返回视频码率 24 //返回视频码率