Skip to content

Commit 40a6836

Browse files
committed
feat: Android 升级到3.60版本
Signed-off-by: lvying.2 <lvying.2@bytedance.com>
1 parent cbe867f commit 40a6836

1,223 files changed

Lines changed: 7647 additions & 2174 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Android/APIExample/app/build.gradle

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ android {
1919

2020
signingConfigs {
2121
release {
22-
storeFile file("bytertc.jks")
23-
storePassword "bytertc"
24-
keyAlias "bytertc"
25-
keyPassword "bytertc"
22+
storeFile file("xxxxxx.jks")
23+
storePassword ""
24+
keyAlias ""
25+
keyPassword ""
2626
}
2727
}
2828

@@ -75,8 +75,6 @@ android {
7575

7676

7777
configurations.all {
78-
// all*.exclude group: 'com.bytedance.applog', module: 'RangersAppLog-Log'
79-
// all*.exclude group: 'com.bytedance.applog', module: 'RangersAppLog-Lite-cn'
8078
all*.exclude group: 'com.bytedanceapi', module: 'ttsdk-ttbmf'
8179
}
8280

@@ -87,7 +85,6 @@ android {
8785
dependencies {
8886

8987
implementation "com.volcengine:VolcEngineRTC:$VOLCENGINE"
90-
// implementation "com.ss.bytertc:VolcEngineRTC:$VOLCENGINE"
9188

9289
implementation files('libs/ByteEffect.aar')
9390
implementation'com.faceunity:core:8.7.0'

Android/APIExample/app/bytertc.jks

-2.15 KB
Binary file not shown.

Android/APIExample/app/src/main/AndroidManifest.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
<uses-permission android:name="android.permission.ACTION_MANAGE_OVERLAY_PERMISSION" />
1010
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
11+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
12+
<uses-permission android:name="android.permission.BLUETOOTH" />
1113

1214
<application
1315
android:allowBackup="true"
@@ -19,6 +21,21 @@
1921
android:supportsRtl="true"
2022
android:theme="@style/Theme.APIExample"
2123
tools:targetApi="31">
24+
<activity
25+
android:name=".examples.screenshare.ScreenShareActivity"
26+
android:exported="false" />
27+
<activity
28+
android:name=".examples.encodevideoframe.EncodeVideoFrameActivity"
29+
android:exported="false" />
30+
<activity
31+
android:name=".examples.CustomAudioCaptureActivity"
32+
android:exported="false" />
33+
<activity
34+
android:name=".examples.videorender.VideoRenderActivity"
35+
android:exported="false" />
36+
<activity
37+
android:name=".examples.ExternalVideoFrameActivity"
38+
android:exported="false" />
2239
<activity
2340
android:name=".examples.PullStreamActivity"
2441
android:exported="false" />
@@ -84,6 +101,12 @@
84101
<category android:name="android.intent.category.LAUNCHER" />
85102
</intent-filter>
86103
</activity>
104+
105+
<service
106+
android:name="com.ss.bytertc.base.media.screen.RXScreenCaptureService"
107+
android:enabled="true"
108+
android:exported="false"
109+
android:foregroundServiceType="mediaProjection" />
87110
</application>
88111

89112
</manifest>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
["sharp", "clear", "smooth", "whiten"]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
&^#.enc\V 5* 9*V 28*!] 14* 15*q^_VFWIU 1*r_] 19* 4*_ 28*Z 28*+ 11*SWyUSQOT 24*W]t 9* 12*OP 2* 28* 2* 24* 16*IE3r_^X-SWV 20* 1*NT 10*q 2* 14*E^] 23*kaTS 8*ZH 25*[H|] 4*Y, 6*W]JP@VPp 3*[EU 3*b0Z 18*R 14* 30*Y]V 25*r_^X-SWV 20* 1*NT 10*q 2* 14*E^] 3*Z[J 21* 3* 19* 16*\ 0* 14*__ 19*q 12* 4*QU]K 29*4 29* 29*L 31*_ 25*[HU 28* 8*NM 17*M8 24* 25* 20* 30*NX 24*RUM 7* 28*[^ 11*YE 5* 28* 18*K\XX 20*7f 31* 16* 25*F 27*_P 1* 18* 0*5UT^\WJp\ 2*^W\ 20*H 7* 28* 2*Z 11* 15*SFuXZ_ZX 30*5 16* 25*FHIY 11*ZC 7*oFQTQmI\ 1*O 16* 4*FX06G 28*MJCWT_ 26*X\^ 9*v^_ 9*H 7* 28* 9*U 1*` 16* 18* 24* 25*G[Q[BYQZ 3*$[O 19* 127* 3* 30* 16* 15* 24* 9*> 30* 29* 29*LLUU 0*F\] 4*Y. 4*D 18* 5* 25* 4*4 29* 29*L 31*C\ 10* 14* 20*P 6*O 25*)_D]K 20* 3* 29*F 17*5 16* 25*FHIY 11*ZC 9*_D]K 20* 3* 29*F 17*5: 25*FH 26*O 2*P 11*DSZ]Z_x\^ 9*|XX 8* 15*_p 14*O 25*J 13* 18*CD> 30* 29* 29*LLUU 0*RSR 14*HEC: 18* 24* 25* 20*LXI 25*M^ 25* 9*b_R 3*6g 12*E\[M]QS 29**^S\' 4*]S 21*U 25* 2*] 127*W]ARX 7* 5*QYMNA0 28*G 28*M 25*U^^ 23*WVX^ 7*yQZ 3*+R] 9*[ 8*&YAL 25* 9* 30*NX 0*Y 30*Z 14* 13*YW!] 14* 15*sZYWS[qT 31*K 16*V 20*HAAm6MJ 16* 18*K\XX 19*^ 4*ZSR 32* 9*YY$T 12* 4*WWtPGJf 13* 20* 14* 0* 9*VXg 28*Z 28* 22*HVS[\}P[RN 31* 28* 25*# 14*\Y 4*H> 14*[ 28*z|rauh!~~f 32*)yy8}.>y}vf| 127*nb*~s|JH 10*AG 28*MJ 29* 31* 221* 190* 142* 217* 179* 141* 136* 133* 138* 209* 226* 208* 26* 218* 240* 138* 136* 226* 139*8 24* 25* 20* 30*NX 0*Y 30*Z 14* 13*YW!] 14* 15*sZYWS[qT 31*Kk 9* 30*Z 10* 12*W 12*]7 16* 15* 24*B 22*X\^ 9*v^_ 9*J 26* 16*Gy 11* 12*UQLjPU 19* 127*)yoq3%{r8z,)umyz`wrs3wqj9.{ 127*" 16*MZM 18* 24* 25* 25* 19* 219* 161* 229* 219* 138* 131* 142* 236* 130* 28* 128* 182* 219* 140* 176* 179*2 25* 20* 30* 29*N 9*SV 23* 5* 0*__ 12*z 12* 9*UqPXZYXq 5*LDbV 16* 8* 12*W 12*]7 16* 15* 24*B 22*X\^ 9*v^_ 9*J 26* 16*Gy 11* 12*UQLjPU 19* 127*)yoq3%{r8z,)umyz`wrs3{yj'8jy&nAJ 0*O 24* 25* 20* 19* 16* 217* 214* 133* 216* 189* 222* 142* 140* 180* 130* 152* 220*J 31* 18* 222* 174* 148* 218* 135* 135* 132* 187* 136*3FH 26* 28* 20*Y 1* 12* 30*QP\WU{\ 15*ZsQ 7* 6*]Y+U 30* 30*k 2*@ 13* 4* 14* 13* 13*1 31* 13* 25* 29*J\] 4*Y$ 4*V] 26* 25* 24* 30* 13*EX 15* 0* 9*VD 26* 12* 26* 28*MJ 16* 18* 24* 25* 20* 30* 29* 29*L 31* 16* 25*FH 26* 28*G 28*MJ 16* 18* 24* 25* 20* 30* 29* 29*L 31* 16* 25*FH 23* 17* 129* 176* 204* 130* 180* 138* 215* 133* 188* 219* 177* 184* 138* 180* 156* 221* 220* 210* 210* 184* 223* 218* 219* 226* 213* 150* 137* 214* 136* 183*7X 2*[:3 0* 29*T_ 19*U 2* 4* 16*tYZQ 127*QZ 3*MYM 14* 5*wS 3*I 1* 15* 10*GH]UJX 21* 1*V\U 15* 27*__ 8*R 9*C: 18* 24* 25* 20*MXQ 10* 17*]f 18* 1*WY4H 12* 7*@ 18* 5* 25*YWQQ 5*LUZ 9* 6*^6m 28*MJ 16* 31* 21* 20* 25* 19* 16* 16*A 18* 29* 20* 0* 9*YY#Y 25* 15*SF 24*lDZ\I 9* 18* 29* 20*KE 23* 17*J 17*@G 29* 31* 21* 20* 25* 19* 16* 16*A 18* 29* 20*KE 23* 17*J 17*@G 29* 31* 21* 20* 25* 19* 16* 16*A 18* 29* 20*KE 23* 17*J 17*@G 29*8 24* 25* 20* 30*QR 15*^\ 25* 0* 9*YY&P 10* 5*B[LQY 30* 0* 29* 31*Z\_H 5*eY 1*Z 8* 9*D 127*YWUYXOVXUM 32* 26*[Q 2*} 1* 13*_@QM\SoX 31*J\MNJ\] 4*YOF 16* 2* 17*3 20* 30* 29* 29* 5*Y 24*_ 7* 11*_} 11*[ 2* 24*YFPT 29* 30*IU 9*Q: 25*FH 26* 28*G 28*M 25*U^^ 23*R_^X%QVVFU 26*y 1*Z 8* 9*Da\R 26*_HI 3*|QJ 18**[O 2*p 24* 11* 127*PR\WJ 21*[ 13*\Ux 10* 15*UN 14*H 5* 7* 25*8 24* 25* 20* 30* 29* 29*L 31*C\ 10* 14* 20*Z 6*_ 8*&QALzZJ 29* 0*LLUU 0*F\] 4*Y. 4*D8 24* 25* 20* 30* 29* 29*L 31*C\ 10* 14* 20*Z 6*_ 8*)^F 24* 4* 20*MXQ 10* 17*VX 5* 13*sR 1*SW 13*UF~XW[~R 25*QD 17*Ob 26* 28*G 28*MJ 16* 18*K\XX 19*Q 13*LDz 9* 30*_NG 1*M 25*U^^ 23*X_NI/PF\ 20*HUNGG 16*` 16* 18* 24* 25* 20* 30* 29* 29* 31*Z\_H 11*UJ 2*NMW 16*A]UR 16*^R 26*ZB 25* 9* 26* 26*G 26*6MJ 16* 18* 24* 25* 20* 30*[R 30* 31*Y 4*WD 26*y 1*Z 8* 9*Da\R 26*|x{3rqa9.{ 127*"c#?} 18*\V> 30* 29* 29*L 31* 16* 25*FH 26* 28*GU 11*BY 18* 4* 4* 20*MXQ 10* 17*VX 5* 13*yR 19* 21*M 30*XWV3 20* 30* 29* 29*L 31* 16* 25*FH 26* 28*G 28*MJCWT_ 26*R\N 24*|_O 3* 26*aU: 28*PJCWT_ 26*]RK 9*MkP;HUNG 13*M` 16* 18* 24* 25* 20* 30* 29* 29*L 31* 16* 25*FH 26* 28* 20*Y 1* 12* 30*QWOQLfT1 31* 13* 25* 21* 13*VZIZ 12* 9*U{V_[ 4*ZX 24*yQZ 3*'Y_ 11*I 30* 3*_\ 16*P 25* 15* 20* 29*f 31* 16* 25*FH 26* 28*G 28*MJ 16*WTJQ4 29* 29*L 31* 16* 25*FH 26* 28*G 28*MJ 16* 18*K\XX 19*Q 13*LDz 9* 30*_N<U0J 13* 18*K\XX 19*^ 3*IUK= 1*g 28* 8*NM[ 16*8 24* 25* 20* 30* 29* 29*L 31* 16* 25*FH 26* 28*G 28* 30* 15*\T 22*Z[HXO7Vm 25*[H 11*6G 28*MJ 16* 18* 24* 25* 20* 30* 29* 29* 9*QT3FH 26* 28*G 28*MJU\\3 20* 30* 29* 29* 9*SC\lH 26* 28*G 28*MJ 16*A]UR 16*[\ 15*ZyW 0* 7* 26* 1*GR 4* 6*: 18* 24* 25* 20*[SYfZ^]lb\I 9*_ 25* 3*_\ 24* 127*U]X| 0*X_K 15* 28*RQ*S 9* 31*\W 2*^QJ{\ 15*ZyW 0* 7* 18* 21*m 28*MJ 16*@]MALS 29* 31*Z\_H 14*[_ 2*u 3* 12*_8]WP47[ 25*QSM 15* 7*T 28*!] 14* 15*q^_VFWIU 1*r_] 19* 4*_ 6* 1*] 14* 15*y\^VqHXS 24* 23*VX 5* 13*sR 1*SDJ 16*8 24* 25* 20* 30*OX 24*JBWF 28*HI 2* 28*g 15*^V23F[IH 30*Q 16* 127* 7* 11*_} 11*[ 2* 24*YFPTyQYH 0*Z
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
&^#.encK3FH 26* 28*EH 12* 13* 18* 8* 24* 27*s{bN 1*P_M 14*7MT 14*H 8* 4*oD 10* 27* 24* 30*7 29*L 31* 16* 27* 16* 13*HO 14*S 3*H 10* 18* 26* 8* 26* 14* 31* 17*L5 16* 25*FH 24*N 2*M 24* 3*BWU\ZJ 31* 7*L5 16* 25*FHA6G 28*MJ 16* 18* 24* 25* 22*X\^ 9*{UM 3* 11*N 30*] 28* 25* 24*EW 20* 25*> 30* 29* 29*L 31* 16* 25*FJW] 19*H 4* 4*W 16* 2* 25*R_QN 9*5 16* 25*FHG 16*G6MJ 16* 18* 26*Z[PIX 2*K 18* 3*Fb 26* 28*G 28* 22*` 16* 18* 24* 25* 20* 30* 29* 29*NOQM 14*J 0* 28*E[ 8* 4*U@YUqX[X 15*K 31* 27*JH0 28*G 28*MJ 16* 18* 24* 27*WQS[ 5*X 18* 3*FJ]Y 9*Y 31* 11*\w^_Q]I 19* 6*L_WDD0 28*G 28*MJ 16* 18* 24* 27*B[ON 5*P^ 27*\H 24* 13*I 12*O` 16* 18* 24* 25*I 18*7 29*L 31* 16* 27* 8* 13*_X 5*P 8* 4*T 16* 2* 25*R_QN 9*5M

Android/APIExample/app/src/main/assets/cvlab/ComposeMakeup.bundle/ComposeMakeup/beauty_Android_lite/GeneralEffect_smooth_whiten/generalEffect/generalEffect.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.
Loading
Loading
Loading

0 commit comments

Comments
 (0)