非必要更新

更新功能 - 修改推流界面的错误提示，从toast提示改为确认弹出框提示，断开连接提示没有修改。 - 修改推流帧率从原来的15改为20。升级jar包 - polyvRTMP1.0.4.jar -> polyvRTMP1.0.5.jar - polyvRTMPChat1.0.4.jar -> polyvRTMPChat1.0.5.jar 升级源码包 - polyvRTMPSources1.0.4.jar -> polyvRTMPSources1.0.5.jar
easefun · Jun 27, 2017 · 7ea8e9c · 7ea8e9c
1 parent 7307c7b
commit 7ea8e9c
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -27,4 +27,5 @@ rtmpSDK1.0demo是rtmpSDK1.0的demo示例Android studio项目工程，其中包
 ***
 #### 更多关于rtmpSDK1.0demo和rtmpSDK1.0的详细介绍请看[Wiki](https://github.com/easefun/polyv-android-rtmp-sdk-1.0-demo/wiki)。
 1.0.3版API文档请看[v1.0.3 API](http://demo.polyv.net/polyv/android/rtmp/sdk/1.0.3/api/index.html)。<br/>
-1.0.4版API文档请看[v1.0.4 API](http://demo.polyv.net/polyv/android/rtmp/sdk/1.0.4/api/index.html)。
+1.0.4版API文档请看[v1.0.4 API](http://demo.polyv.net/polyv/android/rtmp/sdk/1.0.4/api/index.html)。<br/>
+1.0.5版API文档请看[v1.0.5 API](http://demo.polyv.net/polyv/android/rtmp/sdk/1.0.5/api/index.html)。
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '23.0.3'
+    buildToolsVersion "23.0.3"
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 23
-        versionCode 3
-        versionName "1.0.3"
+        versionCode 5
+        versionName "1.0.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/libs/polyvRTMP1.0.4.jar → app/libs/polyvRTMP1.0.5.jar b/app/libs/polyvRTMP1.0.4.jar → app/libs/polyvRTMP1.0.5.jar
diff --git a/app/libs/polyvRTMPChat1.0.4.jar → app/libs/polyvRTMPChat1.0.5.jar b/app/libs/polyvRTMPChat1.0.4.jar → app/libs/polyvRTMPChat1.0.5.jar
diff --git a/app/src/main/java/com/easefun/polyvrtmp/activity/PolyvMainActivity.java b/app/src/main/java/com/easefun/polyvrtmp/activity/PolyvMainActivity.java
@@ -138,57 +138,69 @@ public void onPrepared() {
         polyvRTMPView.setOnErrorListener(new IPolyvRTMPOnErrorListener() {
             @Override
             public void onError(PolyvRTMPErrorReason errorReason) {
+                String message = "";
                 switch (errorReason.getType()) {
                     case PolyvRTMPErrorReason.GET_NGB_PUSH_URL_EMPTY:
-                        Toast.makeText(PolyvMainActivity.this, "获取NGB推流地址为空，请重试", Toast.LENGTH_SHORT).show();
+                        message = "获取NGB推流地址为空，请重试 (error code " + PolyvRTMPErrorReason.GET_NGB_PUSH_URL_EMPTY + ")";
                         break;
                     case PolyvRTMPErrorReason.NETWORK_DENIED:
-                        Toast.makeText(PolyvMainActivity.this, "请连接网络", Toast.LENGTH_SHORT).show();
+                        message = "请连接网络 (error code " + PolyvRTMPErrorReason.NETWORK_DENIED + ")";
                         break;
                     case PolyvRTMPErrorReason.NOT_CAMERA:
-                        Toast.makeText(PolyvMainActivity.this, "没有摄像头，请更换设备", Toast.LENGTH_SHORT).show();
+                        message = "没有摄像头，请更换设备 (error coee " + PolyvRTMPErrorReason.NOT_CAMERA + ")";
                         break;
                     case PolyvRTMPErrorReason.AUDIO_AEC_ERROR:
-                        Toast.makeText(PolyvMainActivity.this, "不支持音频aec", Toast.LENGTH_SHORT).show();
+                        message = "不支持音频aec (error code " + PolyvRTMPErrorReason.AUDIO_AEC_ERROR + ")";
                         break;
                     case PolyvRTMPErrorReason.AUDIO_CONFIGURATION_ERROR:
-                        Toast.makeText(PolyvMainActivity.this, "音频编解码器配置错误", Toast.LENGTH_SHORT).show();
+                        message = "音频编解码器配置错误 (error code " + PolyvRTMPErrorReason.AUDIO_CONFIGURATION_ERROR + ")";
                         break;
                     case PolyvRTMPErrorReason.AUDIO_ERROR:
-                        Toast.makeText(PolyvMainActivity.this, "不能记录音频", Toast.LENGTH_SHORT).show();
+                        message = "不能记录音频 (error code " + PolyvRTMPErrorReason.AUDIO_ERROR + ")";
                         break;
                     case PolyvRTMPErrorReason.AUDIO_TYPE_ERROR:
-                        Toast.makeText(PolyvMainActivity.this, "音频类型错误", Toast.LENGTH_SHORT).show();
+                        message = "音频类型错误 (error code " + PolyvRTMPErrorReason.AUDIO_TYPE_ERROR + ")";
                         break;
                     case PolyvRTMPErrorReason.CAMERA_DISABLED:
-                        Toast.makeText(PolyvMainActivity.this, "摄相机被禁用", Toast.LENGTH_SHORT).show();
+                        message = "摄相机被禁用 (error code " + PolyvRTMPErrorReason.CAMERA_DISABLED + ")";
                         break;
                     case PolyvRTMPErrorReason.CAMERA_ERROR:
-                        Toast.makeText(PolyvMainActivity.this, "摄像机没有开启", Toast.LENGTH_SHORT).show();
+                        message = "摄像机没有开启 (error code " + PolyvRTMPErrorReason.CAMERA_ERROR + ")";
                         break;
                     case PolyvRTMPErrorReason.CAMERA_NOT_SUPPORT:
-                        Toast.makeText(PolyvMainActivity.this, "摄相机不支持", Toast.LENGTH_SHORT).show();
+                        message = "摄相机不支持 (error code " + PolyvRTMPErrorReason.CAMERA_NOT_SUPPORT + ")";
                         break;
                     case PolyvRTMPErrorReason.CAMERA_OPEN_FAILED:
-                        Toast.makeText(PolyvMainActivity.this, "摄相机打开失败", Toast.LENGTH_SHORT).show();
+                        message = "摄相机打开失败 (error code " + PolyvRTMPErrorReason.CAMERA_OPEN_FAILED + ")";
                         break;
                     case PolyvRTMPErrorReason.SDK_VERSION_ERROR:
-                        Toast.makeText(PolyvMainActivity.this, "Android sdk 版本低于18（Android 4.3.1）", Toast.LENGTH_SHORT).show();
+                        message = "Android sdk 版本低于18（Android 4.3.1）(error code " + PolyvRTMPErrorReason.SDK_VERSION_ERROR + ")";
                         break;
                     case PolyvRTMPErrorReason.VIDEO_CONFIGURATION_ERROR:
-                        Toast.makeText(PolyvMainActivity.this, "视频编解码器配置错误", Toast.LENGTH_SHORT).show();
+                        message = "视频编解码器配置错误 (error code " + PolyvRTMPErrorReason.VIDEO_CONFIGURATION_ERROR + ")";
                         break;
                     case PolyvRTMPErrorReason.VIDEO_TYPE_ERROR:
-                        Toast.makeText(PolyvMainActivity.this, "视频类型错误", Toast.LENGTH_SHORT).show();
+                        message = "视频类型错误 (error code " + PolyvRTMPErrorReason.VIDEO_TYPE_ERROR + ")";
                         break;
                     case PolyvRTMPErrorReason.NOT_LOGIN:
-                        Toast.makeText(PolyvMainActivity.this, "请先登录", Toast.LENGTH_SHORT).show();
+                        message = "请先登录 (error code " + PolyvRTMPErrorReason.NOT_LOGIN + ")";
                         break;
                     case PolyvRTMPErrorReason.RELOGIN_FAIL:
-                        Toast.makeText(PolyvMainActivity.this, "请重新登陆", Toast.LENGTH_SHORT).show();
+                        message = "请重新登陆 (error code " + PolyvRTMPErrorReason.RELOGIN_FAIL + ")";
                         break;
                 }
 
+                AlertDialog.Builder builder = new AlertDialog.Builder(PolyvMainActivity.this);
+                builder.setTitle("错误");
+                builder.setMessage(message);
+                builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int whichButton) {
+                        dialog.dismiss();
+                    }
+                });
+
+                builder.show();
+
                 mainFragment.getTimeView().setText(PolyvDisplayUtils.getVideoDisplayTime(0));
                 handler.removeMessages(TIME_COUNT);
             }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/sources/polyvRTMPSources1.0.4.jar → sources/polyvRTMPSources1.0.5.jar b/sources/polyvRTMPSources1.0.4.jar → sources/polyvRTMPSources1.0.5.jar