Merge remote-tracking branch 'Gitea/master' into iOS

# Conflicts:
#	pubspec.yaml
This commit is contained in:
2022-06-10 11:03:11 +08:00
7 changed files with 112 additions and 79 deletions
@@ -9,7 +9,7 @@ import android.text.TextUtils;
import android.widget.Toast;
import com.tencent.rtmp.TXLivePlayer;
import com.tencent.rtmp.TXLog;
//import com.tencent.rtmp.TXLog;
import java.lang.ref.WeakReference;
@@ -54,12 +54,12 @@ public class NetWatcher {
mLoadingCount = 0;
mLoadingTime= 0;
mLoadingStartTime = 0;
TXLog.w("NetWatcher", "net check start watch ");
//TXLog.w("NetWatcher", "net check start watch ");
Handler mainHandler = new Handler(Looper.getMainLooper());
mainHandler.postDelayed(new Runnable() {
@Override
public void run() {
TXLog.w("NetWatcher", "net check loading count = "+mLoadingCount+" loading time = "+mLoadingTime);
//TXLog.w("NetWatcher", "net check loading count = "+mLoadingCount+" loading time = "+mLoadingTime);
if (mLoadingCount >= MAX_LOADING_COUNT || mLoadingTime >= MAX_LOADING_TIME) {
showSwitchStreamDialog();
}
@@ -79,7 +79,7 @@ public class NetWatcher {
mLoadingStartTime = 0;
mPlayURL = "";
mLivePlayer = null;
TXLog.w("NetWatcher", "net check stop watch");
//TXLog.w("NetWatcher", "net check stop watch");
}
/**