chore: 提交高层 xiaomi 封装库及示例
- 新增 xiaomi/examples/ 下 8 个示例程序（用户/家庭查询、设备列表、开关/灯光/空调控制、属性订阅、高级过滤分类、SPEC 解析） - miot_client_sub.go: 重构 SubProp/SubEvent，使用 buildPropTopic/buildEventTopic 支持通配符订阅（siid/piid=0 → +），并修复锁顺序问题（将 RequestRefreshProp 移到 Lock 外） - spec_parser.go: 新增 downloadSpecFile 方法，本地 SPEC 文件缺失时自动从 miot-spec.org 下载 - ARCH_PLAN.md: 架构设计从 Proposed 更新为 Accepted（v1.0→v1.1），补充设备分类/工厂/SPEC 映射等模块设计 - xiaomi/: 新增 miot 上层强类型封装模块，包含 Client 主入口、用户/家庭/设备 API、属性读写、动作调用、订阅通知，以及 devices/ 设备控制抽象（Switch/Light/AirConditioner/Fan/Cover/Humidifier/Vacuum/WaterHeater/Thermostat）和 specs/ SPEC 查询辅助 - 更多 xiaomi 示例（风扇/窗帘/传感器控制）
This commit is contained in:
@@ -0,0 +1,21 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIBazCCAQ+gAwIBAgIEA/UKYDAMBggqhkjOPQQDAgUAMCIxEzARBgNVBAoTCk1p
|
||||
amlhIFJvb3QxCzAJBgNVBAYTAkNOMCAXDTE2MTEyMzAxMzk0NVoYDzIwNjYxMTEx
|
||||
MDEzOTQ1WjAiMRMwEQYDVQQKEwpNaWppYSBSb290MQswCQYDVQQGEwJDTjBZMBMG
|
||||
ByqGSM49AgEGCCqGSM49AwEHA0IABL71iwLa4//4VBqgRI+6xE23xpovqPCxtv96
|
||||
2VHbZij61/Ag6jmi7oZ/3Xg/3C+whglcwoUEE6KALGJ9vccV9PmjLzAtMAwGA1Ud
|
||||
EwQFMAMBAf8wHQYDVR0OBBYEFJa3onw5sblmM6n40QmyAGDI5sURMAwGCCqGSM49
|
||||
BAMCBQADSAAwRQIgchciK9h6tZmfrP8Ka6KziQ4Lv3hKfrHtAZXMHPda4IYCIQCG
|
||||
az93ggFcbrG9u2wixjx1HKW4DUA5NXZG0wWQTpJTbQ==
|
||||
-----END CERTIFICATE-----
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIBjzCCATWgAwIBAgIBATAKBggqhkjOPQQDAjAiMRMwEQYDVQQKEwpNaWppYSBS
|
||||
b290MQswCQYDVQQGEwJDTjAgFw0yMjA2MDkxNDE0MThaGA8yMDcyMDUyNzE0MTQx
|
||||
OFowLDELMAkGA1UEBhMCQ04xHTAbBgNVBAoMFE1JT1QgQ0VOVFJBTCBHQVRFV0FZ
|
||||
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdYrzbnp/0x/cZLZnuEDXTFf8mhj4
|
||||
CVpZPwgj9e9Ve5r3K7zvu8Jjj7JF1JjQYvEC6yhp1SzBgglnK4L8xQzdiqNQME4w
|
||||
HQYDVR0OBBYEFCf9+YBU7pXDs6K6CAQPRhlGJ+cuMB8GA1UdIwQYMBaAFJa3onw5
|
||||
sblmM6n40QmyAGDI5sURMAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIh
|
||||
AKUv+c8v98vypkGMTzMwckGjjVqTef8xodsy6PhcSCq+AiA/n9mDs62hAo5zXyJy
|
||||
Bs1s7mqXPf1XgieoxIvs1MqyiA==
|
||||
-----END CERTIFICATE-----
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
+1
@@ -0,0 +1 @@
|
||||
{"type":"urn:miot-spec-v2:device:air-conditioner:0000A004:090615-k20:1","description":"Air Conditioner","services":[{"iid":1,"type":"urn:miot-spec-v2:service:device-information:00007801:090615-k20:1","description":"Device Information","properties":[{"iid":1,"type":"urn:miot-spec-v2:property:manufacturer:00000001:090615-k20:1","description":"Device Manufacturer","format":"string","access":["read"]},{"iid":2,"type":"urn:miot-spec-v2:property:model:00000002:090615-k20:1","description":"Device Model","format":"string","access":["read"]},{"iid":3,"type":"urn:miot-spec-v2:property:serial-number:00000003:090615-k20:1","description":"Device ID","format":"string","access":["read"]},{"iid":4,"type":"urn:miot-spec-v2:property:firmware-revision:00000005:090615-k20:1","description":"Current Firmware Version","format":"string","access":["read"]},{"iid":5,"type":"urn:miot-spec-v2:property:serial-no:000000FF:090615-k20:1","description":"Serial Number","format":"string","access":["read","notify"]}]},{"iid":2,"type":"urn:miot-spec-v2:service:air-conditioner:0000780F:090615-k20:1","description":"Air Conditioner","properties":[{"iid":1,"type":"urn:miot-spec-v2:property:on:00000006:090615-k20:1","description":"Switch Status","format":"bool","access":["read","write","notify"]},{"iid":2,"type":"urn:miot-spec-v2:property:mode:00000008:090615-k20:1","description":"Mode","format":"uint8","access":["read","write","notify"],"value-list":[{"value":0,"description":"Cool"},{"value":1,"description":"Heat"},{"value":2,"description":"Fan"},{"value":3,"description":"Dry"}],"gatt-access":[]},{"iid":3,"type":"urn:miot-spec-v2:property:fault:00000009:090615-k20:1","description":"Device Fault","format":"uint8","access":["read","notify"],"value-list":[{"value":0,"description":"No Faults"},{"value":1,"description":"Error"}],"gatt-access":[]},{"iid":4,"type":"urn:miot-spec-v2:property:target-temperature:00000021:090615-k20:1","description":"Target Temperature","format":"float","access":["read","write","notify"],"unit":"celsius","value-range":[16,32,1]}],"actions":[{"iid":1,"type":"urn:miot-spec-v2:action:toggle:00002811:090615-k20:1","description":"Toggle","in":[],"out":[]},{"iid":2,"type":"urn:miot-spec-v2:action:favorite-toggle:000028B5:090615-k20:1","description":"Favorite Toggle","in":[],"out":[]},{"iid":3,"type":"urn:miot-spec-v2:action:favorite-toggle:000028B5:090615-k20:1","description":"Favorite Toggle","in":[],"out":[]},{"iid":4,"type":"urn:miot-spec-v2:action:favorite-toggle:000028B5:090615-k20:1","description":"Favorite Toggle","in":[],"out":[]}]},{"iid":3,"type":"urn:miot-spec-v2:service:fan-control:00007809:090615-k20:1","description":"Fan Control","properties":[{"iid":2,"type":"urn:miot-spec-v2:property:fan-level:00000016:090615-k20:1","description":"Fan Level","format":"uint8","access":["read","write","notify"],"value-list":[{"value":0,"description":"Auto"},{"value":1,"description":"Low"},{"value":2,"description":"Medium"},{"value":3,"description":"High"}],"gatt-access":[]},{"iid":3,"type":"urn:miot-spec-v2:property:horizontal-position:000001FD:090615-k20:1","description":"Horizontal Position","format":"uint8","access":["read","write","notify"],"value-range":[1,200,1],"gatt-access":[]},{"iid":4,"type":"urn:miot-spec-v2:property:swing-mode:000001A6:090615-k20:1","description":"Swing Mode","format":"uint8","access":["read","write","notify"],"value-list":[{"value":0,"description":"Reactive Swing"},{"value":1,"description":"Symmetrical Swing"}],"gatt-access":[]}],"actions":[{"iid":1,"type":"urn:miot-spec-v2:action:turn-left:00002886:090615-k20:1","description":"Turn Left","in":[],"out":[]},{"iid":2,"type":"urn:miot-spec-v2:action:turn-right:00002887:090615-k20:1","description":"Turn Right","in":[],"out":[]}]},{"iid":4,"type":"urn:miot-spec-v2:service:environment:0000780A:090615-k20:1","description":"Environment","properties":[{"iid":7,"type":"urn:miot-spec-v2:property:temperature:00000020:090615-k20:1","description":"Temperature","format":"float","access":["read","notify"],"unit":"celsius","value-range":[-30,50,1],"gatt-access":[]}]}]}
|
||||
+1
@@ -0,0 +1 @@
|
||||
{"type":"urn:miot-spec-v2:device:air-conditioner:0000A004:lumi-mcn02:1","description":"Air Conditioner","services":[{"iid":1,"type":"urn:miot-spec-v2:service:device-information:00007801:lumi-mcn02:1","description":"Device Information","properties":[{"iid":1,"type":"urn:miot-spec-v2:property:manufacturer:00000001:lumi-mcn02:1","description":"Device Manufacturer","format":"string","access":["read"]},{"iid":2,"type":"urn:miot-spec-v2:property:model:00000002:lumi-mcn02:1","description":"Device Model","format":"string","access":["read"]},{"iid":3,"type":"urn:miot-spec-v2:property:serial-number:00000003:lumi-mcn02:1","description":"Device Serial Number","format":"string","access":["read"]},{"iid":4,"type":"urn:miot-spec-v2:property:firmware-revision:00000005:lumi-mcn02:1","description":"Current Firmware Version","format":"string","access":["read"]}]},{"iid":2,"type":"urn:miot-spec-v2:service:air-conditioner:0000780F:lumi-mcn02:1","description":"Air Conditioner","properties":[{"iid":1,"type":"urn:miot-spec-v2:property:on:00000006:lumi-mcn02:1","description":"Switch Status","format":"bool","access":["read","write","notify"]},{"iid":2,"type":"urn:miot-spec-v2:property:mode:00000008:lumi-mcn02:1","description":"Mode","format":"uint8","access":["read","write","notify"],"value-list":[{"value":0,"description":"Auto"},{"value":1,"description":"Cool"},{"value":2,"description":"Dry"},{"value":3,"description":"Heat"},{"value":4,"description":"Fan"}]},{"iid":3,"type":"urn:miot-spec-v2:property:target-temperature:00000021:lumi-mcn02:1","description":"Target Temperature","format":"float","access":["read","write","notify"],"unit":"celsius","value-range":[16,30,1]}]},{"iid":3,"type":"urn:miot-spec-v2:service:fan-control:00007809:lumi-mcn02:1","description":"Fan Control","properties":[{"iid":1,"type":"urn:miot-spec-v2:property:fan-level:00000016:lumi-mcn02:1","description":"Fan Level","format":"uint8","access":["read","write","notify"],"value-list":[{"value":0,"description":"Auto"},{"value":1,"description":"Low"},{"value":2,"description":"Medium"},{"value":3,"description":"High"}]},{"iid":2,"type":"urn:miot-spec-v2:property:vertical-swing:00000018:lumi-mcn02:1","description":"Vertical Swing","format":"bool","access":["read","write","notify"]}]},{"iid":4,"type":"urn:miot-spec-v2:service:air-condition-outlet-matching:000078B9:lumi-mcn02:1","description":"Air Condition Outlet Matching","properties":[{"iid":1,"type":"urn:miot-spec-v2:property:match-state:00000141:lumi-mcn02:1","description":"Match State","format":"uint8","access":["read","write"],"value-list":[{"value":0,"description":"Out Of Matching"},{"value":1,"description":"Matching"}]},{"iid":2,"type":"urn:miot-spec-v2:property:ac-work-mode:00000142:lumi-mcn02:1","description":"Ac Work Mode","format":"uint8","access":["read","write"],"value-list":[{"value":0,"description":"Ac Mode With Outlet"},{"value":1,"description":"Ac Mode Without Outlet"}]},{"iid":3,"type":"urn:miot-spec-v2:property:ac-state:00000143:lumi-mcn02:1","description":"Ac State","format":"string","access":["read","write"]},{"iid":4,"type":"urn:miot-spec-v2:property:brand-id:00000144:lumi-mcn02:1","description":"Brand Id","format":"uint32","access":[],"value-range":[1,4294967295,1]},{"iid":5,"type":"urn:miot-spec-v2:property:remote-id:00000145:lumi-mcn02:1","description":"Remote Id","format":"uint32","access":[],"value-range":[1,4294967295,1]},{"iid":6,"type":"urn:miot-spec-v2:property:ac-type:00000146:lumi-mcn02:1","description":"Ac Type","format":"uint32","access":[],"value-list":[{"value":0,"description":"Stateless"},{"value":1,"description":"Stateful"}]},{"iid":7,"type":"urn:miot-spec-v2:property:ac-ctrl-library:00000148:lumi-mcn02:1","description":"Ac Ctrl Library","format":"string","access":[]},{"iid":8,"type":"urn:miot-spec-v2:property:ac-ctrl-library-crc32:00000147:lumi-mcn02:1","description":"Ac Ctrl Library Crc32","format":"uint32","access":[],"value-range":[1,4294967295,1]}],"actions":[{"iid":1,"type":"urn:miot-spec-v2:action:set-ac-model:00002865:lumi-mcn02:1","description":"Set Ac Model","in":[4,5,6],"out":[]},{"iid":2,"type":"urn:miot-spec-v2:action:set-ac-ctrl-info:00002866:lumi-mcn02:1","description":"Set Ac Ctrl Info","in":[5,8,7],"out":[]}]},{"iid":5,"type":"urn:miot-spec-v2:service:power-consumption:0000780E:lumi-mcn02:1","description":"Power Consumption","properties":[{"iid":1,"type":"urn:miot-spec-v2:property:electric-power:00000066:lumi-mcn02:1","description":"Electric Power","format":"float","access":["read","notify"],"unit":"watt","value-range":[0,10000,0.01]}]}]}
|
||||
+1
@@ -0,0 +1 @@
|
||||
{"type":"urn:miot-spec-v2:device:air-conditioner:0000A004:qdhkl-b27:1","description":"Air Conditioner","services":[{"iid":1,"type":"urn:miot-spec-v2:service:device-information:00007801:qdhkl-b27:1","description":"Device Information","properties":[{"iid":1,"type":"urn:miot-spec-v2:property:manufacturer:00000001:qdhkl-b27:1","description":"Device Manufacturer","format":"string","access":["read"]},{"iid":2,"type":"urn:miot-spec-v2:property:model:00000002:qdhkl-b27:1","description":"Device Model","format":"string","access":["read"]},{"iid":3,"type":"urn:miot-spec-v2:property:serial-number:00000003:qdhkl-b27:1","description":"Device ID","format":"string","access":["read"]},{"iid":4,"type":"urn:miot-spec-v2:property:firmware-revision:00000005:qdhkl-b27:1","description":"Current Firmware Version","format":"string","access":["read"]},{"iid":5,"type":"urn:miot-spec-v2:property:serial-no:000000FF:qdhkl-b27:1","description":"Serial Number","format":"string","access":["read","notify"]}]},{"iid":2,"type":"urn:miot-spec-v2:service:air-conditioner:0000780F:qdhkl-b27:1","description":"Air Conditioner","properties":[{"iid":1,"type":"urn:miot-spec-v2:property:on:00000006:qdhkl-b27:1","description":"Switch Status","format":"bool","access":["read","write","notify"]},{"iid":2,"type":"urn:miot-spec-v2:property:mode:00000008:qdhkl-b27:1","description":"Mode","format":"uint8","access":["read","write","notify"],"value-list":[{"value":8,"description":"Heat"},{"value":1,"description":"Cool"},{"value":2,"description":"Dry"},{"value":4,"description":"Fan"}],"gatt-access":[]},{"iid":3,"type":"urn:miot-spec-v2:property:fault:00000009:qdhkl-b27:1","description":"Device Fault","format":"uint8","access":["read","notify"],"value-list":[{"value":0,"description":"No Faults"}]},{"iid":4,"type":"urn:miot-spec-v2:property:target-temperature:00000021:qdhkl-b27:1","description":"Target Temperature","format":"float","access":["read","write","notify"],"unit":"celsius","value-range":[16,32,1],"gatt-access":[]}],"actions":[{"iid":1,"type":"urn:miot-spec-v2:action:toggle:00002811:qdhkl-b27:1","description":"Toggle","in":[],"out":[]}]},{"iid":3,"type":"urn:miot-spec-v2:service:fan-control:00007809:qdhkl-b27:1","description":"Fan Control","properties":[{"iid":2,"type":"urn:miot-spec-v2:property:fan-level:00000016:qdhkl-b27:1","description":"Fan Level","format":"uint8","access":["read","write","notify"],"value-list":[{"value":3,"description":"High"},{"value":2,"description":"Medium"},{"value":1,"description":"Low"},{"value":0,"description":"Auto"}],"gatt-access":[]}]},{"iid":4,"type":"urn:miot-spec-v2:service:environment:0000780A:qdhkl-b27:1","description":"Environment","properties":[{"iid":7,"type":"urn:miot-spec-v2:property:temperature:00000020:qdhkl-b27:1","description":"Temperature","format":"float","access":["read","notify"],"unit":"celsius","value-range":[-30,100,1]}]},{"iid":5,"type":"urn:qdhkl-spec:service:custom:00007801:qdhkl-b27:1","description":"custom","actions":[{"iid":1,"type":"urn:qdhkl-spec:action:raise-one-degree:00002801:qdhkl-b27:1","description":"raise-one-degree","in":[],"out":[]},{"iid":2,"type":"urn:qdhkl-spec:action:down-one-degree:00002802:qdhkl-b27:1","description":"down-one-degree","in":[],"out":[]},{"iid":3,"type":"urn:qdhkl-spec:action:fan-speed-up:00002803:qdhkl-b27:1","description":"fan-speed-up","in":[],"out":[]},{"iid":4,"type":"urn:qdhkl-spec:action:fan-speed-down:00002804:qdhkl-b27:1","description":"fan-speed-down","in":[],"out":[]}]}]}
|
||||
+1
File diff suppressed because one or more lines are too long
@@ -0,0 +1,111 @@
|
||||
// Package main demonstrates full air conditioner control.
|
||||
// 运行前提：已配置环境变量 XIAOMI_CLIENT_ID / XIAOMI_CLIENT_SECRET / XIAOMI_ACCESS_TOKEN。
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
"time"
|
||||
|
||||
"xiaomihome/xiaomi"
|
||||
"xiaomihome/xiaomi/devices"
|
||||
miotconfig "xiaomihome/miot/examples/config"
|
||||
)
|
||||
|
||||
func main() {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||
defer cancel()
|
||||
|
||||
cfg, err := miotconfig.LoadConfig("../../../miot/examples/config.json")
|
||||
if err != nil {
|
||||
log.Fatal("请先运行 miot/examples/cloud_oauth 获取 token:", err)
|
||||
}
|
||||
|
||||
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
|
||||
ClientSecret: "",
|
||||
AccessToken: cfg.AuthInfo.AccessToken,
|
||||
UID: cfg.UID,
|
||||
UUID: cfg.UUID,
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
defer client.Close()
|
||||
|
||||
const targetDID = "2053225728"
|
||||
|
||||
info, err := client.GetDevice(ctx, targetDID)
|
||||
if err != nil {
|
||||
log.Fatalf("获取设备 %s 失败: %v", targetDID, err)
|
||||
}
|
||||
|
||||
ac, err := devices.NewAirConditioner(client, info)
|
||||
if err != nil {
|
||||
log.Fatalf("创建 AirConditioner 失败: %v", err)
|
||||
}
|
||||
|
||||
log.Printf("空调: %s (DID: %s, 型号: %s)", info.Name, info.DID, info.Model)
|
||||
|
||||
on, _ := ac.IsOn(ctx)
|
||||
mode, _ := ac.GetMode(ctx)
|
||||
targetTemp, _ := ac.GetTargetTemp(ctx)
|
||||
currentTemp, _ := ac.GetCurrentTemp(ctx)
|
||||
fanSpeed, _ := ac.GetFanSpeed(ctx)
|
||||
swing, _ := ac.GetSwing(ctx)
|
||||
log.Printf("当前状态: on=%v mode=%s target=%.1f current=%.1f fan=%s swing=%s",
|
||||
on, mode, targetTemp, currentTemp, fanSpeed, swing)
|
||||
|
||||
log.Println("=== 执行控制: 开 -> 制冷 -> 26度 -> 自动风速 -> 垂直摆风 ===")
|
||||
|
||||
if !on {
|
||||
log.Println(" 开启空调...")
|
||||
ac.TurnOn(ctx)
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
}
|
||||
|
||||
log.Println(" 设置制冷模式...")
|
||||
ac.SetMode(ctx, devices.ModeCool)
|
||||
log.Println(" 设置目标温度 26度...")
|
||||
ac.SetTargetTemp(ctx, 26.0)
|
||||
log.Println(" 设置自动风速...")
|
||||
ac.SetFanSpeed(ctx, devices.SpeedAuto)
|
||||
log.Println(" 设置垂直摆风...")
|
||||
ac.SetSwing(ctx, devices.SwingVertical)
|
||||
|
||||
time.Sleep(1 * time.Second)
|
||||
|
||||
mode, _ = ac.GetMode(ctx)
|
||||
targetTemp, _ = ac.GetTargetTemp(ctx)
|
||||
currentTemp, _ = ac.GetCurrentTemp(ctx)
|
||||
fanSpeed, _ = ac.GetFanSpeed(ctx)
|
||||
swing, _ = ac.GetSwing(ctx)
|
||||
log.Printf("更新后状态: mode=%s target=%.1f current=%.1f fan=%s swing=%s",
|
||||
mode, targetTemp, currentTemp, fanSpeed, swing)
|
||||
|
||||
log.Println("设置目标湿度 50...")
|
||||
if err := ac.SetTargetHumidity(ctx, 50); err != nil {
|
||||
log.Printf(" 设置湿度失败（可能不支持）: %v", err)
|
||||
} else {
|
||||
humidity, _ := ac.GetTargetHumidity(ctx)
|
||||
curHumidity, _ := ac.GetCurrentHumidity(ctx)
|
||||
log.Printf(" 湿度: target=%d current=%d", humidity, curHumidity)
|
||||
}
|
||||
|
||||
log.Println("关闭电辅热...")
|
||||
ac.SetAuxHeat(ctx, false)
|
||||
log.Println("开启节能模式...")
|
||||
ac.SetEco(ctx, true)
|
||||
|
||||
subID, err := ac.OnStateChanged(func(state devices.ACState) {
|
||||
log.Printf("空调状态变化: power=%v mode=%s target=%.1f current=%.1f fan=%s swing=%s",
|
||||
state.Power, state.Mode, state.TargetTemp, state.CurrentTemp,
|
||||
state.FanSpeed, state.Swing)
|
||||
})
|
||||
if err != nil {
|
||||
log.Printf("订阅状态失败: %v", err)
|
||||
} else {
|
||||
log.Printf("已订阅空调状态: subID=%s", subID)
|
||||
}
|
||||
|
||||
log.Println("空调控制演示完毕")
|
||||
}
|
||||
Reference in New Issue
Block a user