Skip to content

Commit

Permalink
Version_0.2.5-fix2
Browse files Browse the repository at this point in the history
  • Loading branch information
@censujiang
censujiang committed Nov 2, 2023
1 parent d9651ff commit 4fd463f
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 55 deletions.
37 changes: 17 additions & 20 deletions dist/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,23 @@ const notificationPermission = {
plus.ios.deleteObject(UIApplication);
}
else {
result = await requestAndroidPermission('android.permission.ACCESS_NOTIFICATION_POLICY');
//首先判断安卓13引入的新权限
result = await requestAndroidPermission('android.permission.POST_NOTIFICATIONS');
//不运行的时候不通知？没关系，我们再试试旧的权限，反正我们只需要知道应用到底能不能发起通知
if (result == false) {
const main = plus.android.runtimeMainActivity();
let NotificationManagerCompat = plus.android.importClass("android.support.v4.app.NotificationManagerCompat");
if (checkNull(NotificationManagerCompat)) {
NotificationManagerCompat = plus.android.importClass("androidx.core.app.NotificationManagerCompat");
}
const notificationManagerResult = NotificationManagerCompat.from(main).areNotificationsEnabled();
if (!notificationManagerResult) {
result = false;
}
else {
result = true;
}
}
}
// #endif
return result;
Expand Down Expand Up @@ -974,25 +990,6 @@ const notificationPermission = {
plus.ios.deleteObject(app);
plus.ios.deleteObject(UIApplication);
}
else {
//首先判断安卓13引入的新权限
result = await requestAndroidPermission('android.permission.POST_NOTIFICATIONS');
//不运行的时候不通知？没关系，我们再试试旧的权限，反正我们只需要知道应用到底能不能发起通知
if (result == false) {
const main = plus.android.runtimeMainActivity();
let NotificationManagerCompat = plus.android.importClass("android.support.v4.app.NotificationManagerCompat");
if (checkNull(NotificationManagerCompat)) {
NotificationManagerCompat = plus.android.importClass("androidx.core.app.NotificationManagerCompat");
}
const notificationManagerResult = NotificationManagerCompat.from(main).areNotificationsEnabled();
if (!notificationManagerResult) {
result = false;
}
else {
result = true;
}
}
}
// #endif
// #ifndef H5 || APP-PLUS
//小程序暂时没有思路去请求，暂时只做检查
Expand Down
36 changes: 18 additions & 18 deletions esm/permission.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,23 @@ export const notificationPermission = {
plus.ios.deleteObject(UIApplication);
}
else {
result = await requestAndroidPermission('android.permission.ACCESS_NOTIFICATION_POLICY');
//首先判断安卓13引入的新权限
result = await requestAndroidPermission('android.permission.POST_NOTIFICATIONS');
//不运行的时候不通知？没关系，我们再试试旧的权限，反正我们只需要知道应用到底能不能发起通知
if (result == false) {
const main = plus.android.runtimeMainActivity();
let NotificationManagerCompat = plus.android.importClass("android.support.v4.app.NotificationManagerCompat");
if (checkNull(NotificationManagerCompat)) {
NotificationManagerCompat = plus.android.importClass("androidx.core.app.NotificationManagerCompat");
}
const notificationManagerResult = NotificationManagerCompat.from(main).areNotificationsEnabled();
if (!notificationManagerResult) {
result = false;
}
else {
result = true;
}
}
}
// #endif
return result;
Expand Down Expand Up @@ -91,23 +107,7 @@ export const notificationPermission = {
plus.ios.deleteObject(UIApplication);
}
else {
//首先判断安卓13引入的新权限
result = await requestAndroidPermission('android.permission.POST_NOTIFICATIONS');
//不运行的时候不通知？没关系，我们再试试旧的权限，反正我们只需要知道应用到底能不能发起通知
if (result == false) {
const main = plus.android.runtimeMainActivity();
let NotificationManagerCompat = plus.android.importClass("android.support.v4.app.NotificationManagerCompat");
if (checkNull(NotificationManagerCompat)) {
NotificationManagerCompat = plus.android.importClass("androidx.core.app.NotificationManagerCompat");
}
const notificationManagerResult = NotificationManagerCompat.from(main).areNotificationsEnabled();
if (!notificationManagerResult) {
result = false;
}
else {
result = true;
}
}
//没办法自动请求，需要后面兼容代码解决
}
// #endif
// #ifndef H5 || APP-PLUS
Expand Down
34 changes: 17 additions & 17 deletions src/permission.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,22 @@ export const notificationPermission = {
plus.ios.deleteObject(app);
plus.ios.deleteObject(UIApplication);
} else {
result = await requestAndroidPermission('android.permission.ACCESS_NOTIFICATION_POLICY') as boolean
//首先判断安卓13引入的新权限
result = await requestAndroidPermission('android.permission.POST_NOTIFICATIONS') as boolean
//不运行的时候不通知？没关系，我们再试试旧的权限，反正我们只需要知道应用到底能不能发起通知
if (result == false) {
const main = plus.android.runtimeMainActivity();
let NotificationManagerCompat = plus.android.importClass("android.support.v4.app.NotificationManagerCompat");
if (checkNull(NotificationManagerCompat)) {
NotificationManagerCompat = plus.android.importClass("androidx.core.app.NotificationManagerCompat");
}
const notificationManagerResult = NotificationManagerCompat.from(main).areNotificationsEnabled()
if (!notificationManagerResult) {
result = false
} else {
result = true
}
}
}
// #endif
return result
Expand Down Expand Up @@ -91,22 +106,7 @@ export const notificationPermission = {
plus.ios.deleteObject(app);
plus.ios.deleteObject(UIApplication);
} else {
//首先判断安卓13引入的新权限
result = await requestAndroidPermission('android.permission.POST_NOTIFICATIONS') as boolean
//不运行的时候不通知？没关系，我们再试试旧的权限，反正我们只需要知道应用到底能不能发起通知
if (result == false) {
const main = plus.android.runtimeMainActivity();
let NotificationManagerCompat = plus.android.importClass("android.support.v4.app.NotificationManagerCompat");
if (checkNull(NotificationManagerCompat)) {
NotificationManagerCompat = plus.android.importClass("androidx.core.app.NotificationManagerCompat");
}
const notificationManagerResult = NotificationManagerCompat.from(main).areNotificationsEnabled()
if (!notificationManagerResult) {
result = false
} else {
result = true
}
}
//没办法自动请求，需要后面兼容代码解决
}
// #endif
// #ifndef H5 || APP-PLUS
Expand Down

0 comments on commit 4fd463f

Please sign in to comment.