Develop caprice

.gitignore

@@ -1,17 +1,3 @@
-/caprice/.idea/
-/caprice/.gradle/
-/caprice/.DS_Store/
-/caprice/gradle/
-/caprice/build/
-/caprice/blur/build/
-/caprice/kit/build/
-/caprice/res/build/
-/caprice/ui/build/
-/caprice/sample/build/
-/caprice/local.properties
-/caprice/gradlew
-/caprice/gradlew.bat
-
 /steady/.idea/
 /steady/.gradle/
 /steady/.DS_Store/

caprice/.gitignore

@@ -1,11 +1,9 @@
+*.iml
+.idea
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
 /build
-.idea/
-*.iml
+/captures
 /gradle
-gradlew
-gradlew.bat
+.externalNativeBuild

caprice/app/build.gradle

@@ -0,0 +1,37 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion ANDROID_BUILD_SDK_VERSION as int
+    buildToolsVersion ANDROID_BUILD_TOOLS_VERSION
+
+    defaultConfig {
+        applicationId "net.qiujuer.sample.genius"
+        minSdkVersion ANDROID_BUILD_MIN_SDK_VERSION as int
+        targetSdkVersion ANDROID_BUILD_TARGET_SDK_VERSION as int
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile project(':graphics')
+    compile project(':res')
+    compile project(':ui')
+    compile project(':kit-cmd')
+    compile project(':kit-reflect')
+    compile project(':kit-handler')
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
+    testCompile 'junit:junit:4.12'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+    androidTestCompile 'com.android.support.test:runner:0.5'
+    androidTestCompile 'com.android.support:support-annotations:23.4.0'
+}

caprice/app/src/androidTest/java/net/qiujuer/sample/genius/ExampleInstrumentationTest.java

@@ -0,0 +1,29 @@
+package net.qiujuer.sample.genius;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentationTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("net.qiujuer.sample.genius", appContext.getPackageName());
+    }
+}

caprice/sample/src/main/AndroidManifest.xml → caprice/app/src/main/AndroidManifest.xml

@@ -2,22 +2,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.qiujuer.sample.genius">
 
-    <!-- 网络 权限 -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <!-- 日志写文件 权限 -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <!-- getDeviceId 权限 -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -27,11 +19,19 @@
         </activity>
         <activity
             android:name=".BlurActivity"
-            android:label="@string/title_activity_blur" />
+            android:label="@string/title_activity_blur"
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".KitActivity"
-            android:label="@string/title_activity_kit" />
-        <activity android:name=".SeekBarActivity" />
+            android:label="@string/title_activity_kit"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".SeekBarActivity"
+            android:label="@string/title_activity_seek"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".BlurClipActivity"
+            android:theme="@style/AppTheme.FullScreen" />
     </application>
 
 </manifest>

caprice/sample/src/main/java/net/qiujuer/sample/genius/BlurActivity.java → caprice/app/src/main/java/net/qiujuer/sample/genius/BlurActivity.java

@@ -11,7 +11,10 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import net.qiujuer.genius.blur.StackBlur;
+import net.qiujuer.genius.graphics.Blur;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 
 
 public class BlurActivity extends AppCompatActivity {
@@ -42,10 +45,40 @@ protected void onResume() {
         applyBlur();
     }
 
+    private static Bitmap codec(Bitmap src, Bitmap.CompressFormat format,
+                                int quality) {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        src.compress(format, quality, os);
+
+        byte[] array = os.toByteArray();
+        return BitmapFactory.decodeByteArray(array, 0, array.length);
+    }
+
+    private Bitmap compressImage(Bitmap image) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        image.compress(Bitmap.CompressFormat.PNG, 100, baos);//质量压缩方法，这里100表示不压缩，把压缩后的数据存放到baos中
+        int options = 100;
+        while (baos.toByteArray().length / 1024 > 100) {  //循环判断如果压缩后图片是否大于100kb,大于继续压缩
+            baos.reset();//重置baos即清空baos
+            image.compress(Bitmap.CompressFormat.JPEG, options, baos);//这里压缩options%，把压缩后的数据存放到baos中
+            options -= 10;//每次都减少10
+        }
+        ByteArrayInputStream isBm = new ByteArrayInputStream(baos.toByteArray());//把压缩后的数据baos存放到ByteArrayInputStream中
+        BitmapFactory.Options options1 = new BitmapFactory.Options();
+        options1.inPreferredConfig = Bitmap.Config.RGB_565;
+        Bitmap bitmap = BitmapFactory.decodeStream(isBm, null, options1);//把ByteArrayInputStream数据生成图片
+        return bitmap;
+    }
+
 
     private void initBlur() {
         // Find Bitmap
         mBitmap = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_blur);
+        //Bitmap.Config config = mBitmap.getConfig();
+        //mBitmap = mBitmap.copy(Bitmap.Config.RGB_565, true);
+        //mBitmap = compressImage(mBitmap);
+
+
         mImageJava = (ImageView) findViewById(R.id.image_blur_java);
         mImageJniPixels = (ImageView) findViewById(R.id.image_blur_jni_pixels);
         mImageJniBitmap = (ImageView) findViewById(R.id.image_blur_jni_bitmap);
@@ -61,6 +94,8 @@ private void initBlur() {
         mCompressBitmap = Bitmap.createBitmap(mBitmap, 0, 0,
                 mBitmap.getWidth(), mBitmap.getHeight(), matrix, true);
 
+        mCompressBitmap = mCompressBitmap.copy(Bitmap.Config.RGB_565, true);
+
         // Set On OnCheckedChangeListener
         CheckBox checkBox = (CheckBox) findViewById(R.id.checkbox_blur_isCompress);
         checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -117,21 +152,29 @@ else if (i == 3)
 
         // Is Compress
         float radius = 20;
-        Bitmap overlay = mBitmap;
+        Bitmap overlay = mBitmap.copy(mBitmap.getConfig(), true);
         if (mCompress) {
             radius = 3;
-            overlay = mCompressBitmap;
+            overlay = mCompressBitmap.copy(mCompressBitmap.getConfig(), true);
         }
 
-        // Java
-        if (i == 1)
-            overlay = StackBlur.blur(overlay, (int) radius, false);
-            // Bitmap JNI Native
-        else if (i == 2)
-            overlay = StackBlur.blurNatively(overlay, (int) radius, false);
+
+        if (i == 1) {
+            // Java
+            overlay = Blur.onStackBlurJava(overlay, (int) radius);
+        } else if (i == 2) {
             // Pixels JNI Native
-        else if (i == 3)
-            overlay = StackBlur.blurNativelyPixels(overlay, (int) radius, false);
+            int w = overlay.getWidth();
+            int h = overlay.getHeight();
+            int[] pix = new int[w * h];
+            overlay.getPixels(pix, 0, w, 0, 0, w, h);
+            // Jni Pixels Blur
+            pix = Blur.onStackBlurPixels(pix, w, h, (int) radius);
+            overlay.setPixels(pix, 0, w, 0, 0, w, h);
+        } else if (i == 3) {
+            // Bitmap JNI Native
+            overlay = Blur.onStackBlur(overlay, (int) radius);
+        }
 
         // Show
         showDrawable(view, overlay);

caprice/app/src/main/java/net/qiujuer/sample/genius/BlurClipActivity.java

@@ -0,0 +1,81 @@
+package net.qiujuer.sample.genius;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.ImageView;
+
+import net.qiujuer.genius.graphics.Blur;
+
+public class BlurClipActivity extends AppCompatActivity {
+    private Bitmap mSrc1;
+    private Bitmap mSrc2;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_blur_clip);
+
+        try {
+            // Find Bitmap
+            Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.mipmap.walkthrough);
+            mSrc1 = bitmap.copy(bitmap.getConfig(), true);
+            mSrc2 = bitmap.copy(bitmap.getConfig(), true);
+            bitmap.recycle();
+        } catch (OutOfMemoryError error) {
+            error.printStackTrace();
+            finish();
+        }
+
+        findViewById(R.id.btn_todo1).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                clipBlur();
+            }
+        });
+        findViewById(R.id.btn_todo2).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                blur();
+            }
+        });
+        findViewById(R.id.btn_clear).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                clear();
+            }
+        });
+    }
+
+    private void clear() {
+        Drawable drawable = ((ImageView) findViewById(R.id.iv_show1)).getDrawable();
+        if (drawable != null && drawable instanceof BitmapDrawable) {
+            ((ImageView) findViewById(R.id.iv_show1)).setImageDrawable(null);
+            ((BitmapDrawable) drawable).getBitmap().recycle();
+        }
+    }
+
+    private void clipBlur() {
+        ((ImageView) findViewById(R.id.iv_show1)).setImageBitmap(Blur.onStackBlurClip(mSrc1, 120));
+    }
+
+    private void blur() {
+        ((ImageView) findViewById(R.id.iv_show1)).setImageBitmap(Blur.onStackBlur(mSrc2, 120));
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mSrc1 != null && !mSrc1.isRecycled())
+            mSrc1.recycle();
+        if (mSrc2 != null && !mSrc2.isRecycled())
+            mSrc2.recycle();
+
+        System.gc();
+    }
+}

caprice/sample/src/main/java/net/qiujuer/sample/genius/KitActivity.java → caprice/app/src/main/java/net/qiujuer/sample/genius/KitActivity.java

@@ -8,7 +8,6 @@
 import android.view.View;
 import android.widget.TextView;
 
-import net.qiujuer.genius.kit.Kit;
 import net.qiujuer.genius.kit.cmd.Cmd;
 import net.qiujuer.genius.kit.cmd.Command;
 import net.qiujuer.genius.kit.cmd.DnsResolve;
@@ -57,9 +56,9 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void init() {
-        Application kitApp = Kit.getApplication();
+        //Application kitApp = Kit.getApplication();
         Application application = getApplication();
-        showLog(TAG, "Kit.getApplication() eq getApplication() is:" + (kitApp == application));
+        //showLog(TAG, "Kit.getApplication() eq getApplication() is:" + (kitApp == application));
         Cmd.init(application);
     }