Skip to content

Commit

Permalink
Merge pull request #332 from BoleLiu/dev
Browse files Browse the repository at this point in the history
Release v3.1.2
  • Loading branch information
BoleLiu authored May 6, 2022
2 parents 04c746b + 9f12de7 commit ebf0e80
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 11 deletions.
4 changes: 2 additions & 2 deletions PLDroidMediaStreamingDemo/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "com.qiniu.pili.droid.streaming.demo"
minSdkVersion 18
targetSdkVersion 29
versionCode 74
versionName "3.1.1"
versionCode 75
versionName "3.1.2"
}
buildTypes {
release {
Expand Down
Binary file not shown.
Binary file not shown.
4 changes: 1 addition & 3 deletions PLDroidMediaStreamingDemo/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.BLUETOOTH" />

<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

<uses-feature android:name="android.hardware.camera.autofocus" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,12 @@ public void run() {
}

public void scanQRCode(View v) {
// API < M, no need to request permissions, so always true.
boolean isPermissionOK = Build.VERSION.SDK_INT < Build.VERSION_CODES.M || mPermissionChecker.checkPermission();
if (!isPermissionOK) {
Util.showToast(this, "请授予相关权限!!!");
return;
}
IntentIntegrator integrator = new IntentIntegrator(this);
integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES);
integrator.setOrientationLocked(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ public boolean checkPermission() {
if (!addPermission(permissionsList, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
permissionsNeeded.add("Write external storage");
}
if (!addPermission(permissionsList, Manifest.permission.READ_PHONE_STATE)) {
permissionsNeeded.add("Read phone state");
}
if (!addPermission(permissionsList, Manifest.permission.ACCESS_FINE_LOCATION)) {
permissionsNeeded.add("Access fine location");
}

if (!permissionsNeeded.isEmpty()) {
// Need Rationale
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ PLDroidCameraStreaming 是一个适用于 Android 的 RTMP 直播推流 SDK,

## 版本升级须知

### v3.1.2

- 从 v3.1.2 版本开始,SDK 将不再强制要求获取 READ_PHONE_STATE 和 ACCESS_FINE_LOCATION 的权限

### v3.1.1

- 从 v3.1.1 版本开始,Happy DNS 库建议到 0.2.18 版本

### v3.0.2
- 从 v3.0.2 版本开始,请务必添加 `android.arch.lifecycle:extensions:x.y.z` 的依赖
- 从 v3.0.2 版本开始,`StreamingEnv.init(Context context)` 已被弃用,请更新到 `StreamingEnv.init(Context contex, String userId)` 进行环境的初始化,其中,userId 代表用户的唯一标识符,用于区分不同的用户
Expand Down
30 changes: 30 additions & 0 deletions ReleaseNotes/release-notes-3.1.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# PLDroidMediaStreaming Release Notes for 3.1.2

本次更新:

## 版本

- 发布 pldroid-media-streaming-3.1.2.jar

## 功能

- 新增硬编场景码率控制模式的设置

## 优化

- 优化自适应码率的调整逻辑

## 缺陷

- 修复个别场景下的空指针异常
- 修复录屏场景下偶现的音画不同步问题

## 注意事项

- 从 v3.1.2 版本开始,SDK 将不再强制要求获取 READ_PHONE_STATE 和 ACCESS_FINE_LOCATION 的权限
- 从 v3.1.1 版本开始,Happy DNS 库建议到 0.2.18 版本
- **从 v3.0.2 版本开始,请务必添加 `android.arch.lifecycle:extensions:x.y.z` 的依赖**
- 从 v3.0.2 版本开始,`StreamingEnv.init(Context context)` 已被弃用,请更新到 `StreamingEnv.init(Context contex, String userId)` 进行环境的初始化,其中,userId 代表用户的唯一标识符,用于区分不同的用户
- **从 v3.0.0 版本开始,七牛直播推流 SDK 需要先获取授权才能使用。授权分为试用版和正式版,可通过 400-808-9176 转 2 号线联系七牛商务咨询,或者 [通过工单](https://support.qiniu.com/?ref=developer.qiniu.com) 联系七牛的技术支持。**
- **v3.0.0 之前的版本不受影响,请继续放心使用。**
- **老客户升级 v3.0.0 版本之前,请先联系七牛获取相应授权,以免发生鉴权不通过的现象。**
Binary file removed releases/pldroid-media-streaming-3.1.1.jar
Binary file not shown.
Binary file added releases/pldroid-media-streaming-3.1.2.jar
Binary file not shown.

0 comments on commit ebf0e80

Please sign in to comment.