kongzue 4 years ago
parent
commit
4879c184fb

+ 3 - 3
DialogX/build.gradle

@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/DialogX' //项目在github主页地址
 def gitUrl = 'https://github.com/kongzue/DialogX.git'   //Git仓库的地址
 
 group = "com.kongzue.dialogx"
-version = "0.0.2"
+version = "0.0.3"
 
 android {
     compileSdkVersion 30
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 2
-        versionName "0.0.2"
+        versionCode 3
+        versionName "0.0.3"
 
         consumerProguardFiles "consumer-rules.pro"
 

+ 12 - 4
DialogX/src/main/java/com/kongzue/dialogx/util/views/BlurView.java

@@ -170,6 +170,7 @@ public class BlurView extends View {
     }
     
     protected void release() {
+        log("release");
         releaseBitmap();
         releaseScript();
     }
@@ -205,10 +206,10 @@ public class BlurView extends View {
                 mBlurScript.setRadius(radius);
             }
         }
-        
+    
         final int width = getWidth();
         final int height = getHeight();
-        
+    
         int scaledWidth = Math.max(1, (int) (width / downsampleFactor));
         int scaledHeight = Math.max(1, (int) (height / downsampleFactor));
         
@@ -223,6 +224,10 @@ public class BlurView extends View {
                 }
                 mBlurringCanvas = new Canvas(mBitmapToBlur);
                 
+                if (!supportRenderScript || !useBlur){
+                    return true;
+                }
+                
                 mBlurInput = Allocation.createFromBitmap(mRenderScript, mBitmapToBlur,
                         Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT
                 );
@@ -423,16 +428,19 @@ public class BlurView extends View {
                     BlurView.class.getClassLoader().loadClass(RenderScript.class.getCanonicalName());
                     supportRenderScript = true;
                 } catch (Throwable e) {
+                    if (isDebug()){
+                        e.printStackTrace();
+                    }
                     supportRenderScript = false;
                 }
             }
         }.start();
     }
     
-    private static boolean DEBUGMODE = false;
+    public static boolean DEBUGMODE = false;
     
     static boolean isDebug() {
-        return DEBUGMODE && DialogX.DEBUGMODE;
+        return DialogX.DEBUGMODE;
     }
     
     public static void log(Object o) {

+ 2 - 1
DialogXIOSStyle/build.gradle

@@ -20,5 +20,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation files('libs\\DialogXInterface.jar')
+    implementation project(path: ':DialogX')
+    implementation project(path: ':DialogXInterface')
 }

BIN
DialogXIOSStyle/libs/DialogXInterface.jar


+ 2 - 1
DialogXKongzueStyle/build.gradle

@@ -20,5 +20,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation files('libs\\DialogXInterface.jar')
+    implementation project(path: ':DialogX')
+    implementation project(path: ':DialogXInterface')
 }

BIN
DialogXKongzueStyle/libs/DialogXInterface.jar


+ 2 - 1
DialogXMIUIStyle/build.gradle

@@ -21,5 +21,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation files('libs\\DialogXInterface.jar')
+    implementation project(path: ':DialogX')
+    implementation project(path: ':DialogXInterface')
 }

BIN
DialogXMIUIStyle/libs/DialogXInterface.jar


+ 6 - 4
app/build.gradle

@@ -30,8 +30,10 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.kongzue.baseframeworkx:baseframework:6.7.6'
-    implementation project(':DialogX')
-    implementation project(path: ':DialogXIOSStyle')
-    implementation project(path: ':DialogXKongzueStyle')
-    implementation project(path: ':DialogXMIUIStyle')
+
+//    implementation(name: 'DialogX-release', ext: 'aar')
+    implementation(name: 'DialogXIOSStyle-release', ext: 'aar')
+    implementation(name: 'DialogXKongzueStyle-release', ext: 'aar')
+    implementation(name: 'DialogXMIUIStyle-release', ext: 'aar')
+    implementation project(path: ':DialogX')
 }

BIN
app/libs/DialogXIOSStyle-release.aar


BIN
app/libs/DialogXKongzueStyle-release.aar


BIN
app/libs/DialogXMIUIStyle-release.aar