Yunzai-Plugin/ZZZ-Plugin
1
0
Fork 0
mirror of https://github.com/ZZZure/ZZZ-Plugin.git synced 2025-12-16 13:17:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix:默认设备为空

Browse source
This commit is contained in:
kissnavel 2025-07-02 21:06:34 +08:00
parent 80b39c9864
commit 6b9ba4a908
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/mysapi/tool.js
View file

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