fix Multi-threading issues

Author: lixiaoliang04

app/src/main/java/com/imf/test/MainActivity.java

@@ -29,6 +29,7 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         checkSoLoad();
+        loadSourceLib();
         fullScreen();
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
@@ -40,19 +41,14 @@ protected void onCreate(Bundle savedInstanceState) {
         TextView tv = findViewById(R.id.sample_text);
         tv.setOnClickListener(v -> {
             StringBuilder stringBuilder = new StringBuilder();
-            v.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    loadSourceLib();
-                    stringBuilder.append("源码引入: ").append(NativeSourceTest.stringFromJNI()).append('\n');
-                    stringBuilder.append("aar引入: ").append(NativeLibTest.stringFromJNI()).append('\n');
-                    stringBuilder.append("子工程引入: ").append(NativeTestLibrary.stringFromJNI()).append('\n');
-                    stringBuilder.append("Maven引入: >背景图片变模糊<");
-                    tv.setText(stringBuilder.toString());
-                    image.setImageBitmap(BitmapBlur.blur(bitmap, 9));
-                    updateCacheDir();
-                }
-            }, 100);
+            loadSourceLib();
+            stringBuilder.append("源码引入: ").append(NativeSourceTest.stringFromJNI()).append('\n');
+            stringBuilder.append("aar引入: ").append(NativeLibTest.stringFromJNI()).append('\n');
+            stringBuilder.append("子工程引入: ").append(NativeTestLibrary.stringFromJNI()).append('\n');
+            stringBuilder.append("Maven引入: >背景图片变模糊<");
+            tv.setText(stringBuilder.toString());
+            image.setImageBitmap(BitmapBlur.blur(bitmap, 9));
+            updateCacheDir();
         });
 
     }
@@ -83,7 +79,7 @@ public void onLibsEmpty() {
     }
 
     private void loadSourceLib() {
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 1000; i++) {
             new Thread(new Runnable() {
                 @Override
                 public void run() {

app/src/main/res/layout/activity_main.xml

@@ -26,6 +26,7 @@
             android:background="#c7edcc"
             android:padding="10dp"
             android:text="缓存目录情况:"
+            android:textSize="8dp"
             android:textColor="#333333"
             android:textStyle="normal" />
 

file-plugin/src/main/kotlin/com/imf/plugin/so/Plugin.kt

@@ -47,9 +47,32 @@ abstract class SoFilePlugin : Plugin<Project> {
 
         val osdetector = project.extensions.getByType(OsDetector::class.java)
 
+        //region 尝试查找 aar 里面的可执行文件
+        val depAAR = project.dependencies.add(
+            p7zConfig.name, mapOf(
+                "group" to "com.github.mainlxl.Android-So-Handler",
+                "name" to "p7z",
+                "classifier" to "all",
+                "version" to "1.0.1",
+                "ext" to "aar"
+            )
+        )
+        runCatching {
+            val aar = p7zConfig.fileCollection(depAAR).singleFile
+            ZipFile(aar).unzipTo(aar.parentFile)
+            val file = aar.parentFile.listFiles()?.firstOrNull {
+                it.name.contains(osdetector.classifier)
+            } ?: throw FileNotFoundException()
+            if (!file.canExecute() && !file.setExecutable(true)) {
+                throw GradleException("Cannot set ${file} as executable")
+            }
+            return file.absolutePath
+        }
+        //endregion
+
         val dep = project.dependencies.add(
             p7zConfig.name, mapOf<String, String>(
-                "group" to "com.github.mainlxl.Android-So-Handler",
+                "group" to "com.mainlxl.tools",
                 "name" to "p7z",
                 "classifier" to osdetector.classifier,
                 "version" to "1.0.1",

gradle.properties

@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 ANDROID_GRADLE_VERSION=7.3.0
 #SO_PLUGIN_VERSION=0.0.4-SNAPSHOT
-SO_PLUGIN_VERSION=0.0.11
+SO_PLUGIN_VERSION=0.0.12
 userPlugin=true
 GROUP_ID=com.github.mainlxl.Android-So-Handler

jitpack.yml

@@ -1,5 +1,5 @@
 jdk:
   - openjdk11
 install:
-  - sh uploadAllToMavenLocal.sh
+#  - sh uploadAllToMavenLocal.sh
 

load-assets-7z/src/main/java/com/imf/so/assets/load/AssetsSoLoadBy7zFileManager.java

@@ -16,6 +16,7 @@
 import org.json.JSONObject;
 
 import java.io.File;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,11 +28,11 @@
 public class AssetsSoLoadBy7zFileManager {
     public final static String DIR_JNI_LIBS = "jniLibs";
     public final static String ASSETS_CONFIG_INFO_PATH = "jniLibs/info.json";
-    private static Context sAppContext;
-    private static File sSaveLibsDir;
-    private static AbiSoFileConfigInfo sSoLoadInfo;
+    private static volatile Context sAppContext;
+    private static volatile File sSaveLibsDir;
+    private static volatile AbiSoFileConfigInfo sSoLoadInfo;
 
-    private static final Map<String, Object> sLoadingLibraries = new HashMap<>();
+    private static final Map<String, Object> sLoadingLibraries = Collections.synchronizedMap(new HashMap<>());
 
     public static void setLogEnable(boolean enable) {
         LogUtil.setLogEnable(enable);

load-hook/src/main/java/com/imf/so/SoLoadHook.java

@@ -8,7 +8,7 @@
 public class SoLoadHook {
     private static volatile SoLoadProxy sSoLoadProxy = new DefaultSoLoadProxy();
 
-    public static void setSoLoadProxy(SoLoadProxy soLoadProxy) {
+    public static synchronized void setSoLoadProxy(SoLoadProxy soLoadProxy) {
         if (soLoadProxy == null) {
             return;
         }