From 7ea8e9c97fc3de407603aa91edad36271e5ceff9 Mon Sep 17 00:00:00 2001 From: tanqu2013 Date: Tue, 27 Jun 2017 22:12:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E5=BF=85=E8=A6=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新功能 - 修改推流界面的错误提示,从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 --- README.md | 3 +- app/build.gradle | 6 +-- ...{polyvRTMP1.0.4.jar => polyvRTMP1.0.5.jar} | Bin 208803 -> 208803 bytes ...MPChat1.0.4.jar => polyvRTMPChat1.0.5.jar} | Bin 27480 -> 27480 bytes .../polyvrtmp/activity/PolyvMainActivity.java | 44 +++++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- ...ces1.0.4.jar => polyvRTMPSources1.0.5.jar} | Bin 18624 -> 18624 bytes 7 files changed, 34 insertions(+), 21 deletions(-) rename app/libs/{polyvRTMP1.0.4.jar => polyvRTMP1.0.5.jar} (83%) rename app/libs/{polyvRTMPChat1.0.4.jar => polyvRTMPChat1.0.5.jar} (88%) rename sources/{polyvRTMPSources1.0.4.jar => polyvRTMPSources1.0.5.jar} (76%) diff --git a/README.md b/README.md index 6d0fb81..18526ab 100644 --- 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)。
-1.0.4版API文档请看[v1.0.4 API](http://demo.polyv.net/polyv/android/rtmp/sdk/1.0.4/api/index.html)。 \ No newline at end of file +1.0.4版API文档请看[v1.0.4 API](http://demo.polyv.net/polyv/android/rtmp/sdk/1.0.4/api/index.html)。
+1.0.5版API文档请看[v1.0.5 API](http://demo.polyv.net/polyv/android/rtmp/sdk/1.0.5/api/index.html)。 \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7507127..2e98ffe 100644 --- 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 b/app/libs/polyvRTMP1.0.5.jar similarity index 83% rename from app/libs/polyvRTMP1.0.4.jar rename to app/libs/polyvRTMP1.0.5.jar index f6763a5d5a678820adbabd9179e9abb90eff2bd3..9d5e7b7ca9aa6948509d6dbcb1e73990b24d7459 100644 GIT binary patch delta 6520 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 Cm}PbV delta 6520 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 fO!H=@g6Y!CG%$TH6C&=Ib_?Ny# delta 518 zcmca{jq%1cM&1B#W)?061`ZAe#_F>ZdDS?8lvl7|$=8Y2F~WyVA3e>=fKc+a;_Sp# zip(JDoFob}&e*@B)j5Z+t<`sws_aK^|3V()J za9dQB9c%%!Y$QY^UhWbzSj0q0MHFJUIWr5Gk!XDlqTR~wE4LuXZU!I#8V?34lP?M= zO*Y78eK4(*Y!0Slk{!VG z{A5>ZahSEQvbZk0A{7`xcSf6D^ l9++O0kpQN7GgHBIX=WOjzLyCRcg*q!^CxG;faywk@3JpM&1B#W)?061`ZB}(uUg;dDS@9O}Xav*h1vQMC%ygQ>TxfW@SKCvPzK| zr1G35nEGW5qBa{a-ev?d_?YFHAR?@$V3ElgY>Pnxllj<x1bqYe+y& zuyzFVuULnJX+4`jFx_MW;oq?d2J?+<9l&&{tt*(`YwHE3x$F|abgmtQzsoKF%;&Yw z0n;`1d0_gjeI}TWbVvl#dma42G{0jCnBHY4J$a&|DVTlIF&RwjI~9QGMNW}m`kzxB zn67uO2h)r$wk@3JpM&1B#W)?061`ZAet@g7MdDS?8lvl7|$=8Y2F~WyVA3e>=fU0DbA~Q(k zIZZJ2%NRs$HekHX2xjmx%QHblSWUqqlQY;Bg9Ik?u^WMDXLfTiUCV9*R=9_q4Xk5w zExXQS11=VRW>gC&-<2_#Y{Df3R_w{O0AkM@ZeeCVkW+JBh0Nc~!oVOWF?pYv>SP%n zk;(QB+?xaW_p*R>2#Pc@gYBCp?g*k6-x6m9^Y6+y34#o`aU>$q9cX|LF9U(SR&6#r1`(;T(1F;w+R6kTACsS3S%Dp{VyzFR!>l0zIlN~X4TOKkCK${&vULE{rM9kMdatb)nC7xe0Mog45dJQ^05G4|J_k(K z*yn-ixAvJ}I?^E#Oz(B@2h;qHDPVe+o%H01j;3JtNylU`t?yI-rWZLyg6V%wbzr*Q wxgJb2x|D