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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
This commit is contained in:
zlzw
2023-04-19 10:58:02 +08:00
parent 181ff4274c dc5633bcb9
commit 47c3282861
165 changed files with 1961 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
View File

@@ -532,7 +532,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
}
} else if (e == TXLiveConstants.PLAY_ERR_NET_DISCONNECT ||
e == TXLiveConstants.PLAY_ERR_FILE_NOT_FOUND) {
ToastUtil.show(WordUtil.getString(R.string.live_play_error));
ToastUtil.show(mContext.getString(R.string.live_play_error));
checkUidAndToken();
} else if (e == TXLiveConstants.PLAY_EVT_PLAY_PROGRESS) {
int progress = bundle.getInt("EVT_PLAY_PROGRESS_MS");