yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix[修复BUG]

Browse Source
This commit is contained in:
Martin 2024-06-05 13:27:22 +08:00
parent 66822139ba
commit 419e3a7ab5
17 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FaceUnity/build.gradle
View File

@ -33,7 +33,7 @@ android {
versionName rootProject.ext.android.versionName versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk { ndk {
abiFilters "armeabi-v7a", "arm64-v8a" abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
} }
} }
aaptOptions { aaptOptions {

2
Share/build.gradle
View File

@ -33,7 +33,7 @@ android {
versionName rootProject.ext.android.versionName versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk { ndk {
abiFilters "armeabi-v7a", "arm64-v8a" abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
} }
} }
aaptOptions { aaptOptions {

3
app/build.gradle
View File

@ -257,7 +257,8 @@ android {
multiDexEnabled true multiDexEnabled true
ndk { ndk {
// TODO: 谷歌商城需要兼容两个平台 // TODO: 谷歌商城需要兼容两个平台
abiFilters "armeabi-v7a", "arm64-v8a" //abiFilters "armeabi-v7a", "arm64-v8a"
abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
} }
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {

2
baidu/build.gradle
View File

@ -31,7 +31,7 @@ android {
versionName rootProject.ext.android.versionName versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk { ndk {
abiFilters "armeabi-v7a","arm64-v8a" abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
} }
} }
buildTypes { buildTypes {

2
beauty/build.gradle
View File

@ -31,7 +31,7 @@ android {
versionName rootProject.ext.android.versionName versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk { ndk {
abiFilters "armeabi-v7a","arm64-v8a" abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
} }
} }
aaptOptions { aaptOptions {

2
build.gradle
View File

@ -55,7 +55,7 @@ task clean(type: Delete) {
ext { ext {
IS_PUBLISH_LOCAL=true IS_PUBLISH_LOCAL=true
LIB_VERSION="1.0.6" LIB_VERSION="1.0.6"
AGORA_RTC_SDK= 'io.agora.rtc:agora-special-full:4.1.1.28' AGORA_RTC_SDK= 'io.agora.rtc:agora-special-full:4.2.6.12'
// AGORA_RTC_SDK= "${rootProject.rootDir.absolutePath}/sdk" // AGORA_RTC_SDK= "${rootProject.rootDir.absolutePath}/sdk"
// AGORA_RTC_SDK="io.agora.rtc:full-sdk:4.2.6" // AGORA_RTC_SDK="io.agora.rtc:full-sdk:4.2.6"
} }

4
common/build.gradle
View File

@ -14,7 +14,7 @@ android {
versionName rootProject.ext.android.versionName versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk { ndk {
abiFilters "armeabi-v7a", "arm64-v8a" abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
} }
} }
@ -212,7 +212,7 @@ dependencies {
api 'com.yanzhenjie.recyclerview:x:1.3.2' api 'com.yanzhenjie.recyclerview:x:1.3.2'
//华为支付插件包 //华为支付插件包
// api project(':lib_huawei') //api project(':lib_huawei')
//google插件包 //google插件包
api project(':lib_google') api project(':lib_google')

14
config.gradle
View File

@ -4,14 +4,14 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 33, targetSdkVersion : 33,
versionCode : 474, versionCode : 676,
versionName : "6.7.8" versionName : "6.6.9"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式、 //正式、
//serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
// 测试 // 测试
serverHost : "https://ceshi.yaoulive.com", //serverHost : "https://ceshi.yaoulive.com",
buildTime : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")), buildTime : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")),
@ -22,11 +22,11 @@ ext {
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
// true表示谷歌支付 false 0 链接包 1 谷歌包 2华为包 3 samsung包 // true表示谷歌支付 false 0 链接包(isPluginModel-> true) 1 谷歌包 2华为包 3 samsung包
isGooglePlay : 1, isGooglePlay : 0,
//是否上报异常日志 //是否上报异常日志
isUploadLog : true, isUploadLog : true,
//是否打包成插件包模式 //是否打包成插件包模式
isPluginModel : false, isPluginModel : true,
] ]
} }

4
lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/utils/egl/GLFrameBuffer.java
View File

@ -115,10 +115,10 @@ public class GLFrameBuffer {
synchronized (EglBase.lock){ synchronized (EglBase.lock){
if(textureType == GLES11Ext.GL_TEXTURE_EXTERNAL_OES){ if(textureType == GLES11Ext.GL_TEXTURE_EXTERNAL_OES){
drawer.drawOes(textureId,0, matrix, mWidth, mHeight, 0, 0, mWidth, mHeight); drawer.drawOes(textureId,matrix, mWidth, mHeight, 0, 0, mWidth, mHeight);
}else{ }else{
drawer.drawRgb(textureId,0, matrix, mWidth, mHeight, 0, 0, mWidth, mHeight); drawer.drawRgb(textureId, matrix, mWidth, mHeight, 0, 0, mWidth, mHeight);
} }
} }

2
live/build.gradle
View File

@ -1 +1 @@
apply plugin: 'com.android.library' apply plugin: 'img-optimizer' apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.android.compileSdkVersion buildToolsVersion rootProject.ext.android.buildToolsVersion aaptOptions.cruncherEnabled = false aaptOptions.useNewCruncher = false packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" pickFirst "lib/armeabi-v7a/libyuvutils.so" pickFirst "lib/armeabi/libyuvtools.so" pickFirst "lib/arm64-v8a/libyuvtools.so" pickFirst "lib/armeabi-v7a/libyuvtools.so" exclude "lib/arm64-v8a/libmmcv_api_handgesture.so" exclude "lib/arm64-v8a/libmmcv_api_express.so" exclude "lib/arm64-v8a/libMediaEncoder.so" exclude "lib/arm64-v8a/libarcore_sdk_c.so" exclude "lib/arm64-v8a/libmediadecoder.so" exclude "lib/arm64-v8a/libMediaMuxer.so" exclude "lib/arm64-v8a/libarcore_sdk_jni.so" exclude "lib/arm64-v8a/libMediaUtils.so" exclude "lib/arm64-v8a/libcosmosffmpeg.so" } defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion versionCode rootProject.ext.android.versionCode versionName rootProject.ext.android.versionName manifestPlaceholders = rootProject.ext.manifestPlaceholders ndk { abiFilters "armeabi-v7a", "arm64-v8a" } javaCompileOptions { annotationProcessorOptions { arguments = [AROUTER_MODULE_NAME: project.getName()] } } } aaptOptions { cruncherEnabled = false useNewCruncher = false } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } kotlinOptions { allWarningsAsErrors = true } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } } repositories { flatDir { dirs 'libs', '../libs' } mavenCentral() } dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.0' implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) implementation (name:'../libs/beautysdk-202202241203',ext:'aar') implementation (name:'../libs/svgaplayer-release-v1.2.1',ext:'aar') //socket.io implementation('io.socket:socket.io-client:1.0.0') { exclude group: 'org.json', module: 'json' } //common api project(path:':lib_faceunity')//新娱美颜 api project(':Share')//分享 annotationProcessor rootProject.ext.dependencies["arouter-compiler"] //工具 api rootProject.ext.dependencies["blank-utilcode"] implementation 'com.eightbitlab:blurview:1.6.6' implementation 'com.google.code.gson:gson:2.8.6' implementation "com.getkeepsafe.relinker:relinker:1.4.4" //ExoPlayer,腾讯的播放器不支持无缝切换 implementation 'com.google.android.exoplayer:exoplayer:2.18.2' implementation 'com.google.android.exoplayer:exoplayer-core:2.18.2@aar' } apply plugin: 'com.android.library' apply plugin: 'img-optimizer' apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.android.compileSdkVersion buildToolsVersion rootProject.ext.android.buildToolsVersion aaptOptions.cruncherEnabled = false aaptOptions.useNewCruncher = false packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" pickFirst "lib/armeabi-v7a/libyuvutils.so" pickFirst "lib/armeabi/libyuvtools.so" pickFirst "lib/arm64-v8a/libyuvtools.so" pickFirst "lib/armeabi-v7a/libyuvtools.so" exclude "lib/arm64-v8a/libmmcv_api_handgesture.so" exclude "lib/arm64-v8a/libmmcv_api_express.so" exclude "lib/arm64-v8a/libMediaEncoder.so" exclude "lib/arm64-v8a/libarcore_sdk_c.so" exclude "lib/arm64-v8a/libmediadecoder.so" exclude "lib/arm64-v8a/libMediaMuxer.so" exclude "lib/arm64-v8a/libarcore_sdk_jni.so" exclude "lib/arm64-v8a/libMediaUtils.so" exclude "lib/arm64-v8a/libcosmosffmpeg.so" } defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion versionCode rootProject.ext.android.versionCode versionName rootProject.ext.android.versionName manifestPlaceholders = rootProject.ext.manifestPlaceholders ndk { abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64" } javaCompileOptions { annotationProcessorOptions { arguments = [AROUTER_MODULE_NAME: project.getName()] } } } aaptOptions { cruncherEnabled = false useNewCruncher = false } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } kotlinOptions { allWarningsAsErrors = true } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } } repositories { flatDir { dirs 'libs', '../libs' } mavenCentral() } dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.0' implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) implementation (name:'../libs/beautysdk-202202241203',ext:'aar') implementation (name:'../libs/svgaplayer-release-v1.2.1',ext:'aar') //socket.io implementation('io.socket:socket.io-client:1.0.0') { exclude group: 'org.json', module: 'json' } //common api project(path:':lib_faceunity')//新娱美颜 api project(':Share')//分享 annotationProcessor rootProject.ext.dependencies["arouter-compiler"] //工具 api rootProject.ext.dependencies["blank-utilcode"] implementation 'com.eightbitlab:blurview:1.6.6' implementation 'com.google.code.gson:gson:2.8.6' implementation "com.getkeepsafe.relinker:relinker:1.4.4" //ExoPlayer,腾讯的播放器不支持无缝切换 implementation 'com.google.android.exoplayer:exoplayer:2.18.2' implementation 'com.google.android.exoplayer:exoplayer-core:2.18.2@aar' }

11
live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
View File

@ -1652,15 +1652,15 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
} }
break; break;
case LEAVE_DR_ROOM: case LEAVE_DR_ROOM:
if (mLiveSwLinkMicPkPresenter != null) {
mLiveSwLinkMicPkPresenter.leaveDRRoom();
}
if (mLiveRoomViewHolder != null) { if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.seisShowGif(true); mLiveRoomViewHolder.seisShowGif(true);
if(isDRPK==1){ if(DRPKing==1){
mLiveRoomViewHolder.endDRGif(); mLiveRoomViewHolder.endDRGif();
} }
} }
if (mLiveSwLinkMicPkPresenter != null) {
mLiveSwLinkMicPkPresenter.leaveDRRoom();
}
SWManager.get().setDrPkNumClarity(1); SWManager.get().setDrPkNumClarity(1);
// if (mLiveRoomViewHolder != null) { // if (mLiveRoomViewHolder != null) {
// mLiveRoomViewHolder.hotAddVisibility(false); // mLiveRoomViewHolder.hotAddVisibility(false);
@ -1943,8 +1943,9 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
} }
break; break;
} }
}
}
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onAllServerNotifyFFGGGDJANEvent(AllServerNotifyFFGGGDJANEvent event) { public void onAllServerNotifyFFGGGDJANEvent(AllServerNotifyFFGGGDJANEvent event) {
if (mLiveRoomViewHolder != null) { if (mLiveRoomViewHolder != null) {

2
live/src/main/java/com/yunbao/live/socket/SocketSwChatUtil.java
View File

@ -104,7 +104,7 @@ public class SocketSwChatUtil {
.param("vip_type", u.getVip().getType()) .param("vip_type", u.getVip().getType())
.param("guard_type", IMLoginManager.get(CommonAppContext.sInstance.getApplicationContext()).getGuardType()) .param("guard_type", IMLoginManager.get(CommonAppContext.sInstance.getApplicationContext()).getGuardType())
.param("medal_name", u.getMedalName()) .param("medal_name", u.getMedalName())
.param("medal_level", model.getMedalLevel()) .param("medal_level", u.getMedalLevel())
.param("good_num", u.getGoodnum()) .param("good_num", u.getGoodnum())
.param("ct", content) .param("ct", content)
.param("noble_id", String.valueOf(model.getNobleId())) .param("noble_id", String.valueOf(model.getNobleId()))

1
live/src/main/java/com/yunbao/live/socket/SocketSwClient.java
View File

@ -335,7 +335,6 @@ public class SocketSwClient {
DRPKing = 1; DRPKing = 1;
} else if (action3 == 5) {//结束PK } else if (action3 == 5) {//结束PK
// endDRGif(); // endDRGif();
DRPKing= -1;
LiveRoomViewHolder.d_pk_view.setVisibility(View.GONE); LiveRoomViewHolder.d_pk_view.setVisibility(View.GONE);
if (LiveSwAnchorActivity.mLiveAnchorViewHolder != null) { if (LiveSwAnchorActivity.mLiveAnchorViewHolder != null) {
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);

4
live/src/main/res/layout/view_live_room.xml
View File

@ -1491,12 +1491,11 @@
android:visibility="visible" /> android:visibility="visible" />
<RelativeLayout <RelativeLayout
android:layout_marginTop="315dp"
android:id="@+id/lt_pk_line" android:id="@+id/lt_pk_line"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/live_top"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
android:id="@+id/pk_rank_red_val" android:id="@+id/pk_rank_red_val"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -1535,6 +1534,7 @@
<LinearLayout <LinearLayout
android:id="@+id/pk_red_layout" android:id="@+id/pk_red_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout

2
main/build.gradle
View File

@ -30,7 +30,7 @@ android {
versionName rootProject.ext.android.versionName versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk { ndk {
abiFilters "armeabi-v7a", "arm64-v8a" abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
} }
javaCompileOptions { javaCompileOptions {

2
pluginsForAnchor/build.gradle
View File

@ -119,7 +119,7 @@ android {
versionName rootProject.ext.android.versionName versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk { ndk {
abiFilters "armeabi-v7a", "arm64-v8a" abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
} }
} }
aaptOptions { aaptOptions {

2
video/build.gradle
View File

@ -31,7 +31,7 @@ android {
versionName rootProject.ext.android.versionName versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk { ndk {
abiFilters "armeabi-v7a","arm64-v8a" abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
} }
} }
aaptOptions { aaptOptions {