Code cleanup

- Move source files to convenient folders - Remove unused classes - Remove NDK ABI filter (supports all architectures)
2025-12-13 01:51:30 -07:00 · 2020-11-12 09:34:08 +07:00 · 2020-11-12 09:34:08 +07:00 · 5214a4f7e6
commit 5214a4f7e6
parent 2ae3bd748d
30 changed files with 284 additions and 625 deletions
--- a/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
@ -0,0 +1,142 @@
+package net.kdt.pojavlaunch;
+
+import android.graphics.*;
+import android.os.*;
+import android.view.*;
+import android.widget.*;
+import java.io.*;
+import java.util.*;
+import net.kdt.pojavlaunch.utils.*;
+import org.lwjgl.glfw.*;
+
+public class JavaGUILauncherActivity extends LoggableActivity {
+    public static volatile boolean IS_JRE_RUNNING;
+
+    private AWTCanvasView mTextureView;
+    private LinearLayout contentLog;
+    private TextView textLog;
+    private ScrollView contentScroll;
+    private ToggleButton toggleLog; 
+
+    private File logFile;
+    private PrintStream logStream;
+
+    private boolean isLogAllow;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.install_mod);
+
+        try {
+            Tools.setFullscreen(this);
+
+            logFile = new File(Tools.MAIN_PATH, "latestlog.txt");
+            logFile.delete();
+            logFile.createNewFile();
+            logStream = new PrintStream(logFile.getAbsolutePath());
+            this.contentLog = findViewById(R.id.content_log_layout);
+            this.contentScroll = (ScrollView) findViewById(R.id.content_log_scroll);
+            this.textLog = (TextView) contentScroll.getChildAt(0);
+            this.toggleLog = (ToggleButton) findViewById(R.id.content_log_toggle_log);
+            this.toggleLog.setChecked(false);
+            // this.textLogBehindGL = (TextView) findViewById(R.id.main_log_behind_GL);
+            // this.textLogBehindGL.setTypeface(Typeface.MONOSPACE);
+            this.textLog.setTypeface(Typeface.MONOSPACE);
+            this.toggleLog.setOnCheckedChangeListener(new ToggleButton.OnCheckedChangeListener(){
+                    @Override
+                    public void onCheckedChanged(CompoundButton button, boolean isChecked) {
+                        isLogAllow = isChecked;
+                        appendToLog("");
+                    }
+                });
+            JREUtils.redirectAndPrintJRELog(this, null);
+
+            final File modFile = (File) getIntent().getExtras().getSerializable("modFile");
+            final String javaArgs = getIntent().getExtras().getString("javaArgs");
+
+            mTextureView = findViewById(R.id.installmod_surfaceview);
+
+            new Thread(new Runnable(){
+                    @Override
+                    public void run() {
+                        launchJavaRuntime(modFile, javaArgs);
+                        IS_JRE_RUNNING = false;
+                    }
+                }, "JREMainThread").start();
+        } catch (Throwable th) {
+            Tools.showError(this, th, true);
+        }
+    }
+
+    public void forceClose(View v) {
+        MainActivity.dialogForceClose(this);
+    }
+
+    public void openLogOutput(View v) {
+        contentLog.setVisibility(View.VISIBLE);
+    }
+
+    public void closeLogOutput(View view) {
+        contentLog.setVisibility(View.GONE);
+        // mIsResuming = true;
+    }
+
+    private void launchJavaRuntime(File modFile, String javaArgs) {
+        try {
+            List<String> javaArgList = new ArrayList<String>();
+
+            File cacioAwtLibPath = new File(Tools.MAIN_PATH, "cacioawtlib");
+            if (cacioAwtLibPath.exists()) {
+                StringBuilder libStr = new StringBuilder();
+                for (File file: cacioAwtLibPath.listFiles()) {
+                    if (file.getName().endsWith(".jar")) {
+                        libStr.append(":" + file.getAbsolutePath());
+                    }
+                }
+                javaArgList.add("-Xbootclasspath/a" + libStr.toString());
+            }
+
+            javaArgList.add("-Dcacio.managed.screensize=" + CallbackBridge.windowWidth + "x" + CallbackBridge.windowHeight);
+
+            File cacioArgOverrideFile = new File(cacioAwtLibPath, "overrideargs.txt");
+            if (cacioArgOverrideFile.exists()) {
+                javaArgList.addAll(Arrays.asList(Tools.read(cacioArgOverrideFile.getAbsolutePath()).split(" ")));
+            }
+
+            if (javaArgs != null) {
+                javaArgList.addAll(Arrays.asList(javaArgs.split(" ")));
+            } else {
+                javaArgList.add("-jar");
+                javaArgList.add(modFile.getAbsolutePath());
+            }
+
+            // System.out.println(Arrays.toString(javaArgList.toArray(new String[0])));
+
+            Tools.launchJavaVM(this, javaArgList);
+        } catch (Throwable th) {
+            Tools.showError(this, th, true);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        final int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
+        final View decorView = getWindow().getDecorView();
+        decorView.setSystemUiVisibility(uiOptions);
+    }
+
+    @Override
+    public void appendToLog(final String text, boolean checkAllow) {
+        logStream.print(text);
+        if (checkAllow && !isLogAllow) return;
+        textLog.post(new Runnable(){
+                @Override
+                public void run() {
+                    textLog.append(text);
+                    contentScroll.fullScroll(ScrollView.FOCUS_DOWN);
+                }
+            });
+    }
+}