xymp
/
frpAndroid
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化foreground service的实现

Browse Source
main
Matthew 11 months ago
parent 7ee193ae66
commit 4e26bfa10b
3 changed files with 103 additions and 34 deletions
Show Stats Download Patch File Download Diff File

BIN
app/libs/common-release.aar
View File

Binary file not shown.

84
app/src/main/java/com/xypower/frpandroid/MainActivity.java
Unescape Escape View File

@ -10,13 +10,11 @@ import android.content.ServiceConnection;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.res.AssetManager;
import android.content.res.Resources;
import android.os.Build;
import android.os.Handler;
import android.os.IBinder;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.SwitchCompat;
import android.telephony.SubscriptionManager;
import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
@ -29,6 +27,10 @@ import android.widget.Switch;
import android.widget.TextView;
import com.xypower.common.FilesUtils;
import com.xypower.common.LogFormatter;
import com.xypower.common.LogcatHandler;
import com.xypower.common.RotatingHandler;
import org.jetbrains.annotations.NotNull;
@ -36,6 +38,9 @@ import java.io.Closeable;
import java.io.File;
import java.io.InputStream;
import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
public class MainActivity extends AppCompatActivity {
@ -57,6 +62,8 @@ public class MainActivity extends AppCompatActivity {
Handler mHandler;
public Logger logger;
private String mServer = DEFAULT_SERVER;
private int mPort = DEFAULT_PORT;
private int mRemotePort = DEFAULT_REMOTE_PORT;
@ -84,8 +91,36 @@ public class MainActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
File file = new File(getDataDir(), "running.txt");
FilesUtils.writeTextFile(file.getAbsolutePath(), "");
mHandler = new Handler();
logger = Logger.getLogger("com.xypower.frp.logger");
logger.setLevel(Level.ALL);
// LogFormatter.installFormatter(logger);
LogFormatter logFormatter = new LogFormatter();
if (BuildConfig.DEBUG) {
LogcatHandler logcatHandler = new LogcatHandler(TAG);
logcatHandler.setFormatter(logFormatter);
logger.addHandler(logcatHandler);
}
RotatingHandler rotatingHandler = null;
try {
File logFile = new File(getDataDir(), "frplog.txt");
rotatingHandler = new RotatingHandler(logFile.getAbsolutePath(), logFormatter);
logger.addHandler(rotatingHandler);
} catch (Throwable e) {
System.out.println("Failed to create directory:" + e.getMessage());
}
logger.info("FrpAndroid is launching");
String versionName = null;
try {
versionName = this.getPackageManager().getPackageInfo(this.getPackageName(), 0).versionName;
@ -154,7 +189,7 @@ public class MainActivity extends AppCompatActivity {
if (mBound) {
Intent intent = new Intent((Context)this, ShellService.class);
this.bindService(intent, (ServiceConnection)this.connection, 1);
this.bindService(intent, (ServiceConnection)this.connection, Context.BIND_AUTO_CREATE);
}
this.setListener();
@ -172,6 +207,15 @@ public class MainActivity extends AppCompatActivity {
}
}
protected void onDestroy() {
super.onDestroy();
File file = new File(getDataDir(), "running.txt");
if (file.exists()) {
file.delete();
}
}
private final void setListener() {
Button configButton = (Button)this.findViewById(R.id.configButton);
configButton.setOnClickListener((View.OnClickListener)(new View.OnClickListener() {
@ -233,7 +277,7 @@ public class MainActivity extends AppCompatActivity {
} catch (Throwable ex) {
ex.printStackTrace();
} finally {
closeFinally(inputStream);
FilesUtils.closeFriendly(inputStream);
}
try {
@ -254,23 +298,22 @@ public class MainActivity extends AppCompatActivity {
return file;
}
private static final void closeFinally(Closeable closable) {
if (closable != null) {
try {
closable.close();
} catch (Throwable var3) {
// ExceptionsKt.addSuppressed(cause, var3);
private final void startShell() {
logger.info("Start Shell");
try {
Intent intent = new Intent(getApplicationContext(), ShellService.class);
intent.putExtra("filename", "libfrpc.so");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
startForegroundService(intent);
} else {
startService(intent);
}
this.bindService(intent, (ServiceConnection) this.connection, Context.BIND_AUTO_CREATE);
} catch (Exception ex) {
logger.warning(ex.getMessage());
}
}
private final void startShell() {
Intent intent = new Intent((Context)this, ShellService.class);
intent.putExtra("filename", "libfrpc.so");
this.startService(intent);
this.bindService(intent, (ServiceConnection)this.connection, Context.BIND_AUTO_CREATE);
}
private final void stopShell() {
Intent intent = new Intent((Context)this, ShellService.class);
this.unbindService((ServiceConnection)this.connection);
@ -351,6 +394,11 @@ public class MainActivity extends AppCompatActivity {
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
File file = new File(MainActivity.this.getDataDir(), "running.txt");
if (file.exists()) {
file.delete();
}
MainActivity.this.finish();
System.exit(0);
}

53
app/src/main/java/com/xypower/frpandroid/ShellService.java
Unescape Escape View File

@ -15,18 +15,23 @@ import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.util.Random;
import java.util.logging.Logger;
import org.jetbrains.annotations.NotNull;
public class ShellService extends Service {
private static final String TAG = "FRP";
private Thread mProcessThread;
private final StringBuilder mOutputBuilder = new StringBuilder();
private final LocalBinder mBinder = new LocalBinder();
private final Random mGenerator = new Random();
public Logger logger;
public ShellService() {
}
@ -52,6 +57,14 @@ public class ShellService extends Service {
return this.mGenerator.nextInt(100);
}
@Override
public void onCreate() {
super.onCreate();
logger = Logger.getLogger("com.xypower.frp.logger");
logger.info("ShellService is launching");
}
public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
String fileName = "";
@ -67,6 +80,7 @@ public class ShellService extends Service {
Bundle extras = intent.getExtras();
fileName = extras != null ? extras.getString("filename") : null;
if (TextUtils.isEmpty(fileName)) {
logger.warning("Filename is null");
throw new NullPointerException("null cannot be cast to non-null type kotlin.String");
} else {
@ -79,6 +93,7 @@ public class ShellService extends Service {
// Intrinsics.checkNotNullExpressionValue(var9, "packageManager.getApplic…GET_SHARED_LIBRARY_FILES)");
Log.d("adx", "native library dir " + applicationInfo.nativeLibraryDir);
logger.warning("Starting service");
try {
String cmd = applicationInfo.nativeLibraryDir + '/' + fileName + " -c " + confFile.getAbsolutePath();
String[] params = new String[]{""};
@ -87,14 +102,18 @@ public class ShellService extends Service {
this.runCommand(cmd, params, workDir);
} catch (Exception ex) {
// Log.e("adx", ExceptionsKt.stackTraceToString((Throwable)var7));
logger.warning(ex.getMessage());
ex.printStackTrace();
Toast.makeText((Context)this, (CharSequence)ex.getMessage(), Toast.LENGTH_SHORT).show();
this.stopSelf();
return Service.START_NOT_STICKY;
}
logger.warning("Service has been started");
Toast.makeText((Context)this, (CharSequence)"已启动frp服务", Toast.LENGTH_SHORT).show();
this.startForeground(1, this.showMotification());
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
this.startForeground(1, this.showNotification());
}
return Service.START_NOT_STICKY;
}
} else {
@ -111,6 +130,7 @@ public class ShellService extends Service {
mProcessThread.interrupt();
}
logger.warning("Service has been stopped");
Toast.makeText((Context)this, (CharSequence)"已关闭frp服务", Toast.LENGTH_SHORT).show();
}
@ -136,19 +156,20 @@ public class ShellService extends Service {
}
private final Notification showMotification() {
Intent intent = new Intent((Context)this, MainActivity.class);
boolean var4 = false;
PendingIntent pendingIntent = PendingIntent.getActivity((Context)this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
// Intrinsics.checkNotNullExpressionValue(var10000, "Intent(this, MainActivit…_IMMUTABLE)\n }");
Notification.Builder notificationBuilder = new Notification.Builder((Context)this, "shell_bg");
notificationBuilder.setSmallIcon(R.drawable.ic_launcher_foreground).
setContentTitle((CharSequence)"frp后台服务").
setContentText((CharSequence)"已启动frp").
setContentIntent(pendingIntent);
// Intrinsics.checkNotNullExpressionValue(var5, "NotificationCompat.Build…tentIntent(pendingIntent)");
return notificationBuilder.build();
// Intrinsics.checkNotNullExpressionValue(var6, "notification.build()");
private final Notification showNotification() {
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
Intent intent = new Intent(this.getApplicationContext(), MainActivity.class);
PendingIntent pendingIntent = PendingIntent.getActivity((Context) this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
Notification.Builder notificationBuilder = new Notification.Builder((Context) this, "shell_bg");
notificationBuilder.setSmallIcon(R.drawable.ic_launcher_foreground).
setContentTitle((CharSequence) "frp后台服务").
setContentText((CharSequence) "已启动frp").
setContentIntent(pendingIntent);
return notificationBuilder.build();
}
return null;
}
public final class LocalBinder extends Binder implements IBinder {

Write Preview
Loading…
Cancel
Save