Skip to content

Commit

Permalink
see 12/13 log
Browse files Browse the repository at this point in the history
  • Loading branch information
Blankj committed Dec 13, 2018
1 parent dbf64da commit 812ca69
Show file tree
Hide file tree
Showing 20 changed files with 283 additions and 102 deletions.
32 changes: 0 additions & 32 deletions launcher/app/src/main/java/com/blankj/launcher/app/UtilsApp.java
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down Expand Up @@ -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();
}
});
}


Expand All @@ -79,11 +52,6 @@ private Bitmap getBitmapForView(View src) {

return bitmap;
}

@BusUtils.Subscribe(name = "showDialog")
public static void showDialog() {
DialogHelper.showOpenAppSettingDialog();
}
}


67 changes: 10 additions & 57 deletions launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -56,26 +57,9 @@ class MainActivity : BaseDrawerActivity() {
}

launcherMainSubUtilBtn.setOnClickListener {
BusUtils.post<Any>("showDialog")
// BusUtils.post<Any>("SubUtilActivity#start", this)
BusUtils.post<Any>("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);

}

Expand All @@ -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()
}
}
1 change: 0 additions & 1 deletion lib/base/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/base/src/main/res/values-v27/styles.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
Expand Down
2 changes: 1 addition & 1 deletion lib/base/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.DayNight">
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
includeModule\
':buildSrc',
':bus-gradle-plugin',
':launcher',
':-launcher',
':lib',
':subutil',
':-subutil',
':utilcode'

// 如果 name 以 '-' 开头,则剔除在外
Expand Down
10 changes: 5 additions & 5 deletions utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@ public void onActivityResumed(Activity activity) {

@Override
public void onActivityPaused(Activity activity) {/**/

}

@Override
public void onActivityStopped(Activity activity) {
if (activity.isChangingConfigurations()) {
--mConfigCount;
} else {
Expand All @@ -214,11 +219,6 @@ public void onActivityPaused(Activity activity) {/**/
}
}

@Override
public void onActivityStopped(Activity activity) {

}

@Override
public void onActivitySaveInstanceState(Activity activity, Bundle outState) {/**/}

Expand Down
1 change: 1 addition & 0 deletions utilcode/pkg/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ apply {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
api project(':lib-base')
api 'com.jaredrummler:android-processes:1.1.1'
}
8 changes: 7 additions & 1 deletion utilcode/pkg/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@
<activity
android:name=".pkg.feature.bar.BarStatusSwipeBackActivity"
android:launchMode="singleTop" />
<activity
android:name=".pkg.feature.blur.BlurActivity"
android:launchMode="singleTop" />
<activity
android:name=".pkg.feature.blur.TransparentActivity"
android:theme="@style/ActivityTranslucent"
android:launchMode="singleTop" />
<activity
android:name=".pkg.feature.clean.CleanActivity"
android:launchMode="singleTop" />
Expand Down Expand Up @@ -156,7 +163,6 @@
<meta-data
android:name="app_meta_data"
android:value="AppMetaData" />

</application>


Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.blankj.utilcode.pkg.feature.adaptScreen.AdaptScreenActivity;
import com.blankj.utilcode.pkg.feature.app.AppActivity;
import com.blankj.utilcode.pkg.feature.bar.BarActivity;
import com.blankj.utilcode.pkg.feature.blur.BlurActivity;
import com.blankj.utilcode.pkg.feature.clean.CleanActivity;
import com.blankj.utilcode.pkg.feature.device.DeviceActivity;
import com.blankj.utilcode.pkg.feature.fragment.FragmentActivity;
Expand All @@ -32,7 +33,6 @@
import com.blankj.utilcode.pkg.feature.span.SpanActivity;
import com.blankj.utilcode.pkg.feature.toast.ToastActivity;
import com.blankj.utilcode.util.BusUtils;
import com.blankj.utilcode.util.Utils;

/**
* <pre>
Expand Down Expand Up @@ -62,7 +62,6 @@ public int bindLayout() {

@Override
public void initView(Bundle savedInstanceState, View contentView) {
Utils.getApp();
setTitle(R.string.core_util);
}

Expand Down Expand Up @@ -96,6 +95,10 @@ public void barClick(View view) {
BarActivity.start(this);
}

public void blurClick(View view) {
BlurActivity.start(this);
}

public void cleanClick(View view) {
CleanActivity.start(this);
}
Expand Down
Loading

0 comments on commit 812ca69

Please sign in to comment.