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-05-28 21:28:20 +08:00
parent 0252963b2e
commit 9711b1f8d4
6 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gradle.properties
View File

@ -21,10 +21,10 @@ org.gradle.configureondemand=true
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
systemProp.http.proxyHost=127.0.0.1 #systemProp.http.proxyHost=127.0.0.1
systemProp.https.proxyHost=127.0.0.1 #systemProp.https.proxyHost=127.0.0.1
systemProp.https.proxyPort=10809 #systemProp.https.proxyPort=10809
systemProp.http.proxyPort=10809 #systemProp.http.proxyPort=10809
#android.enableR8.fullMode=true #android.enableR8.fullMode=true

1
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@ -187,7 +187,6 @@ public class LiveAudienceActivity extends LiveActivity {
private boolean liveIndex = true; private boolean liveIndex = true;
private boolean isPk = false; private boolean isPk = false;
private boolean isRadPacetModle = false; private boolean isRadPacetModle = false;
public boolean isSw;
@Override @Override
public <T extends View> T findViewById(@IdRes int id) { public <T extends View> T findViewById(@IdRes int id) {

3
live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java
View File

@ -733,12 +733,13 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
mCover.setVisibility(View.VISIBLE); mCover.setVisibility(View.VISIBLE);
} }
} }
swAuManager.exitChannelAll();
stopPlay2(); stopPlay2();
} }
@Override @Override
public void stopPlay2() { public void stopPlay2() {
drMicUserList = new ArrayList<>();
} }
@Override @Override

33
live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java
View File

@ -130,22 +130,25 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
btn_start_dr_pk.setOnClickListener(new View.OnClickListener() { btn_start_dr_pk.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (pk_nub <= 0) return; if(pk_nub<= 0){
//開始多人PK ToastUtil.show("多人PK次数已用完");
HttpClient.getInstance().get("live.startDRPK", "live.startDRPK") }else{
.params("roomid", CommonAppConfig.getInstance().getUid()) //開始多人PK
.execute(new HttpCallback() { HttpClient.getInstance().get("live.startDRPK", "live.startDRPK")
@Override .params("roomid", CommonAppConfig.getInstance().getUid())
public void onSuccess(int code, String msg, String[] info) { .execute(new HttpCallback() {
if (code == 0) { @Override
PKing = true; public void onSuccess(int code, String msg, String[] info) {
pk_nub = pk_nub - 1; if (code == 0) {
btn_dr_pk_nub.setText("剩餘次數:" + pk_nub); PKing = true;
} else { pk_nub = pk_nub - 1;
ToastUtil.show(msg); btn_dr_pk_nub.setText("剩餘次數:" + pk_nub);
} else {
ToastUtil.show(msg);
}
} }
} });
}); }
} }
}); });

3
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -983,6 +983,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRyLinkMicPkPresenter.release(); mLiveRyLinkMicPkPresenter.release();
mLiveRyLinkMicPkPresenter = null; mLiveRyLinkMicPkPresenter = null;
} }
if(mLivePlayViewHolder!=null){
mLivePlayViewHolder.stopPlay2();
}
if (mLiveEndViewHolder != null) { if (mLiveEndViewHolder != null) {
removeLiveEnd(); removeLiveEnd();
} }

2
live/src/main/res/layout/view_live_play_sw.xml
View File

@ -69,7 +69,7 @@
<LinearLayout <LinearLayout
android:id="@+id/dr_pk_view" android:id="@+id/dr_pk_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="270dp"
android:layout_marginTop="130dp" android:layout_marginTop="130dp"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone"> android:visibility="gone">