diff --git a/app/build.gradle b/app/build.gradle index b955878..5511e40 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,6 +25,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.1.0' + compile 'com.android.support:appcompat-v7:25.1.1' compile project(path: ':library') } diff --git a/app/src/main/java/net/ossrs/yasea/demo/MainActivity.java b/app/src/main/java/net/ossrs/yasea/demo/MainActivity.java index f8899be..99f4341 100644 --- a/app/src/main/java/net/ossrs/yasea/demo/MainActivity.java +++ b/app/src/main/java/net/ossrs/yasea/demo/MainActivity.java @@ -84,8 +84,8 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL editor.putString("rtmpUrl", rtmpUrl); editor.apply(); - mPublisher.startCamera(); mPublisher.startPublish(rtmpUrl); + mPublisher.startCamera(); if (btnSwitchEncoder.getText().toString().contentEquals("soft encoder")) { Toast.makeText(getApplicationContext(), "Use hard encoder", Toast.LENGTH_SHORT).show(); @@ -243,8 +243,8 @@ public class MainActivity extends AppCompatActivity implements RtmpHandler.RtmpL btnRecord.setText("record"); mPublisher.setScreenOrientation(newConfig.orientation); if (btnPublish.getText().toString().contentEquals("stop")) { - mPublisher.startCamera(); mPublisher.startEncode(); + mPublisher.startCamera(); } } diff --git a/library/build.gradle b/library/build.gradle index 7a393d7..000cdc6 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -28,6 +28,6 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.1.0' + compile 'com.android.support:appcompat-v7:25.1.1' testCompile 'junit:junit:4.12' }