优化项目结构
This commit is contained in:
@@ -4,10 +4,10 @@ package com.web.FreeAUD;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.Bundle;
|
||||
|
||||
import com.web.base.MainActivity2;
|
||||
import com.google.firebase.messaging.FirebaseMessaging;
|
||||
|
||||
public class MainActivity extends com.web.base.MainActivity2 {
|
||||
public class MainActivity extends MainActivity2 {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
@@ -28,11 +28,6 @@ public class MainActivity extends com.web.base.MainActivity2 {
|
||||
//订阅主题
|
||||
FirebaseMessaging.getInstance().subscribeToTopic("demo")
|
||||
.addOnCompleteListener(task -> {
|
||||
String msg = "Subscribed";
|
||||
if (!task.isSuccessful()) {
|
||||
msg = "Subscribe failed";
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
@@ -45,7 +40,5 @@ public class MainActivity extends com.web.base.MainActivity2 {
|
||||
} catch (PackageManager.NameNotFoundException e) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -7,16 +7,13 @@ import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Build;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.core.app.NotificationCompat;
|
||||
|
||||
import com.google.firebase.messaging.FirebaseMessagingService;
|
||||
import com.google.firebase.messaging.RemoteMessage;
|
||||
import com.google.gson.Gson;
|
||||
import com.web.base.GsonUtils;
|
||||
import com.web.base.MessageInfo;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
|
||||
@@ -34,17 +31,12 @@ public class MyFirebaseMessageingService extends FirebaseMessagingService {
|
||||
Gson gson = new Gson();
|
||||
MessageInfo messageInfo = gson.fromJson(value, MessageInfo.class);
|
||||
showNotification(messageInfo);
|
||||
// if (remoteMessage.getNotification() != null) {
|
||||
// showNotification(remoteMessage.getNotification().getTitle(), remoteMessage.getNotification().getBody());
|
||||
// }
|
||||
} else {
|
||||
//收到通知 创建notify
|
||||
if (remoteMessage.getNotification() != null) {
|
||||
showNotification(remoteMessage.getNotification().getTitle(), remoteMessage.getNotification().getBody());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void showNotification(MessageInfo messageInfo) {
|
||||
@@ -57,23 +49,11 @@ public class MyFirebaseMessageingService extends FirebaseMessagingService {
|
||||
.getComponent();
|
||||
notifyIntent.setComponent(launchComponent);
|
||||
}
|
||||
|
||||
notifyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
|
||||
notifyIntent.setAction(Intent.ACTION_VIEW);
|
||||
notifyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // 必须
|
||||
notifyIntent.putExtra("message", messageInfo);
|
||||
|
||||
PendingIntent pendingIntent = PendingIntent.getActivity(this, new Random().nextInt(10000), notifyIntent, PendingIntent.FLAG_IMMUTABLE);
|
||||
|
||||
// Intent notifyIntent = new Intent(this, MainActivity2.class);
|
||||
// notifyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
|
||||
// // notifyIntent.putExtra("message", messageInfo);
|
||||
// notifyIntent.setAction(Intent.ACTION_VIEW);
|
||||
// notifyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // 必须
|
||||
// PendingIntent pendingIntent;
|
||||
// pendingIntent = PendingIntent.getActivity
|
||||
// (this, 0, notifyIntent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
|
||||
|
||||
NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
|
||||
NotificationChannel channelwinway = null;
|
||||
NotificationCompat.Builder notificationBuilder = null;
|
||||
@@ -113,8 +93,6 @@ public class MyFirebaseMessageingService extends FirebaseMessagingService {
|
||||
notifyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
|
||||
notifyIntent.setAction(Intent.ACTION_VIEW);
|
||||
notifyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // 必须
|
||||
|
||||
|
||||
PendingIntent pendingIntent = PendingIntent.getActivity(this, new Random().nextInt(10000), notifyIntent, PendingIntent.FLAG_IMMUTABLE);
|
||||
NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
|
||||
NotificationChannel channelwinway = null;
|
||||
@@ -143,29 +121,5 @@ public class MyFirebaseMessageingService extends FirebaseMessagingService {
|
||||
.setContentIntent(pendingIntent);
|
||||
}
|
||||
notificationManager.notify(0, notificationBuilder.build());
|
||||
//存储数据
|
||||
// saveNotifyMessage(body);
|
||||
}
|
||||
|
||||
|
||||
// public void saveNotifyMessage(String body) {
|
||||
// MessageInfo messageInfo = GsonUtils.getObjFromJSON(body, MessageInfo.class);
|
||||
// String savenotify = Utils.get(getApplication(),ApiService.savenotify,"");
|
||||
// if(messageInfo!=null){
|
||||
// if(TextUtils.isEmpty(savenotify)){
|
||||
// GsonUtils.getListFromJSON(savenotify,)
|
||||
// }
|
||||
// }
|
||||
// String jsonString = GsonUtils.beanToJSONString(chatMessageBeans);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * @param key 要设置的key
|
||||
// */
|
||||
// public static void set(Context activity, String key, String is) {
|
||||
// SharedPreferences nameSetting = getConfigShared(activity);
|
||||
// SharedPreferences.Editor namePref = nameSetting.edit();
|
||||
// namePref.putString(key, is);
|
||||
// namePref.commit();
|
||||
// }
|
||||
}
|
||||
|
||||
@@ -2,10 +2,8 @@ package com.web.FreeAUD;
|
||||
|
||||
import android.app.Application;
|
||||
import android.content.Context;
|
||||
|
||||
import com.tencent.smtt.export.external.TbsCoreSettings;
|
||||
import com.tencent.smtt.sdk.QbSdk;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
public class WebApplication extends Application {
|
||||
|
||||
Reference in New Issue
Block a user