|
@@ -113,6 +113,7 @@ class VersionManagement(View):
|
|
|
resolutionRatio = request_dict.get('resolutionRatio', '')
|
|
|
Description = request_dict.get('Description', '')
|
|
|
status = request_dict.get('status', 0)
|
|
|
+ isPopup = request_dict.get('isPopup', 0)
|
|
|
|
|
|
if not all([file, mci, lang, ESN, max_ver, channel, resolutionRatio]):
|
|
|
return response.json(444)
|
|
@@ -122,6 +123,7 @@ class VersionManagement(View):
|
|
|
channel = int(channel)
|
|
|
resolutionRatio = int(resolutionRatio)
|
|
|
status = int(status)
|
|
|
+ isPopup = int(isPopup)
|
|
|
# 文件名为设备版本,最后一个'.'的前面为软件版本,后面为设备规格名称
|
|
|
# V2.2.4.16E201252CA,软件版本:2.2.4,设备规格名称:16E201252CA
|
|
|
# V1.7.2.36C11680X30411F000600000150001Z,软件版本:1.7.2,设备规格名称:36C11680X30411F000600000150001Z
|
|
@@ -147,7 +149,8 @@ class VersionManagement(View):
|
|
|
'resolutionRatio': resolutionRatio, 'Description': Description, 'status': status,
|
|
|
'version': version, 'softwareVersion': softwareVersion, 'code': code,
|
|
|
'chipModelList2Code': chipModelList2Code, 'type': type, 'companyCode': companyCode,
|
|
|
- 'fileSize': fileSize, 'filePath': filePath, 'fileMd5': fileMd5, 'update_time': nowTime}
|
|
|
+ 'fileSize': fileSize, 'filePath': filePath, 'fileMd5': fileMd5, 'update_time': nowTime,
|
|
|
+ 'is_popup': isPopup}
|
|
|
# Equipment_Version表创建或更新数据
|
|
|
equipment_version_qs = Equipment_Version.objects.filter(code=code, lang=lang)
|
|
|
if not equipment_version_qs.exists():
|
|
@@ -180,6 +183,7 @@ class VersionManagement(View):
|
|
|
channel = request_dict.get('channel', '')
|
|
|
resolutionRatio = request_dict.get('resolutionRatio', '')
|
|
|
Description = request_dict.get('Description', '')
|
|
|
+ is_popup = request_dict.get('is_popup', '')
|
|
|
|
|
|
if not eid:
|
|
|
return response.json(444)
|
|
@@ -189,7 +193,8 @@ class VersionManagement(View):
|
|
|
if not equipment_version_qs.exists():
|
|
|
return response.json(173)
|
|
|
data_dict = {'ESN': ESN, 'max_ver': max_ver, 'status': status, 'channel': channel,
|
|
|
- 'resolutionRatio': resolutionRatio, 'Description': Description}
|
|
|
+ 'resolutionRatio': resolutionRatio, 'Description': Description,
|
|
|
+ 'is_popup': is_popup}
|
|
|
equipment_version_qs.update(**data_dict)
|
|
|
return response.json(0)
|
|
|
except Exception as e:
|