diff --git a/tvbus/src/main/java/com/tvbus/engine/TVCore.java b/tvbus/src/main/java/com/tvbus/engine/TVCore.java index 20cdb220f..0e20f002d 100644 --- a/tvbus/src/main/java/com/tvbus/engine/TVCore.java +++ b/tvbus/src/main/java/com/tvbus/engine/TVCore.java @@ -25,42 +25,66 @@ public class TVCore { } public TVCore listener(TVListener listener) { - setListener(nativeHandle, listener); + try { + setListener(nativeHandle, listener); + } catch (Throwable ignored) { + } return this; } public TVCore play(int port) { - setPlayPort(nativeHandle, port); + try { + setPlayPort(nativeHandle, port); + } catch (Throwable ignored) { + } return this; } public TVCore serv(int port) { - setServPort(nativeHandle, port); + try { + setServPort(nativeHandle, port); + } catch (Throwable ignored) { + } return this; } public TVCore mode(int mode) { - setRunningMode(nativeHandle, mode); + try { + setRunningMode(nativeHandle, mode); + } catch (Throwable ignored) { + } return this; } public TVCore auth(String str) { - if (!TextUtils.isEmpty(str)) setAuthUrl(nativeHandle, str); + try { + if (!TextUtils.isEmpty(str)) setAuthUrl(nativeHandle, str); + } catch (Throwable ignored) { + } return this; } public TVCore broker(String str) { - if (!TextUtils.isEmpty(str)) setMKBroker(nativeHandle, str); + try { + if (!TextUtils.isEmpty(str)) setMKBroker(nativeHandle, str); + } catch (Throwable ignored) { + } return this; } public TVCore name(String str) { - if (!TextUtils.isEmpty(str)) setUsername(nativeHandle, str); + try { + if (!TextUtils.isEmpty(str)) setUsername(nativeHandle, str); + } catch (Throwable ignored) { + } return this; } public TVCore pass(String str) { - if (!TextUtils.isEmpty(str)) setPassword(nativeHandle, str); + try { + if (!TextUtils.isEmpty(str)) setPassword(nativeHandle, str); + } catch (Throwable ignored) { + } return this; } @@ -79,10 +103,11 @@ public class TVCore { } void init(Context context) { - new Thread(() -> { + try { init(nativeHandle, context); run(nativeHandle); - }).start(); + } catch (Throwable ignored) { + } } void quit() { diff --git a/tvbus/src/main/java/com/tvbus/engine/TVService.java b/tvbus/src/main/java/com/tvbus/engine/TVService.java index 0edd08bcf..b31e4466f 100644 --- a/tvbus/src/main/java/com/tvbus/engine/TVService.java +++ b/tvbus/src/main/java/com/tvbus/engine/TVService.java @@ -17,7 +17,7 @@ public class TVService extends Service { intent.putExtra("pass", pass); intent.putExtra("broker", broker); context.startService(intent); - } catch (Exception e) { + } catch (Throwable e) { e.printStackTrace(); } } @@ -33,8 +33,7 @@ public class TVService extends Service { @Override public int onStartCommand(Intent intent, int flags, int startId) { tvcore = TVCore.getInstance().auth(intent.getStringExtra("auth")).name(intent.getStringExtra("name")).pass(intent.getStringExtra("pass")).broker(intent.getStringExtra("broker")); - tvcore.serv(0).play(8902).mode(1); - tvcore.init(this); + tvcore.serv(0).play(8902).mode(1).init(this); return START_NOT_STICKY; }