chenjunkai 6 жил өмнө
parent
commit
040f67431f

+ 9 - 2
Controller/EquipmentManager.py

@@ -685,13 +685,20 @@ def uid_status(request):
     response.lang = tko.lang
     if tko.code != 0:
         return response.json(tko.code)
+    userID = tko.userID
     # 判断用户是否绑定设备
     qs = UidSetModel.objects.filter(uid=uid).values('uid', 'detect_status', 'detect_interval', 'version', 'ucode',
-                                                    'p2p_region', 'tz', 'video_code', 'channel', 'cloud_vod')
+                                                    'p2p_region', 'tz', 'video_code', 'channel', 'cloud_vod', 'id')
     # 判断uid配置表信息是否存在
     if qs.exists():
+        # 获取uid推送是否添加过
+        us_id = qs[0]['id']
+        if UidPushModel.objects.filter(uid_set_id=us_id, userID_id=userID).exists():
+            detect_status = qs[0]['detect_status']
+        else:
+            detect_status = 0
         data = {
-            'push_status': qs[0]['detect_status'],  # 推送状态
+            'push_status': detect_status,  # 推送状态
             'push_interval': qs[0]['detect_interval'],  # 推送间隔
             'ucode': qs[0]['ucode'],
             'version': qs[0]['version'],