Merge remote-tracking branch 'origin/master'

This commit is contained in:
zlzw 2024-01-24 14:43:43 +08:00
commit e0200a9c7f

View File

@ -5143,14 +5143,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
detailsView.setLayoutParams(params); detailsView.setLayoutParams(params);
} }
}); });
}
if (time > 0) { if (time > 0) {
mPkTimeCount2 = time; mPkTimeCount2 = time;
drPKtIME = time; drPKtIME = time;
timeTitle.setVisibility(View.VISIBLE); timeTitle.setVisibility(View.VISIBLE);
timeTitle.post(countdownRunnable); timeTitle.post(countdownRunnable);
} }
}
Log.e("多人Pk", "upDataPkScore mPkTimeCount:" + mPkTimeCount); Log.e("多人Pk", "upDataPkScore mPkTimeCount:" + mPkTimeCount);
for (int i = 0; i < pkScores.size(); i++) { for (int i = 0; i < pkScores.size(); i++) {
JSONObject score = pkScores.getJSONObject(i); JSONObject score = pkScores.getJSONObject(i);