diff --git a/app/src/main/java/com/example/dcav2gui/InstanceInterface.java b/app/src/main/java/com/example/dcav2gui/InstanceInterface.java index 58b65fa..5231d47 100644 --- a/app/src/main/java/com/example/dcav2gui/InstanceInterface.java +++ b/app/src/main/java/com/example/dcav2gui/InstanceInterface.java @@ -294,13 +294,17 @@ public class InstanceInterface { fundsAvailable = getFundsAvailable(exchange, "USDT", true); //Individual worker status needed to calculate this - workers = getAllWorkersStats("binance", true); + workers = getAllWorkersStats(exchange, true); //Funds needed fundsNeeded = 0; //Online workers - onlineWorkers = 0; + if (workers != null) { + onlineWorkers = workers.size(); + } else { + onlineWorkers = 0; + } //Long workers longWorkers = 0; diff --git a/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java b/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java index c9e1dfb..e10f6bc 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java @@ -429,12 +429,36 @@ public class HomeFragment extends Fragment { }); CompletableFuture future14 = CompletableFuture.supplyAsync(() -> { - try { - return InstanceInterface.getExchangeStatsData("binance"); - } catch (IOException e) { - System.err.print(e.toString()); - return null; - } + try { + return InstanceInterface.getExchangeStatsData("binance"); + } catch (IOException e) { + System.err.print(e.toString()); + return null; + } + }); + CompletableFuture future15 = CompletableFuture.supplyAsync(() -> { + try { + return InstanceInterface.getExchangeStatsData("gateio"); + } catch (IOException e) { + System.err.print(e.toString()); + return null; + } + }); + CompletableFuture future16 = CompletableFuture.supplyAsync(() -> { + try { + return InstanceInterface.getExchangeStatsData("kucoin"); + } catch (IOException e) { + System.err.print(e.toString()); + return null; + } + }); + CompletableFuture future17 = CompletableFuture.supplyAsync(() -> { + try { + return InstanceInterface.getExchangeStatsData("okex"); + } catch (IOException e) { + System.err.print(e.toString()); + return null; + } }); // Wait for all futures to complete @@ -653,11 +677,32 @@ public class HomeFragment extends Fragment { log3Content.setText(logs3); log4Content.setText(logs4); -// try { -// System.err.println(future14.get()); -// } catch (ExecutionException | InterruptedException e) { -// throw new RuntimeException(e); -// } + // Exchange stats + InstanceInterface.ExchangeStatsData binanceGlobalStats; + InstanceInterface.ExchangeStatsData gateioGlobalStats; + InstanceInterface.ExchangeStatsData kucoinGlobalStats; + InstanceInterface.ExchangeStatsData okexGlobalStats; + try { + binanceGlobalStats = future14.get(); + gateioGlobalStats = future15.get(); + kucoinGlobalStats = future16.get(); + okexGlobalStats = future17.get(); + } catch (ExecutionException | InterruptedException e) { + throw new RuntimeException(e); + } + + if (binanceGlobalStats != null) { + exchange1WorkersOnline.setText(String.valueOf(binanceGlobalStats.getOnlineWorkers())); + } + if (gateioGlobalStats != null) { + exchange2WorkersOnline.setText(String.valueOf(gateioGlobalStats.getOnlineWorkers())); + } + if (kucoinGlobalStats != null) { + exchange3WorkersOnline.setText(String.valueOf(kucoinGlobalStats.getOnlineWorkers())); + } + if (okexGlobalStats != null) { + exchange4WorkersOnline.setText(String.valueOf(okexGlobalStats.getOnlineWorkers())); + } });