Bladeren bron

低电量推送内容去掉":"

locky 2 jaren geleden
bovenliggende
commit
c69b26c7a9
3 gewijzigde bestanden met toevoegingen van 6 en 6 verwijderingen
  1. 2 2
      Controller/DetectControllerV2.py
  2. 2 2
      Service/DevicePushService.py
  3. 2 2
      Service/PushService.py

+ 2 - 2
Controller/DetectControllerV2.py

@@ -210,7 +210,7 @@ class NotificationV2View(View):
         etype = int(event_type)
         if lang == 'cn':
             if etype == 704:
-                msg_type = '剩余电量:' + electricity
+                msg_type = '剩余电量 ' + electricity
             elif etype == 702:
                 msg_type = '摄像头休眠'
             elif etype == 703:
@@ -223,7 +223,7 @@ class NotificationV2View(View):
                 send_text = '{msg_type} 通道:{channel} 日期:{date}'.format(msg_type=msg_type, channel=channel, date=n_date)
         else:
             if etype == 704:
-                msg_type = 'Battery remaining:' + electricity
+                msg_type = 'Battery remaining ' + electricity
             elif etype == 702:
                 msg_type = 'Camera sleep'
             elif etype == 703:

+ 2 - 2
Service/DevicePushService.py

@@ -259,7 +259,7 @@ class DevicePushService:
         etype = int(event_type)
         if lang == 'cn':
             if etype == 704:
-                msg_type = '剩余电量:' + electricity
+                msg_type = '剩余电量 ' + electricity
             elif etype == 702:
                 msg_type = '摄像头休眠'
             elif etype == 703:
@@ -272,7 +272,7 @@ class DevicePushService:
                 send_text = '{msg_type} 通道:{channel} 日期:{date}'.format(msg_type=msg_type, channel=channel, date=n_date)
         else:
             if etype == 704:
-                msg_type = 'Battery remaining:' + electricity
+                msg_type = 'Battery remaining ' + electricity
             elif etype == 702:
                 msg_type = 'Camera sleep'
             elif etype == 703:

+ 2 - 2
Service/PushService.py

@@ -87,13 +87,13 @@ class PushObject:
         """
         n_date = CommonService.get_now_time_str(n_time=n_time, tz=tz, lang=lang)
         if lang == 'cn':
-            alarm = '剩余电量:' + electricity
+            alarm = '剩余电量 ' + electricity
             if is_sys:
                 low_power_msg_text = '{} 通道:{}'.format(alarm, channel)
             else:
                 low_power_msg_text = '{} 通道:{} 日期:{}'.format(alarm, channel, n_date)
         else:
-            alarm = 'Battery remaining:' + electricity
+            alarm = 'Battery remaining ' + electricity
             if is_sys:
                 low_power_msg_text = '{} channel:{}'.format(alarm, channel)
             else: