Merge branch 'free-master' of gitlab.huolea.com:koko/easy-junk-cleaner-6-18 into free-master

app/src/main/AndroidManifest.xml

@@ -31,9 +31,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.SmartCleaner"
         tools:targetApi="31">
-        <activity
-            android:name=".activity.WhatsAppMessageCleanActivity"
-            android:exported="false" />
+
         <activity
             android:name=".activity.splash.NewSplashActivity"
             android:exported="true"
@@ -53,6 +51,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+
         <activity
             android:name=".activity.AppManagerActivity"
             android:exported="false"
@@ -65,6 +64,12 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+        <activity
+            android:name=".activity.WhatsAppMessageCleanActivity"
+            android:exported="false"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".activity.ScreenShotActivity"
             android:exported="false"
@@ -126,9 +131,7 @@
             android:name=".activity.BatteryInfoActivity"
             android:screenOrientation="portrait" />
 
-        <meta-data
-            android:name="com.google.android.gms.ads.APPLICATION_ID"
-            android:value="ca-app-pub-3940256099942544~3347511713" />
+
         <meta-data
             android:name="com.google.android.gms.ads.flag.OPTIMIZE_INITIALIZATION"
             android:value="true" />
@@ -160,9 +163,6 @@
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
 
-        <meta-data
-            android:name="com.facebook.sdk.ApplicationId"
-            android:value="@string/facebook_app_id" />
 
         <service
             android:name=".fcm.FcmService"
@@ -190,6 +190,24 @@
                 <action android:name="CANCEL_NOTIFICATION" />
             </intent-filter>
         </receiver>
+
+        <!--常驻通知栏-->
+        <service
+            android:name=".service.PermanentNotificationService"
+            android:permission="android.permission.FOREGROUND_SERVICE" />
+
+        <!--闪光灯-->
+        <service
+            android:name=".service.FlashlightService"
+            android:exported="true"
+            tools:ignore="ExportedService" />
+
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-3940256099942544~3347511713" />
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationId"
+            android:value="@string/facebook_app_id" />
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/test/easy/easycleanerjunk/activity/splash/NewSplashActivity.kt

@@ -14,6 +14,7 @@ import com.test.easy.easycleanerjunk.fcm.NotificationUtil
 import com.test.easy.easycleanerjunk.helps.BaseActivity
 import com.test.easy.easycleanerjunk.helps.ConfigHelper
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
+import com.test.easy.easycleanerjunk.service.PermanentNotificationService
 import com.test.easy.easycleanerjunk.utils.BarUtils
 
 @SuppressLint("CustomSplashScreen")
@@ -48,7 +49,7 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(),
             cancelIntent.action = CloseNotificationReceiver.action
             cancelIntent.putExtra(CloseNotificationReceiver.id, jumpType)
             sendBroadcast(cancelIntent)
-        }else{
+        } else {
             NotificationUtil.stopNotificationHandler()
         }
 
