代码整理

朱显松
1 parent 4c9b109a
Showing 5 changed files with 11 additions and 50 deletions
app/src/main/java/com/cnlive/demo/video/BarrageActivity.java
app/src/main/java/com/cnlive/demo/video/MainActivity.java
app/src/main/java/com/cnlive/demo/video/MediaPlayerActivity.java
app/src/main/java/com/cnlive/demo/video/VideoViewActivity.java
app/src/main/res/layout/activity_main.xml
@@ -19,10 +19,10 @@ public class BarrageActivity extends Activity implements View.OnClickListener{
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_barrage);
         barrageLayout = (BarrageLayout) findViewById(R.id.barrage);
-        if (barrageLayout != null) barrageLayout.init(BarrageBaseView.class, 400, 10, 10, 4);
+        barrageLayout.init(BarrageBaseView.class, 400, 10, 10, 4);
  
         barrageGiftLayout = (BarrageLayout) findViewById(R.id.barrage_gift);
-        if (barrageGiftLayout != null) barrageGiftLayout.init(BarrageGiftView.class, 400, 4, 10, 6);
+        barrageGiftLayout.init(BarrageGiftView.class, 400, 4, 10, 6);
  
         findViewById(R.id.addMessage).setOnClickListener(this);
         findViewById(R.id.addGiftMessage).setOnClickListener(this);
@@ -11,9 +11,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        findViewById(R.id.play).setOnClickListener(this);
-        findViewById(R.id.barrageBtn).setOnClickListener(this);
-        findViewById(R.id.videoId).setOnClickListener(this);
     }
  
     @Override
@@ -16,8 +16,6 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceHolder.Callback;
 import android.view.SurfaceView;
 import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -329,39 +327,6 @@ public class MediaPlayerActivity extends Activity implements View.OnClickListene
         super.onConfigurationChanged(newConfig);
     }
  
-    private void scaleVideoView() {
-        if (mMediaPlayer == null || mMediaPlayer.getVideoHeight() <= 0 || mVideoSurfaceView == null)
-            return;
-
-        WindowManager wm = this.getWindowManager();
-        int sw = wm.getDefaultDisplay().getWidth();
-        int sh = wm.getDefaultDisplay().getHeight();
-        int videoWidth = mVideoWidth;
-        int videoHeight = mVideoHeight;
-        int visibleWidth = 0;
-        int visibleHeight = 0;
-
-        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-            visibleWidth = sw > sh ? sh : sw;
-            visibleHeight = (int) Math.ceil(visibleWidth * videoHeight / videoWidth);
-        } else if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-
-            if (videoHeight * sw > videoWidth * sh) {
-                visibleHeight = sh;
-                visibleWidth = (int) Math.ceil(videoWidth * visibleHeight / videoHeight);
-            } else {
-                visibleWidth = sw;
-                visibleHeight = (int) Math.ceil(visibleWidth * videoHeight / videoWidth);
-            }
-        }
-
-        LayoutParams lp = mVideoSurfaceView.getLayoutParams();
-        lp.width = visibleWidth;
-        lp.height = visibleHeight;
-        mVideoSurfaceView.setLayoutParams(lp);
-
-        mVideoSurfaceView.invalidate();
-    }
  
     // Maybe we could support gesture detect
     private void dealTouchEvent(View view, MotionEvent event) {
@@ -3,14 +3,10 @@ package com.cnlive.demo.video;
 import android.app.Activity;
 import android.os.Bundle;
  
-import com.cnlive.demo.video.model.ProgramVod;
+import com.cnlive.demo.video.model.ProgramLive;
 import com.cnlive.libs.video.video.VideoView;
  
  
-/**
- * Created by xiansong on 2016/10/8.
- */
-
 public class VideoViewActivity extends Activity {
  
     protected VideoView videoView;
@@ -44,10 +40,10 @@ public class VideoViewActivity extends Activity {
         videoView = (VideoView) findViewById(R.id.videoview);
  
         //视讯云 直播
-//        videoView.setDataSource(new ProgramLive(),false);
+        videoView.setDataSource(new ProgramLive(),false);
  
         //视讯云 点播
-        videoView.setDataSourceByAuth(new ProgramVod(), false);
+//        videoView.setDataSourceByAuth(new ProgramVod(), false);
  
         //本地视频
 //        try {
@@ -13,18 +13,21 @@
         android:id="@+id/play"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="视频基本操作" />
+        android:text="视频基本操作"
+        android:onClick="onClick"/>
  
     <Button android:id="@+id/videoId"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="播放视讯云视频"
-        android:layout_below="@+id/play"/>
+        android:layout_below="@+id/play"
+        android:onClick="onClick"/>
  
     <Button
         android:id="@+id/barrageBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="弹幕"
-        android:layout_below="@+id/videoId"/>
+        android:layout_below="@+id/videoId"
+        android:onClick="onClick"/>
 </RelativeLayout>