|
|
@@ -272,13 +272,13 @@ class EquipmentManagerV3(View):
|
|
|
print('uidContent: ', uid_content_list)
|
|
|
re_uid = re.compile(r'^[A-Za-z0-9]{14,20}$')
|
|
|
for uid_content in uid_content_list:
|
|
|
- UID = uid_content['UID']
|
|
|
- NickName = uid_content['NickName']
|
|
|
- Type = uid_content['Type']
|
|
|
- ChannelIndex = uid_content['ChannelIndex']
|
|
|
+ UID = uid_content['uid']
|
|
|
+ NickName = uid_content['nickName']
|
|
|
+ Type = uid_content['type']
|
|
|
+ ChannelIndex = uid_content['channelIndex']
|
|
|
version = uid_content['version']
|
|
|
isCheckMainUser = uid_content['isCheckMainUser']
|
|
|
- View_Account = uid_content['View_Account']
|
|
|
+ View_Account = uid_content['viewAccount']
|
|
|
encryptPassword = uid_content['encryptPassword']
|
|
|
View_Password = self.decode_pwd(encryptPassword)
|
|
|
if not all([UID, NickName, View_Account, Type, ChannelIndex]): # Type和ChannelIndex可能为0
|
