Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-11.3.13171 #53

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static void safeStartActivity(Context context, Intent intent) {
}
context.startActivity(intent);
} catch (ActivityNotFoundException e) {
Log.e("TAG", "ActivityNotFoundException : " + intent.toString());
Log.e(TAG, "ActivityNotFoundException : " + intent.toString());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ public static String getApplicationName(Context context) {
applicationInfo = null;
}
String applicationName = (String) packageManager.getApplicationLabel(applicationInfo);
if (applicationInfo != null) {
applicationName = context.getResources().getString(applicationInfo.labelRes);
}

return TextUtils.isEmpty(applicationName) ? "" : applicationName;
}

Expand Down
6 changes: 5 additions & 1 deletion Android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ buildscript {


classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// 添加神策分析 android-gradle-plugin2 依赖
classpath 'com.sensorsdata.analytics.android:android-gradle-plugin2:3.5.3'
}
}

Expand All @@ -31,5 +34,6 @@ task clean(type: Delete) {

ext {
liteavSdk="com.tencent.liteav:LiteAVSDK_Live:latest.release"
imSdk = "com.tencent.imsdk:imsdk-plus:7.1.3925"
roomEngineSdk = "com.tencent.liteav.tuikit:tuiroomengine:latest.release"
imSdk = "com.tencent.imsdk:imsdk-plus:7.3.4358"
}
2 changes: 1 addition & 1 deletion Android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
org.gradle.jvmargs=-Xmx4608M
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import android.view.WindowManager;
import android.widget.ImageView;

import com.tencent.liteav.basic.IntentUtils;
import com.tencent.liteav.showlive.R;
import com.tencent.liteav.showlive.model.services.room.bean.RoomInfo;
import com.tencent.liteav.showlive.ui.ShowLiveAudienceActivity;
Expand Down Expand Up @@ -164,7 +165,7 @@ public void onClick(View v) {
intent.putExtra(TCConstants.PUSHER_NAME, mRoomInfo.roomName);
intent.putExtra(TCConstants.COVER_PIC, mRoomInfo.coverUrl);
intent.putExtra(TCConstants.PUSHER_AVATAR, mRoomInfo.coverUrl);
mContext.getApplicationContext().startActivity(intent);
IntentUtils.safeStartActivity(mContext, intent);
}
});
mImageClose.setOnClickListener(new View.OnClickListener() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,12 @@ private void handleBGM(final int position, final BGMItemEntity model) {
mButtonBGMPlay.setVisibility(VISIBLE);
mButtonBGMPlay.setImageResource(R.drawable.tuiaudioeffect_bgm_pause);
// 开始播放音乐时,无论是否首次均需重新设置变调和音量,因为音乐id发生了变化
mPresenter.setMusicPitch(position, mViewVoicePitch.getPitch());
mPresenter.setMusicPlayoutVolume(position, mViewMusicVolume.getVolume());
mPresenter.setMusicPublishVolume(position, mViewMusicVolume.getVolume());
mPresenter.setMusicObserver(mBGMId, new BGMListener());
mPresenter.startPlayMusic(position, model.mPath, true);
// 音调需要在startPlayMusic之后调用才会生效
mPresenter.setMusicPitch(position, mViewVoicePitch.getPitch());
mGetMusicDurationCallback = new AudioEffectModel.GetMusicDurationCallback() {
@Override
public void onSuccess(String path, long duration) {
Expand Down
2 changes: 1 addition & 1 deletion Android/tuibeauty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ android {

dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
api 'com.tencent.mediacloud:TencentEffect_S1-04:2.4.2.324'
api 'com.tencent.mediacloud:TencentEffect_S1-04:3.0.0.13'
api "androidx.constraintlayout:constraintlayout:1.1.3"
api 'com.google.android.material:material:1.4.0'
api "com.google.code.gson:gson:2.8.6"
Expand Down

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Loading