华为推送添加channel

Service/HuaweiPushService/HuaweiPushService.py

@@ -35,17 +35,19 @@ class HuaweiPushObject:
         @return: bool
         """
         LOGGER.info(
-            '华为推送参数: uid:{}, token_val:{}, msg_title:{}, msg_text:{}, image_url:{}, event_type:{}, n_time:{}'.format(
-                uid, token_val, msg_title, msg_text, image_url, event_type, n_time))
+            '华为推送参数: '
+            'uid:{}, token_val:{}, msg_title:{}, msg_text:{}, image_url:{}, event_type:{}, n_time:{}, channel:{}'.
+            format(uid, token_val, msg_title, msg_text, image_url, event_type, n_time, channel))
 
         send_succeed = self.send_notify_message(msg_title, msg_text, image_url, uid, nickname,
-                                                event_type, n_time, token_val)
+                                                event_type, n_time, token_val, channel)
         if int(event_type) in [606, 607]:
-            self.send_data_message(uid, event_type, n_time, token_val)
+            self.send_data_message(uid, event_type, n_time, token_val, channel)
 
         return send_succeed
 
-    def send_notify_message(self, msg_title, msg_text, image_url, uid, nickname, event_type, n_time, token_val):
+    def send_notify_message(
+            self, msg_title, msg_text, image_url, uid, nickname, event_type, n_time, token_val, channel):
         """
         发送通知推送
         @param msg_title:
@@ -56,6 +58,7 @@ class HuaweiPushObject:
         @param event_type:
         @param n_time:
         @param token_val:
+        @param channel:
         @return: bool
         """
         LOGGER.info('{}进入发送通知推送函数'.format(uid))
@@ -67,9 +70,10 @@ class HuaweiPushObject:
         )
 
         # 自定义键值对
-        data = {'alert': 'Motion', 'msg': '', 'sound': 'sound.aif', 'zpush': '1', 'uid': uid,
-                'nickname': nickname, 'event_type': event_type, 'received_at': n_time, 'event_time': n_time
-                }
+        data = {
+                    'alert': 'Motion', 'msg': '', 'sound': 'sound.aif', 'zpush': '1', 'uid': uid, 'nickname': nickname,
+                    'event_type': event_type, 'received_at': n_time, 'event_time': n_time, 'channel': channel
+            }
         data = json.dumps(data)
         # 推送通知内容配置
         intent = 'intent://com.vivo.pushvideo/detail?#Intent;scheme=vpushscheme;launchFlags=0x10000000;S.uid={};S.event_type={};S.event_time={};end'.format(
@@ -103,17 +107,20 @@ class HuaweiPushObject:
             return False
 
     @staticmethod
-    def send_data_message(uid, event_type, n_time, token_val):
+    def send_data_message(uid, event_type, n_time, token_val, channel):
         """
         发送透传推送
         @param uid:
         @param event_type:
         @param n_time:
         @param token_val:
+        @param channel:
         @return: None
         """
         LOGGER.info('{}进入发送透传推送函数'.format(uid))
-        data = {'uid': uid, 'event_type': event_type, 'event_time': n_time}
+        data = {
+            'uid': uid, 'event_type': event_type, 'event_time': n_time, 'channel': channel
+        }
         data = json.dumps(data)
         android = messaging.AndroidConfig(
             collapse_key=-1,