Merge remote-tracking branch 'origin/dev_6.7.0' into dev_6.7.0

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

@@ -1874,11 +1874,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             prank_group.setVisibility(View.VISIBLE);
             initPrankAdapter();
             if (mPrankType == 1){//礼物
-                sortByCompletionRate(prankAndComboList);
+//                sortByCompletionRate(prankAndComboList);
                 prankAdapter.setViewType(PrankAdapter.TYPE_GIFT);
                 prankAdapter.setList(prankAndComboList);
             }else { //连击
-                sortBySendNum(prankAndComboList);
+//                sortBySendNum(prankAndComboList);
                 prankAdapter.setViewType(PrankAdapter.TYPE_COMBO);
                 prankAdapter.setList(prankAndComboList);
             }
@@ -1951,7 +1951,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     }
 
     private void switchGifDrawable(boolean start){
-        LogUtils.e("yqw=====>判断闪烁："+(mGifDrawable != null)+","+start);
+//        LogUtils.e("yqw=====>判断闪烁："+(mGifDrawable != null)+","+start);
         if (mGifDrawable != null){
             if (start){
                 mGifDrawable.start();