Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/swiftcleaner/chovey/view/activity/StartActivity.java

app/src/main/java/com/swiftcleaner/chovey/view/ExampleApplication.java

@@ -6,17 +6,6 @@ public class ExampleApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-//        JPushInterface.setDebugMode(true);
-//
-//        // 调整点一：初始化代码前增加setAuth调用
-//        boolean isPrivacyReady = false; // app根据是否已弹窗获取隐私授权来赋值
-//        if(!isPrivacyReady){
-//            JCollectionAuth.setAuth(context, false); // 后续初始化过程将被拦截
-//        }
-//        JPushInterface.init();
-//
-//
-//        // 调整点二：隐私政策授权获取成功后调用
-//        JCollectionAuth.setAuth(context, true); //如初始化被拦截过，将重试初始化过程
+
     }
 }

app/src/main/java/com/swiftcleaner/chovey/view/activity/StartActivity.java

@@ -224,12 +224,12 @@ public class StartActivity extends AppCompatActivity {
         }
 
         if (Objects.equals(actionId, FUNCTION_APP_MANAGER)) {
-            startActivity(new Intent(this, MainActivity.class));
+            startActivity(new Intent(this, BatteryInfoActivity.class));
             finish();
             return;
         }
         if (Objects.equals(actionId, FUNCTION_BATTERY)) {
-            startActivity(new Intent(this, BatteryInfoActivity.class));
+            startActivity(new Intent(this, InfoActivity.class));
             finish();
             return;
         }

app/src/main/java/com/zxdemo/ZxApplication.kt

@@ -58,6 +58,8 @@ class ZxApplication : Application() {
         startOmgNotification()
         AdmobHelper.init(this, {}, {})
 
+        AppInstallReceiver.registerReceiver(context)
+        UnlockReceiver.mIsScreenOn
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
@@ -147,7 +149,6 @@ class ZxApplication : Application() {
 
         val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
         isDeviceLocked = keyguardManager.isKeyguardLocked
-
     }
 
 }
\ No newline at end of file

app/src/main/java/com/zxdemo/receiver/AppInstallReceiver.kt

@@ -34,6 +34,7 @@ class AppInstallReceiver : BroadcastReceiver() {
 
     @RequiresApi(Build.VERSION_CODES.O)
     override fun onReceive(context: Context, intent: Intent) {
+        Log.d("111sss", "111")
 //获取当前时间和上一次推送的时间
         var current = LocalDateTime.now()
         val intervalTime = 1L //间隔时间(分钟)