Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Versioned device info #1704

Merged
merged 2 commits into from
Nov 29, 2021
Merged

Versioned device info #1704

merged 2 commits into from
Nov 29, 2021

Conversation

Him188
Copy link
Member

@Him188 Him188 commented Nov 28, 2021

  • 增加了版本号属性 deviceInfoVersion
  • 兼容旧版 ([2.0.0, 2.9.0))
  • 旧版不会自动更新到新版
  • 现在新创建的设备信息都会是新版
  • Hex 字符串表示字节数组 (见示例 imsiMd5)

新版示例:

{
    "deviceInfoVersion": 2,
    "data": {
        "display": "MIRAI.868912.001",
        "product": "mirai",
        "device": "mirai",
        "board": "mirai",
        "brand": "mamoe",
        "model": "mirai",
        "bootloader": "unknown",
        "fingerprint": "mamoe/mirai/mirai:10/MIRAI.200122.001/6174518:user/release-keys",
        "bootId": "500E9D6F-1A76-4ED0-20F3-66A5B20C7049",
        "procVersion": "Linux version 3.0.31-r35YRB94 ([email protected])",
        "baseBand": "",
        "version": {
            "incremental": "5891938",
            "release": "10",
            "codename": "REL"
        },
        "simInfo": "T-Mobile",
        "osType": "android",
        "macAddress": "02:00:00:00:00:00",
        "wifiBSSID": "02:00:00:00:00:00",
        "wifiSSID": "<unknown ssid>",
        "imsiMd5": "d1ead821747a3ad3f8f3784fafa3b954",
        "imei": "155970036849035",
        "apn": "wifi"
    }
}

close #1295

… stores properties as String and hex strings instead of ByteArrays.
@Him188 Him188 added the t:feature 类型: 新特性 label Nov 28, 2021
@Him188 Him188 added this to the 2.9.0-RC milestone Nov 28, 2021
@Him188 Him188 requested a review from Karlatemp November 28, 2021 18:10
@Him188 Him188 added the z:ready-to-merge 状态: PR 已经可以合并, 正在等待一些安排 label Nov 29, 2021
@Him188 Him188 merged commit 8b99cc4 into dev Nov 29, 2021
@Him188 Him188 deleted the versioned-device-info branch November 29, 2021 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
t:feature 类型: 新特性 z:ready-to-merge 状态: PR 已经可以合并, 正在等待一些安排
Projects
No open projects
Status: Fixed
Development

Successfully merging this pull request may close these issues.

使设备信息 device.json 更易读易修改
2 participants