bart

Controller/DetectController.py

@@ -487,7 +487,7 @@ class NotificationView(View):
         push_data = {"alert": "Motion ", "event_time": n_time, "event_type": event_type, "msg": "",
                      "received_at": n_time, "sound": "sound.aif", "uid": uid, "zpush": "1", "channel": channel}
         message_title = self.get_message_title(appBundleId=appBundleId, nickname=nickname)
-        send_text = self.get_send_text(channel=channel, n_time=n_time, lang=lang, tz=tz)
+        send_text = self.get_send_text(channel=channel, n_time=n_time, lang=lang, tz=tz,event_type=event_type)
         android = jpush.android(alert=send_text, priority=1, style=1, alert_type=7,
                                 big_text=send_text, title=message_title,
                                 extras=push_data)
@@ -524,11 +524,16 @@ class NotificationView(View):
         else:
             return nickname
 
-    def get_send_text(self, channel, n_time, lang, tz):
+    def get_send_text(self, channel, n_time, lang, tz, event_type):
         n_date = CommonService.get_now_time_str(n_time=n_time, tz=tz)
-        send_text = 'channel:{channel} date:{date}'.format(channel=channel, date=n_date)
+        msg_type = ''
+        if int(event_type) == 704:
+            msg_type = 'battery is too low'
+            if lang == 'cn':
+                msg_type = '电池电量过低'
+        send_text = '{msg_type}channel:{channel} date:{date}'.format(msg_type=msg_type, channel=channel, date=n_date)
         if lang == 'cn':
-            send_text = '通道:{channel} 日期:{date}'.format(channel=channel, date=n_date)
+            send_text = '{msg_type}通道:{channel} 日期:{date}'.format(msg_type=msg_type, channel=channel, date=n_date)
         return send_text
 
     def do_fcm(self, request_dict, uaql, response, uid, channel, nickname):
@@ -545,7 +550,7 @@ class NotificationView(View):
         push_service = FCMNotification(api_key=serverKey)
         registration_id = token_val
         message_title = self.get_message_title(appBundleId=appBundleId, nickname=nickname)
-        send_text = self.get_send_text(channel=channel, n_time=n_time, lang=lang, tz=tz)
+        send_text = self.get_send_text(channel=channel, n_time=n_time, lang=lang, tz=tz,event_type=event_type)
         data = {"alert": "Motion ", "event_time": n_time, "event_type": event_type, "msg": "",
                 "received_at": n_time, "sound": "sound.aif", "uid": uid, "zpush": "1", "channel": channel}
         result = push_service.notify_single_device(registration_id=registration_id, message_title=message_title,
@@ -566,7 +571,7 @@ class NotificationView(View):
         appBundleId = uaql['appBundleId']
         tz = uaql['tz']
         message_title = self.get_message_title(appBundleId=appBundleId, nickname=nickname)
-        send_text = self.get_send_text(channel=channel, n_time=n_time, lang=lang, tz=tz)
+        send_text = self.get_send_text(channel=channel, n_time=n_time, lang=lang, tz=tz,event_type=event_type)
         try:
             print('---')
 

Model/models.py

@@ -344,6 +344,7 @@ class FeedBackModel(models.Model):
     appBundleId = models.CharField(max_length=32, default='', verbose_name='app版本appBundleId')
     email = models.CharField(max_length=32, default='', verbose_name='app版本email')
     score = models.CharField(max_length=32, default='0', verbose_name='评分--星星数')
+
     def __str__(self):
         return self.id
 
@@ -624,7 +625,7 @@ class SysMsgModel(models.Model):
 # 设备配置表，新
 class UidSetModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
-    uid = models.CharField(max_length=20, db_index=True, verbose_name='设备UID')
+    uid = models.CharField(max_length=20, db_index=True, unique=True, verbose_name='设备UID')
     channel = models.SmallIntegerField(default=0, verbose_name='通道数量')  #
     detect_status = models.SmallIntegerField(default=0, verbose_name='推送开关')  # 状态[0:关闭,1:开启,2:用户解绑]
     detect_interval = models.IntegerField(verbose_name='推送间隔', default=60)  # 秒
@@ -640,7 +641,7 @@ class UidSetModel(models.Model):
     ip = models.CharField(max_length=20, default='', verbose_name=u'设备ip')
     pwd = models.CharField(max_length=32, default='', verbose_name=u'设备密码')
     # 设备重置后第一次启动时间
-    resetTime = models.IntegerField(default=0,verbose_name='设备重置时间')
+    resetTime = models.IntegerField(default=0, verbose_name='设备重置时间')
 
     class Meta:
         db_table = 'uid_set'
@@ -749,10 +750,11 @@ class UidUserModel(models.Model):
         verbose_name = u'用户设备ap表'
         verbose_name_plural = verbose_name
 
+
 class pushDeployModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键自增id')
-    name = models.CharField(max_length=32, default='',verbose_name=u'推送配置名称')
-    key = models.CharField(max_length=32, default='',verbose_name=u'推送配置key')
+    name = models.CharField(max_length=32, default='', verbose_name=u'推送配置名称')
+    key = models.CharField(max_length=32, default='', verbose_name=u'推送配置key')
     secret = models.CharField(max_length=32, default='', verbose_name=u'推送配置密钥')
     pem = models.CharField(max_length=32, default='', verbose_name=u'推送配置路径')
     type = models.CharField(max_length=32, default='', verbose_name=u'推送配置类型')  # ios 1,android 2
@@ -763,4 +765,4 @@ class pushDeployModel(models.Model):
         db_table = 'push_deploy'
         verbose_name = '推送配置表'
         verbose_name_plural = verbose_name
-        ordering = ('-id',)
+        ordering = ('-id',)