Browse Source

修改手机端添加设备逻辑

peng 3 năm trước cách đây
mục cha
commit
7ea05b5d39
1 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 4 4
      Controller/EquipmentManagerV3.py

+ 4 - 4
Controller/EquipmentManagerV3.py

@@ -108,10 +108,6 @@ class EquipmentManagerV3(View):
         main_exist = Device_Info.objects.filter(UID=UID)
         main_exist = main_exist.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID', 'vodPrimaryMaster')
 
-        # 添加到家庭房间
-        if family_id:
-            EquipmentFamilyView.family_room_device_save(family_id, room_id, id)
-
         vodPrimaryUserID = userID
         vodPrimaryMaster = userName
         primaryUserID = ''
@@ -208,6 +204,10 @@ class EquipmentManagerV3(View):
                                      View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex, version=version,
                                      vodPrimaryUserID=vodPrimaryUserID, vodPrimaryMaster=vodPrimaryMaster)
             userDevice.save()
+            # 添加到家庭房间
+            if family_id:
+                EquipmentFamilyView.family_room_device_save(family_id, room_id, userDevice.id)
+
             uid_serial_qs = UIDCompanySerialModel.objects.filter(uid__uid=UID)
             if uid_serial_qs.exists():
                 uid_serial = uid_serial_qs[0]