okjack
FongMi 2 years ago
parent d203bc177d
commit 46e9c48f8c
  1. 2
      app/build.gradle
  2. 8
      app/src/main/java/com/fongmi/android/tv/App.java
  3. 2
      app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
  4. 2
      app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java
  5. 2
      app/src/main/java/com/fongmi/android/tv/api/WallConfig.java
  6. 10
      app/src/main/java/com/fongmi/android/tv/server/Server.java
  7. 2
      app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java

@ -127,8 +127,8 @@ dependencies {
implementation 'org.greenrobot:eventbus:3.3.1'
implementation 'org.nanohttpd:nanohttpd:2.3.1'
implementation('org.simpleframework:simple-xml:2.7.1') { exclude group: 'stax', module: 'stax-api' exclude group: 'xpp3', module: 'xpp3' }
implementation(ext: 'aar', name: 'go_proxy_video', group: 'fongmi', version: 'release')
implementation(ext: 'aar', name: 'dlna-core', group: 'fongmi', version: 'release')
implementation(ext: 'aar', name: 'go-proxy-video', group: 'fongmi', version: 'release')
leanbackImplementation(ext: 'aar', name: 'dlna-dmr', group: 'fongmi', version: 'release')
leanbackImplementation 'androidx.leanback:leanback:1.2.0-alpha04'
leanbackImplementation 'me.jessyan:autosize:1.2.1'

@ -18,7 +18,6 @@ import com.fongmi.android.tv.utils.Notify;
import com.github.catvod.Init;
import com.github.catvod.bean.Doh;
import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Github;
import com.google.gson.Gson;
import com.orhanobut.logger.AndroidLogAdapter;
import com.orhanobut.logger.LogAdapter;
@ -29,8 +28,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import cat.ereza.customactivityoncrash.config.CaocConfig;
import go_proxy_video.GoVideoProxy;
import go_proxy_video.Go_proxy_video;
public class App extends Application {
private final ExecutorService executor;
@ -111,10 +109,6 @@ public class App extends Application {
OkHttp.get().setProxy(Setting.getProxy());
OkHttp.get().setDoh(Doh.objectFrom(Setting.getDoh()));
CaocConfig.Builder.create().backgroundMode(CaocConfig.BACKGROUND_MODE_SILENT).errorActivity(CrashActivity.class).apply();
new Thread(() -> {
GoVideoProxy videoProxy = Go_proxy_video.newGoVideoProxy();
videoProxy.start();
}).start();
registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
@Override
public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {

@ -120,7 +120,7 @@ public class ApiConfig {
}
public void load(Callback callback) {
new Thread(() -> loadConfig(callback)).start();
App.execute(() -> loadConfig(callback));
}
private void loadConfig(Callback callback) {

@ -93,7 +93,7 @@ public class LiveConfig {
}
public void load(Callback callback) {
new Thread(() -> loadConfig(callback)).start();
App.execute(() -> loadConfig(callback));
}
private void loadConfig(Callback callback) {

@ -75,7 +75,7 @@ public class WallConfig {
}
public void load(Callback callback) {
new Thread(() -> loadConfig(callback)).start();
App.execute(() -> loadConfig(callback));
}
private void loadConfig(Callback callback) {

@ -13,8 +13,12 @@ import java.net.NetworkInterface;
import java.net.SocketException;
import java.util.Enumeration;
import go_proxy_video.GoVideoProxy;
import go_proxy_video.Go_proxy_video;
public class Server {
private GoVideoProxy proxy;
private Nano nano;
private int port;
@ -53,6 +57,8 @@ public class Server {
nano = new Nano(port);
Proxy.set(port);
nano.start();
proxy = Go_proxy_video.newGoVideoProxy();
App.execute(() -> proxy.start());
break;
} catch (Exception e) {
++port;
@ -67,6 +73,10 @@ public class Server {
nano.stop();
nano = null;
}
if (proxy != null) {
proxy.stop();
proxy = null;
}
}
public String getIP() {

@ -48,7 +48,7 @@ public class ScanTask {
private void getDevice(List<String> urls) throws Exception {
CountDownLatch cd = new CountDownLatch(urls.size());
for (String url : urls) new Thread(() -> findDevice(cd, url)).start();
for (String url : urls) App.execute(() -> findDevice(cd, url));
cd.await();
}

Loading…
Cancel
Save