Commit 128e9a623c3de5b4de317d049e98701006f3c5c3

Authored by 朱显松
1 parent f54df245

合并

app/src/main/java/com/cnlive/demo/stream/MainActivity.java
1 package com.cnlive.demo.stream; 1 package com.cnlive.demo.stream;
2 2
3 -import android.content.Intent;  
4 -import android.support.v7.app.AppCompatActivity;  
5 import android.os.Bundle; 3 import android.os.Bundle;
6 -import android.text.InputType; 4 +import android.support.v7.app.AppCompatActivity;
7 import android.text.TextUtils; 5 import android.text.TextUtils;
8 import android.view.View; 6 import android.view.View;
9 import android.widget.Button; 7 import android.widget.Button;
10 import android.widget.EditText; 8 import android.widget.EditText;
11 import android.widget.RadioButton; 9 import android.widget.RadioButton;
12 10
13 -import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE;  
14 -import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_SOFTWARE;  
15 -import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT;  
16 -import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P;  
17 -import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_480P;  
18 -import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_540P;  
19 -import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_720P;  
20 -  
21 public class MainActivity extends AppCompatActivity implements View.OnClickListener { 11 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
22 12
23 private static final String TAG = MainActivity.class.getSimpleName(); 13 private static final String TAG = MainActivity.class.getSimpleName();