support android8

fixed bugs
PangBaiWork · Mar 10, 2024 · 077dd54 · 077dd54
1 parent 32034b0
commit 077dd54
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 10 deletions.
diff --git a/README-CN.md b/README-CN.md
@@ -1,4 +1,8 @@
 Read this in other languages: [English](README.md)  , [简体中文](README-CN.md),
+
+[![CI](https://github.com/Rosemoe/CodeEditor/actions/workflows/gradle.yml/badge.svg?event=push)](https://github.com/PangBaiWork/WeBlog/actions/workflows/main.yml)
+[![QQ](https://img.shields.io/badge/Join-QQ_Group-ff69b4)](https://qm.qq.com/q/1wJcBUfst2)
+----
 ## 引言 
 博客是什么？它是我们的另一片天地，在这里你可以说你想说的话，分享自己学到的新东西，美好的事，是温馨的小窝。
 它是不被世俗打扰的净土，没有人在这里教你做事，你可以倾心陈述一切。

diff --git a/README.md b/README.md
@@ -1,4 +1,8 @@
 Read this in other languages: [English](README.md)  , [简体中文](README-CN.md)
+
+[![CI](https://github.com/Rosemoe/CodeEditor/actions/workflows/gradle.yml/badge.svg?event=push)](https://github.com/PangBaiWork/WeBlog/actions/workflows/main.yml)
+[![QQ](https://img.shields.io/badge/Join-QQ_Group-ff69b4)](https://qm.qq.com/q/1wJcBUfst2)
+----
 ## Introduction 
 What is a blog? It is another world for us,also a warm nest where you can say what you want to say,
 share new and beautiful things you have learned.

diff --git a/app/build.gradle b/app/build.gradle
@@ -13,9 +13,7 @@ android {
     // buildToolsVersion "33.0.0"
 
     lintOptions {
-
         abortOnError false
-
     }
     packagingOptions {
         jniLibs {
@@ -31,7 +29,8 @@ android {
         versionCode 2
         versionName "1.1"
         ndk {//让gradle知道ndk的配置
-            abiFilter "arm64-v8a"//so文件的平
+          //  abiFilter "arm64-v8a,"//so文件的平
+
         }
         vectorDrawables {
             useSupportLibrary true

diff --git a/app/src/main/assets/libexec.so b/app/src/main/assets/libexec.so
diff --git a/app/src/main/java/com/pangbai/terminal/view/SuperTerminalView.java b/app/src/main/java/com/pangbai/terminal/view/SuperTerminalView.java
@@ -85,8 +85,12 @@ public SuperTerminalView(Context context, AttributeSet attributes) {
     }
 
     public   void setTerminal(String cwd) {
-     String[] n = {Init.linker,Init.busyboxPath,"sh"};
-     setProcess(Init.linker, cwd, n,Init.envp, 0);
+    if (Init.android10) {
+        String[] n = {Init.linker, Init.busyboxPath, "sh"};
+        setProcess(Init.linker, cwd, n, Init.envp, 0);
+    }else {
+        setProcess(Init.busyboxPath, cwd,new String[] {"sh"}, Init.envp, 0);
+    }
      //   setProcess(Init.shell, cwd, null,new String[]{ "PATH=" + Init.binDir}, 0);
         runProcess();
         //cmdView.requestFocus();

diff --git a/app/src/main/java/com/pangbai/weblog/execute/cmdExer.java b/app/src/main/java/com/pangbai/weblog/execute/cmdExer.java
@@ -58,8 +58,11 @@ public static int execute(String command, boolean su, boolean wait) {
 
         // 设置环境变量
         // environment.put("LD_LIBRARY_PATH", Init.filesDirPath + "/usr/lib");
-
-        processBuilder.command(Init.linker,Init.busyboxPath,shell, "-c",command);
+      if (Init.android10) {
+          processBuilder.command(Init.linker, Init.busyboxPath, shell, "-c", command);
+      }else {
+          processBuilder.command(Init.busyboxPath,shell, "-c", command);
+      }
        processBuilder.redirectErrorStream(true);
 
         try {

diff --git a/app/src/main/java/com/pangbai/weblog/tool/Init.java b/app/src/main/java/com/pangbai/weblog/tool/Init.java
@@ -45,6 +45,7 @@ public class Init {
     final public static String sdcardPath = "/storage/emulated/0/";
     final public static String linker = "/system/bin/linker64";
     public static String keyPath;
+    final public static boolean android10=Build.VERSION.SDK_INT>=29;
     boolean result;
 
     AlertDialog dialog;
@@ -75,6 +76,7 @@ public Init(Activity ct) {
                 "PS1=\\[\\e[1\\;31m\\])➜ \\[\\e[1;36m\\]\\W\\[\\e[m\\] ",
                 "TERM=xterm-256color",
                 "LANG=en_US.UTF-8",
+                android10?"ANDROID10=1":"ANDROID10=0",
                 "ANDROID_DATA=/data",
                 "ANDROID_ROOT=/system"
         };
@@ -109,6 +111,9 @@ public void run() {
                                         checkPermission(ct);
 
                                     });
+                        else
+                            checkPermission(ct);
+
 
 
                     });

diff --git a/app/src/main/java/com/pangbai/weblog/view/FilesListAdapter.java b/app/src/main/java/com/pangbai/weblog/view/FilesListAdapter.java
@@ -186,8 +186,7 @@ public void refreshList(){
     @SuppressLint("NotifyDataSetChanged")
     public void setList(File files) {
         if (!files.exists() || !files.canRead()) {
-
-            Snackbar.make(parent, "Can Not Open This Folder", Snackbar.LENGTH_SHORT).show();
+            if (parent!=null) Snackbar.make(parent, "Can Not Open This Folder", Snackbar.LENGTH_SHORT).show();
 
             return;
         }

diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk
@@ -1,4 +1,4 @@
 Dowork_TOOLCHAIN_VERSION := 4.9
 APP_STL := c++_static
-APP_ABI := arm64-v8a
+APP_ABI := arm64-v8a,x86_64
 APP_PLATFORM := android-24