From 7bcee44c79e4986ab2b8724d70772950555fd7d3 Mon Sep 17 00:00:00 2001 From: eryan Date: Thu, 17 Sep 2020 09:25:09 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20plugin=20=E6=9C=AA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pubspec.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 0f9fff4c..c08ef68c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -22,11 +22,12 @@ dev_dependencies: # The following section is specific to Flutter. flutter: plugin: - android: - package: com.jiguang.jpush - pluginClass: JPushPlugin - ios: - pluginClass: JPushPlugin + platforms: + android: + package: com.jiguang.jpush + pluginClass: JPushPlugin + ios: + pluginClass: JPushPlugin # To add assets to your plugin package, add an assets section, like this: # assets: From 3a2d12f3669d8c6f259d93a988150bceac2a0b9f Mon Sep 17 00:00:00 2001 From: eryan Date: Thu, 17 Sep 2020 11:05:20 +0800 Subject: [PATCH 02/11] add resetBadge --- ios/Classes/JPushPlugin.m | 9 +++++++++ lib/jpush_flutter.dart | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/ios/Classes/JPushPlugin.m b/ios/Classes/JPushPlugin.m index 5d225312..38760338 100644 --- a/ios/Classes/JPushPlugin.m +++ b/ios/Classes/JPushPlugin.m @@ -138,6 +138,8 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { [self deleteAlias:call result:result]; } else if([@"setBadge" isEqualToString:call.method]) { [self setBadge:call result:result]; + } else if([@"resetBadge" isEqualToString:call.method]) { + [self resetBadge:call result:result]; } else if([@"stopPush" isEqualToString:call.method]) { [self stopPush:call result:result]; } else if([@"resumePush" isEqualToString:call.method]) { @@ -312,6 +314,13 @@ - (void)setBadge:(FlutterMethodCall*)call result:(FlutterResult)result { [JPUSHService setBadge: badge]; } +- (void)resetBadge:(FlutterMethodCall*)call result:(FlutterResult)result { + JPLog(@"resetBadge:"); + [[UIApplication sharedApplication] setApplicationIconBadgeNumber: 0]; + [JPUSHService resetBadge]; +} + + - (void)stopPush:(FlutterMethodCall*)call result:(FlutterResult)result { JPLog(@"stopPush:"); [[UIApplication sharedApplication] unregisterForRemoteNotifications]; diff --git a/lib/jpush_flutter.dart b/lib/jpush_flutter.dart index 8f343a72..067a5065 100644 --- a/lib/jpush_flutter.dart +++ b/lib/jpush_flutter.dart @@ -208,6 +208,15 @@ class JPush { await _channel.invokeMethod('setBadge', {"badge": badge}); } + /// + /// 清空应用Badge（小红点） + /// + Future resetBadge() async { + print(flutter_log + "resetBadge:"); + + await _channel.invokeMethod('resetBadge'); + } + /// /// 停止接收推送，调用该方法后应用将不再受到推送，如果想要重新收到推送可以调用 resumePush。 /// From 898d08d66ada49e280f260eb178a0ec5d11308e3 Mon Sep 17 00:00:00 2001 From: eryan Date: Fri, 29 Jan 2021 12:18:52 +0800 Subject: [PATCH 03/11] buildId 2 --- android/gradle/wrapper/gradle-wrapper.properties | 3 ++- .../main/java/com/jiguang/jpush/JPushPlugin.java | 13 ++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ea402fd1..c74af106 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +#distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/android/src/main/java/com/jiguang/jpush/JPushPlugin.java b/android/src/main/java/com/jiguang/jpush/JPushPlugin.java index 2b6f4d34..092416fa 100644 --- a/android/src/main/java/com/jiguang/jpush/JPushPlugin.java +++ b/android/src/main/java/com/jiguang/jpush/JPushPlugin.java @@ -1,5 +1,6 @@ package com.jiguang.jpush; +import android.app.Notification; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -7,6 +8,7 @@ import android.os.Looper; import android.util.Log; +import cn.jpush.android.api.BasicPushNotificationBuilder; import org.json.JSONObject; import cn.jpush.android.data.JPushLocalNotification; @@ -320,6 +322,15 @@ public void sendLocalNotification(MethodCall call, Result result) { long date = (long) map.get("fireTime"); ln.setBroadcastTime(date); + BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(registrar.context()); + builder.statusBarDrawable = R.drawable.jpush_notification_icon; + builder.notificationFlags = Notification.FLAG_AUTO_CANCEL + | Notification.FLAG_SHOW_LIGHTS; //设置为自动消失和呼吸灯闪烁 + builder.notificationDefaults = Notification.DEFAULT_SOUND + | Notification.DEFAULT_VIBRATE + | Notification.DEFAULT_LIGHTS; // 设置为铃声、震动、呼吸灯闪烁都要 + JPushInterface.setPushNotificationBuilder(2, builder); + JPushInterface.addLocalNotification(registrar.context(), ln); } catch (Exception e) { e.printStackTrace(); @@ -344,7 +355,7 @@ private void isNotificationEnabled(MethodCall call, Result result) { int isEnabled = JPushInterface.isNotificationEnabled(registrar.context()); //1表示开启，0表示关闭，-1表示检测失败 HashMap map = new HashMap(); - map.put("isEnabled",isEnabled==1?true:false); + map.put("isEnabled", isEnabled == 1); runMainThread(map,result,null); } From a388b3d1ae9d9f14e0b6ee40ef649665115f20d4 Mon Sep 17 00:00:00 2001 From: eryan Date: Fri, 29 Jan 2021 12:19:18 +0800 Subject: [PATCH 04/11] buildId 2 --- .../res/drawable/jpush_notification_icon.png | Bin 0 -> 5623 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 android/src/main/res/drawable/jpush_notification_icon.png diff --git a/android/src/main/res/drawable/jpush_notification_icon.png b/android/src/main/res/drawable/jpush_notification_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fb7455fa715ba4932913dfea3e77954464b8cdca GIT binary patch literal 5623 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 Rt`q Date: Fri, 29 Jan 2021 12:36:52 +0800 Subject: [PATCH 05/11] buildId 2 --- .../java/com/jiguang/jpush/JPushPlugin.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/android/src/main/java/com/jiguang/jpush/JPushPlugin.java b/android/src/main/java/com/jiguang/jpush/JPushPlugin.java index 092416fa..73f1b29a 100644 --- a/android/src/main/java/com/jiguang/jpush/JPushPlugin.java +++ b/android/src/main/java/com/jiguang/jpush/JPushPlugin.java @@ -9,6 +9,7 @@ import android.util.Log; import cn.jpush.android.api.BasicPushNotificationBuilder; +import cn.jpush.android.api.CustomPushNotificationBuilder; import org.json.JSONObject; import cn.jpush.android.data.JPushLocalNotification; @@ -150,6 +151,16 @@ public void setup(MethodCall call, Result result) { JPushPlugin.instance.dartIsReady = true; + BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(registrar.context()); + builder.statusBarDrawable = R.drawable.jpush_notification_icon; + builder.notificationFlags = Notification.FLAG_AUTO_CANCEL + | Notification.FLAG_SHOW_LIGHTS; //设置为自动消失和呼吸灯闪烁 + builder.notificationDefaults = Notification.DEFAULT_SOUND + | Notification.DEFAULT_VIBRATE + | Notification.DEFAULT_LIGHTS; // 设置为铃声、震动、呼吸灯闪烁都要 + // 指定下拉状态栏时显示的通知图标 + JPushInterface.setPushNotificationBuilder(2, builder); + // try to clean getRid cache scheduleCache(); } @@ -321,16 +332,6 @@ public void sendLocalNotification(MethodCall call, Result result) { long date = (long) map.get("fireTime"); ln.setBroadcastTime(date); - - BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(registrar.context()); - builder.statusBarDrawable = R.drawable.jpush_notification_icon; - builder.notificationFlags = Notification.FLAG_AUTO_CANCEL - | Notification.FLAG_SHOW_LIGHTS; //设置为自动消失和呼吸灯闪烁 - builder.notificationDefaults = Notification.DEFAULT_SOUND - | Notification.DEFAULT_VIBRATE - | Notification.DEFAULT_LIGHTS; // 设置为铃声、震动、呼吸灯闪烁都要 - JPushInterface.setPushNotificationBuilder(2, builder); - JPushInterface.addLocalNotification(registrar.context(), ln); } catch (Exception e) { e.printStackTrace(); From 855948abf91ab7e47966e2cf1752ed41164a5d7c Mon Sep 17 00:00:00 2001 From: eryan Date: Fri, 29 Jan 2021 13:12:28 +0800 Subject: [PATCH 06/11] buildId 2 --- .../main/java/com/jiguang/jpush/JPushPlugin.java | 14 +------------- .../res/drawable/jpush_notification_icon.png | Bin 5623 -> 0 bytes 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 android/src/main/res/drawable/jpush_notification_icon.png diff --git a/android/src/main/java/com/jiguang/jpush/JPushPlugin.java b/android/src/main/java/com/jiguang/jpush/JPushPlugin.java index 73f1b29a..1730bf5a 100644 --- a/android/src/main/java/com/jiguang/jpush/JPushPlugin.java +++ b/android/src/main/java/com/jiguang/jpush/JPushPlugin.java @@ -1,6 +1,5 @@ package com.jiguang.jpush; -import android.app.Notification; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -8,8 +7,6 @@ import android.os.Looper; import android.util.Log; -import cn.jpush.android.api.BasicPushNotificationBuilder; -import cn.jpush.android.api.CustomPushNotificationBuilder; import org.json.JSONObject; import cn.jpush.android.data.JPushLocalNotification; @@ -151,16 +148,6 @@ public void setup(MethodCall call, Result result) { JPushPlugin.instance.dartIsReady = true; - BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(registrar.context()); - builder.statusBarDrawable = R.drawable.jpush_notification_icon; - builder.notificationFlags = Notification.FLAG_AUTO_CANCEL - | Notification.FLAG_SHOW_LIGHTS; //设置为自动消失和呼吸灯闪烁 - builder.notificationDefaults = Notification.DEFAULT_SOUND - | Notification.DEFAULT_VIBRATE - | Notification.DEFAULT_LIGHTS; // 设置为铃声、震动、呼吸灯闪烁都要 - // 指定下拉状态栏时显示的通知图标 - JPushInterface.setPushNotificationBuilder(2, builder); - // try to clean getRid cache scheduleCache(); } @@ -332,6 +319,7 @@ public void sendLocalNotification(MethodCall call, Result result) { long date = (long) map.get("fireTime"); ln.setBroadcastTime(date); + JPushInterface.addLocalNotification(registrar.context(), ln); } catch (Exception e) { e.printStackTrace(); diff --git a/android/src/main/res/drawable/jpush_notification_icon.png b/android/src/main/res/drawable/jpush_notification_icon.png deleted file mode 100644 index fb7455fa715ba4932913dfea3e77954464b8cdca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5623 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 Rt`q Date: Mon, 8 Mar 2021 15:23:22 +0800 Subject: [PATCH 07/11] buildId 2 --- pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index f896a89c..e7a3ece9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,11 +5,11 @@ version: 0.6.3 homepage: https://www.jiguang.cn environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" flutter: ">=1.10.0" dependencies: - platform: ^2.0.0 + platform: ^3.0.0 flutter: sdk: flutter From e893fdef1deb99f53d7a0361698a66b25846c4af Mon Sep 17 00:00:00 2001 From: eryan Date: Mon, 8 Mar 2021 16:03:58 +0800 Subject: [PATCH 08/11] buildId 2 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index e7a3ece9..bb05d4a4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ version: 0.6.3 homepage: https://www.jiguang.cn environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.1.0 <3.0.0" flutter: ">=1.10.0" dependencies: From 3108c76f397c8a0bce528cf7b2272a8301617a62 Mon Sep 17 00:00:00 2001 From: eryan Date: Mon, 10 May 2021 15:04:04 +0800 Subject: [PATCH 09/11] buildId 2 --- android/build.gradle | 2 +- ios/jpush_flutter.podspec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 99e966ac..b8a01c56 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -35,7 +35,7 @@ android { dependencies { implementation 'cn.jiguang.sdk:jpush:3.9.0' - implementation 'cn.jiguang.sdk:jcore:2.6.0' + implementation 'cn.jiguang.sdk:jcore:2.7.8' // implementation 'com.android.support:appcompat-v7:28.+' compileOnly files('libs/flutter.jar') diff --git a/ios/jpush_flutter.podspec b/ios/jpush_flutter.podspec index 73cf84d6..caa4178a 100644 --- a/ios/jpush_flutter.podspec +++ b/ios/jpush_flutter.podspec @@ -15,8 +15,8 @@ A new flutter plugin project. s.source_files = 'Classes/**/*' s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' - s.dependency 'JCore','2.4.0' - s.dependency 'JPush','3.4.0' + s.dependency 'JCore','2.6.2' + s.dependency 'JPush','3.5.2' s.ios.deployment_target = '8.0' s.static_framework = true From 095327be23e9206eb2ac6011fd1d3a692e4ad9a5 Mon Sep 17 00:00:00 2001 From: eryan Date: Mon, 10 May 2021 15:06:30 +0800 Subject: [PATCH 10/11] buildId 2 --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index b8a01c56..a23712da 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -34,7 +34,7 @@ android { } dependencies { - implementation 'cn.jiguang.sdk:jpush:3.9.0' + implementation 'cn.jiguang.sdk:jpush:6.0.6' implementation 'cn.jiguang.sdk:jcore:2.7.8' // implementation 'com.android.support:appcompat-v7:28.+' compileOnly files('libs/flutter.jar') From 70d4eb134e6426bb9bbcd46a6cc8b53aa824f2ca Mon Sep 17 00:00:00 2001 From: eryan Date: Mon, 10 May 2021 15:08:24 +0800 Subject: [PATCH 11/11] buildId 2 --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index a23712da..d2ba6954 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -34,7 +34,7 @@ android { } dependencies { - implementation 'cn.jiguang.sdk:jpush:6.0.6' + implementation 'cn.jiguang.sdk:jpush:4.0.6' implementation 'cn.jiguang.sdk:jcore:2.7.8' // implementation 'com.android.support:appcompat-v7:28.+' compileOnly files('libs/flutter.jar')