Skip to content

Commit

Permalink
Update simple code.
Browse files Browse the repository at this point in the history
  • Loading branch information
garyxgwang committed Feb 7, 2021
1 parent c9336d2 commit d280dd1
Show file tree
Hide file tree
Showing 172 changed files with 2,513 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Android/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 13
versionName "8.3.647"
versionCode 14
versionName "8.4.664"

multiDexEnabled true
ndk {
Expand Down Expand Up @@ -47,7 +47,7 @@ dependencies {
compile project(':login')
compile project(':liveplayerdemo')
compile project(':livepusherdemo')
compile project(':mlvbliveroomdemo')
compile project(':livelinkmicdemoold')

compile 'com.android.support:appcompat-v7:25.+'
compile 'com.android.support:recyclerview-v7:25.+'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_main);

mTvVersion = (TextView) findViewById(R.id.main_tv_version);
mTvVersion.setText("Smart版本 v" + TXLiveBase.getSDKVersionStr()+"(8.3.647)");
mTvVersion.setText("Smart版本 v" + TXLiveBase.getSDKVersionStr()+"(8.4.664)");

mMainTitle = (TextView) findViewById(R.id.main_title);
mMainTitle.setOnLongClickListener(new View.OnLongClickListener() {
Expand Down Expand Up @@ -201,13 +201,13 @@ private List<GroupBean> initGroupData() {

// 直播
List<ChildBean> pusherChildList = new ArrayList<>();
pusherChildList.add(new ChildBean("MLVBLiveRoom", R.drawable.room_live, 0, LiveRoomActivity.class));
pusherChildList.add(new ChildBean("摄像头推流", R.drawable.push, 0, CameraPushEntranceActivity.class));
pusherChildList.add(new ChildBean("直播播放器", R.drawable.live, 0, LivePlayerEntranceActivity.class));
pusherChildList.add(new ChildBean("推流演示(摄像头推流)", R.drawable.push, 0, CameraPushEntranceActivity.class));
pusherChildList.add(new ChildBean("拉流演示", R.drawable.live, 0, LivePlayerEntranceActivity.class));
pusherChildList.add(new ChildBean("连麦演示", R.drawable.room_live, 0, LiveRoomActivity.class));
if (pusherChildList.size() != 0) {
// 这个是网页链接,配合build.sh避免在如ugc_smart版中出现
pusherChildList.add(new ChildBean("小直播", R.drawable.xiaozhibo, 0, null));
GroupBean pusherGroupBean = new GroupBean("移动直播", R.drawable.room_live, pusherChildList);
GroupBean pusherGroupBean = new GroupBean("移动直播 MLVB", R.drawable.room_live, pusherChildList);
groupList.add(pusherGroupBean);
}

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Android/Demo/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ include ':audioeffectsettingkit'

include ':liveplayerdemo'
include ':livepusherdemo'
include ':mlvbliveroomdemo'
include ':livelinkmicdemoold'
1 change: 1 addition & 0 deletions Android/SimpleDemo/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
31 changes: 31 additions & 0 deletions Android/SimpleDemo/app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
apply plugin: 'com.android.application'

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

defaultConfig {
applicationId "com.tencent.liteav.demo"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
abiFilters "armeabi", "armeabi-v7a", "arm64-v8a"
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation "$rootProject.ext.liteavSdk"
implementation project(':v2')
}
21 changes: 21 additions & 0 deletions Android/SimpleDemo/app/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
38 changes: 38 additions & 0 deletions Android/SimpleDemo/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tencent.liteav.demo">


<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.BLUETOOTH" />

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

<application
android:allowBackup="true"
android:icon="@mipmap/ic_appicon"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:name="com.tencent.mlvbsimpledemo.DemoApplication"
android:theme="@style/AppTheme">
<activity android:name="com.tencent.mlvbsimpledemo.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.tencent.mlvbsimpledemo;

import android.app.Application;
import com.tencent.rtmp.TXLiveBase;

public class DemoApplication extends Application {

private static DemoApplication instance;

// 如何获取License? 请参考官网指引 https://cloud.tencent.com/document/product/454/34750
String licenceUrl = "http://download-1252463788.cossh.myqcloud.com/xiaoshipin/licence_android/RDM_Enterprise.license";
String licenseKey = "9bc74ac7bfd07ea392e8fdff2ba5678a";

@Override
public void onCreate() {
super.onCreate();
instance = this;
TXLiveBase.setConsoleEnabled(true);
TXLiveBase.getInstance().setLicence(instance, licenceUrl, licenseKey);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package com.tencent.mlvbsimpledemo;

import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.view.View;

import androidx.appcompat.app.AppCompatActivity;

import com.example.v2.V2MainActivity;
import com.tencent.liteav.demo.R;

public class MainActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
getSupportActionBar().hide();
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
findViewById(R.id.launch_view).setVisibility(View.GONE);
}
}, 1000);
findViewById(R.id.bt_v2).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(MainActivity.this, V2MainActivity.class);
startActivity(intent);
}
});
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillType="evenOdd"
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
android:strokeWidth="1"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:endX="78.5885"
android:endY="90.9159"
android:startX="48.7653"
android:startY="61.0927"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
12 changes: 12 additions & 0 deletions Android/SimpleDemo/app/src/main/res/drawable/button_bg.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/live_green_bg" />

<corners
android:bottomLeftRadius="5dip"
android:bottomRightRadius="5dip"
android:topLeftRadius="5dip"
android:topRightRadius="5dip" />

</shape>
Loading

0 comments on commit d280dd1

Please sign in to comment.