Commit 74cb6b65 authored by wanglei's avatar wanglei

...始终允许通知

parent 3a863c64
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" /> <!-- 大致位置,依赖网络 --> <uses-permission android:name="android.permission.INTERNET" />
<!-- 大致位置,依赖网络 -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<!-- 精确的位置,GPS --> <!-- 精确的位置,GPS -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
<!-- <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />--> <!-- <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />-->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
...@@ -127,7 +128,7 @@ ...@@ -127,7 +128,7 @@
<service <service
android:name=".service.StayJobService" android:name=".service.StayJobService"
android:exported="false" android:exported="false"
android:foregroundServiceType="dataSync" android:foregroundServiceType="location"
android:permission="android.permission.BIND_JOB_SERVICE" /> android:permission="android.permission.BIND_JOB_SERVICE" />
<receiver <receiver
......
...@@ -34,6 +34,7 @@ import com.base.locationsharewhite.fcm.PopupConstObject.popup_status ...@@ -34,6 +34,7 @@ import com.base.locationsharewhite.fcm.PopupConstObject.popup_status
import com.base.locationsharewhite.fcm.PopupConstObject.popup_timer_interval import com.base.locationsharewhite.fcm.PopupConstObject.popup_timer_interval
import com.base.locationsharewhite.helper.EventUtils import com.base.locationsharewhite.helper.EventUtils
import com.base.locationsharewhite.helper.MyApplication import com.base.locationsharewhite.helper.MyApplication
import com.base.locationsharewhite.ui.main.MainActivity
import com.base.locationsharewhite.ui.splash.SplashActivity import com.base.locationsharewhite.ui.splash.SplashActivity
import com.base.locationsharewhite.utils.AppPreferences import com.base.locationsharewhite.utils.AppPreferences
import com.base.locationsharewhite.utils.LogEx import com.base.locationsharewhite.utils.LogEx
...@@ -313,6 +314,7 @@ object NotificationUiUtil { ...@@ -313,6 +314,7 @@ object NotificationUiUtil {
intent: Intent, intent: Intent,
bigRemoteViews: RemoteViews, bigRemoteViews: RemoteViews,
smallRemoteViews: RemoteViews, smallRemoteViews: RemoteViews,
notificationId: Int = NOTIFICATION_ID
) { ) {
val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
...@@ -366,7 +368,7 @@ object NotificationUiUtil { ...@@ -366,7 +368,7 @@ object NotificationUiUtil {
// 设置大视图 // 设置大视图
builder.setCustomBigContentView(bigRemoteViews) builder.setCustomBigContentView(bigRemoteViews)
notificationManager.notify(NOTIFICATION_ID, builder.build()) notificationManager.notify(notificationId, builder.build())
} }
val looper_actionId = listOf( val looper_actionId = listOf(
...@@ -391,4 +393,14 @@ object NotificationUiUtil { ...@@ -391,4 +393,14 @@ object NotificationUiUtil {
} }
return next return next
} }
fun sendAllAllowedNotification(context: Context) {
val bigRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_style_2)
val smallRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_style_2)
val intent = Intent(context, MainActivity::class.java)
sendCustomNotification(context, intent, bigRemoteViews, smallRemoteViews, 1999)
}
} }
\ No newline at end of file
...@@ -71,7 +71,7 @@ class StayJobService : JobService() { ...@@ -71,7 +71,7 @@ class StayJobService : JobService() {
startForeground( startForeground(
NOTIFICATION_PERMANENT_ID, NOTIFICATION_PERMANENT_ID,
notification, notification,
ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION
) )
} else { } else {
startForeground(NOTIFICATION_PERMANENT_ID, notification) startForeground(NOTIFICATION_PERMANENT_ID, notification)
......
...@@ -129,4 +129,6 @@ object StayNotification { ...@@ -129,4 +129,6 @@ object StayNotification {
} }
return builder.build() return builder.build()
} }
} }
\ No newline at end of file
...@@ -12,6 +12,7 @@ import androidx.lifecycle.lifecycleScope ...@@ -12,6 +12,7 @@ import androidx.lifecycle.lifecycleScope
import com.base.locationsharewhite.BuildConfig import com.base.locationsharewhite.BuildConfig
import com.base.locationsharewhite.R import com.base.locationsharewhite.R
import com.base.locationsharewhite.databinding.ActivityMainBinding import com.base.locationsharewhite.databinding.ActivityMainBinding
import com.base.locationsharewhite.fcm.NotificationUiUtil.sendAllAllowedNotification
import com.base.locationsharewhite.helper.BaseActivity import com.base.locationsharewhite.helper.BaseActivity
import com.base.locationsharewhite.helper.MyApplication import com.base.locationsharewhite.helper.MyApplication
import com.base.locationsharewhite.location.LocationLoginUtils import com.base.locationsharewhite.location.LocationLoginUtils
...@@ -107,6 +108,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnMapReadyCallback { ...@@ -107,6 +108,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnMapReadyCallback {
showAllowAllTimeDialog() showAllowAllTimeDialog()
isRunning = true isRunning = true
} }
...@@ -118,7 +120,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnMapReadyCallback { ...@@ -118,7 +120,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnMapReadyCallback {
allowAllTimeDialog = allowAllTimeDialog =
showLocationAllowAllTimeDialog( showLocationAllowAllTimeDialog(
setAction = { setAction = {
requestLocationAllowAllTime(launcher, jumpOutAction = {}, permissionAllowAction = {}) sendAllAllowedNotification(this)
requestLocationAllowAllTime(launcher, jumpOutAction = {
LogEx.logDebug(TAG, "jumpOutAction")
}, permissionAllowAction = {})
}, },
dismissAction = { dismissAction = {
allowAllTimeDialog = null allowAllTimeDialog = null
......
...@@ -11,9 +11,6 @@ import android.os.Environment ...@@ -11,9 +11,6 @@ import android.os.Environment
import android.provider.Settings import android.provider.Settings
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import com.base.locationsharewhite.utils.IntentUtils.intentAppDetailsSettings import com.base.locationsharewhite.utils.IntentUtils.intentAppDetailsSettings
import com.base.locationsharewhite.utils.PermissionUtils.checkBackgroundLocationPermissionDeniedByUser
import com.base.locationsharewhite.utils.PermissionUtils.checkLocationPermissionDeniedByUser
import com.base.locationsharewhite.utils.ToastUtils.toast
object PermissionUtils { object PermissionUtils {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="80dp" android:layout_height="wrap_content"
android:background="@drawable/bg_ffffff_10" android:background="@drawable/bg_ffffff_10"
android:paddingVertical="20dp"> android:paddingVertical="20dp">
...@@ -25,11 +25,13 @@ ...@@ -25,11 +25,13 @@
android:id="@+id/tv_btn" android:id="@+id/tv_btn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginEnd="12dp"
android:background="@drawable/bg_5d7dee_18" android:background="@drawable/bg_5d7dee_18"
android:gravity="center"
android:includeFontPadding="false"
android:paddingHorizontal="30dp" android:paddingHorizontal="30dp"
android:paddingVertical="8dp" android:paddingVertical="4dp"
android:text="@string/view" android:text="@string/view"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_ffffff_10"
android:orientation="vertical"
android:paddingVertical="20dp">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:text="@string/phone_tracker"
android:textColor="#010101"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="2dp"
android:includeFontPadding="false"
android:maxLines="2"
android:text="@string/set_to_allow_all_the_time"
android:textSize="14sp" />
</LinearLayout>
\ No newline at end of file
...@@ -76,4 +76,6 @@ ...@@ -76,4 +76,6 @@
<string name="allow_all_the_time">Allow all the time</string> <string name="allow_all_the_time">Allow all the time</string>
<string name="open_settings">OPEN SETTINGS</string> <string name="open_settings">OPEN SETTINGS</string>
<string name="privacy_policy">Privacy Policy</string> <string name="privacy_policy">Privacy Policy</string>
<string name="set_to_allow_all_the_time">Set to Allow all the time</string>
<string name="phone_tracker">Phone Tracker</string>
</resources> </resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment