播放SDK升级版本

王琳
1 parent 20feb81d
Showing 6 changed files with 46 additions and 19 deletions
.idea/inspectionProfiles/Project_Default.xml
.idea/misc.xml
.idea/modules.xml
app/build.gradle
app/src/main/java/com/cnlive/demo/video/MainActivity.java
app/src/main/java/com/cnlive/demo/video/model/ProgramVod.java
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="date" />
+    </inspection_tool>
+  </profile>
+</component>
 \ No newline at end of file
 <?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" />
@@ -27,17 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <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_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/CNLiveVideoDemo.iml" filepath="$PROJECT_DIR$/CNLiveVideoDemo.iml" />
+      <module fileurl="file://E:\AndroidPro\CNVideoDemo\CNLiveVideoDemo.iml" filepath="E:\AndroidPro\CNVideoDemo\CNLiveVideoDemo.iml" />
       <module fileurl="file://$PROJECT_DIR$/CNVideoDemo.iml" filepath="$PROJECT_DIR$/CNVideoDemo.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
@@ -27,6 +27,10 @@ dependencies {
     compile 'com.android.support.constraint:constraint-layout:1.0.1'
     compile 'com.android.support:design:25.0.0'
  
-    compile 'com.cnlive:lib_cnvideo2.0:2.2.3'
+    compile 'com.cnlive:lib_cnvideo2.0:3.0'
+    compile 'com.cnlive:lib_cnutil:3.0.3'
+    compile 'com.cnlive:lib_cnuser:1.0.1'
+    compile 'com.cnlive:lib_analytics:1.0.1'
+    compile 'com.cnlive:lib_cnchat_tc:3.0.1'
  
 }
@@ -42,7 +42,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 startActivity(intent);
                 break;
             case R.id.active_info:
-                GetActiveInfoUtil.getActiveInfo(this, "60_50430");
+                GetActiveInfoUtil.getActiveInfo(this, "androidtest");
                 break;
         }
     }
@@ -12,13 +12,13 @@ public class ProgramVod implements IDataSource {
     //返回点播视频ID
     @Override
     public String getDataSourceId() {
-        return "117_0005701481101785734a";
+        return "androidtest";
     }
  
     //返回视频类型 vod
     @Override
     public String getDataSourceType() {
-        return Config.TYPE_VOD;
+        return Config.TYPE_LIVE;
     }
  
     //返回视频码率