Selaa lähdekoodia

feat: 启用腾讯云特效播放器

wutiaorong 8 kuukautta sitten
vanhempi
sitoutus
bdf8dc8940

+ 5 - 2
app/dependencies/releaseRuntimeClasspath.txt

@@ -221,6 +221,9 @@ com.tencent.imsdk:imsdk-plus:8.4.6667
 com.tencent.liteav.tuikit:tuicore:8.4.6667
 com.tencent.liteav:LiteAVSDK_Professional:12.3.0.17115
 com.tencent.liteav:LiteAVSDK_ScreenCapture:12.3.0.17115
+com.tencent.mediacloud:TCEffectPlayer:3.1.0.247
+com.tencent.mediacloud:TCMediaX:3.1.0.247
+com.tencent.mediacloud:TCXMagicAuth:3.1.0.247
 com.tencent.vasdolly:common:3.0.6
 com.tencent.vasdolly:helper:3.0.6
 com.tencent.vasdolly:reader:3.0.6
@@ -233,7 +236,7 @@ com.wenext.android:frame-aab:5.1.8-yoki-beta
 com.wenext.android:frame-apm:5.1.4
 com.wenext.android:frame-audio:5.1.4
 com.wenext.android:frame-base:5.1.4
-com.wenext.android:frame-bom:5.1.22-yoki-12
+com.wenext.android:frame-bom:5.1.22-yoki-14
 com.wenext.android:frame-coroutine:5.1.4
 com.wenext.android:frame-crash:5.1.4
 com.wenext.android:frame-data:5.1.5-yoki
@@ -261,7 +264,7 @@ com.wenext.android:frame-sound:5.1.4
 com.wenext.android:frame-spi:5.1.4
 com.wenext.android:frame-statistics:5.1.5
 com.wenext.android:frame-storage:5.1.5-yoki
-com.wenext.android:frame-tceffect:5.1.6-yoki-beta
+com.wenext.android:frame-tceffect:5.1.7-yoki-beta
 com.wenext.android:frame-tcturing:5.1.4
 com.wenext.android:frame-util:5.1.5-yoki-beta-2
 com.wenext.android:frame-zero:5.1.4

BIN
app/libs/TCEffectPlayer_2.1.0.147.aar


BIN
app/libs/TCMediaX_2.1.0.147.aar


+ 8 - 1
app/proguard-rules.pro

@@ -403,4 +403,11 @@
 -dontnote com.google.android.gms.gcm.**
 -dontnote io.rong.**
 
--ignorewarnings
+-ignorewarnings
+
+#tceffect
+-keep class com.tcmediax.** { *; }
+-keep class com.tencent.** { *; }
+-keep class com.tencent.xmagic.** { *; }
+# 腾讯礼物动画特效SDK会通过 exifinterface 解析动效资源元数据,如果项目中引入了exifinterface, 必须加入下面的混淆配置
+-keep class androidx.exifinterface.** {*;}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
app/src/main/assets/TCMediaX.licence


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
app/src/main/assets/v_cube.license


+ 3 - 6
app/src/main/java/com/adealink/weparty/App.kt

@@ -46,6 +46,7 @@ import com.adealink.frame.startup.dispatcher.AppStartTaskDispatcher
 import com.adealink.frame.startup.task.AppStartTask
 import com.adealink.frame.statistics.report.initStat
 import com.adealink.frame.storageService
+import com.adealink.frame.tceffect.TCEffectManager
 import com.adealink.frame.util.ActivityLifecycleCallbacksExt
 import com.adealink.frame.util.AppUtil
 import com.adealink.frame.util.ScreenAutoSizeUtil
@@ -69,6 +70,7 @@ import com.adealink.weparty.deviceidservice.DeviceIdServiceConfig
 import com.adealink.weparty.deviceidservice.TCTuringConfig
 import com.adealink.weparty.download.DownloadConfig
 import com.adealink.weparty.effect.EffectConfig
+import com.adealink.weparty.effect.TCEffectConfig
 import com.adealink.weparty.googleservice.GoogleServiceConfig
 import com.adealink.weparty.hardware.HardwareManager
 import com.adealink.weparty.hardware.IHardwareManager