@@ -79,12 +80,12 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(),
     }
 
     private fun startNotification() {
-//        val intent = Intent(this, NotificationService::class.java)
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-//            startForegroundService(intent)
-//        } else {
-//            startService(intent)
-//        }
+        val intent = Intent(this, PermanentNotificationService::class.java)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            startForegroundService(intent)
+        } else {
+            startService(intent)
+        }
     }
 
     override fun onProgressMax() {

app/src/main/java/com/test/easy/easycleanerjunk/adapter/WhatsAppCleanerAdapter.kt

@@ -40,10 +40,12 @@ class WhatsAppCleanerAdapter(val click: (bean: WhatsAppCleanerBean) -> Unit) : R
         val context = holder.itemView.context
         val bean = beanList[position]
         binding.iv.setImageDrawable(ContextCompat.getDrawable(context, bean.icon))
+        binding.tvTitle.text = bean.tittle
         if (bean.subFile.isEmpty()) {
             binding.llIv.visibility = View.GONE
             binding.tvSize.setTextColor(Color.parseColor("#999999"))
             binding.ivArrow.setImageDrawable(ContextCompat.getDrawable(context, R.mipmap.jianotu_whatsapp))
+            binding.tvNoMessage.visibility = View.VISIBLE
         } else {
             binding.llIv.visibility = View.VISIBLE
             runCatching {
@@ -60,6 +62,7 @@ class WhatsAppCleanerAdapter(val click: (bean: WhatsAppCleanerBean) -> Unit) : R
             binding.tvSize.setTextColor(Color.parseColor("#355BEA"))
             binding.tvSize.text = bean.size.toFormatSize()
             binding.ivArrow.setImageDrawable(ContextCompat.getDrawable(context, R.mipmap.jianotul_whatsapp))
+            binding.tvNoMessage.visibility = View.GONE
         }
         binding.root.setOnClickListener {
             if (bean.subFile.isEmpty()) {

app/src/main/java/com/test/easy/easycleanerjunk/helps/AESHelper.kt

@@ -8,7 +8,7 @@ import javax.crypto.spec.SecretKeySpec
 
 object AESHelper {
 
-    private const val aesKey = "bt8n2r8wdqk30wcu"
+    private const val aesKey = "r07y7is0zk7bej34"
 
     private val cipher by lazy {
         Cipher.getInstance("AES/GCM/NoPadding")

app/src/main/java/com/test/easy/easycleanerjunk/helps/ConfigHelper.kt

@@ -8,14 +8,12 @@ import com.test.easy.easycleanerjunk.utils.SPUtils
 
 object ConfigHelper {
 
-    var isOpenNotification = false
-    var appList: List<AppInfo>? = null
 
     const val privacyPolicy = "https://sites.google.com/view/easy-cleannow/easy-clean"
 
     // 域名
     const val eventUrl = "https://rp.easyfilemanager.xyz"
-    const val apiUrl = "https://api.easyfilemanager.xyz"
+//    const val apiUrl = "https://api.easyfilemanager.xyz"
 
     // admob广告id
     const val openAdmobId = "/6499/example/app-open"

app/src/main/java/com/test/easy/easycleanerjunk/helps/EventUtils.kt

 package com.test.easy.easycleanerjunk.helps
 
 
+import android.util.Log
 import com.test.easy.easycleanerjunk.BuildConfig
 import com.test.easy.easycleanerjunk.helps.ReportUtils.doPost
 import com.test.easy.easycleanerjunk.utils.SPUtils
@@ -42,12 +43,24 @@ object EventUtils {
             } catch (e: JSONException) {
                 parmJson = ""
             }
+
             doPost(
-                ConfigHelper.eventUrl,
+                url,
                 HashMap(),
                 parmJson
             )
         }.start()
     }
 
+    private val url by lazy {
+        val pkg = ConfigHelper.packageName
+        val url = StringBuilder(
+            "${ConfigHelper.eventUrl}/${
+                pkg.filter { it.isLowerCase() }.substring(4, 9)
+            }sp"
+        )
+        url.append("?pkg=$pkg")
+        url.toString()
+    }
+
 }
\ No newline at end of file

app/src/main/java/com/test/easy/easycleanerjunk/service/FlashlightService.kt

+package com.test.easy.easycleanerjunk.service
+
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.hardware.camera2.CameraAccessException
+import android.hardware.camera2.CameraManager
+import android.os.Build
+import android.os.IBinder
+import android.util.Log
+
+
+class FlashlightService : Service() {
+    private var cameraManager: CameraManager? = null
+    private var flashlightOn = false
+    override fun onCreate() {
+        super.onCreate()
+        Log.e("MXL", "SerciveonCreate: ")
+
+        cameraManager = getSystemService(Context.CAMERA_SERVICE) as CameraManager?
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        try {
+            val cameraId = cameraManager!!.cameraIdList[0]
+            flashlightOn = if (flashlightOn) {
+                cameraManager?.setTorchMode(cameraId, false)
+                false
+            } else {
+                cameraManager?.setTorchMode(cameraId, true)
+                true
+            }
+        } catch (e: CameraAccessException) {
+            e.printStackTrace()
+        }
+        return START_NOT_STICKY
+    }
+
+
+    override fun onBind(p0: Intent?): IBinder? {
+        return null
+    }
+}
\ No newline at end of file

app/src/main/java/com/test/easy/easycleanerjunk/service/PermanentNotificationService.kt

+package  com.test.easy.easycleanerjunk.service
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.IBinder
+import android.widget.RemoteViews
+import androidx.core.app.NotificationCompat
+import com.test.easy.easycleanerjunk.R
+import com.test.easy.easycleanerjunk.activity.AppManagerActivity
+import com.test.easy.easycleanerjunk.activity.BatteryInfoActivity
+import com.test.easy.easycleanerjunk.activity.PrepareScanActivity
+import com.test.easy.easycleanerjunk.activity.home.NewMainActivity
+
+
+/**
+ *  常驻通知栏
+ */
+class PermanentNotificationService : Service() {
+
+    companion object {
+        var isRunning = false
+    }
+
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (isRunning) {
+            stopSelf()
+            return START_NOT_STICKY
+        }
+
+        val notification = createPermanentNotification(applicationContext)
+        startForeground(1, notification)
+        return START_STICKY
+    }
+
+
+    override fun onBind(intent: Intent?): IBinder? {
+        return null
+    }
+
+    override fun onDestroy() {
+        isRunning = false
+        super.onDestroy()
+        // 取消订阅
+
+    }
+
+    private fun createPermanentNotification(context: Context): Notification {
+
+        val isOngoing = true //是否持续(为不消失的常驻通知)
+        val channelName = "Foreground Service Channel"
+        val channelId = "Service_Id"
+        val category = Notification.CATEGORY_SERVICE
+        val contentView = RemoteViews(context.packageName, R.layout.reminder_layout_notification_notify)
+        val expendView = RemoteViews(context.packageName, R.layout.reminder_layout_notification_big_notify)
+
+        val intent0 = Intent(context, PrepareScanActivity::class.java)
+        val pendingIntent0 =
+            PendingIntent.getActivity(context, 0, intent0, PendingIntent.FLAG_IMMUTABLE)
+        contentView.setOnClickPendingIntent(R.id.id_ll_clean, pendingIntent0)
+        expendView.setOnClickPendingIntent(R.id.id_ll_clean, pendingIntent0)
+
+
+        val intent2 = Intent(context, AppManagerActivity::class.java)
+        val pendingIntent2 =
+            PendingIntent.getActivity(context, 0, intent2, PendingIntent.FLAG_IMMUTABLE)
+        contentView.setOnClickPendingIntent(R.id.id_app_manager, pendingIntent2)
+        expendView.setOnClickPendingIntent(R.id.id_app_manager, pendingIntent2)
+
+        val intent3 = Intent(context, BatteryInfoActivity::class.java)
+        val pendingIntent3 =
+            PendingIntent.getActivity(context, 0, intent3, PendingIntent.FLAG_IMMUTABLE)
+        contentView.setOnClickPendingIntent(R.id.id_battery_info, pendingIntent3)
+        expendView.setOnClickPendingIntent(R.id.id_battery_info, pendingIntent3)
+
+        val intent4 = Intent()
+        val serviceComponent = ComponentName(context, FlashlightService::class.java)
+        intent4.component = serviceComponent
+        val pendingIntent4 =
+            PendingIntent.getService(context, 0, intent4, PendingIntent.FLAG_IMMUTABLE)
+        contentView.setOnClickPendingIntent(R.id.id_light, pendingIntent4)
+        expendView.setOnClickPendingIntent(R.id.id_light, pendingIntent4)
+
+
+        val nfIntent = Intent(context, NewMainActivity::class.java)
+        val pendingIntent =
+            PendingIntent.getActivity(context, 0, nfIntent, PendingIntent.FLAG_IMMUTABLE)
+
+
+        val builder = NotificationCompat.Builder(context, channelId)
+
+        builder.setCustomContentView(contentView)
+        builder.setCustomBigContentView(expendView)
+        builder.setContentIntent(pendingIntent) //设置PendingIntent
+        builder.setSmallIcon(R.drawable.easycleanjunk_noticeicon) //设置状态栏内的小图标
+        builder.setVisibility(NotificationCompat.VISIBILITY_PRIVATE) //设置通知公开可见
+//        builder.setOngoing(isOngoing) //设置持续(不消失的常驻通知)
+//        builder.setCategory(category) //设置类别
+        builder.setAutoCancel(false)
+        builder.setPriority(NotificationCompat.PRIORITY_MAX) //优先级为：重要通知
+
+        builder.setWhen(System.currentTimeMillis())
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel =
+                NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_LOW)
+            channel.lockscreenVisibility = 1
+            val notificationManager =
+                context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.createNotificationChannel(channel)
+            builder.setChannelId(channelId)
+        }
+        return builder.build()
+    }
+}
\ No newline at end of file

