|
@@ -16,6 +16,7 @@ from Object.uidManageResponseObject import uidManageResponseObject
|
|
from Object.TokenObject import TokenObject
|
|
from Object.TokenObject import TokenObject
|
|
from Service.AlgorithmService import AlgorithmBaseOn35
|
|
from Service.AlgorithmService import AlgorithmBaseOn35
|
|
from Service.CommonService import CommonService
|
|
from Service.CommonService import CommonService
|
|
|
|
+from Ansjer.config import CRCKey
|
|
from Service.ModelService import ModelService
|
|
from Service.ModelService import ModelService
|
|
|
|
|
|
|
|
|
|
@@ -254,8 +255,12 @@ class SerialNumberView(View):
|
|
if dev.exists():
|
|
if dev.exists():
|
|
dev.update(serial_number=serial_number)
|
|
dev.update(serial_number=serial_number)
|
|
|
|
|
|
|
|
+ full_uid_code = uid.uid__full_uid_code
|
|
|
|
+ if uid.platform in CRCKey.keys():
|
|
|
|
+ full_uid_code += ':'+CRCKey[uid.platform]
|
|
|
|
+
|
|
res = {
|
|
res = {
|
|
- 'full_uid_code': CommonService.encode_data(uid.full_uid_code),
|
|
|
|
|
|
+ 'full_uid_code': CommonService.encode_data(full_uid_code),
|
|
'uid': CommonService.encode_data(uid.uid),
|
|
'uid': CommonService.encode_data(uid.uid),
|
|
'mac': CommonService.encode_data(uid.mac),
|
|
'mac': CommonService.encode_data(uid.mac),
|
|
'extra': uid.uid_extra,
|
|
'extra': uid.uid_extra,
|
|
@@ -273,8 +278,11 @@ class SerialNumberView(View):
|
|
if uid_qs.exists():
|
|
if uid_qs.exists():
|
|
uid = uid_qs.values('uid__uid', 'uid__mac', 'uid__uid_extra', 'uid__full_uid_code',
|
|
uid = uid_qs.values('uid__uid', 'uid__mac', 'uid__uid_extra', 'uid__full_uid_code',
|
|
'uid__platform', 'uid__init_string', 'uid__init_string_app')[0]
|
|
'uid__platform', 'uid__init_string', 'uid__init_string_app')[0]
|
|
|
|
+ full_uid_code = uid['uid__full_uid_code']
|
|
|
|
+ if uid['uid__platform'] in CRCKey.keys():
|
|
|
|
+ full_uid_code += ':'+CRCKey[uid['uid__platform']]
|
|
res = {
|
|
res = {
|
|
- 'full_uid_code': CommonService.encode_data(uid['uid__full_uid_code']),
|
|
|
|
|
|
+ 'full_uid_code': CommonService.encode_data(full_uid_code),
|
|
'uid': CommonService.encode_data(uid['uid__uid']),
|
|
'uid': CommonService.encode_data(uid['uid__uid']),
|
|
'mac': CommonService.encode_data(uid['uid__mac']),
|
|
'mac': CommonService.encode_data(uid['uid__mac']),
|
|
'extra': uid['uid__uid_extra'],
|
|
'extra': uid['uid__uid_extra'],
|