升级 Android SDK 到 v3.2.4

Author: Jeepeng

android/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.3'
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 16
@@ -31,10 +31,10 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile "com.facebook.react:react-native:+"
     compile "me.leolin:ShortcutBadger:1.1.21@aar"
-    compile 'com.tencent.xinge:xinge:3.2.2-release'
+    compile 'com.tencent.xinge:xinge:3.2.4-beta'
     compile 'com.tencent.wup:wup:1.0.0.E-release'
     compile 'com.tencent.mid:mid:4.0.6-release'
-    compile 'com.tencent.xinge:xghw:2.5.2.300-release'
-    compile 'com.tencent.xinge:mipush:3.2.2-release'
-    compile 'com.tencent.xinge:xgmz:3.2.2-release'
+    compile 'com.tencent.xinge:xghw:3.2.4-beta'
+    compile 'com.tencent.xinge:mipush:3.2.4-beta'
+    compile 'com.tencent.xinge:xgmz:3.2.4-beta'
 }

android/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
                 <action android:name="com.tencent.android.tpush.action.FEEDBACK" />
             </intent-filter>
         </receiver>
-        <receiver android:name="com.jeepeng.react.xgpush.receiver.HWMessageReceiver" >
+        <receiver android:name="com.tencent.android.hwpush.HWPushMessageReceiver" >
             <intent-filter>
                 <!-- 必须,用于接收TOKEN -->
                 <action android:name="com.huawei.android.push.intent.REGISTRATION" />
@@ -28,7 +28,7 @@
         </receiver>
         <receiver
             android:exported="true"
-            android:name="com.jeepeng.react.xgpush.receiver.XMMessageReceiver">
+            android:name="com.tencent.android.mipush.XMPushMessageReceiver">
             <intent-filter>
                 <action android:name="com.xiaomi.mipush.RECEIVE_MESSAGE" />
             </intent-filter>
@@ -39,7 +39,7 @@
                 <action android:name="com.xiaomi.mipush.ERROR" />
             </intent-filter>
         </receiver>
-        <receiver android:name="com.jeepeng.react.xgpush.receiver.MZMessageReceiver">
+        <receiver android:name="com.tencent.android.mzpush.MZPushMessageReceiver">
             <intent-filter>
                 <!-- 接收push消息 -->
                 <action android:name="com.meizu.flyme.push.intent.MESSAGE" />

android/src/main/java/com/jeepeng/react/xgpush/PushModule.java

@@ -20,6 +20,7 @@
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.tencent.android.tpush.XGIOperateCallback;
 import com.tencent.android.tpush.XGLocalMessage;
+import com.tencent.android.tpush.XGPushClickedResult;
 import com.tencent.android.tpush.XGPushConfig;
 import com.tencent.android.tpush.XGPushManager;
 import com.tencent.android.tpush.encrypt.Rijndael;
