diff --git a/lib/mysapi/tool.js b/lib/mysapi/tool.js index e0bbdd9..db876f9 100644 --- a/lib/mysapi/tool.js +++ b/lib/mysapi/tool.js @@ -91,18 +91,19 @@ export default class ZZZApiTool { const deviceCfg = settings.getConfig('device'); const defDeviceCfg = settings.getdefSet('device'); const { - productName = _.get(deviceCfg, 'productName') ?? + productName = _.get(deviceCfg, 'productName') || _.get(defDeviceCfg, 'productName'), - deviceType = _.get(deviceCfg, 'productType') ?? + deviceType = _.get(deviceCfg, 'productType') || _.get(defDeviceCfg, 'productType'), - modelName = _.get(deviceCfg, 'modelName') ?? + modelName = _.get(deviceCfg, 'modelName') || _.get(defDeviceCfg, 'modelName'), oaid = this.uuid, - osVersion = _.get(deviceCfg, 'osVersion') ?? + osVersion = _.get(deviceCfg, 'osVersion') || _.get(defDeviceCfg, 'osVersion'), - deviceInfo = _.get(deviceCfg, 'deviceInfo') ?? + deviceInfo = _.get(deviceCfg, 'deviceInfo') || _.get(defDeviceCfg, 'deviceInfo'), - board = _.get(deviceCfg, 'board') ?? _.get(defDeviceCfg, 'board'), + board = _.get(deviceCfg, 'board') || + _.get(defDeviceCfg, 'board'), } = data; const deviceBrand = deviceInfo.split('/')[0]; const deviceDisplay = deviceInfo.split('/')[3];