huawei push compatible

Author: Helperhaps

examples/huawei_push_example.php

@@ -0,0 +1,36 @@
+<?php
+// 这只是使用样例,不应该直接用于实际生产环境中 !!
+
+require 'config.php';
+
+try {
+    $payload = $client->push()
+        ->setPlatform(array('ios', 'android'))
+        // ->addAlias('alias')
+        ->addTag(array('tag1', 'tag2'))
+        // ->addRegistrationId($registration_id)
+        ->setNotificationAlert('Hi, JPush')
+        ->androidNotification('Hello HUAWEI', array(
+            'title' => 'huawei demo',
+
+            // ---------------------------------------------------
+            // `uri_activity` 字段用于指定想要打开的 activity.
+            // 值为 activity 节点的 “android:name” 属性值。
+            'uri_activity' => 'cn.jpush.android.ui.OpenClickActivity',
+            // ---------------------------------------------------
+
+            'extras' => array(
+                'key' => 'value',
+                'jiguang'
+            ),
+        ));
+        // ->send();
+        print_r($payload->build());
+
+} catch (\JPush\Exceptions\APIConnectionException $e) {
+    // try something here
+    print $e;
+} catch (\JPush\Exceptions\APIRequestException $e) {
+    // try something here
+    print $e;
+}

src/JPush/PushPayload.php

@@ -367,8 +367,6 @@ public function iosNotification($alert = '', array $notification = array()) {
     }
 
     public function androidNotification($alert = '', array $notification = array()) {
-        # $required_keys = array('title', 'builder_id', 'priority', 'category', 'style',
-        #                        'alert_type', 'big_text', 'inbox', 'big_pic_path', 'extras');
         $android = array();
         $android['alert'] = is_string($alert) ? $alert : '';
         if (!empty($notification)) {
@@ -402,6 +400,7 @@ public function androidNotification($alert = '', array $notification = array())
             if (isset($notification['alert_type']) && is_int($notification['alert_type'])) {
                 $android['alert_type'] = $notification['alert_type'];
             }
+            $android = array_merge($notification, $android);
         }
         $this->androidNotification = $android;
         return $this;

src/JPush/version.php

@@ -1,4 +1,4 @@
 <?php
 namespace JPush;
 
-  const VERSION = '3.5.22';
+  const VERSION = '3.5.23';