|
@@ -144,7 +144,7 @@ class DeviceShareView(View):
|
|
|
shareToken = request_dict.get('shareToken', None)
|
|
shareToken = request_dict.get('shareToken', None)
|
|
|
family_id = request_dict.get('familyId', None)
|
|
family_id = request_dict.get('familyId', None)
|
|
|
room_id = request_dict.get('roomId', None)
|
|
room_id = request_dict.get('roomId', None)
|
|
|
- if not all([shareToken, family_id]):
|
|
|
|
|
|
|
+ if not shareToken:
|
|
|
# try:
|
|
# try:
|
|
|
# data = jwt.decode(shareToken, '.#^^&', algorithms='HS256')
|
|
# data = jwt.decode(shareToken, '.#^^&', algorithms='HS256')
|
|
|
# except Exception as e:
|
|
# except Exception as e:
|
|
@@ -193,7 +193,8 @@ class DeviceShareView(View):
|
|
|
'primaryUserID', 'primaryMaster',
|
|
'primaryUserID', 'primaryMaster',
|
|
|
'data_joined', 'version',
|
|
'data_joined', 'version',
|
|
|
'isVod', 'isExist')
|
|
'isVod', 'isExist')
|
|
|
- EquipmentFamilyView.family_room_device_save(family_id, room_id, deviceId, dvqs[0]['Type'])
|
|
|
|
|
|
|
+ if family_id:
|
|
|
|
|
+ EquipmentFamilyView.family_room_device_save(family_id, room_id, deviceId, dvqs[0]['Type'])
|
|
|
dvql = CommonService.qs_to_list(dvqs)
|
|
dvql = CommonService.qs_to_list(dvqs)
|
|
|
ubqs = UID_Bucket.objects.filter(uid=UID). \
|
|
ubqs = UID_Bucket.objects.filter(uid=UID). \
|
|
|
values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
