Skip to content

Commit 812ca69

Browse files
BlankjBlankj
committed
see 12/13 log
1 parent dbf64da commit 812ca69

File tree

20 files changed

+283
-102
lines changed

20 files changed

+283
-102
lines changed

‎launcher/app/src/main/java/com/blankj/launcher/app/UtilsApp.java‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
package com.blankj.launcher.app;
22

3-
import android.app.Activity;
43
import android.content.Context;
54
import android.graphics.Bitmap;
65
import android.graphics.Canvas;
76
import android.view.View;
8-
import android.view.ViewGroup;
9-
import android.view.WindowManager;
10-
import android.widget.ImageView;
117

128
import com.blankj.base.BaseApplication;
139
import com.blankj.subutil.pkg.helper.DialogHelper;
14-
import com.blankj.utilcode.util.ActivityUtils;
1510
import com.blankj.utilcode.util.AppUtils;
1611
import com.blankj.utilcode.util.BusUtils;
17-
import com.blankj.utilcode.util.ImageUtils;
1812
import com.blankj.utilcode.util.LogUtils;
19-
import com.blankj.utilcode.util.ScreenUtils;
2013
import com.blankj.utilcode.util.Utils;
2114

2215
/**
@@ -44,26 +37,6 @@ protected void attachBaseContext(Context base) {
4437
public void onCreate() {
4538
super.onCreate();
4639
sInstance = this;
47-
AppUtils.registerAppStatusChangedListener(this, new Utils.OnAppStatusChangedListener() {
48-
@Override
49-
public void onForeground() {
50-
// Activity topActivity = ActivityUtils.getTopActivity();
51-
// if (topActivity == null) return;
52-
// ViewGroup decorView = (ViewGroup) topActivity.getWindow().getDecorView();
53-
// View blur = decorView.findViewWithTag("blur");
54-
// if (blur == null) return;
55-
// decorView.removeView(blur);
56-
57-
LogUtils.i();
58-
}
59-
60-
@Override
61-
public void onBackground() {
62-
63-
64-
LogUtils.i();
65-
}
66-
});
6740
}
6841

6942

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

8053
return bitmap;
8154
}
82-
83-
@BusUtils.Subscribe(name = "showDialog")
84-
public static void showDialog() {
85-
DialogHelper.showOpenAppSettingDialog();
86-
}
8755
}
8856

8957

‎launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt‎

Lines changed: 10 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
package com.blankj.launcher.pkg
22

3+
import android.content.BroadcastReceiver
4+
import android.content.Context
5+
import android.content.Intent
6+
import android.content.IntentFilter
37
import android.graphics.Color
4-
import android.opengl.Visibility
58
import android.os.Bundle
69
import android.support.v7.app.ActionBarDrawerToggle
10+
import android.view.KeyEvent
711
import android.view.View
8-
import android.view.ViewGroup
9-
import android.view.WindowManager
1012
import android.widget.ImageView
1113
import com.blankj.base.BaseDrawerActivity
1214
import com.blankj.launcher.R
13-
import com.blankj.utilcode.util.ActivityUtils
14-
import com.blankj.utilcode.util.BarUtils
15-
import com.blankj.utilcode.util.BusUtils
16-
import com.blankj.utilcode.util.ImageUtils
15+
import com.blankj.utilcode.util.*
1716
import kotlinx.android.synthetic.main.activity_main.*
1817

1918

19+
20+
2021
/**
2122
* ```
2223
* author: Blankj
@@ -56,26 +57,9 @@ class MainActivity : BaseDrawerActivity() {
5657
}
5758

5859
launcherMainSubUtilBtn.setOnClickListener {
59-
BusUtils.post<Any>("showDialog")
60-
// BusUtils.post<Any>("SubUtilActivity#start", this)
60+
BusUtils.post<Any>("SubUtilActivity#start", this)
6161
}
62-
63-
64-
contentView.post(Runnable {
65-
val topActivity = ActivityUtils.getTopActivity() ?: return@Runnable
66-
val decorView = topActivity.window.decorView as ViewGroup
67-
val bitmapForView = ImageUtils.view2Bitmap(decorView)
68-
69-
val bitmap = ImageUtils.fastBlur(bitmapForView, 0.125f, 2f, true, true)
70-
71-
view = ImageView(topActivity)
72-
view?.setImageBitmap(bitmap)
73-
view?.tag = "blur"
74-
decorView.addView(view, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
75-
view?.visibility = View.GONE
76-
})
77-
78-
getWindow().setFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND, WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
62+
// getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
7963

8064
}
8165

@@ -90,35 +74,4 @@ class MainActivity : BaseDrawerActivity() {
9074
override fun onBackPressed() {
9175
ActivityUtils.startHomeActivity()
9276
}
93-
94-
override fun onResume() {
95-
view?.visibility = View.GONE
96-
super.onResume()
97-
}
98-
99-
override fun onPause() {
100-
view?.visibility = View.VISIBLE
101-
// val topActivity = ActivityUtils.getTopActivity() ?: return
102-
// val decorView = topActivity.window.decorView as ViewGroup
103-
// val bitmapForView = ImageUtils.view2Bitmap(decorView)
104-
//
105-
// val bitmap = ImageUtils.fastBlur(bitmapForView, 0.125f, 2f, true, true)
106-
//
107-
// val view = ImageView(topActivity)
108-
// view.setImageBitmap(bitmap)
109-
// view.tag = "blur"
110-
// decorView.addView(view, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
111-
// val windowManager = topActivity.windowManager
112-
// val mParams = WindowManager.LayoutParams()
113-
//
114-
// mParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL
115-
// mParams.height = WindowManager.LayoutParams.MATCH_PARENT
116-
// mParams.width = WindowManager.LayoutParams.MATCH_PARENT
117-
//
118-
// val view = ImageView(topActivity)
119-
// view.setImageBitmap(bitmap)
120-
// view.tag = "blur"
121-
// windowManager.addView(view, mParams)
122-
super.onPause()
123-
}
12477
}

‎lib/base/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ apply {
55
dependencies {
66
implementation fileTree(include: ['*.jar'], dir: 'libs')
77
api project(':utilcode-lib')
8-
api project(':subutil-lib')
98

109
api dep.support.appcompat_v7
1110
api dep.support.design

‎lib/base/src/main/res/values-v27/styles.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<resources>
22

33
<!-- Base application theme. -->
4-
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
4+
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
55
<!-- Customize your theme here. -->
66
<item name="colorPrimary">@color/colorPrimary</item>
77
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>

‎lib/base/src/main/res/values/styles.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<resources>
22

33
<!-- Base application theme. -->
4-
<style name="AppTheme" parent="Theme.AppCompat.DayNight">
4+
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
55
<!-- Customize your theme here. -->
66
<item name="colorPrimary">@color/colorPrimary</item>
77
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>

‎settings.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
includeModule\
22
':buildSrc',
33
':bus-gradle-plugin',
4-
':launcher',
4+
':-launcher',
55
':lib',
6-
':subutil',
6+
':-subutil',
77
':utilcode'
88

99
// 如果 name 以 '-' 开头，则剔除在外

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,11 @@ public void onActivityResumed(Activity activity) {
204204

205205
@Override
206206
public void onActivityPaused(Activity activity) {/**/
207+
208+
}
209+
210+
@Override
211+
public void onActivityStopped(Activity activity) {
207212
if (activity.isChangingConfigurations()) {
208213
--mConfigCount;
209214
} else {
@@ -214,11 +219,6 @@ public void onActivityPaused(Activity activity) {/**/
214219
}
215220
}
216221

217-
@Override
218-
public void onActivityStopped(Activity activity) {
219-
220-
}
221-
222222
@Override
223223
public void onActivitySaveInstanceState(Activity activity, Bundle outState) {/**/}
224224

‎utilcode/pkg/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ apply {
55
dependencies {
66
implementation fileTree(dir: 'libs', include: ['*.jar'])
77
api project(':lib-base')
8+
api 'com.jaredrummler:android-processes:1.1.1'
89
}

‎utilcode/pkg/src/main/AndroidManifest.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,13 @@
8989
<activity
9090
android:name=".pkg.feature.bar.BarStatusSwipeBackActivity"
9191
android:launchMode="singleTop" />
92+
<activity
93+
android:name=".pkg.feature.blur.BlurActivity"
94+
android:launchMode="singleTop" />
95+
<activity
96+
android:name=".pkg.feature.blur.TransparentActivity"
97+
android:theme="@style/ActivityTranslucent"
98+
android:launchMode="singleTop" />
9299
<activity
93100
android:name=".pkg.feature.clean.CleanActivity"
94101
android:launchMode="singleTop" />
@@ -156,7 +163,6 @@
156163
<meta-data
157164
android:name="app_meta_data"
158165
android:value="AppMetaData" />
159-
160166
</application>
161167

162168

utilcode/app/src/main/assets/fonts/dnmbhs.ttf renamed to utilcode/pkg/src/main/assets/fonts/dnmbhs.ttf

File renamed without changes.

0 commit comments

Comments
 (0)