@@ -371,8 +372,13 @@ public void initMeizu(String appId, String appKey) {
     public void getInitialNotification(Promise promise) {
         WritableMap params = Arguments.createMap();
         Activity activity = getCurrentActivity();
+        Log.d("getInitialNotification", ">>>>>>>>>>>>>>>>>");
         if (activity != null) {
             Intent intent = activity.getIntent();
+            XGPushClickedResult result = XGPushManager.onActivityStarted(activity);
+            if (result != null) {
+                Log.d("getInitialNotification", result.getContent());
+            }
             try {
                 if(intent != null && intent.hasExtra("protect")) {
                     String title = Rijndael.decrypt(intent.getStringExtra("title"));
@@ -381,6 +387,7 @@ public void getInitialNotification(Promise promise) {
                     params.putString("title",  title);
                     params.putString("content",  content);
                     params.putString("custom_content",  customContent);
+                    Log.d("getInitialNotification", content);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -422,11 +429,10 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
 
     @Override
     public void onNewIntent(Intent intent) {
-        /*
+        Log.d("onNewIntent", ">>>>>>>>>>>>>>>>>");
         Activity activity = getCurrentActivity();
         if (activity != null) {
             activity.setIntent(intent); // 后台运行时点击通知会调用
         }
-        */
     }
 }

android/src/main/java/com/jeepeng/react/xgpush/receiver/HWMessageReceiver.java

@@ -1,101 +1,11 @@
 package com.jeepeng.react.xgpush.receiver;
 
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-
-import com.huawei.hms.support.api.push.PushReceiver;
-import com.jeepeng.react.xgpush.Constants;
-
-import java.io.FileWriter;
-import java.io.IOException;
+import com.tencent.android.hwpush.HWPushMessageReceiver;
 
 /**
  * 华为官方推送通道消息接收器
  * Created by Jeepeng on 2018/3/11.
  */
 
-public class HWMessageReceiver extends PushReceiver {
-
-    @Override
-    public void onEvent(Context context, Event event, Bundle extras) {
-        if (Event.NOTIFICATION_OPENED.equals(event) || Event.NOTIFICATION_CLICK_BTN.equals(event)) {
-            int notifyId = extras.getInt(BOUND_KEY.pushNotifyId, 0);
-            if (0 != notifyId) {
-                NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-                manager.cancel(notifyId);
-            }
-        }
-
-        String message = extras.getString(BOUND_KEY.pushMsgKey);
-        String deviceToken = extras.getString(BOUND_KEY.deviceTokenKey);
-        int receiveType = extras.getInt(BOUND_KEY.receiveTypeKey);
-        String pushState = extras.getString(BOUND_KEY.pushStateKey);
-        int pushNotifyId = extras.getInt(BOUND_KEY.pushNotifyId, 0);
-        // message:[{"id":"123456"}]
-        // Bundle[{receiveType=4, pushMsg=[{"id":"1"},{"name":"jeepeng"},{"sex":"man"}]}]
-
-        if (Event.NOTIFICATION_OPENED.equals(event)) {
-            // 通知在通知栏被点击啦。。。。。
-            Intent intent = new Intent(Constants.ACTION_ON_NOTIFICATION_CLICKED);
-            Bundle bundle = new Bundle();
-            bundle.putString("content", message);
-            intent.putExtra("notification", bundle);
-
-            intent.putExtra("content", message);
-            intent.putExtra("custom_content", message);
-            context.sendBroadcast(intent);
-        }
-
-        super.onEvent(context, event, extras);
-    }
-
-    @Override
-    public boolean onPushMsg(Context context, byte[] msg, Bundle bundle) {
-        try {
-            String content = new String(msg, "UTF-8");
-            Intent intent = new Intent(Constants.ACTION_ON_TEXT_MESSAGE);
-            intent.putExtra("content", content);
-            context.sendBroadcast(intent);
-            System.out.println(bundle);
-            Log.i("HWMessageReceiver", "收到PUSH透传消息,消息内容为:" + content);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return super.onPushMsg(context, msg, bundle);
-    }
-
-    @Override
-    public void onPushState(Context context, boolean pushState) {
-        super.onPushState(context, pushState);
-    }
-
-    @Override
-    public void onToken(Context context, String token, Bundle extras) {
-        super.onToken(context, token, extras);
-    }
-
-    @Override
-    public void onToken(Context context, String token) {
-        super.onToken(context, token);
-    }
-
-    private void  writeToFile(String conrent) {
-        String SDPATH = Environment.getExternalStorageDirectory() + "/huawei.txt";
-        try {
-            FileWriter fileWriter = new FileWriter(SDPATH, true);
-
-            fileWriter.write(conrent+"\r\n");
-            fileWriter.flush();
-            fileWriter.close();
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
-
-
+public class HWMessageReceiver extends HWPushMessageReceiver {
 }

example/android/app/build.gradle

@@ -94,22 +94,23 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.3'
+    compileSdkVersion 26
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "com.jeepeng.push"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 3
-        versionName "1.0"
+        versionName "1.0.1"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
         manifestPlaceholders = [
             XG_ACCESS_ID: "2100209996",
             XG_ACCESS_KEY: "AHW931HVZ42A",
             HW_APPID: "100225811",
+            PACKAGE_NAME: "com.jeepeng.push"
         ]
     }
     splits {
@@ -144,7 +145,7 @@ android {
 dependencies {
     compile project(':react-native-xinge-push')
     compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.android.support:appcompat-v7:25.4.0"
+    compile "com.android.support:appcompat-v7:26.1.0"
     compile "com.facebook.react:react-native:+"  // From node_modules
 }
 

example/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jan 17 12:01:37 CST 2018
+#Tue Mar 27 17:51:16 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip