Forráskód Böngészése

1.修改Android Apex CRM通知处理。

Pen Li 7 éve
szülő
commit
9350a80a37

+ 2 - 6
ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/application/ApexApplication.java

@@ -243,11 +243,7 @@ public class ApexApplication extends Application {
         }
     }
 
-    public Class getMainActivityClass() {
-        return Activity.class;
-    }
-
-    public void showNotification(NotificationContent content, String channelId, String channelName) {
+    public void showNotification(NotificationContent content, String channelId, String channelName, Class activityCls) {
         if (content == null) {
             return;
         }
@@ -256,7 +252,7 @@ public class ApexApplication extends Application {
             return;
         }
 
-        Intent intent = new Intent(getApplicationContext(), getMainActivityClass());
+        Intent intent = new Intent(getApplicationContext(), activityCls);
         intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); // getIntent可能是null
         if (content.extra != null) {
             intent.putExtra(NotificationContent.ExtraKey,content.extra); // 程序在后台的情况下,点击通知将程序唤醒到前台时,并不能取得extra

+ 1 - 6
ApexDrivers/apexcrm/src/main/java/com/usai/apex/apexcrm/application/ApexCRMApp.java

@@ -67,11 +67,6 @@ public class ApexCRMApp extends ApexApplication implements RAProviderHelper.Prov
         initAlarm(AlarmReceiver.class);
     }
 
-    @Override
-    public Class getMainActivityClass() {
-        return MainActivity.class;
-    }
-
     // endregion
 
     // region Getter
@@ -203,7 +198,7 @@ public class ApexCRMApp extends ApexApplication implements RAProviderHelper.Prov
 
                     NotificationContent notificationContent = new NotificationContent(id, title, body, R.drawable.small_icon_clear, R.drawable.large_notification_icon_clear , aps.toString());
 
-                    showNotification(notificationContent, CHANNEL_ID, CHANNEL_NAME);
+                    showNotification(notificationContent, CHANNEL_ID, CHANNEL_NAME, MainActivity.class);
                 }
 
             }