see 12/14 log

Blankj · Dec 14, 2018 · cce9449 · cce9449
1 parent 812ca69
commit cce9449
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 45 deletions.
diff --git a/config_app.gradle b/config_app.gradle
@@ -21,9 +21,16 @@ android {
     }
 
     buildTypes {
+//        debug {
+//            minifyEnabled true
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+//            for (int i = 0; i < consumerProguardFiles.size(); i++) {
+//                println consumerProguardFiles[i].getAbsolutePath() + "<111"
+//            }
+////             consumerProguardFiles[0] + ",111 " + consumerProguardFiles[1].getAbsolutePath()
+//        }
         release {
             minifyEnabled true
-            consumerProguardFiles 'proguard-rules.pro'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -61,7 +68,7 @@ def configSigning(Project pro) {
         properties.load(new FileInputStream(signPropertiesFile))
         signingConfigs {
             release {
-                storeFile file(properties['keystore'])
+                storeFile new File(signPropertiesFile.getParent(), properties['keystore'])
                 storePassword properties['storePassword']
                 keyAlias properties['keyAlias']
                 keyPassword properties['keyPassword']

diff --git a/sign/keystore.properties b/sign/keystore.properties
@@ -1,4 +1,4 @@
-keystore=sign/keystore.jks
+keystore=keystore.jks
 storePassword=utilcode
 keyAlias=utilcode
 keyPassword=utilcode
diff --git a/utilcode/app/build.gradle b/utilcode/app/build.gradle
@@ -5,4 +5,5 @@ apply {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':utilcode-pkg')
+    api dep.free_proguard
 }
diff --git a/utilcode/lib/proguard-rules.pro b/utilcode/lib/proguard-rules.pro
@@ -16,6 +16,6 @@
 #   public *;
 #}
 
-#-keep class com.blankj.utilcode.** { *; }
-#-keepclassmembers class com.blankj.utilcode.** { *; }
+-keep class com.blankj.utilcode.** { *; }
+-keepclassmembers class com.blankj.utilcode.** { *; }
 -dontwarn com.blankj.utilcode.**
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java
@@ -160,8 +160,9 @@ static class ActivityLifecycleImpl implements ActivityLifecycleCallbacks {
 
         private OnActivityDestroyedListener mOnActivityDestroyedListener;
 
-        private int mForegroundCount = 0;
-        private int mConfigCount     = 0;
+        private int     mForegroundCount = 0;
+        private int     mConfigCount     = 0;
+        private boolean mIsBackground    = false;
 
         OnActivityDestroyedListener getOnActivityDestroyedListener() {
             return mOnActivityDestroyedListener;
@@ -186,9 +187,8 @@ public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
 
         @Override
         public void onActivityStarted(Activity activity) {
-            setTopActivity(activity);
-            if (mForegroundCount <= 0) {
-                postStatus(true);
+            if (!mIsBackground) {
+                setTopActivity(activity);
             }
             if (mConfigCount < 0) {
                 ++mConfigCount;
@@ -200,6 +200,10 @@ public void onActivityStarted(Activity activity) {
         @Override
         public void onActivityResumed(Activity activity) {
             setTopActivity(activity);
+            if (mIsBackground) {
+                mIsBackground = false;
+                postStatus(true);
+            }
         }
 
         @Override
@@ -214,6 +218,7 @@ public void onActivityStopped(Activity activity) {
             } else {
                 --mForegroundCount;
                 if (mForegroundCount <= 0) {
+                    mIsBackground = true;
                     postStatus(false);
                 }
             }

diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/blur/BlurActivity.java b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/blur/BlurActivity.java
@@ -17,6 +17,7 @@
 import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.ImageUtils;
 import com.blankj.utilcode.util.LogUtils;
+import com.blankj.utilcode.util.Utils;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -44,7 +45,7 @@ public void initData(@Nullable Bundle bundle) {
 
     @Override
     public int bindLayout() {
-        this.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
+//        this.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
         return R.layout.activity_blur;
     }
 
@@ -55,24 +56,19 @@ public void initView(@Nullable Bundle savedInstanceState, @NotNull View contentV
 
     @Override
     public void doBusiness() {
-//        AppUtils.registerAppStatusChangedListener(this, new Utils.OnAppStatusChangedListener() {
-//            @Override
-//            public void onForeground() {
-//                BlurActivity.leave(false);
-//            }
-//
-//            @Override
-//            public void onBackground() {
-//                BlurActivity.leave(true);
-//            }
-//        });
-        mContentView.postDelayed(new Runnable() {
+        AppUtils.registerAppStatusChangedListener(this, new Utils.OnAppStatusChangedListener() {
             @Override
-            public void run() {
-                DialogHelper.showAdaptScreenDialog();
+            public void onForeground() {
+                LogUtils.e();
+                BlurActivity.leave(false);
             }
-        }, 1000);
 
+            @Override
+            public void onBackground() {
+                LogUtils.e();
+                BlurActivity.leave(true);
+            }
+        });
     }
 
     @Override
@@ -91,24 +87,17 @@ protected void onResume() {
         super.onResume();
     }
 
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        if (hasFocus) {
-            leave(false);
-            LogUtils.e();
-        } else {
-            leave(true);
-            LogUtils.e();
-        }
-        super.onWindowFocusChanged(hasFocus);
-    }
-
-    @Override
-    protected void onUserLeaveHint() {
-        leave(true);
-        LogUtils.e();
-        super.onUserLeaveHint();
-    }
+//    @Override
+//    public void onWindowFocusChanged(boolean hasFocus) {
+//        if (hasFocus) {
+//            leave(false);
+//            LogUtils.e();
+//        } else {
+//            leave(true);
+//            LogUtils.e();
+//        }
+//        super.onWindowFocusChanged(hasFocus);
+//    }
 
 
     public static void leave(boolean isBlur) {
@@ -129,7 +118,7 @@ public static void leave(boolean isBlur) {
                         view,
                         new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
                 );
-                TransparentActivity.start();
+//                TransparentActivity.start();
             }
         } else {
             if (!isBlur) {

diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/blur/TransparentActivity.java b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/blur/TransparentActivity.java
@@ -26,5 +26,6 @@ public static void start() {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        finish();
     }
 }