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

Merge branch 'master' into 声网升级

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/java/com/yunbao/common/utils/DialogUitl.java
#	common/src/main/java/com/yunbao/common/utils/RouteUtil.java
#	live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
#	live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java
#	main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
This commit is contained in:
Martin
2024-05-22 13:37:33 +08:00
parent dc0ae1124f 92d1861d8f
commit cbf517bed6
141 changed files with 3139 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FaceUnity/src/androidTest/java/com/yunbao/faceunity/ExampleInstrumentedTest.java
View File

@@ -2,7 +2,7 @@ package com.yunbao.faceunity;
import android.content.Context;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.platform.app.Instrimport com.yunbao.common.utils.MobclickAgent;ntationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;