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

fix 修复一些反馈的问题

Browse Source
This commit is contained in:
zlzw 2023-09-22 11:05:02 +08:00
parent f3195bbcf8
commit 00db8a00c7
6 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/yunbao/common/manager/OpenAdManager.java
View File

@ -52,6 +52,9 @@ public class OpenAdManager {
if (list != null && list.isEmpty()) { if (list != null && list.isEmpty()) {
return; return;
} }
if(CommonAppContext.getTopActivity()==null){
return;
}
LiveNetManager.get(CommonAppContext.getTopActivity()) LiveNetManager.get(CommonAppContext.getTopActivity())
.activityPopup(new HttpCallback<List<OpenAdModel>>() { .activityPopup(new HttpCallback<List<OpenAdModel>>() {
@Override @Override

1
common/src/main/java/com/yunbao/common/utils/PluginManager.java
View File

@ -143,6 +143,7 @@ public class PluginManager {
private void loadSo(File dir, String file) { private void loadSo(File dir, String file) {
file += ".so"; file += ".so";
if (new File(dir.getAbsolutePath() + File.separator + file).exists()) { if (new File(dir.getAbsolutePath() + File.separator + file).exists()) {
Log.d(TAG, "加载 " + dir.getAbsolutePath() + File.separator + file);
System.load(dir + File.separator + file); System.load(dir + File.separator + file);
Log.d(TAG, "加载成功 " + dir + File.separator + file); Log.d(TAG, "加载成功 " + dir + File.separator + file);
} else { } else {

3
config.gradle
View File

@ -26,5 +26,6 @@ ext {
//是否上报异常日志 //是否上报异常日志
isUploadLog : true, isUploadLog : true,
//是否打包成插件包模式 //是否打包成插件包模式
isPluginModel : true, ] isPluginModel : false,
]
} }

6
live/src/main/java/com/yunbao/live/utils/LiveExoPlayerManager.java
View File

@ -68,7 +68,7 @@ public class LiveExoPlayerManager {
handler = new Handler(Looper.getMainLooper()); handler = new Handler(Looper.getMainLooper());
setListener(); setListener();
setAnalyticsListener(); setAnalyticsListener();
//createDeBugDialog(); // createDeBugDialog();
} }
@ -474,6 +474,10 @@ public class LiveExoPlayerManager {
if (getNextPlayer() != null && getNextPlayer().isPlaying()) { if (getNextPlayer() != null && getNextPlayer().isPlaying()) {
getNextPlayer().stop(); getNextPlayer().stop();
} }
if (task != null) {
task.cancel();
task = null;
}
clearUrl(); clearUrl();
} }

2
live/src/main/java/com/yunbao/live/views/LiveLinkMicPkViewHolder.java
View File

@ -157,7 +157,7 @@ public class LiveLinkMicPkViewHolder extends AbsViewHolder {
@Override @Override
public void onTextChanged(CharSequence s, int start, int before, int count) { public void onTextChanged(CharSequence s, int start, int before, int count) {
Log.i("女神说", "倒计时状态:" + s); Log.i("女神说", "倒计时状态:" + s);
if (mTime.getVisibility() == View.VISIBLE) { if (mTime.getVisibility() == View.VISIBLE && !s.toString().contains(mContext.getString(R.string.live_pk_time_2))) {
EventBus.getDefault().post(new LiveAudienceEvent() EventBus.getDefault().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.LIVE_PK_ING)); .setType(LiveAudienceEvent.LiveAudienceType.LIVE_PK_ING));
} }

2
live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
View File

@ -498,6 +498,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
DialogUitl.showSimpleDialog(mContext,WordUtil.isNewZh()? "是否要斷開連麥？":"Do you want to disconnect Link?", new DialogUitl.SimpleCallback() { DialogUitl.showSimpleDialog(mContext,WordUtil.isNewZh()? "是否要斷開連麥？":"Do you want to disconnect Link?", new DialogUitl.SimpleCallback() {
@Override @Override
public void onConfirmClick(Dialog dialog, String content) { public void onConfirmClick(Dialog dialog, String content) {
Log.i("PK----->", "updateSub: "+isPk+"|");
aheadOfScheduleEndPK(mPkUid, CommonAppConfig.getInstance().getUserBean().getUserNiceName(), (String) tv_avatarOther_name.getTag()); aheadOfScheduleEndPK(mPkUid, CommonAppConfig.getInstance().getUserBean().getUserNiceName(), (String) tv_avatarOther_name.getTag());
//断开连麦 //断开连麦
LiveRyAnchorActivity.isDRPK = 0; LiveRyAnchorActivity.isDRPK = 0;
@ -1056,5 +1057,6 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
} else if (event.getType() == LIVE_PK_ING) { } else if (event.getType() == LIVE_PK_ING) {
isPk = true; isPk = true;
} }
Log.i("PK----->", "updateSub: "+isPk+"|"+event.getType());
} }
} }