fix[声望升级-修复BUG]

gradle.properties

@@ -21,10 +21,10 @@ org.gradle.configureondemand=true
 android.useAndroidX=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

live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java

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

live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java

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

live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java

@@ -130,7 +130,9 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
         btn_start_dr_pk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (pk_nub <= 0) return;
+                if(pk_nub<= 0){
+                    ToastUtil.show("多人PK次数已用完");
+                }else{
                     //開始多人PK
                     HttpClient.getInstance().get("live.startDRPK", "live.startDRPK")
                             .params("roomid", CommonAppConfig.getInstance().getUid())
@@ -147,6 +149,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
                                 }
                             });
                 }
+            }
         });
 
         //结束多人PK

live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java

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

live/src/main/res/layout/view_live_play_sw.xml

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