补充提交资源文件，添加CNPlayerActivityNew启动

朱显松
1 parent f2c156ea
Showing 6 changed files with 19 additions and 3 deletions
.idea/gradle.xml
.idea/misc.xml
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/demo/video/MainActivity.java
app/src/main/res/drawable-xxhdpi/cnlive_video_bottom_bg.png
app/src/main/res/layout/activity_main.xml
@@ -5,6 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <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">
+  <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">
@@ -28,7 +28,12 @@
             android:name=".CNPlayerActivity"
             android:configChanges="keyboardHidden|screenSize|orientation"
             android:screenOrientation="portrait" />
-
+        <activity
+            android:name=".CNPlayerActivityNew"
+            android:configChanges="keyboardHidden|screenSize|orientation"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".PlayerActivity"
             android:configChanges="keyboardHidden|screenSize|orientation"
@@ -18,6 +18,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         findViewById(R.id.play).setOnClickListener(this);
         findViewById(R.id.playCnlive).setOnClickListener(this);
         findViewById(R.id.barrageBtn).setOnClickListener(this);
+        findViewById(R.id.videoId).setOnClickListener(this);
     }
     @Override
@@ -31,6 +32,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 intent.putExtra("id",editText.getText().toString());
                 startActivity(intent);
                 break;
+            case R.id.videoId:
+                startActivity(new Intent(this, CNPlayerActivityNew.class));
+                break;
             case R.id.barrageBtn:
                 startActivity(new Intent(this,CNBarrageActivity.class));
                 break;
@@ -29,10 +29,16 @@
         android:layout_toRightOf="@+id/playCnlive"
         android:layout_alignBottom="@+id/playCnlive"/>
+    <Button android:id="@+id/videoId"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="播放视讯云视频 点播/直播 ID"
+        android:layout_below="@+id/playCnlive"/>
+
     <Button
         android:id="@+id/barrageBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="弹幕"
-        android:layout_below="@+id/playCnlive"/>
+        android:layout_below="@+id/videoId"/>
 </RelativeLayout>