Merge remote-tracking branch 'remotes/origin/locky' into test

Controller/AiController.py

@@ -159,7 +159,7 @@ class AiView(View):
                 token_val = up['token_val']
                 lang = up['lang']
                 # 推送标题和推送内容
-                msg_title = PushObject.get_msg_title(app_bundle_id=app_bundle_id, nickname=nickname)
+                msg_title = PushObject.get_msg_title(nickname=nickname)
                 msg_text = PushObject.get_ai_msg_text(channel=channel, n_time=n_time, lang=lang, tz=tz, label=label_str)
 
                 kwargs = {

Controller/ComboCron/ComboCronPushController.py

@@ -102,7 +102,7 @@ class ComboCronPushView(View):
                 app_bundle_id = push_vo['app_bundle_id']
 
                 # 获取推送所需数据
-                msg_title = PushObject.get_msg_title(app_bundle_id, nickname)
+                msg_title = PushObject.get_msg_title(nickname)
                 if lang == 'cn':
                     sys_msg_text = "温馨提示：尊敬的客户，您" + nickname + "设备4G流量套餐将在" + time.strftime("%Y-%m-%d", time.localtime(
                         item['expire_time'])) + "到期"
@@ -183,7 +183,7 @@ class ComboCronPushView(View):
                     app_bundle_id = push_vo['app_bundle_id']
 
                     # 获取推送所需数据
-                    msg_title = PushObject.get_msg_title(app_bundle_id, item.serial_no)
+                    msg_title = PushObject.get_msg_title(item.serial_no)
                     sys_msg_text = sys_msg if msg else cls.get_msg_text(item.serial_no, lang, total, usage, usable)
                     kwargs['app_bundle_id'] = app_bundle_id
                     kwargs['token_val'] = token_val

Controller/DetectControllerV2.py

@@ -194,25 +194,6 @@ class NotificationV2View(View):
         except Exception as e:
             logger.info('推送图片测试异常:{}'.format(e))
 
-    def get_msg_title(self, appBundleId, nickname):
-        package_title_config = {
-            'com.ansjer.customizedd_a': 'DVS',
-            'com.ansjer.zccloud_a': 'ZosiSmart',
-            'com.ansjer.zccloud_ab': '周视',
-            'com.ansjer.adcloud_a': 'ADCloud',
-            'com.ansjer.adcloud_ab': 'ADCloud',
-            'com.ansjer.accloud_a': 'ACCloud',
-            'com.ansjer.loocamccloud_a': 'Loocam',
-            'com.ansjer.loocamdcloud_a': 'Anlapus',
-            'com.ansjer.customizedb_a': 'COCOONHD',
-            'com.ansjer.customizeda_a': 'Guardian365',
-            'com.ansjer.customizedc_a': 'PatrolSecure',
-        }
-        if appBundleId in package_title_config.keys():
-            return package_title_config[appBundleId] + '(' + nickname + ')'
-        else:
-            return nickname
-
     @staticmethod
     def is_sys_msg(event_type):
         """

Controller/PowerWarningController.py

@@ -67,7 +67,7 @@ class PowerWarningView(View):
                     tz = 0
 
                 # 推送标题和推送内容
-                msg_title = PushObject.get_msg_title(app_bundle_id=app_bundle_id, nickname=nickname)
+                msg_title = PushObject.get_msg_title(nickname=nickname)
                 msg_text = PushObject.get_low_power_msg_text(channel=channel, n_time=now_time, lang=lang, tz=tz,
                                                              electricity=electricity)
 

Controller/gatewayController.py

@@ -157,7 +157,7 @@ class GatewayView(View):
                     tz = gateway_push['tz'] if gateway_push['tz'] else 0
 
                     # 获取推送所需数据
-                    msg_title = PushObject.get_msg_title(app_bundle_id, nickname)
+                    msg_title = PushObject.get_msg_title(nickname)
                     msg_text = PushObject.get_gateway_msg_text(n_time, tz, lang, alarm)
 
                     kwargs['msg_title'] = msg_title

Service/DevicePushService.py

@@ -116,7 +116,7 @@ class DevicePushService:
             if tz is None or tz == '':
                 tz = 0
             # 发送标题
-            msg_title = cls.get_msg_title(appBundleId=appBundleId, nickname=params['nickname'])
+            msg_title = cls.get_msg_title(nickname=params['nickname'])
             # 发送内容
             msg_text = cls.get_msg_text(channel=params['channel'], n_time=params['n_time'], lang=lang,
                                         tz=tz, event_type=params['event_type'],
@@ -241,14 +241,11 @@ class DevicePushService:
         )
 
     @staticmethod
-    def get_msg_title(appBundleId, nickname):
+    def get_msg_title(nickname):
         """
         获取消息标题
         """""
-        if appBundleId in APP_BUNDLE_DICT.keys():
-            return APP_BUNDLE_DICT[appBundleId] + '(' + nickname + ')'
-        else:
-            return nickname
+        return nickname
 
     @staticmethod
     def get_msg_text(channel, n_time, lang, tz, event_type, electricity='', is_sys=0):

Service/HuaweiPushService/HuaweiPushService.py

@@ -27,6 +27,7 @@ class HuaweiPushObject:
         logger = logging.getLogger('info')
         logger.info('华为推送参数:{}, {}, {}, {}'.format(msg_title, msg_text, image_url, token_val))
 
+        msg_title = '设备昵称: {}'.format(msg_title)
         notification = messaging.Notification(
             title=msg_title,
             body=msg_text,

Service/PushService.py

@@ -27,18 +27,13 @@ from Service.VivoPushService.push_admin.APISender import APISender
 class PushObject:
     # 推送对象
     @staticmethod
-    def get_msg_title(app_bundle_id, nickname):
+    def get_msg_title(nickname):
         """
         获取推送消息标题
-        @param app_bundle_id: app包id
         @param nickname: 设备名
         @return: msg_title
         """
-        if app_bundle_id in APP_BUNDLE_DICT.keys():
-            msg_title = APP_BUNDLE_DICT[app_bundle_id] + '(' + nickname + ')'
-        else:
-            msg_title = nickname
-        return msg_title
+        return nickname
 
     @staticmethod
     def get_gateway_msg_text(n_time, tz, lang, alarm):