@@ -386,12 +388,7 @@ class App : SplitCompatApplication(), ActivityLifecycleCallbacksExt {
     }
 
     private fun initTCEffect() {
-//        暂时不使用
-//        if (ProductFlavor.isCurrProductLite()) {
-//            //Lite目前不支持
-//            return
-//        }
-//        TCEffectManager.init(TCEffectConfig())
+        TCEffectManager.init(TCEffectConfig())
     }
 
     private fun initSVGA() {

+ 3 - 3
app/src/main/java/com/adealink/weparty/effect/TCEffectConfig.kt

@@ -11,10 +11,10 @@ import java.net.URI
 
 class TCEffectConfig : ITCEffectConfig {
     override val licenceUrls: List<String> = listOf(
-        "https://plugin.vodglcdn.com/plugin/v1/1314119829/license.json",
-        "https://plugin.vod-common.com/plugin/v1/1314119829/license.json",
+        "https://license.vod2.myqcloud.com/license/v2/1314119829_1/v_cube.license",
     )
-    override val licence: String = "edbd15d01777ad43b422347e94e90757"
+    override val oldLicence: String = "edbd15d01777ad43b422347e94e90757"
+    override val licence: String = "db3ac8d5972ef28cb62c9b7eabe76b39"
     override val logEnable: Boolean = true
     override val log: ILog = object : ILog {
         override fun logD(tag: String, msg: String) {

+ 13 - 2
app/src/main/java/com/adealink/weparty/effect/WeAnimView.kt

@@ -3,8 +3,8 @@ package com.adealink.weparty.effect
 import android.content.Context
 import android.content.res.TypedArray
 import android.graphics.Matrix
+import android.os.Bundle
 import android.util.AttributeSet
-import android.util.Log
 import android.view.ViewTreeObserver
 import android.widget.FrameLayout
 import android.widget.ImageView
@@ -15,10 +15,10 @@ import com.adealink.frame.download.manager.downloadManager
 import com.adealink.frame.download.task.TaskPriority
 import com.adealink.frame.effect.data.INFINITE_LOOP
 import com.adealink.frame.effect.svga.data.PathType
+import com.adealink.frame.log.Log
 import com.adealink.frame.tceffect.TCEffectManager
 import com.adealink.frame.util.AppUtil
 import com.adealink.frame.util.createOrExistsDir
-import com.adealink.frame.util.isFileExists
 import com.adealink.frame.util.runOnUiThread
 import com.adealink.weparty.R
 import com.adealink.weparty.commonui.ext.gone
@@ -35,6 +35,7 @@ import com.tencent.qgame.animplayer.AnimView
 import com.tencent.qgame.animplayer.inter.IAnimListener
 import com.tencent.qgame.animplayer.util.ScaleType
 import com.tencent.tcmediax.tceffectplayer.api.TCEffectAnimView
+import com.tencent.tcmediax.tceffectplayer.api.TCEffectConfig
 import com.tencent.tcmediax.tceffectplayer.api.TCEffectPlayerConstant
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -487,6 +488,10 @@ open class WeAnimView @JvmOverloads constructor(
                     listener?.onPlayError(p0.toString())
                 }
             }
+
+            override fun onPlayEvent(p0: Int, p1: Bundle?) {
+
+            }
         })
         extraConfig?.tcExtraConfig?.tcFetchResource?.let {
             tcAnimView?.setFetchResource(it)
@@ -678,6 +683,12 @@ open class WeAnimView @JvmOverloads constructor(
             AnimViewType.TC -> {
                 if (tcAnimView?.parent == null) {
                     tcAnimView = TCEffectAnimView(context)
+                    val tceConfigExtendMap: HashMap<String, Any> = hashMapOf(
+                        TCEffectPlayerConstant.PARAM_OPTIONAL_STRING_EXTRA_LICENSE_KEY to TCEffectManager.getOldLicense()
+                    )
+                    tcAnimView?.setConfig(
+                        TCEffectConfig.Builder().setExtendMapParams(tceConfigExtendMap).build()
+                    )
                     addView(tcAnimView, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
                     tcAnimView?.show()
                 }

+ 1 - 1
gradle/libs.versions.toml

@@ -154,7 +154,7 @@ appleAppauth = "0.11.1"
 tiktok = "2.3.0"
 
 # frame
-frameBom = "5.1.22-yoki-12"
+frameBom = "5.1.22-yoki-14"
 frameRouterCompiler = "5.1.6"
 frameTrace = "1.0.0"
 frameBundleTool = "1.0.0"

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä