From 812ca6909b29acf3c99cffcd30c8bd5c9fee13c9 Mon Sep 17 00:00:00 2001 From: Blankj <625783482@qq.com> Date: Thu, 13 Dec 2018 21:37:37 +0800 Subject: [PATCH] see 12/13 log --- .../com/blankj/launcher/app/UtilsApp.java | 32 ---- .../com/blankj/launcher/pkg/MainActivity.kt | 67 ++------- lib/base/build.gradle | 1 - lib/base/src/main/res/values-v27/styles.xml | 2 +- lib/base/src/main/res/values/styles.xml | 2 +- settings.gradle | 4 +- .../java/com/blankj/utilcode/util/Utils.java | 10 +- utilcode/pkg/build.gradle | 1 + utilcode/pkg/src/main/AndroidManifest.xml | 8 +- .../src/main/assets/fonts/dnmbhs.ttf | Bin .../src/main/assets/test/sub/test.txt | 0 .../src/main/assets/test/test.txt | 0 .../{app => pkg}/src/main/assets/test_install | Bin .../pkg/feature/CoreUtilActivity.java | 7 +- .../pkg/feature/blur/BlurActivity.java | 141 ++++++++++++++++++ .../pkg/feature/blur/InputReceiver.java | 51 +++++++ .../pkg/feature/blur/TransparentActivity.java | 30 ++++ .../pkg/src/main/res/layout/activity_blur.xml | 18 +++ .../main/res/layout/activity_util_core.xml | 7 + utilcode/pkg/src/main/res/values/strings.xml | 4 + 20 files changed, 283 insertions(+), 102 deletions(-) rename utilcode/{app => pkg}/src/main/assets/fonts/dnmbhs.ttf (100%) rename utilcode/{app => pkg}/src/main/assets/test/sub/test.txt (100%) rename utilcode/{app => pkg}/src/main/assets/test/test.txt (100%) rename utilcode/{app => pkg}/src/main/assets/test_install (100%) create mode 100644 utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/blur/BlurActivity.java create mode 100644 utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/blur/InputReceiver.java create mode 100644 utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/blur/TransparentActivity.java create mode 100644 utilcode/pkg/src/main/res/layout/activity_blur.xml diff --git a/launcher/app/src/main/java/com/blankj/launcher/app/UtilsApp.java b/launcher/app/src/main/java/com/blankj/launcher/app/UtilsApp.java index aa6cd1ec5f..7ba1e87325 100644 --- a/launcher/app/src/main/java/com/blankj/launcher/app/UtilsApp.java +++ b/launcher/app/src/main/java/com/blankj/launcher/app/UtilsApp.java @@ -1,22 +1,15 @@ package com.blankj.launcher.app; -import android.app.Activity; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; import android.view.View; -import android.view.ViewGroup; -import android.view.WindowManager; -import android.widget.ImageView; import com.blankj.base.BaseApplication; import com.blankj.subutil.pkg.helper.DialogHelper; -import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.AppUtils; import com.blankj.utilcode.util.BusUtils; -import com.blankj.utilcode.util.ImageUtils; import com.blankj.utilcode.util.LogUtils; -import com.blankj.utilcode.util.ScreenUtils; import com.blankj.utilcode.util.Utils; /** @@ -44,26 +37,6 @@ protected void attachBaseContext(Context base) { public void onCreate() { super.onCreate(); sInstance = this; - AppUtils.registerAppStatusChangedListener(this, new Utils.OnAppStatusChangedListener() { - @Override - public void onForeground() { -// Activity topActivity = ActivityUtils.getTopActivity(); -// if (topActivity == null) return; -// ViewGroup decorView = (ViewGroup) topActivity.getWindow().getDecorView(); -// View blur = decorView.findViewWithTag("blur"); -// if (blur == null) return; -// decorView.removeView(blur); - - LogUtils.i(); - } - - @Override - public void onBackground() { - - - LogUtils.i(); - } - }); } @@ -79,11 +52,6 @@ private Bitmap getBitmapForView(View src) { return bitmap; } - - @BusUtils.Subscribe(name = "showDialog") - public static void showDialog() { - DialogHelper.showOpenAppSettingDialog(); - } } diff --git a/launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt b/launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt index 6df55ef848..a0595ba7ef 100644 --- a/launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt +++ b/launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt @@ -1,22 +1,23 @@ package com.blankj.launcher.pkg +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter import android.graphics.Color -import android.opengl.Visibility import android.os.Bundle import android.support.v7.app.ActionBarDrawerToggle +import android.view.KeyEvent import android.view.View -import android.view.ViewGroup -import android.view.WindowManager import android.widget.ImageView import com.blankj.base.BaseDrawerActivity import com.blankj.launcher.R -import com.blankj.utilcode.util.ActivityUtils -import com.blankj.utilcode.util.BarUtils -import com.blankj.utilcode.util.BusUtils -import com.blankj.utilcode.util.ImageUtils +import com.blankj.utilcode.util.* import kotlinx.android.synthetic.main.activity_main.* + + /** * ``` * author: Blankj @@ -56,26 +57,9 @@ class MainActivity : BaseDrawerActivity() { } launcherMainSubUtilBtn.setOnClickListener { - BusUtils.post("showDialog") -// BusUtils.post("SubUtilActivity#start", this) + BusUtils.post("SubUtilActivity#start", this) } - - - contentView.post(Runnable { - val topActivity = ActivityUtils.getTopActivity() ?: return@Runnable - val decorView = topActivity.window.decorView as ViewGroup - val bitmapForView = ImageUtils.view2Bitmap(decorView) - - val bitmap = ImageUtils.fastBlur(bitmapForView, 0.125f, 2f, true, true) - - view = ImageView(topActivity) - view?.setImageBitmap(bitmap) - view?.tag = "blur" - decorView.addView(view, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) - view?.visibility = View.GONE - }) - - getWindow().setFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND, WindowManager.LayoutParams.FLAG_BLUR_BEHIND); +// getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE); } @@ -90,35 +74,4 @@ class MainActivity : BaseDrawerActivity() { override fun onBackPressed() { ActivityUtils.startHomeActivity() } - - override fun onResume() { - view?.visibility = View.GONE - super.onResume() - } - - override fun onPause() { - view?.visibility = View.VISIBLE -// val topActivity = ActivityUtils.getTopActivity() ?: return -// val decorView = topActivity.window.decorView as ViewGroup -// val bitmapForView = ImageUtils.view2Bitmap(decorView) -// -// val bitmap = ImageUtils.fastBlur(bitmapForView, 0.125f, 2f, true, true) -// -// val view = ImageView(topActivity) -// view.setImageBitmap(bitmap) -// view.tag = "blur" -// decorView.addView(view, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) -// val windowManager = topActivity.windowManager -// val mParams = WindowManager.LayoutParams() -// -// mParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL -// mParams.height = WindowManager.LayoutParams.MATCH_PARENT -// mParams.width = WindowManager.LayoutParams.MATCH_PARENT -// -// val view = ImageView(topActivity) -// view.setImageBitmap(bitmap) -// view.tag = "blur" -// windowManager.addView(view, mParams) - super.onPause() - } } diff --git a/lib/base/build.gradle b/lib/base/build.gradle index 2969515ecc..a73b5cbb12 100644 --- a/lib/base/build.gradle +++ b/lib/base/build.gradle @@ -5,7 +5,6 @@ apply { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') api project(':utilcode-lib') - api project(':subutil-lib') api dep.support.appcompat_v7 api dep.support.design diff --git a/lib/base/src/main/res/values-v27/styles.xml b/lib/base/src/main/res/values-v27/styles.xml index 5bff7f9152..4c19777add 100644 --- a/lib/base/src/main/res/values-v27/styles.xml +++ b/lib/base/src/main/res/values-v27/styles.xml @@ -1,7 +1,7 @@ -