update push

heavy163 · Jan 26, 2019 · 4e1b318 · 4e1b318
1 parent 72d9238
commit 4e1b318
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 48 deletions.
diff --git a/chat/src/main/AndroidManifest.xml b/chat/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
@@ -177,7 +177,12 @@
         <activity android:name="cn.wildfire.chat.channel.ChannelInfoActivity" />
         <activity
             android:name="cn.wildfire.chat.main.MainActivity"
-            android:label="火信" />
+            android:label="火信">
+            <intent-filter>
+                <action android:name="cn.wildfirechat.chat.main" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <provider
             android:name="cn.wildfire.chat.third.utils.FilePickerProvider"

diff --git a/chat/src/main/java/cn/wildfire/chat/app/MyApp.java b/chat/src/main/java/cn/wildfire/chat/app/MyApp.java
@@ -73,6 +73,7 @@ public void onCreate() {
             ProcessLifecycleOwner.get().getLifecycle().addObserver(new LifecycleObserver() {
                 @OnLifecycleEvent(Lifecycle.Event.ON_START)
                 public void onForeground() {
+                    PushService.clearNotification(MyApp.this);
                     isBackground = false;
                 }
 

diff --git a/push/README.md b/push/README.md
@@ -0,0 +1,24 @@
+#推送说明
+1. 目前集成了小米、华为、魅族推送，开发者可以自行集成其他推送。小米、华为、魅族手机上，分别走各家自己的推送；其他手机走小米推送。
+2. 项目中的key等，只供测试使用，开发者需要自行申请相关key等。
+
+##小米推送
+1. 小米支持透传和通知栏推送，目前voip相关消息，走透传推送，其他消息，走通知栏推送。透传和通知栏的差别如下表：
+
+  |            | 透传推送                       | 通知栏推送                   |
+  | ---------- | ------------------------------ | ---------------------------- |
+  | 允许自启动 | 通知栏不弹出通知，但拉活应用   | 通知栏弹出通知，并拉活应用   |
+  | 禁止自启动 | 通知栏不弹出通知，也不拉活应用 | 通知栏弹出通知，但不拉活应用 |
+
+2. 当允许自启动，并采用通知栏推送时，通知栏会重复
+
+## 华为推送
+
+todo
+
+## 魅族推送
+
+todo
+
+
+
diff --git a/push/build.gradle b/push/build.gradle
@@ -48,24 +48,3 @@ dependencies {
     implementation project(':client')
     implementation 'com.meizu.flyme.internet:push-internal:3.4.2@aar'
 }
-
-//apply plugin: 'com.novoda.bintray-release'
-////设置所有工程编码为UTF-8编码，防止出现编码GBK的不可映射字符
-//allprojects {
-//    tasks.withType(Javadoc) {
-//        options {
-//            encoding "UTF-8"
-//            charSet 'UTF-8'
-//            links "http://docs.oracle.com/javase/7/docs/api"
-//        }
-//    }
-//}
-//
-//publish {
-//    userOrg = 'wfchat'
-//    groupId = 'cn.wildfirechat'
-//    artifactId = 'push'
-//    publishVersion = android.defaultConfig.versionName
-//    desc = 'Oh hi, this is a nice description for a project, right?'
-//    website = 'https://github.com/novoda/bintray-release'
-//}
diff --git a/push/src/main/AndroidManifest.xml b/push/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
     <!-- the following 2 com.xiaomi.mipushdemo should be changed to your package name -->
     <permission
         android:name="${APP_ID}.permission.MIPUSH_RECEIVE"
-        android:protectionLevel="signature" />
+        android:protectionLevel="signatureOrSystem" />
 
     <uses-permission android:name="${APP_ID}.permission.MIPUSH_RECEIVE" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -31,21 +31,10 @@
     <uses-permission android:name="com.meizu.c2dm.permission.RECEIVE" />
     <permission
         android:name="${APP_ID}.permission.C2D_MESSAGE"
-        android:protectionLevel="signature"/>
+        android:protectionLevel="signature" />
     <uses-permission android:name="${APP_ID}.permission.C2D_MESSAGE" />
 
     <application>
-        <!--getui -->
-        <!-- 用户自定义服务继承自GTIntentService,作为SDK与APP桥梁服务,用来接收各种消息和命令回复-->
-        <!-- 主进程-->
-        <service android:name="cn.wildfirechat.push.getui.GetuiIntentService" />
-
-        <!-- 配置SDK核心服务 -->
-        <service
-            android:name="cn.wildfirechat.push.getui.GetuiPushService"
-            android:exported="true"
-            android:label="PushService"
-            android:process=":pushservice" />
 
         <!--huawei-->
         <!-- value的值“xxx”用实际申请的应用ID替换，来源于开发者联盟网站应用的服务详情。-->
@@ -153,6 +142,7 @@
             </intent-filter>
         </receiver>
 
+        <!--meizu-->
         <receiver android:name=".meizu.MeizuPushReceiver">
             <intent-filter>
                 <!-- 接收push消息 -->

diff --git a/push/src/main/java/cn/wildfirechat/push/PushService.java b/push/src/main/java/cn/wildfirechat/push/PushService.java
@@ -2,6 +2,7 @@
 
 import android.app.ActivityManager;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
@@ -43,7 +44,7 @@ public enum PushServiceType {
 
     public static void init(Context gContext) {
         String sys = getSystem();
-        if(SYS_EMUI.equals(sys) &&INST.isHMSConfigured(gContext)) {
+        if (SYS_EMUI.equals(sys) && INST.isHMSConfigured(gContext)) {
             INST.pushServiceType = PushServiceType.HMS;
             INST.initHMS(gContext);
         } else if (/*SYS_FLYME.equals(sys) && INST.isMZConfigured(gContext)*/MzSystemUtils.isBrandMeizu()) {
@@ -54,7 +55,21 @@ public static void init(Context gContext) {
             INST.pushServiceType = PushServiceType.Xiaomi;
             INST.initXiaomi(gContext);
         }
+    }
+
+    public static void clearNotification(Context context) {
+        if (INST.pushServiceType == PushServiceType.Xiaomi) {
+            MiPushClient.clearNotification(context);
+        } else {
+            // TODO
+        }
+    }
 
+    public static void showMainActivity(Context context) {
+        String action = "cn.wildfirechat.chat.main";
+        Intent intent = new Intent(action);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
     }
 
     public static void didReceiveIMPushMessage(Context context, AndroidPushMessage pushMessage, PushServiceType pushServiceType) {

diff --git a/push/src/main/java/cn/wildfirechat/push/huawei/HuaweiPushRevicer.java b/push/src/main/java/cn/wildfirechat/push/huawei/HuaweiPushRevicer.java
@@ -17,6 +17,7 @@
 
 public class HuaweiPushRevicer extends PushReceiver {
     private final static String TAG = "HuaweiPushRevicer";
+
     @Override
     public void onToken(Context context, String s, Bundle bundle) {
         try {
@@ -38,4 +39,13 @@ public void onPushMsg(Context context, byte[] payload, String s) {
             PushService.didReceivePushMessageData(context, data);
         }
     }
+
+    @Override
+    public void onEvent(Context context, Event event, Bundle extras) {
+        if (event == Event.NOTIFICATION_OPENED || event == Event.NOTIFICATION_CLICK_BTN) {
+            PushService.showMainActivity(context);
+        } else {
+            super.onEvent(context, event, extras);
+        }
+    }
 }
diff --git a/push/src/main/java/cn/wildfirechat/push/meizu/MeizuPushReceiver.java b/push/src/main/java/cn/wildfirechat/push/meizu/MeizuPushReceiver.java
@@ -68,9 +68,7 @@ public void onSubAliasStatus(Context context, SubAliasStatus subAliasStatus) {
 
     @Override
     public void onNotificationClicked(Context context, String title, String content, String selfDefineContentString) {
-        super.onNotificationClicked(context, title, content, selfDefineContentString);
-        Log.e(TAG, "onNC");
-        // do nothing, will start app
+        PushService.showMainActivity(context);
     }
 
     @Override

diff --git a/push/src/main/java/cn/wildfirechat/push/xiaomi/MiMessageReceiver.java b/push/src/main/java/cn/wildfirechat/push/xiaomi/MiMessageReceiver.java
@@ -56,14 +56,7 @@ public void onReceivePassThroughMessage(Context context, MiPushMessage message)
 
     @Override
     public void onNotificationMessageClicked(Context context, MiPushMessage message) {
-        mMessage = message.getContent();
-        if (!TextUtils.isEmpty(message.getTopic())) {
-            mTopic = message.getTopic();
-        } else if (!TextUtils.isEmpty(message.getAlias())) {
-            mAlias = message.getAlias();
-        } else if (!TextUtils.isEmpty(message.getUserAccount())) {
-            mUserAccount = message.getUserAccount();
-        }
+        PushService.showMainActivity(context);
     }
 
     @Override