|
@@ -356,12 +356,51 @@ export class ToolsHelper {
|
|
|
ToolsHelper.deviceInfo = new DeviceInfo()
|
|
|
ToolsHelper.deviceInfo.ODID = deviceInfo.ODID
|
|
|
ToolsHelper.deviceInfo.manufacture = deviceInfo.manufacture
|
|
|
+ ToolsHelper.deviceInfo.productModel = deviceInfo.productModel
|
|
|
ToolsHelper.deviceInfo.brand = deviceInfo.brand
|
|
|
ToolsHelper.deviceInfo.osFullName = deviceInfo.osFullName
|
|
|
+ ToolsHelper.logInfo()
|
|
|
}
|
|
|
return ToolsHelper.deviceInfo
|
|
|
}
|
|
|
|
|
|
+ private static logInfo() {
|
|
|
+ // ToolsHelper.log('deviceType-----', deviceInfo.deviceType)
|
|
|
+ // ToolsHelper.log('manufacture-----', deviceInfo.manufacture)
|
|
|
+ // ToolsHelper.log('brand-----', deviceInfo.brand)
|
|
|
+ // ToolsHelper.log('marketName-----', deviceInfo.marketName)
|
|
|
+ // ToolsHelper.log('productSeries-----', deviceInfo.productSeries)
|
|
|
+ // ToolsHelper.log('productModel-----', deviceInfo.productModel)
|
|
|
+ // ToolsHelper.log('softwareModel-----', deviceInfo.softwareModel)
|
|
|
+ // ToolsHelper.log('hardwareModel-----', deviceInfo.hardwareModel)
|
|
|
+ // ToolsHelper.log('hardwareProfile-----', deviceInfo.hardwareProfile)
|
|
|
+ // ToolsHelper.log('serial-----', deviceInfo.serial)
|
|
|
+ // ToolsHelper.log('bootloaderVersion-----', deviceInfo.bootloaderVersion)
|
|
|
+ // ToolsHelper.log('abiList-----', deviceInfo.abiList)
|
|
|
+ // ToolsHelper.log('securityPatchTag-----', deviceInfo.securityPatchTag)
|
|
|
+ // ToolsHelper.log('displayVersion-----', deviceInfo.displayVersion)
|
|
|
+ // ToolsHelper.log('incrementalVersion-----', deviceInfo.incrementalVersion)
|
|
|
+ // ToolsHelper.log('osReleaseType-----', deviceInfo.osReleaseType)
|
|
|
+ // ToolsHelper.log('osFullName-----', deviceInfo.osFullName)
|
|
|
+ // ToolsHelper.log('majorVersion-----', deviceInfo.majorVersion)
|
|
|
+ // ToolsHelper.log('seniorVersion-----', deviceInfo.seniorVersion)
|
|
|
+ // ToolsHelper.log('featureVersion-----', deviceInfo.featureVersion)
|
|
|
+ // ToolsHelper.log('buildVersion-----', deviceInfo.buildVersion)
|
|
|
+ // ToolsHelper.log('sdkApiVersion-----', deviceInfo.sdkApiVersion)
|
|
|
+ // ToolsHelper.log('firstApiVersion-----', deviceInfo.firstApiVersion)
|
|
|
+ // ToolsHelper.log('versionId-----', deviceInfo.versionId)
|
|
|
+ // ToolsHelper.log('buildType-----', deviceInfo.buildType)
|
|
|
+ // ToolsHelper.log('buildUser-----', deviceInfo.buildUser)
|
|
|
+ // ToolsHelper.log('buildHost-----', deviceInfo.buildHost)
|
|
|
+ // ToolsHelper.log('buildTime-----', deviceInfo.buildTime)
|
|
|
+ // ToolsHelper.log('buildRootHash-----', deviceInfo.buildRootHash)
|
|
|
+ // ToolsHelper.log('distributionOSName-----', deviceInfo.distributionOSName)
|
|
|
+ // ToolsHelper.log('distributionOSVersion-----', deviceInfo.distributionOSVersion)
|
|
|
+ // ToolsHelper.log('distributionOSApiVersion-----', deviceInfo.distributionOSApiVersion)
|
|
|
+ // ToolsHelper.log('distributionOSApiName-----', deviceInfo.distributionOSApiName)
|
|
|
+ // ToolsHelper.log('distributionOSReleaseType-----', deviceInfo.distributionOSReleaseType)
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 防抖动函数,调用后会延迟wait时间执行,当在wait时间内再次对同一函数调用,则会取消之前的定时器,重新定时
|
|
|
* @param fun
|
|
@@ -405,10 +444,11 @@ export class ToolsHelper {
|
|
|
}
|
|
|
|
|
|
private static getUniqueId(fun: Function): string {
|
|
|
- // ToolsHelper.log(ToolsHelper.getStackKey())
|
|
|
+ // ToolsHelper.log('', ToolsHelper.getStackKey())
|
|
|
if (!ToolsHelper.uniqueIdMap.has(fun)) {
|
|
|
ToolsHelper.uniqueIdMap.set(fun, ToolsHelper.getUuid());
|
|
|
}
|
|
|
return ToolsHelper.uniqueIdMap.get(fun)!;
|
|
|
}
|
|
|
-}
|
|
|
+}
|
|
|
+
|