From 6b9ba4a908b957242181fd7f2defd492575c6ece Mon Sep 17 00:00:00 2001 From: kissnavel Date: Wed, 2 Jul 2025 21:06:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=BB=98=E8=AE=A4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mysapi/tool.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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];