Skip to content

修复由于FlutterEngine detach 造成的空指针 #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev-2.x
Choose a base branch
from
Open

修复由于FlutterEngine detach 造成的空指针 #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ 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-6.5-all.zip
42 changes: 26 additions & 16 deletions android/src/main/java/com/jiguang/jpush/JPushEventReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,47 +23,57 @@
public class JPushEventReceiver extends JPushMessageService {

@Override
public void onNotifyMessageUnShow(Context context,final NotificationMessage notificationMessage) {
super.onNotifyMessageUnShow(context,notificationMessage);
public void onNotifyMessageUnShow(Context context, final NotificationMessage notificationMessage) {
super.onNotifyMessageUnShow(context, notificationMessage);
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
JPushHelper.getInstance().onNotifyMessageUnShow(notificationMessage);
if (JPushHelper.getInstance().getChannel() != null) {
JPushHelper.getInstance().onNotifyMessageUnShow(notificationMessage);
}
}
});
}

@Override
public void onConnected(Context context,final boolean isConnected) {
public void onConnected(Context context, final boolean isConnected) {
//连接状态
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
JPushHelper.getInstance().onConnected(isConnected);
if (JPushHelper.getInstance().getChannel() != null) {
JPushHelper.getInstance().onConnected(isConnected);
}
}
});
}

@Override
public void onInAppMessageShow(Context context,final NotificationMessage message) {
public void onInAppMessageShow(Context context, final NotificationMessage message) {
Log.i("JPushPlugin", "[onInAppMessageShow], " + message.toString());
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
JPushHelper.getInstance().onInAppMessageShow(message);
if (JPushHelper.getInstance().getChannel() != null) {
JPushHelper.getInstance().onInAppMessageShow(message);
}
}
});
}

@Override
public void onInAppMessageClick(Context context,final NotificationMessage message) {
public void onInAppMessageClick(Context context, final NotificationMessage message) {
Log.i("JPushPlugin", "[onInAppMessageClick], " + message.toString());
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
JPushHelper.getInstance().onInAppMessageClick(message);
if (JPushHelper.getInstance().getChannel() != null) {
JPushHelper.getInstance().onInAppMessageClick(message);
}
}
});
}

@Override
public void onTagOperatorResult(Context context, final JPushMessage jPushMessage) {
super.onTagOperatorResult(context, jPushMessage);
Expand Down Expand Up @@ -109,17 +119,16 @@ public void run() {
}



@Override
public void onCheckTagOperatorResult(Context context, final JPushMessage jPushMessage) {
super.onCheckTagOperatorResult(context, jPushMessage);



final int sequence = jPushMessage.getSequence();


final Result callback = JPushHelper.getInstance().getCallback(sequence);;
final Result callback = JPushHelper.getInstance().getCallback(sequence);
;

if (callback == null) {
Log.i("JPushPlugin", "Unexpected error, callback is null!");
Expand Down Expand Up @@ -152,7 +161,8 @@ public void onAliasOperatorResult(Context context, final JPushMessage jPushMessa
final int sequence = jPushMessage.getSequence();


final Result callback = JPushHelper.getInstance().getCallback(sequence);;
final Result callback = JPushHelper.getInstance().getCallback(sequence);
;

if (callback == null) {
Log.i("JPushPlugin", "Unexpected error, callback is null!");
Expand All @@ -164,7 +174,7 @@ public void onAliasOperatorResult(Context context, final JPushMessage jPushMessa
public void run() {
if (jPushMessage.getErrorCode() == 0) { // success
Map<String, Object> res = new HashMap<>();
res.put("alias", (jPushMessage.getAlias() == null)? "" : jPushMessage.getAlias());
res.put("alias", (jPushMessage.getAlias() == null) ? "" : jPushMessage.getAlias());
callback.success(res);

} else {
Expand All @@ -182,7 +192,7 @@ public void onNotificationSettingsCheck(Context context, boolean isOn, int sourc


HashMap<String, Object> map = new HashMap();
map.put("isEnabled",isOn);
JPushHelper.getInstance().runMainThread(map,null,"onReceiveNotificationAuthorization");
map.put("isEnabled", isOn);
JPushHelper.getInstance().runMainThread(map, null, "onReceiveNotificationAuthorization");
}
}