推送API，Notification里Android增加channel_id字段

增加批量单推接口
增加接口送达统计详情（新） /v3/received/detail
增加消息统计详情（VIP 专属接口，新）/v3/messages/detail

Author: zhengjh

Diff for: .gitignore

@@ -4,3 +4,4 @@ dist/
 jpush.egg-info/
 .idea/
 examples/conf.py
+/tests/conf.py

Diff for: examples/batch_push_example.py

@@ -0,0 +1,13 @@
+from conf import app_key, master_secret
+import jpush
+
+_jpush = jpush.JPush(app_key, master_secret)
+_jpush.set_logging("DEBUG")
+
+push = _jpush.create_push()
+single_payload_list = [
+    {'platform':'all', 'target':'regid1', 'notification':{'alert':'alert content'}},
+    {'platform':'all', 'target':'regid2', 'notification':{'alert':'alert content'}}
+]
+response = push.batch_push_by_regid(single_payload_list)
+print(response)

Diff for: examples/push_example.py

@@ -1,4 +1,5 @@
-from . import jpush, app_key, master_secret
+from conf import app_key, master_secret
+import jpush
 
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
@@ -106,4 +107,4 @@ def validate():
     push.audience = jpush.all_
     push.notification = jpush.notification(alert="Hello, world!")
     push.platform = jpush.all_
-    push.send_validate()
+    push.send_validate()

Diff for: examples/report_example.py

@@ -1,4 +1,5 @@
-from . import jpush, app_key, master_secret
+from conf import app_key, master_secret
+import jpush
 
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
@@ -7,11 +8,20 @@
 def messages():
     report.get_messages("3289406737")
 
-def receivede():
+def messages_detail():
+    report.get_messages_detail("3289406737")
+
+def received():
     report.get_received("3289406737")
 
+def received_detail():
+    report.get_received_detail("3289406737")
+
 def users():
     report.get_users("DAY","2016-04-10","3")
 
 def status():
-    report.get_status_messages('3289406737', ['xxx'])
+    report.get_status_message('3289406737', ['xxx'])
+
+messages_detail()
+received_detail()

Diff for: jpush/__init__.py

@@ -75,7 +75,7 @@
     schedulepayload,
 ]
 
-__version__ = '3.3.7'
+__version__ = '3.3.8'
 VERSION = tuple(map(int,  __version__.split('.')))
 
 # Silence urllib3 INFO logging by default

Diff for: jpush/core.py

@@ -60,7 +60,7 @@ def push(self, payload):
         url = common.get_url('push', self.zone) + 'push'
         self._request('POST', body, url, 'application/json', version=1)
 
-    def  set_logging(self, level):
+    def set_logging(self, level):
         level_list= ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "NOTSET"]
         if level in level_list:
             if(level == "CRITICAL"):

Diff for: jpush/push/core.py

@@ -80,6 +80,28 @@ def get_cid(self, count, type = None):
         response = self._jpush._request('GET', body, url, 'application/json', version=3, params = params)
         return PushResponse(response)
 
+    def batch_push_by_regid(self, single_payload_list):
+        cid_response = self.get_cid(len(single_payload_list), 'push')
+        cidlist = cid_response.payload['cidlist']
+        batch_payload = {"pushlist":{}}
+        for index in range(len(single_payload_list)):
+            batch_payload["pushlist"][cidlist[index]] = single_payload_list[index]
+        body = json.dumps(batch_payload)
+        url = common.get_url('push', self.zone) + 'push/batch/regid/single'
+        response = self._jpush._request('POST', body, url, 'application/json', version=3)
+        return PushResponse(response)
+
+    def batch_push_by_alias(self, single_payload_list):
+        cid_response = self.get_cid(len(single_payload_list), 'push')
+        cidlist = cid_response.payload['cidlist']
+        batch_payload = {"pushlist":{}}
+        for index in range(len(single_payload_list)):
+            batch_payload["pushlist"][cidlist[index]] = single_payload_list[index]
+        body = json.dumps(batch_payload)
+        url = common.get_url('push', self.zone) + 'push/batch/alias/single'
+        response = self._jpush._request('POST', body, url, 'application/json', version=3)
+        return PushResponse(response)
+
 
 class PushResponse(object):
     """Response to a successful push notification send.

Diff for: jpush/push/payload.py

@@ -84,7 +84,7 @@ def ios(alert=None, badge='+1', sound=None, content_available=False,
 
 def android(alert, title=None, builder_id=None, extras=None,
         priority=None, category=None, style=None, alert_type=None,
-        big_text=None, inbox=None, big_pic_path=None, large_icon=None, intent=None):
+        big_text=None, inbox=None, big_pic_path=None, large_icon=None, intent=None, channel_id=None):
     """Android specific platform override payload.
 
     :keyword alert: String alert text.If you set alert to a empty string,then the payload
@@ -103,6 +103,8 @@ def android(alert, title=None, builder_id=None, extras=None,
         payload['title'] = title
     if builder_id is not None:
         payload['builder_id'] = builder_id
+    if channel_id is not None:
+        payload['channel_id'] = channel_id
     if priority is not None:
         payload['priority'] = priority
     if category is not None:

Diff for: jpush/report/core.py

@@ -22,8 +22,14 @@ def get_received(self,msg_ids):
         received = self.send("GET", url, params = params)
         return received
 
-    def get_status_messages(self, msg_id, reg_ids, date=None):
-        url = common.get_url('report', self.zone) + 'status/messages'
+    def get_received_detail(self, msg_ids):
+        url = common.get_url('report', self.zone) + 'received/detail'
+        params = {'msg_ids': msg_ids}
+        response = self.send("GET", url, params = params)
+        return response
+
+    def get_status_message(self, msg_id, reg_ids, date=None):
+        url = common.get_url('report', self.zone) + 'status/message'
         if not isinstance(reg_ids, list):
             reg_ids = [reg_ids]
         body = {
@@ -41,6 +47,12 @@ def get_messages(self, msg_ids):
         messages = self.send("GET", url, params = params)
         return messages
 
+    def get_messages_detail(self, msg_ids):
+        url = common.get_url('report', self.zone) + 'messages/detail'
+        params = {'msg_ids': msg_ids}
+        response = self.send("GET", url, params = params)
+        return response
+
     def get_users(self, time_unit,start,duration):
         url = common.get_url('report', self.zone) + 'users'
         params = {

Diff for: tests/conf.py

@@ -0,0 +1,3 @@
+# please put your app_key and master_secret here
+app_key = u'xxxxxx'
+master_secret = u'xxxxxx'