app/src/main/res/layout/activity_layout_battery_info.xml

@@ -23,7 +23,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginStart="13dp"
-                android:src="@mipmap/fanhui" />
+                android:src="@mipmap/fanhui"
+                android:tint="@color/black" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -31,7 +32,8 @@
                 android:layout_centerInParent="true"
                 android:text="Battery info"
                 android:textSize="18sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
         </RelativeLayout>
 
         <FrameLayout

app/src/main/res/layout/item_whatsapp.xml

@@ -28,6 +28,7 @@
             android:orientation="vertical">
 
             <TextView
+                android:id="@+id/tv_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Video Messages"

app/src/main/res/layout/reminder_layout_notification_big_notify.xml

@@ -33,9 +33,61 @@
             tools:ignore="HardcodedText" />
     </LinearLayout>
 
+    <!--app管理-->
+    <LinearLayout
+        android:id="@+id/id_app_manager"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginBottom="8dp"
+            android:src="@mipmap/guanli"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Manager"
+            android:textColor="#666666"
+            android:textSize="12sp"
+            tools:ignore="HardcodedText" />
+    </LinearLayout>
+
+    <!--电池-->
+    <LinearLayout
+        android:id="@+id/id_battery_info"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginBottom="8dp"
+            android:src="@mipmap/dianchi"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Battery"
+            android:textColor="#666666"
+            android:textSize="12sp"
+            tools:ignore="HardcodedText" />
+    </LinearLayout>
+
     <!--手电-->
     <LinearLayout
-        android:id="@+id/id_lighit"
+        android:id="@+id/id_light"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"

app/src/main/res/layout/reminder_layout_notification_notify.xml

@@ -24,9 +24,44 @@
             tools:ignore="ContentDescription" />
     </LinearLayout>
 
+    <!--app管理-->
+    <LinearLayout
+        android:id="@+id/id_app_manager"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginBottom="4dp"
+            android:src="@mipmap/guanli"
+            tools:ignore="ContentDescription" />
+
+    </LinearLayout>
+
+    <!--电池-->
+    <LinearLayout
+        android:id="@+id/id_battery_info"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginBottom="4dp"
+            android:src="@mipmap/dianchi"
+            tools:ignore="ContentDescription" />
+    </LinearLayout>
+
     <!--手电-->
     <LinearLayout
-        android:id="@+id/id_lighit"
+        android:id="@+id/id_light"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"