|
|
@@ -41,7 +41,7 @@ class DeviceTypeView(View):
|
|
|
if operation == 'add':
|
|
|
return self.do_admin_add(token.userID, request_dict, response)
|
|
|
elif operation == 'query':
|
|
|
- return self.do_query(response)
|
|
|
+ return self.do_query(request_dict, response)
|
|
|
elif operation == 'delete':
|
|
|
return self.do_admin_delete(token.userID, request_dict, response)
|
|
|
elif operation == 'getUploadUrl':
|
|
|
@@ -89,13 +89,17 @@ class DeviceTypeView(View):
|
|
|
else:
|
|
|
return response.json(444)
|
|
|
|
|
|
- def do_query(self, response):
|
|
|
+ def do_query(self, request_dict, response):
|
|
|
"""
|
|
|
获取设备图标
|
|
|
+ @param request_dict:请求参数
|
|
|
+ @request_dict app_bundle_id：包名
|
|
|
"""
|
|
|
+ app_bundle_id = request_dict.get('app_bundle_id', None)
|
|
|
+ if not app_bundle_id:
|
|
|
+ return response.json(444, {'error param': 'app_bundle_id'})
|
|
|
try:
|
|
|
lang = response.lang
|
|
|
- app_bundle_id = 'com.ansjer.zccloud'
|
|
|
app_device_qs = DeviceNameLanguage.objects.filter(lang=lang)
|
|
|
if not app_device_qs.exists():
|
|
|
lang = 'en'
|
|
|
@@ -124,7 +128,7 @@ class DeviceTypeView(View):
|
|
|
'sort': app_bundle['sort'],
|
|
|
})
|
|
|
app_bundle_list = sorted(app_bundle_list, key=operator.itemgetter('sort'))
|
|
|
- return response.json(0, app_bundle_list)
|
|
|
+ return response.json(0, {'data': app_bundle_list})
|
|
|
except Exception as e:
|
|
|
print(e)
|
|
|
return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
