|
|
@ -675,6 +675,7 @@ public class AppMaster {
|
|
|
|
JSONObject jsonFrp = new JSONObject(frp);
|
|
|
|
JSONObject jsonFrp = new JSONObject(frp);
|
|
|
|
String server = jsonFrp.optString("server_addr");
|
|
|
|
String server = jsonFrp.optString("server_addr");
|
|
|
|
int port = jsonFrp.optInt("server_port", 7000);
|
|
|
|
int port = jsonFrp.optInt("server_port", 7000);
|
|
|
|
|
|
|
|
int remotePort = jsonFrp.optInt("remote_port", 50001);
|
|
|
|
|
|
|
|
|
|
|
|
mService.logger.info("Starting Frp Server " + server + ":" + Integer.toString(port));
|
|
|
|
mService.logger.info("Starting Frp Server " + server + ":" + Integer.toString(port));
|
|
|
|
|
|
|
|
|
|
|
@ -684,6 +685,7 @@ public class AppMaster {
|
|
|
|
intent.putExtra("startFrp", 1);
|
|
|
|
intent.putExtra("startFrp", 1);
|
|
|
|
intent.putExtra("server", server);
|
|
|
|
intent.putExtra("server", server);
|
|
|
|
intent.putExtra("port", port);
|
|
|
|
intent.putExtra("port", port);
|
|
|
|
|
|
|
|
intent.putExtra("remotePort", remotePort);
|
|
|
|
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
|
|
|
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
|
|
|
context.startActivity(intent);
|
|
|
|
context.startActivity(intent);
|
|
|
|
}
|
|
|
|
}
|
|
|
|