Merge pull request #380 from jpush/dev

Dev

README.md

@@ -41,27 +41,6 @@
   ```shell
   cordova plugin add Your_Plugin_Path --variable APP_KEY=your_jpush_appkey
   ```
-  
-  
-### 参数
-
-  - APP_KEY: 必须设置，JPush 上注册的包名对应的 Appkey
-
-    ```shell
-    --variable APP_KEY=your_jpush_appkey
-    ```
-
-  - CHANNEL: 可以不设置，v3.6.0+ 版本开始支持(Android Only)，方便开发者统计 APK 分发渠道，默认为 developer-default.
-
-    ```shell
-    --variable CHANNEL=your_channel
-    ```
-
-  - 同时动态配置 APP_KEY 和 CHANNEL 示例
-
-    ```shell
-    cordova plugin add jpush-phonegap-plugin --variable APP_KEY=your_jpush_appkey --variable CHANNEL=your_channel
-    ```
 
 ### Ionic
 
@@ -144,10 +123,6 @@ Android 的推送通过长连接的方式实现，只有在保持连接的情况
 
 ### iOS
 
-#### XCode 10 收不到推送怎么办？
-
-打开 xcode -> file -> WorkSpace Settings… -> Build System 改成 Legacy Build System 然后卸载 App 重新运行。
-
 #### 打包时遇到 i386 打包失败怎么办？
 
 ```shell

package.json

@@ -1,6 +1,6 @@
 {
     "name": "jpush-phonegap-plugin",
-    "version": "3.6.0",
+    "version": "3.5.0",
     "description": "JPush for cordova plugin",
     "cordova": {
         "id": "jpush-phonegap-plugin",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="jpush-phonegap-plugin"
-  version="3.6.0">
+  version="3.5.0">
 
     <name>JPush</name>
     <description>JPush for cordova plugin</description>
@@ -11,7 +11,6 @@
     <license>MIT License</license>
 
     <preference name="APP_KEY" />
-    <preference name="CHANNEL" default="developer-default" />
 
     <engines>
         <engine name="cordova" version=">=3.0" />
@@ -213,11 +212,11 @@
 
 
             <!-- Required. Enable it you can get statistics data with channel -->
-            <meta-data android:name="JPUSH_CHANNEL" android:value="$CHANNEL" />
+            <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
             <meta-data android:name="JPUSH_APPKEY" android:value="$APP_KEY" />
         </config-file>
 
-        <lib-file src="src/android/libs/jpush-android-3.1.8.jar" />
+        <lib-file src="src/android/libs/jpush-android-3.1.7.jar" />
 
         <source-file src="src/android/JPushReceiver.java" target-dir="src/cn/jiguang/cordova/push" />
         <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jiguang/cordova/push" />

src/android/JPushPlugin.java

@@ -1,8 +1,8 @@
 package cn.jiguang.cordova.push;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AppOpsManager;
-import android.app.NotificationManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.os.Build;
@@ -20,17 +20,22 @@ import org.json.JSONObject;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import cn.jpush.android.api.BasicPushNotificationBuilder;
 import cn.jpush.android.api.JPushInterface;
 import cn.jpush.android.api.TagAliasCallback;
 import cn.jpush.android.data.JPushLocalNotification;
+import cn.jpush.android.service.JPushMessageReceiver;
 
 public class JPushPlugin extends CordovaPlugin {
 
@@ -668,42 +673,35 @@ public class JPushPlugin extends CordovaPlugin {
         }
     };
 
+    @TargetApi(Build.VERSION_CODES.KITKAT)
     private boolean hasPermission(String appOpsServiceId) {
-
         Context context = cordova.getActivity().getApplicationContext();
-        if (Build.VERSION.SDK_INT >= 24) {
-            NotificationManager mNotificationManager = (NotificationManager) context
-                    .getSystemService(Context.NOTIFICATION_SERVICE);
-            return mNotificationManager.areNotificationsEnabled();
-        } else {
-            AppOpsManager mAppOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
-            ApplicationInfo appInfo = context.getApplicationInfo();
+        AppOpsManager mAppOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+        ApplicationInfo appInfo = context.getApplicationInfo();
 
-            String pkg = context.getPackageName();
-            int uid = appInfo.uid;
-            Class appOpsClazz;
+        String pkg = context.getPackageName();
+        int uid = appInfo.uid;
+        Class appOpsClazz;
 
-            try {
-                appOpsClazz = Class.forName(AppOpsManager.class.getName());
-                Method checkOpNoThrowMethod = appOpsClazz.getMethod("checkOpNoThrow", Integer.TYPE, Integer.TYPE,
-                        String.class);
-                Field opValue = appOpsClazz.getDeclaredField(appOpsServiceId);
-                int value = opValue.getInt(Integer.class);
-                Object result = checkOpNoThrowMethod.invoke(mAppOps, value, uid, pkg);
-                return Integer.parseInt(result.toString()) == AppOpsManager.MODE_ALLOWED;
-            } catch (InvocationTargetException e) {
-                e.printStackTrace();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (NoSuchMethodException e) {
-                e.printStackTrace();
-            } catch (NoSuchFieldException e) {
-                e.printStackTrace();
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            }
+        try {
+            appOpsClazz = Class.forName(AppOpsManager.class.getName());
+            Method checkOpNoThrowMethod = appOpsClazz.getMethod("checkOpNoThrow", Integer.TYPE, Integer.TYPE,
+                    String.class);
+            Field opValue = appOpsClazz.getDeclaredField(appOpsServiceId);
+            int value = opValue.getInt(Integer.class);
+            Object result = checkOpNoThrowMethod.invoke(mAppOps, value, uid, pkg);
+            return Integer.parseInt(result.toString()) == AppOpsManager.MODE_ALLOWED;
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
         }
-
-        return false;
+        return true;
     }
 }