Skip to content

Commit

Permalink
Fix bug, update sdk.
Browse files Browse the repository at this point in the history
  • Loading branch information
garyxgwang committed May 24, 2021
1 parent 6d1d88b commit 1e77a12
Show file tree
Hide file tree
Showing 69 changed files with 2,319 additions and 25 deletions.
5 changes: 3 additions & 2 deletions Demo/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "com.tencent.liteav.demo"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 16
versionName "8.6.688"
versionCode 17
versionName "8.7.804"

multiDexEnabled true
ndk {
Expand Down Expand Up @@ -56,6 +56,7 @@ dependencies {
compile project(':ugcvideouploaddemo')
compile project(':superplayerdemo')
compile project(':liveplayerdemo')
compile project(':lebplayerdemo')
compile project(':livepusherdemo')
compile project(':livelinkmicdemoold')
compile project(':livelinkmicdemonew')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import android.widget.TextView;

import com.tencent.liteav.demo.common.widget.expandableadapter.BaseExpandableRecyclerViewAdapter;
import com.tencent.liteav.demo.lebplayer.ui.LebPlayerLauncherActivity;
import com.tencent.liteav.demo.livelinkmicnew.V2MainActivity;
import com.tencent.liteav.demo.liveplayer.ui.LivePlayerEntranceActivity;
import com.tencent.liteav.demo.livepusher.camerapush.ui.CameraPushEntranceActivity;
Expand Down Expand Up @@ -66,7 +67,7 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_main);

mTvVersion = (TextView) findViewById(R.id.main_tv_version);
mTvVersion.setText(getString(R.string.app_tv_video_cloud_tools_version, TXLiveBase.getSDKVersionStr()+"(8.6.688)"));
mTvVersion.setText(getString(R.string.app_tv_video_cloud_tools_version, TXLiveBase.getSDKVersionStr()+"(8.7.804)"));

mMainTitle = (TextView) findViewById(R.id.main_title);
mMainTitle.setOnLongClickListener(new View.OnLongClickListener() {
Expand Down Expand Up @@ -216,6 +217,7 @@ private List<GroupBean> initGroupData() {
List<ChildBean> pusherChildList = new ArrayList<>();
pusherChildList.add(new ChildBean(getString(R.string.app_item_live_pusher), R.drawable.push, 0, CameraPushEntranceActivity.class));
pusherChildList.add(new ChildBean(getString(R.string.app_item_live_player), R.drawable.live, 0, LivePlayerEntranceActivity.class));
pusherChildList.add(new ChildBean(getString(R.string.app_item_leb_player), R.drawable.live, 0, LebPlayerLauncherActivity.class));
pusherChildList.add(new ChildBean(getString(R.string.app_item_link_mic_new), R.drawable.room_live, 0, V2MainActivity.class));
pusherChildList.add(new ChildBean(getString(R.string.app_item_link_mic_old), R.drawable.room_live, 0, LiveRoomActivity.class));
if (pusherChildList.size() != 0) {
Expand Down
3 changes: 2 additions & 1 deletion Demo/app/src/main/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
<string name="app_dialog_exit_app">确定要退出APP吗?</string>

<string name="app_item_live_pusher">推流演示(摄像头推流)</string>
<string name="app_item_live_player">拉流演示</string>
<string name="app_item_live_player">标准直播播放</string>
<string name="app_item_leb_player">快直播播放</string>
<string name="app_item_link_mic_new">连麦演示(新方案)</string>
<string name="app_item_link_mic_old">连麦演示(旧方案)</string>
<string name="app_item_link_mic">连麦演示</string>
Expand Down
3 changes: 2 additions & 1 deletion Demo/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
<string name="app_dialog_exit_app">确定要退出APP吗?</string>

<string name="app_item_live_pusher">推流演示(摄像头推流)</string>
<string name="app_item_live_player">拉流演示</string>
<string name="app_item_live_player">标准直播播放</string>
<string name="app_item_leb_player">快直播播放</string>
<string name="app_item_link_mic_new">连麦演示(新方案)</string>
<string name="app_item_link_mic_old">连麦演示(旧方案)</string>
<string name="app_item_link_mic">连麦演示</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ public class AudioEffectPanel extends FrameLayout {
private ImageButton mImgbtnBGMPlay;
private TXAudioEffectManager mAudioEffectManager;
private BGMListener mBGMPlayListenr;
private static final String ONLINE_BGM_FIRST = "http://liteav.sdk.qcloud.com/app/res/bgm/testmusic1.mp3";
private static final String ONLINE_BGM_SECOND = "http://liteav.sdk.qcloud.com/app/res/bgm/testmusic2.mp3";
private static final String ONLINE_BGM_THIRD = "http://liteav.sdk.qcloud.com/app/res/bgm/testmusic3.mp3";
private static final String ONLINE_BGM_FIRST = "http://dldir1.qq.com/hudongzhibo/LiteAV/demomusic/testmusic1.mp3";
private static final String ONLINE_BGM_SECOND = "http://dldir1.qq.com/hudongzhibo/LiteAV/demomusic/testmusic2.mp3";
private static final String ONLINE_BGM_THIRD = "http://dldir1.qq.com/hudongzhibo/LiteAV/demomusic/testmusic3.mp3";

private int mBGMId = -1;
private float mPitch = 0;
Expand Down
5 changes: 4 additions & 1 deletion Demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ allprojects {
flatDir {
dirs 'libs'
dirs project(':app').file('libs')
if (!liteavSourcePath.isEmpty()) {
dirs project(':liteav_leb_player').file('src/main/libs')
}
}
jcenter()
google()
Expand Down Expand Up @@ -55,6 +58,6 @@ ext {
imSdk = 'com.tencent.imsdk:imsdk:4.9.1'
versionCode = 1
versionName = "v1.0"
ndkAbi = 'armeabi'//,'armeabi-v7a', 'arm64-v8a'
ndkAbi = 'armeabi-v7a'//,'armeabi-v7a', 'arm64-v8a'
aekit_version = '1.0.10-cloud'
}
42 changes: 42 additions & 0 deletions Demo/lebplayerdemo/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion


defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
// compile project(':liteav_sdk')
compile rootProject.ext.liteavSdk

compile 'com.blankj:utilcode:1.25.9'
compile 'me.dm7.barcodescanner:zxing:1.8.4'
compile 'com.google.code.gson:gson:2.3.1'
compile "com.android.support:appcompat-v7:$rootProject.ext.supportSdkVersion"
compile "com.android.support:recyclerview-v7:$rootProject.ext.supportSdkVersion"
compile 'com.squareup.okhttp3:logging-interceptor:3.11.0'
// compile 'com.github.ctiao:DanmakuFlameMaster:0.5.3'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:multidex:1.0.0'
}

Empty file.
21 changes: 21 additions & 0 deletions Demo/lebplayerdemo/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
53 changes: 53 additions & 0 deletions Demo/lebplayerdemo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tencent.liteav.demo.lebplayer">

<application android:theme="@style/AppTheme">

<activity
android:name="com.tencent.liteav.demo.lebplayer.ui.QRCodeScanActivity"
android:screenOrientation="portrait" />

<activity
android:name="com.tencent.liteav.demo.lebplayer.ui.LebPlayerLauncherActivity"
android:screenOrientation="portrait" />

<activity
android:name="com.tencent.liteav.demo.lebplayer.ui.LebPlayerActivity"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:screenOrientation="portrait" />

<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.tencent.liteav.demo"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
</application>

<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_LOGS" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.CAPTURE_AUDIO_OUTPUT" />
<uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT" />

<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.BLUETOOTH" />

<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />

<uses-permission android:name="android.permission.WRITE_SETTINGS" />
</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.tencent.liteav.demo.lebplayer.ui;

public class Constants {
/**
* 腾讯云直播拉流Demo提供的默认URL
*/
public static final String NORMAL_PLAY_URL = "webrtc://5664.liveplay.myqcloud.com/live/5664_harchar1";

/**
* 腾讯云直播快直播拉流文档URL
*/
public static final String LEB_PLAYER_DOCUMENT_URL = "https://cloud.tencent.com/document/product/454/7886";

/**
* QRCodeScanActivity完成扫描后,传递过来的结果的KEY
*/
public static final String INTENT_SCAN_RESULT = "SCAN_RESULT";

/**
* LivePlayerURLActivity设置页面传递给LivePlayerActivity的直播地址
*/
public static final String INTENT_URL = "intent_url";

}
Loading

0 comments on commit 1e77a12

Please sign in to comment.