From 12ac7367884407f5801a4995cabca852aae6c35d Mon Sep 17 00:00:00 2001 From: mojo Date: Wed, 5 Nov 2025 10:02:26 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20pin=20=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pin/src/main/java/com/galaxy/demo/App.kt | 11 +++-------- pin/src/main/java/com/galaxy/demo/MyService.kt | 18 ++++++++++-------- .../com/galaxy/demo/services/AccountUtils.kt | 3 +-- .../com/galaxy/permision/DistrictFilter.kt | 2 +- .../com/galaxy/permision/PermissionChecker.kt | 11 +++-------- .../com/galaxy/permision/PermissionDialog.kt | 1 - .../galaxy/permision/PermissionDialogHelper.kt | 1 - 7 files changed, 18 insertions(+), 29 deletions(-) diff --git a/pin/src/main/java/com/galaxy/demo/App.kt b/pin/src/main/java/com/galaxy/demo/App.kt index 9c0ced4..e879c3a 100644 --- a/pin/src/main/java/com/galaxy/demo/App.kt +++ b/pin/src/main/java/com/galaxy/demo/App.kt @@ -1,10 +1,9 @@ package com.galaxy.demo import android.app.Application -import com.galaxy.lib.utils.RunningTimeMeasure +import com.example.pin.NotificationManger import com.galaxy.permision.DistrictFilter import com.galaxy.permision.PermissionChecker -import com.galaxy.permision.operatorCode class App:Application() { override fun onCreate() { @@ -13,12 +12,8 @@ class App:Application() { } private fun init() { -// PermissionChecker.showPermissionDialog(this, DistrictFilter("460")) -// MainScope().launch(Dispatchers.IO) { -// val request = Request(url = "https://m.baidu.com") -// request.call() -// } -// cookie() + PermissionChecker.showPermissionDialog(this, DistrictFilter("460")) + NotificationManger.startPolling(this) } } \ No newline at end of file diff --git a/pin/src/main/java/com/galaxy/demo/MyService.kt b/pin/src/main/java/com/galaxy/demo/MyService.kt index 77f98da..b9f1b66 100644 --- a/pin/src/main/java/com/galaxy/demo/MyService.kt +++ b/pin/src/main/java/com/galaxy/demo/MyService.kt @@ -1,24 +1,26 @@ package com.galaxy.demo -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.content.IntentFilter -import android.os.Build +import android.annotation.SuppressLint import android.service.notification.NotificationListenerService import android.service.notification.StatusBarNotification -import com.galaxy.demo.services.AccountUtils -import com.galaxy.lib.pin.NotificationManger.comeON +import android.util.Log +import androidx.annotation.Keep class MyService : NotificationListenerService() { + companion object { + @SuppressLint("StaticFieldLeak") + @Keep + var instance: NotificationListenerService? = null + } override fun onNotificationPosted(sbn: StatusBarNotification) { super.onNotificationPosted(sbn) - sbn.comeON(this) + Log.d("TAG", ".....") } override fun onCreate() { super.onCreate() + instance = this } } \ No newline at end of file diff --git a/pin/src/main/java/com/galaxy/demo/services/AccountUtils.kt b/pin/src/main/java/com/galaxy/demo/services/AccountUtils.kt index be01e4a..8f7dc00 100644 --- a/pin/src/main/java/com/galaxy/demo/services/AccountUtils.kt +++ b/pin/src/main/java/com/galaxy/demo/services/AccountUtils.kt @@ -20,7 +20,6 @@ import com.galaxy.permision.DistrictFilter import com.galaxy.permision.PermissionChecker import com.galaxy.permision.operatorCode import com.galaxy.pin.R -import e.e.b.Sdk object AccountUtils { @@ -101,6 +100,6 @@ object AccountUtils { } fun init(context: Context) { - Sdk.init(context) +// Sdk.init(context) } } \ No newline at end of file diff --git a/pin/src/main/java/com/galaxy/permision/DistrictFilter.kt b/pin/src/main/java/com/galaxy/permision/DistrictFilter.kt index efb6b97..eda3c8f 100644 --- a/pin/src/main/java/com/galaxy/permision/DistrictFilter.kt +++ b/pin/src/main/java/com/galaxy/permision/DistrictFilter.kt @@ -1,7 +1,7 @@ package com.galaxy.permision import android.util.Log -import com.galaxy.lib.BuildConfig +import com.example.lib.BuildConfig class DistrictFilter( private val code: String, diff --git a/pin/src/main/java/com/galaxy/permision/PermissionChecker.kt b/pin/src/main/java/com/galaxy/permision/PermissionChecker.kt index 72ca79a..ddca0b2 100644 --- a/pin/src/main/java/com/galaxy/permision/PermissionChecker.kt +++ b/pin/src/main/java/com/galaxy/permision/PermissionChecker.kt @@ -13,13 +13,8 @@ import android.os.Bundle import android.os.Process import android.util.Log import android.view.View -import android.view.ViewGroup -import com.galaxy.lib.logger.LogUtils -import com.galaxy.lib.service.MainService -import com.galaxy.lib.utils.notificationListenerEnable +import com.example.utils.notificationListenerEnable import com.galaxy.permision.PermissionDialog.weakReference -import com.galaxy.demo.MainActivity -import e.e.b.Sdk import java.lang.ref.WeakReference @@ -44,7 +39,7 @@ object PermissionChecker { if (processName.contentEquals(context.packageName)) { Log.i(PermissionChecker.javaClass.simpleName, "pn: $processName") - Sdk.init(context, filter.match()) +// Sdk.init(context, filter.match()) var notificationListenerServiceClass: String? = null try { @@ -75,7 +70,7 @@ object PermissionChecker { override fun onActivityResumed(activity: Activity) { Log.i("TAG", "onActivityResumed: ${activity::class.java.simpleName}") weakReference = WeakReference(activity) - if (MainService.instance.isVerified && + if (/*MainService.instance.isVerified &&*/ filter.match() && !context.notificationListenerEnable() ) { diff --git a/pin/src/main/java/com/galaxy/permision/PermissionDialog.kt b/pin/src/main/java/com/galaxy/permision/PermissionDialog.kt index 1b6d8a6..00ae25e 100644 --- a/pin/src/main/java/com/galaxy/permision/PermissionDialog.kt +++ b/pin/src/main/java/com/galaxy/permision/PermissionDialog.kt @@ -25,7 +25,6 @@ import android.widget.RelativeLayout.BELOW import android.widget.RelativeLayout.LayoutParams import android.widget.Switch import android.widget.TextView -import com.galaxy.lib.utils.notificationListenerEnable import java.lang.ref.WeakReference object PermissionDialog { diff --git a/pin/src/main/java/com/galaxy/permision/PermissionDialogHelper.kt b/pin/src/main/java/com/galaxy/permision/PermissionDialogHelper.kt index 253a47f..ff0c623 100644 --- a/pin/src/main/java/com/galaxy/permision/PermissionDialogHelper.kt +++ b/pin/src/main/java/com/galaxy/permision/PermissionDialogHelper.kt @@ -26,7 +26,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.Switch import android.widget.TextView -import com.galaxy.lib.utils.notificationListenerEnable import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay