diff --git a/apps/manage/device.js b/apps/manage/device.js index 45588b2..d65f25c 100644 --- a/apps/manage/device.js +++ b/apps/manage/device.js @@ -41,8 +41,8 @@ export async function toSetDefaultDevice() { return false; } settings.setConfig('device', { - productName: info.deviceName, - productType: info.deviceProduct, + productName: info.deviceProduct, + productType: info.deviceName, modelName: info.deviceModel, osVersion: info.androidVersion, deviceInfo: info.deviceFingerprint, diff --git a/defSet/device.yaml b/defSet/device.yaml index 8837c89..0afeb64 100644 --- a/defSet/device.yaml +++ b/defSet/device.yaml @@ -1,7 +1,7 @@ # 通过"%设置默认设备"进行设置，如果不知道这是什么请勿修改 -productName: XQ-AT52 -productType: XQ-AT52 -modelName: XQ-AT52 -osVersion: 12 -deviceInfo: Sony/XQ-AT52/XQ-AT52:12/58.2.A.7.93/058002A007009304241360111:user/release-keys -board: kona \ No newline at end of file +productName: XQ-BC52_EEA +productType: XQ-BC52 +modelName: XQ-BC52 +osVersion: 13 +deviceInfo: Sony/XQ-BC52_EEA/XQ-BC52:13/61.2.A.0.472A/061002A0000472A0046651803:user/release-keys +board: lahaina \ No newline at end of file diff --git a/guoba.support.js b/guoba.support.js index 317cea2..ebac2a4 100644 --- a/guoba.support.js +++ b/guoba.support.js @@ -247,7 +247,7 @@ export function supportGuoba() { }, { field: 'device.productName', - label: 'productName(deviceName)', + label: 'productName(deviceProduct)', bottomHelpMessage: '设置默认设备productName字段', component: 'Input', componentProps: { @@ -256,7 +256,7 @@ export function supportGuoba() { }, { field: 'device.productType', - label: 'productType(deviceProduct)', + label: 'productType(deviceName)', bottomHelpMessage: '设置默认设备productType字段', component: 'Input', componentProps: { diff --git a/lib/mysapi.js b/lib/mysapi.js index 6719a35..2da4f10 100644 --- a/lib/mysapi.js +++ b/lib/mysapi.js @@ -147,7 +147,7 @@ export default class MysZZZApi extends MysApi { // 国际服不需要绑定设备，故写入的'User-Agent'为国服 headers[ 'User-Agent' - ] = `Mozilla/5.0 (Linux; Android ${osVersion}; ${modelName} Build/${deviceDisplay}; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.88 Mobile Safari/537.36 miHoYoBBS/2.73.1`; + ] = `Mozilla/5.0 (Linux; Android ${osVersion}; ${modelName} Build/${deviceDisplay}; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/111.0.5563.116 Mobile Safari/537.36 miHoYoBBS/2.73.1`; } catch (error) { logger.error(`[ZZZ]设备信息解析失败：${error.message}`); } @@ -250,7 +250,7 @@ export default class MysZZZApi extends MysApi { const deviceDisplay = deviceInfo.split('/')[3]; const cn = { app_version: '2.73.1', - User_Agent: `Mozilla/5.0 (Linux; Android ${osVersion}; ${modelName} Build/${deviceDisplay}; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.88 Mobile Safari/537.36 miHoYoBBS/2.73.1`, + User_Agent: `Mozilla/5.0 (Linux; Android ${osVersion}; ${modelName} Build/${deviceDisplay}; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/111.0.5563.116 Mobile Safari/537.36 miHoYoBBS/2.73.1`, client_type: '5', Origin: 'https://act.mihoyo.com', X_Requested_With: 'com.mihoyo.hyperion', @@ -258,7 +258,7 @@ export default class MysZZZApi extends MysApi { }; const os = { app_version: '2.57.1', - User_Agent: `Mozilla/5.0 (Linux; Android ${osVersion}; ${modelName} Build/${deviceDisplay}; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.88 Mobile Safari/537.36 miHoYoBBSOversea/2.57.1`, + User_Agent: `Mozilla/5.0 (Linux; Android ${osVersion}; ${modelName} Build/${deviceDisplay}; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/111.0.5563.116 Mobile Safari/537.36 miHoYoBBSOversea/2.57.1`, client_type: '2', Origin: 'https://act.hoyolab.com', X_Requested_With: 'com.mihoyo.hoyolab', diff --git a/lib/mysapi/tool.js b/lib/mysapi/tool.js index 9300969..e0bbdd9 100644 --- a/lib/mysapi/tool.js +++ b/lib/mysapi/tool.js @@ -115,9 +115,9 @@ export default class ZZZApiTool { body: { app_name: 'bbs_cn', bbs_device_id: `${this.uuid}`, - device_fp: '38d802d62e7fb', - device_id: 'd927172613ac7594', - ext_fields: `{"proxyStatus":1,"isRoot":0,"romCapacity":"512","deviceName":"${modelName}","productName":"${productName}","romRemain":"489","hostname":"BuildHost","screenSize":"1096x2434","isTablet":0,"aaid":"${this.uuid}","model":"${modelName}","brand":"${deviceBrand}","hardware":"qcom","deviceType":"${deviceType}","devId":"REL","serialNumber":"unknown","sdCapacity":228442,"buildTime":"1653304778000","buildUser":"BuildUser","simState":1,"ramRemain":"221267","appUpdateTimeDiff":1736258293874,"deviceInfo":"${deviceInfo}","vaid":"${this.uuid}","buildType":"user","sdkVersion":"31","ui_mode":"UI_MODE_TYPE_NORMAL","isMockLocation":0,"cpuType":"arm64-v8a","isAirMode":0,"ringMode":2,"chargeStatus":1,"manufacturer":"${deviceBrand}","emulatorStatus":0,"appMemory":"512","osVersion":"${osVersion}","vendor":"unknown","accelerometer":"0.24616162x0.44117668x9.934102","sdRemain":221125,"buildTags":"release-keys","packageName":"com.mihoyo.hyperion","networkType":"WiFi","oaid":"${oaid}","debugStatus":1,"ramCapacity":"228442","magnetometer":"-0.93750006x26.456251x-42.693752","display":"${deviceDisplay}","appInstallTimeDiff":1736258293874,"packageVersion":"2.33.0","gyroscope":"4.5813544E-4x-0.0x-7.635591E-4","batteryStatus":66,"hasKeyboard":0,"board":"${board}"}`, + device_fp: '38d805c20d53d', + device_id: 'cc57c40f763ae4cc', + ext_fields: `{"proxyStatus":1,"isRoot":0,"romCapacity":"768","deviceName":"${modelName}","productName":"${productName}","romRemain":"727","hostname":"BuildHost","screenSize":"1096x2434","isTablet":0,"aaid":"${this.uuid}","model":"${modelName}","brand":"${deviceBrand}","hardware":"qcom","deviceType":"${deviceType}","devId":"REL","serialNumber":"unknown","sdCapacity":224845,"buildTime":"1692775759000","buildUser":"BuildUser","simState":1,"ramRemain":"218344","appUpdateTimeDiff":1740498108042,"deviceInfo":"${deviceInfo}","vaid":"${this.uuid}","buildType":"user","sdkVersion":"33","ui_mode":"UI_MODE_TYPE_NORMAL","isMockLocation":0,"cpuType":"arm64-v8a","isAirMode":0,"ringMode":2,"chargeStatus":1,"manufacturer":"${deviceBrand}","emulatorStatus":0,"appMemory":"768","osVersion":"${osVersion}","vendor":"unknown","accelerometer":"-1.588236x6.8404818x6.999604","sdRemain":218214,"buildTags":"release-keys","packageName":"com.mihoyo.hyperion","networkType":"WiFi","oaid":"${oaid}","debugStatus":1,"ramCapacity":"224845","magnetometer":"-47.04375x51.3375x137.96251","display":"${deviceDisplay}","appInstallTimeDiff":1740498108042,"packageVersion":"2.35.0","gyroscope":"-0.22601996x-0.09453133x0.09040799","batteryStatus":88,"hasKeyboard":0,"board":"${board}"}`, platform: '2', seed_id: `${this.uuid}`, seed_time: new Date().getTime() + '', @@ -152,9 +152,9 @@ export default class ZZZApiTool { url: `${this.hostPublicData}device-fp/api/getFp`, body: { app_name: 'bbs_oversea', - device_fp: '38d7f469c1319', - device_id: 'd927172613ac7594', - ext_fields: `{"proxyStatus":1,"isRoot":0,"romCapacity":"512","deviceName":"${modelName}","productName":"${productName}","romRemain":"474","hostname":"BuildHost","screenSize":"1096x2434","isTablet":0,"model":"${modelName}","brand":"${deviceBrand}","hardware":"qcom","deviceType":"${deviceType}","devId":"REL","serialNumber":"unknown","sdCapacity":228442,"buildTime":"1653304778000","buildUser":"BuildUser","simState":1,"ramRemain":"221344","appUpdateTimeDiff":1736258244054,"deviceInfo":"${deviceInfo}","buildType":"user","sdkVersion":"31","ui_mode":"UI_MODE_TYPE_NORMAL","isMockLocation":0,"cpuType":"arm64-v8a","isAirMode":0,"ringMode":2,"app_set_id":"${this.uuid}","chargeStatus":1,"manufacturer":"${deviceBrand}","emulatorStatus":0,"appMemory":"512","adid":"${this.uuid}","osVersion":"${osVersion}","vendor":"unknown","accelerometer":"-1.6262221x3.1136606x9.471091","sdRemain":221216,"buildTags":"release-keys","packageName":"com.mihoyo.hoyolab","networkType":"WiFi","debugStatus":1,"ramCapacity":"228442","magnetometer":"-17.1x-6.6937504x-25.85625","display":"${deviceDisplay}","appInstallTimeDiff":1736258244054,"packageVersion":"2.33.0","gyroscope":"-0.18203248x-0.3193204x0.060321167","batteryStatus":66,"hasKeyboard":0,"board":"${board}"}`, + device_fp: '38d7f4c72b736', + device_id: 'cc57c40f763ae4cc', + ext_fields: `{"proxyStatus":1,"isRoot":0,"romCapacity":"768","deviceName":"${modelName}","productName":"${productName}","romRemain":"737","hostname":"BuildHost","screenSize":"1096x2434","isTablet":0,"model":"${modelName}","brand":"${deviceBrand}","hardware":"qcom","deviceType":"${deviceType}","devId":"REL","serialNumber":"unknown","sdCapacity":224845,"buildTime":"1692775759000","buildUser":"BuildUser","simState":1,"ramRemain":"218355","appUpdateTimeDiff":1740498134990,"deviceInfo":"${deviceInfo}","buildType":"user","sdkVersion":"33","ui_mode":"UI_MODE_TYPE_NORMAL","isMockLocation":0,"cpuType":"arm64-v8a","isAirMode":0,"ringMode":2,"app_set_id":"${this.uuid}","chargeStatus":1,"manufacturer":"${deviceBrand}","emulatorStatus":0,"appMemory":"768","adid":"${this.uuid}","osVersion":"${osVersion}","vendor":"unknown","accelerometer":"-0.6436693x5.510072x8.106883","sdRemain":218227,"buildTags":"release-keys","packageName":"com.mihoyo.hoyolab","networkType":"WiFi","debugStatus":1,"ramCapacity":"224845","magnetometer":"-46.143753x52.350002x141.54376","display":"${deviceDisplay}","appInstallTimeDiff":1740498134990,"packageVersion":"2.35.0","gyroscope":"0.21242823x0.11484258x-0.09850194","batteryStatus":88,"hasKeyboard":0,"board":"${board}"}`, hoyolab_device_id: `${this.uuid}`, platform: '2', seed_id: `${this.uuid}`, diff --git a/lib/plugin.js b/lib/plugin.js index 2e2eca2..f7442d1 100644 --- a/lib/plugin.js +++ b/lib/plugin.js @@ -96,8 +96,8 @@ export class ZZZPlugin extends plugin { try { bindInfo = JSON.parse(bindInfo); data = { - productName: bindInfo?.deviceName, - deviceType: bindInfo?.deviceProduct, + productName: bindInfo?.deviceProduct, + deviceType: bindInfo?.deviceName, modelName: bindInfo?.deviceModel, oaid: bindInfo?.oaid, osVersion: bindInfo?.androidVersion,