From 34dbfd7fd7341f64247885631c799d74574e42b7 Mon Sep 17 00:00:00 2001 From: zyc <1439655764@qq.com> Date: Mon, 9 Feb 2026 15:36:18 +0800 Subject: [PATCH 1/5] add setting --- .claude/settings.local.json | 11 + docs/API_SPECIFICATION.md | 1202 +++++++++++++++++++++++++++++++++++ 2 files changed, 1213 insertions(+) create mode 100644 .claude/settings.local.json create mode 100644 docs/API_SPECIFICATION.md diff --git a/.claude/settings.local.json b/.claude/settings.local.json new file mode 100644 index 0000000..c4ad5e2 --- /dev/null +++ b/.claude/settings.local.json @@ -0,0 +1,11 @@ +{ + "permissions": { + "allow": [ + "Bash(flutter doctor:*)", + "Bash(flutter devices:*)", + "Bash(flutter pub get:*)", + "Bash(pod install)", + "Bash(flutter run:*)" + ] + } +} diff --git a/docs/API_SPECIFICATION.md b/docs/API_SPECIFICATION.md new file mode 100644 index 0000000..2705c6e --- /dev/null +++ b/docs/API_SPECIFICATION.md @@ -0,0 +1,1202 @@ +# Airhub 后台接口规范文档 + +> 版本: 1.0.0 +> 更新日期: 2025-02-09 +> 基于 PRD HTML 原型与 airhub_app Flutter 代码分析整理 + +--- + +## 目录 + +- [概述](#概述) +- [通用规范](#通用规范) +- [接口列表](#接口列表) + - [1. 用户认证](#1-用户认证) + - [2. 用户信息](#2-用户信息) + - [3. 设备管理](#3-设备管理) + - [4. 角色记忆](#4-角色记忆) + - [5. 故事模块](#5-故事模块) + - [6. 音乐模块](#6-音乐模块) + - [7. 通知模块](#7-通知模块) + - [8. 系统接口](#8-系统接口) +- [数据模型](#数据模型) +- [开发优先级](#开发优先级) +- [附录：代码对照表](#附录代码对照表) + +--- + +## 概述 + +本文档定义了 Airhub 智能硬件控制中心 APP 所需的全部后台接口。接口设计基于以下来源： + +1. **PRD HTML 原型文件** - 根目录下的 `.html` 文件 +2. **airhub_app Flutter 代码** - `airhub_app/lib/` 目录 +3. **已实现的接口调用** - `music-creation.html` 中的实际 API 调用 + +### 技术栈建议 + +- 后端框架: Node.js (Express/Fastify) 或 Python (FastAPI) +- 数据库: PostgreSQL / MySQL +- 缓存: Redis +- 对象存储: 阿里云 OSS +- 实时通信: SSE (Server-Sent Events) + +--- + +## 通用规范 + +### 基础 URL + +``` +开发环境: http://localhost:3000/api +生产环境: https://api.airhub.com/v1 +``` + +### 请求头 + +```http +Content-Type: application/json +Authorization: Bearer {access_token} +X-Device-Id: {device_uuid} +X-App-Version: 1.0.0 +``` + +### 响应格式 + +**成功响应** +```json +{ + "code": 0, + "message": "success", + "data": { ... } +} +``` + +**错误响应** +```json +{ + "code": 40001, + "message": "参数错误", + "data": null +} +``` + +### 错误码定义 + +| 错误码 | 说明 | +|--------|------| +| 0 | 成功 | +| 40001 | 参数错误 | +| 40101 | 未授权 (Token 无效) | +| 40102 | Token 过期 | +| 40301 | 无权限 | +| 40401 | 资源不存在 | +| 50001 | 服务器内部错误 | + +--- + +## 接口列表 + +### 1. 用户认证 + +#### 1.1 发送验证码 + +```http +POST /api/auth/send-code +``` + +**请求参数** +```json +{ + "phone": "13800138000" +} +``` + +**响应** +```json +{ + "code": 0, + "message": "验证码已发送", + "data": { + "expire_in": 60 + } +} +``` + +**说明**: 验证码 60 秒内有效，同一手机号 60 秒内只能发送一次 + +--- + +#### 1.2 验证码登录 + +```http +POST /api/auth/login +``` + +**请求参数** +```json +{ + "phone": "13800138000", + "code": "123456" +} +``` + +**响应** +```json +{ + "code": 0, + "message": "登录成功", + "data": { + "access_token": "eyJhbGciOiJIUzI1NiIs...", + "refresh_token": "eyJhbGciOiJIUzI1NiIs...", + "expire_in": 604800, + "user": { + "id": "u_12345678", + "phone": "138****8000", + "nickname": "用户8000", + "avatar_url": null + } + } +} +``` + +**Flutter 代码对应**: `AuthRemoteDataSource.loginWithPhone()` + +--- + +#### 1.3 一键登录 + +```http +POST /api/auth/one-click-login +``` + +**请求参数** +```json +{ + "access_token": "运营商SDK返回的token" +} +``` + +**响应**: 同验证码登录 + +**说明**: 使用运营商 SDK (如阿里云号码认证) 获取本机号码 + +**Flutter 代码对应**: `AuthRemoteDataSource.oneClickLogin()` + +--- + +#### 1.4 刷新 Token + +```http +POST /api/auth/refresh-token +``` + +**请求参数** +```json +{ + "refresh_token": "eyJhbGciOiJIUzI1NiIs..." +} +``` + +**响应** +```json +{ + "code": 0, + "data": { + "access_token": "新的access_token", + "expire_in": 604800 + } +} +``` + +--- + +#### 1.5 退出登录 + +```http +POST /api/auth/logout +``` + +**请求头**: 需要 Authorization + +**响应** +```json +{ + "code": 0, + "message": "已退出登录" +} +``` + +**Flutter 代码对应**: `AuthRepository.logout()` + +--- + +#### 1.6 账号注销 + +```http +DELETE /api/auth/account +``` + +**请求头**: 需要 Authorization + +**响应** +```json +{ + "code": 0, + "message": "账号注销申请已提交，将在7个工作日内处理" +} +``` + +**PRD 来源**: `settings.html` - 账号注销功能 + +--- + +### 2. 用户信息 + +#### 2.1 获取用户资料 + +```http +GET /api/user/profile +``` + +**响应** +```json +{ + "code": 0, + "data": { + "id": "u_12345678", + "phone": "138****8000", + "nickname": "土豆", + "avatar_url": "https://oss.airhub.com/avatars/xxx.jpg", + "gender": "男", + "birthday": "1994-12-09", + "created_at": "2025-01-15T10:30:00Z" + } +} +``` + +**Flutter 代码对应**: `profile_page.dart` - 用户卡片显示 + +--- + +#### 2.2 更新用户资料 + +```http +PUT /api/user/profile +``` + +**请求参数** +```json +{ + "nickname": "新昵称", + "gender": "女", + "birthday": "1995-06-15" +} +``` + +**响应** +```json +{ + "code": 0, + "message": "保存成功" +} +``` + +**Flutter 代码对应**: `profile_info_page.dart` - 保存按钮 + +--- + +#### 2.3 上传头像 + +```http +POST /api/user/avatar +Content-Type: multipart/form-data +``` + +**请求参数** +``` +file: (binary) +``` + +**响应** +```json +{ + "code": 0, + "data": { + "avatar_url": "https://oss.airhub.com/avatars/xxx.jpg" + } +} +``` + +**Flutter 代码对应**: `profile_info_page.dart` - `_pickImage()` + +--- + +### 3. 设备管理 + +#### 3.1 获取设备列表 + +```http +GET /api/devices +``` + +**响应** +```json +{ + "code": 0, + "data": { + "devices": [ + { + "id": "dev_001", + "name": "毛绒机芯", + "model": "Airhub_5G", + "status": "online", + "battery": 85, + "firmware_version": "2.1.3", + "is_ai": true, + "icon": "Capybara.png" + }, + { + "id": "dev_002", + "name": "电子吧唧 AI", + "model": "Badge_AI", + "status": "offline", + "battery": 0, + "is_ai": true + } + ] + } +} +``` + +**设备状态枚举**: +- `online` - 在线 +- `offline` - 离线 +- `pairing` - 配对中 +- `updating` - 固件更新中 + +**Flutter 代码对应**: `product_selection_page.dart` + +--- + +#### 3.2 获取设备详情 + +```http +GET /api/devices/{device_id} +``` + +**响应** +```json +{ + "code": 0, + "data": { + "id": "dev_001", + "name": "毛绒机芯", + "model": "Airhub_5G", + "status": "online", + "battery": 85, + "firmware_version": "2.1.3", + "mac_address": "AA:BB:CC:DD:EE:FF", + "settings": { + "nickname": "小毛球", + "user_name": "土豆", + "volume": 60, + "brightness": 85, + "allow_interrupt": true, + "privacy_mode": true + }, + "wifi_list": [ + { + "ssid": "Home_WiFi", + "is_connected": true + } + ], + "bound_memory_id": "mem_001" + } +} +``` + +**Flutter 代码对应**: `device_control_page.dart` - 设置页面 + +--- + +#### 3.3 更新设备设置 + +```http +PUT /api/devices/{device_id} +``` + +**请求参数** +```json +{ + "nickname": "新昵称", + "user_name": "主人称呼", + "volume": 70, + "brightness": 90, + "allow_interrupt": false, + "privacy_mode": true +} +``` + +**响应** +```json +{ + "code": 0, + "message": "设置已保存" +} +``` + +**PRD 来源**: `device-control.html` - 设备设置面板 + +--- + +#### 3.4 绑定设备 + +```http +POST /api/devices/{device_id}/bind +``` + +**请求参数** +```json +{ + "mac_address": "AA:BB:CC:DD:EE:FF", + "wifi_ssid": "Home_WiFi", + "wifi_password": "password123" +} +``` + +**响应** +```json +{ + "code": 0, + "message": "设备绑定成功", + "data": { + "device_id": "dev_001", + "memory_id": "mem_001" + } +} +``` + +**PRD 来源**: `bluetooth.html`, `wifi-config.html` + +--- + +#### 3.5 解绑设备 + +```http +DELETE /api/devices/{device_id}/unbind +``` + +**响应** +```json +{ + "code": 0, + "message": "设备已解绑", + "data": { + "memory_id": "mem_001", + "memory_name": "Cloud_Mem_01" + } +} +``` + +**说明**: 解绑后角色记忆自动保存到云端 + +**PRD 来源**: `device-control.html` - 解绑设备弹窗 + +--- + +#### 3.6 配置设备 WiFi + +```http +POST /api/devices/{device_id}/wifi +``` + +**请求参数** +```json +{ + "ssid": "New_WiFi", + "password": "password123" +} +``` + +**响应** +```json +{ + "code": 0, + "message": "WiFi 配置成功" +} +``` + +**PRD 来源**: `wifi-config.html` + +--- + +### 4. 角色记忆 + +#### 4.1 获取角色记忆列表 + +```http +GET /api/agents +``` + +**响应** +```json +{ + "code": 0, + "data": { + "agents": [ + { + "id": "mem_001", + "name": "Airhub_Mem_01", + "icon": "🧠", + "nickname": "小毛球", + "bound_device": { + "id": "dev_001", + "name": "Airhub_5G" + }, + "status": "bound", + "created_at": "2025-01-15" + }, + { + "id": "mem_002", + "name": "Airhub_Mem_02", + "icon": "🐾", + "nickname": "豆豆", + "bound_device": null, + "status": "unbound", + "created_at": "2024-08-22" + } + ] + } +} +``` + +**角色记忆状态**: +- `bound` - 已绑定设备 +- `unbound` - 未绑定 (可注入) + +**Flutter 代码对应**: `agent_manage_page.dart` + +--- + +#### 4.2 解绑角色记忆 + +```http +POST /api/agents/{agent_id}/unbind +``` + +**响应** +```json +{ + "code": 0, + "message": "已解绑角色记忆，数据已保留在云端" +} +``` + +--- + +#### 4.3 注入角色记忆 + +```http +POST /api/agents/{agent_id}/inject +``` + +**请求参数** +```json +{ + "device_id": "dev_002" +} +``` + +**响应** +```json +{ + "code": 0, + "message": "角色记忆注入成功" +} +``` + +**PRD 来源**: `agent-manage.html` - 注入设备按钮 + +--- + +### 5. 故事模块 + +#### 5.1 获取故事列表 + +```http +GET /api/stories +``` + +**查询参数** +``` +shelf_id: 1 # 书架 ID，可选 +page: 1 # 页码 +page_size: 20 # 每页数量 +``` + +**响应** +```json +{ + "code": 0, + "data": { + "stories": [ + { + "id": "story_001", + "title": "卡皮巴拉的奇幻漂流", + "cover_url": "https://oss.airhub.com/covers/xxx.jpg", + "content": "在一条蜿蜒的小河边...", + "has_video": true, + "video_url": "https://oss.airhub.com/videos/xxx.mp4", + "created_at": "2025-01-20T15:30:00Z" + } + ], + "total": 5, + "page": 1, + "page_size": 20 + } +} +``` + +**Flutter 代码对应**: `device_control_page.dart` - `_mockStories` + +--- + +#### 5.2 获取故事详情 + +```http +GET /api/stories/{story_id} +``` + +**响应** +```json +{ + "code": 0, + "data": { + "id": "story_001", + "title": "卡皮巴拉的奇幻漂流", + "cover_url": "https://oss.airhub.com/covers/xxx.jpg", + "content": "完整故事内容...", + "has_video": true, + "video_url": "https://oss.airhub.com/videos/xxx.mp4", + "created_at": "2025-01-20T15:30:00Z" + } +} +``` + +**Flutter 代码对应**: `story_detail_page.dart` + +--- + +#### 5.3 生成故事 (SSE 流式) + +```http +POST /api/stories/generate +Accept: text/event-stream +``` + +**请求参数** +```json +{ + "mode": "random", + "prompt": "关于卡皮巴拉的冒险故事", + "theme": "adventure" +} +``` + +**生成模式**: +- `random` - 随机生成 +- `keyword` - 关键词生成 +- `theme` - 主题生成 + +**SSE 响应流** +``` +data: {"stage": "generating", "progress": 10, "message": "正在构思故事大纲..."} + +data: {"stage": "generating", "progress": 50, "message": "正在撰写故事内容..."} + +data: {"stage": "done", "progress": 100, "story": {...}} +``` + +**Flutter 代码对应**: `story_loading_page.dart` + +--- + +#### 5.4 保存故事 + +```http +POST /api/stories/{story_id}/save +``` + +**请求参数** +```json +{ + "shelf_id": 1 +} +``` + +**响应** +```json +{ + "code": 0, + "message": "故事已保存到书架" +} +``` + +**PRD 来源**: `story-detail.html` - 保存故事按钮 + +--- + +#### 5.5 生成动态绘本 (SSE 流式) + +```http +POST /api/stories/{story_id}/video +Accept: text/event-stream +``` + +**SSE 响应流** +``` +data: {"stage": "processing", "progress": 20, "message": "正在生成插画..."} + +data: {"stage": "processing", "progress": 60, "message": "正在合成视频..."} + +data: {"stage": "done", "progress": 100, "video_url": "https://..."} +``` + +**说明**: 生成动态绘本消耗 10 SP (积分) + +**Flutter 代码对应**: `story_detail_page.dart` - `runGenerationProcess()` + +--- + +#### 5.6 解锁新书架 + +```http +POST /api/stories/shelves/unlock +``` + +**请求参数** +```json +{ + "cost_points": 500 +} +``` + +**响应** +```json +{ + "code": 0, + "message": "解锁成功", + "data": { + "shelf_id": 2, + "remaining_points": 1500 + } +} +``` + +**Flutter 代码对应**: `device_control_page.dart` - `_showUnlockDialog()` + +--- + +### 6. 音乐模块 + +> ⚠️ **重要**: 此模块在 `music-creation.html` 中已有实际 API 调用实现 + +#### 6.1 生成音乐 (SSE 流式) + +```http +POST /api/create_music +Accept: text/event-stream +``` + +**请求参数** +```json +{ + "text": "水豚在雨中等公交，心情却很平静", + "mood": "chill" +} +``` + +**心情类型**: +- `chill` - Chill Lofi (慵懒·治愈) +- `happy` - Happy Funk (活力·奔跑) +- `sleep` - Deep Sleep (白噪音·助眠) +- `focus` - Focus Flow (心流·专注) +- `mystery` - 盲盒惊喜 (AI随机) +- `custom` - 自由创作 + +**SSE 响应流** +``` +data: {"stage": "connecting", "progress": 5, "message": "🎼 正在连接 AI..."} + +data: {"stage": "lyrics", "progress": 20, "message": "🎵 正在生成歌词..."} + +data: {"stage": "music", "progress": 30, "message": "🎹 正在作曲..."} + +data: {"stage": "done", "progress": 100, "file_path": "/music/xxx.mp3", "metadata": {"lyrics": "歌词内容..."}} +``` + +**错误响应** +``` +data: {"stage": "error", "message": "生成失败，请重试"} +``` + +**HTML 代码位置**: `music-creation.html:1730` + +**Flutter 代码对应**: `music_creation_page.dart` - `_mockGenerate()` + +--- + +#### 6.2 获取播放列表 + +```http +GET /api/playlist +``` + +**响应** +```json +{ + "code": 0, + "data": { + "playlist": [ + { + "id": 1, + "title": "卡皮巴拉蹦蹦蹦", + "lyrics": "卡皮巴拉\n啦啦啦啦...", + "audio_url": "/music/卡皮巴拉蹦蹦蹦.mp3", + "cover_url": "Capybara.png", + "mood": "happy", + "duration": 204, + "created_at": "2025-01-15T10:00:00Z" + } + ] + } +} +``` + +**HTML 代码位置**: `music-creation.html:2006` + +**Flutter 代码对应**: `music_creation_page.dart` - `_playlist` + +--- + +#### 6.3 删除播放列表项 + +```http +DELETE /api/playlist/{track_id} +``` + +**响应** +```json +{ + "code": 0, + "message": "已从播放列表移除" +} +``` + +--- + +#### 6.4 收藏音乐 + +```http +POST /api/playlist/{track_id}/favorite +``` + +**响应** +```json +{ + "code": 0, + "message": "已收藏" +} +``` + +--- + +### 7. 通知模块 + +#### 7.1 获取通知列表 + +```http +GET /api/notifications +``` + +**查询参数** +``` +type: all # all, system, activity, device +page: 1 +page_size: 20 +``` + +**响应** +```json +{ + "code": 0, + "data": { + "notifications": [ + { + "id": "notif_001", + "type": "system", + "title": "系统更新", + "description": "Airhub V1.2.0 版本更新已准备就绪", + "content": "

更新说明：

", + "is_read": false, + "created_at": "2025-02-09T10:30:00Z" + }, + { + "id": "notif_002", + "type": "activity", + "title": "新春活动", + "description": "领取您的新春限定水豚皮肤", + "image_url": "https://...", + "is_read": true, + "created_at": "2025-02-08T09:00:00Z" + } + ], + "unread_count": 1 + } +} +``` + +**通知类型**: +- `system` - 系统通知 +- `activity` - 活动通知 +- `device` - 设备通知 + +**Flutter 代码对应**: `notification_page.dart` + +--- + +#### 7.2 标记通知已读 + +```http +PUT /api/notifications/{notification_id}/read +``` + +**响应** +```json +{ + "code": 0, + "message": "已标记为已读" +} +``` + +--- + +#### 7.3 标记全部已读 + +```http +PUT /api/notifications/read-all +``` + +**响应** +```json +{ + "code": 0, + "message": "全部标记为已读" +} +``` + +--- + +### 8. 系统接口 + +#### 8.1 提交意见反馈 + +```http +POST /api/feedback +``` + +**请求参数** +```json +{ + "content": "希望增加深色模式功能", + "contact": "user@email.com" +} +``` + +**响应** +```json +{ + "code": 0, + "message": "感谢您的反馈！" +} +``` + +**Flutter 代码对应**: `feedback_dialog.dart` + +--- + +#### 8.2 检查版本更新 + +```http +GET /api/version/check +``` + +**查询参数** +``` +platform: ios # ios, android +current_version: 1.0.0 +``` + +**响应** +```json +{ + "code": 0, + "data": { + "latest_version": "1.2.0", + "current_version": "1.0.0", + "update_required": false, + "force_update": false, + "update_url": "https://apps.apple.com/...", + "release_notes": "1. 新增喂养指南\n2. 优化连接稳定性" + } +} +``` + +**Flutter 代码对应**: `settings_page.dart` - 检查更新 + +--- + +## 数据模型 + +### User (用户) + +```typescript +interface User { + id: string; + phone: string; // 脱敏显示 + nickname: string; + avatar_url: string | null; + gender: '男' | '女' | null; + birthday: string | null; // YYYY-MM-DD + created_at: string; +} +``` + +### Device (设备) + +```typescript +interface Device { + id: string; + name: string; + model: string; + status: 'online' | 'offline' | 'pairing' | 'updating'; + battery: number; // 0-100 + firmware_version: string; + mac_address: string; + is_ai: boolean; + settings: DeviceSettings; + bound_memory_id: string | null; +} + +interface DeviceSettings { + nickname: string; // 设备昵称 + user_name: string; // 用户称呼 + volume: number; // 0-100 + brightness: number; // 0-100 + allow_interrupt: boolean; + privacy_mode: boolean; +} +``` + +### Agent (角色记忆) + +```typescript +interface Agent { + id: string; + name: string; // Airhub_Mem_01 + icon: string; // Emoji + nickname: string; // 小毛球 + bound_device: Device | null; + status: 'bound' | 'unbound'; + created_at: string; +} +``` + +### Story (故事) + +```typescript +interface Story { + id: string; + title: string; + cover_url: string; + content: string; + has_video: boolean; + video_url: string | null; + shelf_id: number; + created_at: string; +} +``` + +### Track (音乐) + +```typescript +interface Track { + id: number; + title: string; + lyrics: string; + audio_url: string; + cover_url: string; + mood: 'chill' | 'happy' | 'sleep' | 'focus' | 'mystery' | 'custom'; + duration: number; // 秒 + created_at: string; +} +``` + +### Notification (通知) + +```typescript +interface Notification { + id: string; + type: 'system' | 'activity' | 'device'; + title: string; + description: string; + content: string | null; // HTML 内容 + image_url: string | null; + is_read: boolean; + created_at: string; +} +``` + +--- + +## 开发优先级 + +| 优先级 | 模块 | 说明 | 依赖 | +|--------|------|------|------| +| **P0** | 用户认证 | 登录/注册是基础功能 | 运营商 SDK | +| **P0** | 设备管理 | 核心业务：设备绑定、配网 | 蓝牙 SDK | +| **P1** | 音乐模块 | 已有 HTML 实现，需对接 MiniMax API | MiniMax API | +| **P1** | 故事模块 | 核心功能：AI 生成故事 | LLM API | +| **P2** | 角色记忆 | 差异化功能 | 设备管理 | +| **P2** | 用户信息 | 个人中心相关 | 用户认证 | +| **P3** | 通知模块 | 辅助功能 | 推送 SDK | +| **P3** | 系统接口 | 反馈、版本检查 | - | + +--- + +## 附录：代码对照表 + +| 接口 | PRD HTML 文件 | Flutter 代码 | +|------|---------------|--------------| +| 登录 | `login.html` | `auth_remote_data_source.dart` | +| 用户资料 | `profile.html`, `profile-info.html` | `profile_page.dart`, `profile_info_page.dart` | +| 设备管理 | `products.html`, `device-control.html` | `product_selection_page.dart`, `device_control_page.dart` | +| 配网 | `bluetooth.html`, `wifi-config.html` | `bluetooth_page.dart`, `wifi_config_page.dart` | +| 角色记忆 | `agent-manage.html` | `agent_manage_page.dart` | +| 故事 | `story-detail.html`, `story-loading.html` | `story_detail_page.dart`, `story_loading_page.dart` | +| 音乐 | `music-creation.html` | `music_creation_page.dart` | +| 通知 | `notifications.html` | `notification_page.dart` | +| 设置 | `settings.html` | `settings_page.dart` | + +--- + +## 更新日志 + +| 版本 | 日期 | 说明 | +|------|------|------| +| 1.0.0 | 2025-02-09 | 初版，基于 PRD 和 Flutter 代码分析 | + +--- + +*本文档由 Claude Code 自动生成，如有问题请联系开发团队。* From b54fbc1ccb8d03d0e6c6fcc0b7e23ac4313d109f Mon Sep 17 00:00:00 2001 From: zyc <1439655764@qq.com> Date: Mon, 9 Feb 2026 18:03:55 +0800 Subject: [PATCH 2/5] add some api --- airhub_app/.metadata | 18 +- airhub_app/build.yaml | 3 + airhub_app/lib/core/errors/exceptions.dart | 20 + airhub_app/lib/core/network/api_client.dart | 178 +++ airhub_app/lib/core/network/api_client.g.dart | 51 + airhub_app/lib/core/network/api_config.dart | 16 + .../lib/core/network/token_manager.dart | 51 + .../lib/core/network/token_manager.g.dart | 51 + airhub_app/lib/core/router/app_router.dart | 18 +- airhub_app/lib/core/router/app_router.g.dart | 2 +- .../lib/core/services/phone_auth_service.dart | 85 ++ .../core/services/phone_auth_service.g.dart | 56 + .../services/phone_auth_service_stub.dart | 14 + .../datasources/auth_remote_data_source.dart | 71 +- .../auth_remote_data_source.g.dart | 2 +- .../repositories/auth_repository_impl.dart | 106 +- .../repositories/auth_repository_impl.g.dart | 4 +- .../auth/domain/entities/auth_tokens.dart | 15 + .../domain/entities/auth_tokens.freezed.dart | 280 +++++ .../auth/domain/entities/auth_tokens.g.dart | 15 + .../features/auth/domain/entities/user.dart | 8 +- .../auth/domain/entities/user.freezed.dart | 56 +- .../features/auth/domain/entities/user.g.dart | 14 +- .../domain/repositories/auth_repository.dart | 7 +- .../controllers/auth_controller.dart | 60 +- .../controllers/auth_controller.g.dart | 2 +- .../auth/presentation/pages/login_page.dart | 63 +- .../device_remote_data_source.dart | 115 ++ .../device_remote_data_source.g.dart | 58 + .../repositories/device_repository_impl.dart | 147 +++ .../device_repository_impl.g.dart | 56 + .../device/domain/entities/device.dart | 55 + .../domain/entities/device.freezed.dart | 932 ++++++++++++++ .../device/domain/entities/device.g.dart | 80 ++ .../device/domain/entities/device_detail.dart | 51 + .../entities/device_detail.freezed.dart | 892 +++++++++++++ .../domain/entities/device_detail.g.dart | 76 ++ .../repositories/device_repository.dart | 16 + .../controllers/device_controller.dart | 106 ++ .../controllers/device_controller.g.dart | 163 +++ .../notification_remote_data_source.dart | 74 ++ .../notification_remote_data_source.g.dart | 59 + .../notification_repository_impl.dart | 78 ++ .../notification_repository_impl.g.dart | 58 + .../domain/entities/app_notification.dart | 21 + .../entities/app_notification.freezed.dart | 300 +++++ .../domain/entities/app_notification.g.dart | 31 + .../repositories/notification_repository.dart | 11 + .../controllers/notification_controller.dart | 75 ++ .../notification_controller.g.dart | 63 + .../spirit_remote_data_source.dart | 71 ++ .../spirit_remote_data_source.g.dart | 58 + .../repositories/spirit_repository_impl.dart | 116 ++ .../spirit_repository_impl.g.dart | 56 + .../spirit/domain/entities/spirit.dart | 21 + .../domain/entities/spirit.freezed.dart | 301 +++++ .../spirit/domain/entities/spirit.g.dart | 31 + .../repositories/spirit_repository.dart | 19 + .../controllers/spirit_controller.dart | 85 ++ .../controllers/spirit_controller.g.dart | 55 + .../system_remote_data_source.dart | 50 + .../system_remote_data_source.g.dart | 58 + .../datasources/user_remote_data_source.dart | 45 + .../user_remote_data_source.g.dart | 58 + .../repositories/user_repository_impl.dart | 65 + .../repositories/user_repository_impl.g.dart | 51 + .../domain/repositories/user_repository.dart | 13 + .../controllers/user_controller.dart | 64 + .../controllers/user_controller.g.dart | 55 + airhub_app/lib/main.dart | 1 + airhub_app/lib/pages/device_control_page.dart | 170 +-- .../lib/pages/profile/agent_manage_page.dart | 182 ++- .../lib/pages/profile/notification_page.dart | 321 +++-- .../lib/pages/profile/profile_info_page.dart | 145 ++- .../lib/pages/profile/profile_page.dart | 42 +- .../lib/pages/profile/settings_page.dart | 53 +- airhub_app/lib/pages/settings_page.dart | 123 +- airhub_app/lib/pages/wifi_config_page.dart | 20 +- airhub_app/lib/widgets/feedback_dialog.dart | 100 +- airhub_app/macos/.gitignore | 7 + .../macos/Flutter/Flutter-Debug.xcconfig | 2 + .../macos/Flutter/Flutter-Release.xcconfig | 2 + .../Flutter/GeneratedPluginRegistrant.swift | 22 + airhub_app/macos/Podfile | 42 + airhub_app/macos/Podfile.lock | 56 + .../macos/Runner.xcodeproj/project.pbxproj | 801 ++++++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 99 ++ .../contents.xcworkspacedata | 10 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + airhub_app/macos/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 68 + .../AppIcon.appiconset/app_icon_1024.png | Bin 0 -> 102994 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 0 -> 5680 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 0 -> 520 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 0 -> 14142 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 0 -> 1066 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 0 -> 36406 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 0 -> 2218 bytes .../macos/Runner/Base.lproj/MainMenu.xib | 343 +++++ .../macos/Runner/Configs/AppInfo.xcconfig | 14 + .../macos/Runner/Configs/Debug.xcconfig | 2 + .../macos/Runner/Configs/Release.xcconfig | 2 + .../macos/Runner/Configs/Warnings.xcconfig | 13 + .../macos/Runner/DebugProfile.entitlements | 14 + airhub_app/macos/Runner/Info.plist | 32 + .../macos/Runner/MainFlutterWindow.swift | 15 + airhub_app/macos/Runner/Release.entitlements | 10 + .../macos/RunnerTests/RunnerTests.swift | 12 + .../packages/ali_auth/lib/ali_auth.dart | 107 ++ .../packages/ali_auth/lib/ali_auth_enum.dart | 242 ++++ .../ali_auth/lib/ali_auth_method_channel.dart | 161 +++ .../packages/ali_auth/lib/ali_auth_model.dart | 1114 +++++++++++++++++ .../lib/ali_auth_platform_interface.dart | 118 ++ .../packages/ali_auth/lib/ali_auth_web.dart | 48 + .../ali_auth/lib/ali_auth_web_api.dart | 16 + .../ali_auth/lib/ali_auth_web_utils.dart | 31 + airhub_app/packages/ali_auth/pubspec.lock | 218 ++++ airhub_app/packages/ali_auth/pubspec.yaml | 78 ++ airhub_app/pubspec.lock | 397 +++--- airhub_app/pubspec.yaml | 11 + 121 files changed, 10661 insertions(+), 687 deletions(-) create mode 100644 airhub_app/lib/core/errors/exceptions.dart create mode 100644 airhub_app/lib/core/network/api_client.dart create mode 100644 airhub_app/lib/core/network/api_client.g.dart create mode 100644 airhub_app/lib/core/network/api_config.dart create mode 100644 airhub_app/lib/core/network/token_manager.dart create mode 100644 airhub_app/lib/core/network/token_manager.g.dart create mode 100644 airhub_app/lib/core/services/phone_auth_service.dart create mode 100644 airhub_app/lib/core/services/phone_auth_service.g.dart create mode 100644 airhub_app/lib/core/services/phone_auth_service_stub.dart create mode 100644 airhub_app/lib/features/auth/domain/entities/auth_tokens.dart create mode 100644 airhub_app/lib/features/auth/domain/entities/auth_tokens.freezed.dart create mode 100644 airhub_app/lib/features/auth/domain/entities/auth_tokens.g.dart create mode 100644 airhub_app/lib/features/device/data/datasources/device_remote_data_source.dart create mode 100644 airhub_app/lib/features/device/data/datasources/device_remote_data_source.g.dart create mode 100644 airhub_app/lib/features/device/data/repositories/device_repository_impl.dart create mode 100644 airhub_app/lib/features/device/data/repositories/device_repository_impl.g.dart create mode 100644 airhub_app/lib/features/device/domain/entities/device.dart create mode 100644 airhub_app/lib/features/device/domain/entities/device.freezed.dart create mode 100644 airhub_app/lib/features/device/domain/entities/device.g.dart create mode 100644 airhub_app/lib/features/device/domain/entities/device_detail.dart create mode 100644 airhub_app/lib/features/device/domain/entities/device_detail.freezed.dart create mode 100644 airhub_app/lib/features/device/domain/entities/device_detail.g.dart create mode 100644 airhub_app/lib/features/device/domain/repositories/device_repository.dart create mode 100644 airhub_app/lib/features/device/presentation/controllers/device_controller.dart create mode 100644 airhub_app/lib/features/device/presentation/controllers/device_controller.g.dart create mode 100644 airhub_app/lib/features/notification/data/datasources/notification_remote_data_source.dart create mode 100644 airhub_app/lib/features/notification/data/datasources/notification_remote_data_source.g.dart create mode 100644 airhub_app/lib/features/notification/data/repositories/notification_repository_impl.dart create mode 100644 airhub_app/lib/features/notification/data/repositories/notification_repository_impl.g.dart create mode 100644 airhub_app/lib/features/notification/domain/entities/app_notification.dart create mode 100644 airhub_app/lib/features/notification/domain/entities/app_notification.freezed.dart create mode 100644 airhub_app/lib/features/notification/domain/entities/app_notification.g.dart create mode 100644 airhub_app/lib/features/notification/domain/repositories/notification_repository.dart create mode 100644 airhub_app/lib/features/notification/presentation/controllers/notification_controller.dart create mode 100644 airhub_app/lib/features/notification/presentation/controllers/notification_controller.g.dart create mode 100644 airhub_app/lib/features/spirit/data/datasources/spirit_remote_data_source.dart create mode 100644 airhub_app/lib/features/spirit/data/datasources/spirit_remote_data_source.g.dart create mode 100644 airhub_app/lib/features/spirit/data/repositories/spirit_repository_impl.dart create mode 100644 airhub_app/lib/features/spirit/data/repositories/spirit_repository_impl.g.dart create mode 100644 airhub_app/lib/features/spirit/domain/entities/spirit.dart create mode 100644 airhub_app/lib/features/spirit/domain/entities/spirit.freezed.dart create mode 100644 airhub_app/lib/features/spirit/domain/entities/spirit.g.dart create mode 100644 airhub_app/lib/features/spirit/domain/repositories/spirit_repository.dart create mode 100644 airhub_app/lib/features/spirit/presentation/controllers/spirit_controller.dart create mode 100644 airhub_app/lib/features/spirit/presentation/controllers/spirit_controller.g.dart create mode 100644 airhub_app/lib/features/system/data/datasources/system_remote_data_source.dart create mode 100644 airhub_app/lib/features/system/data/datasources/system_remote_data_source.g.dart create mode 100644 airhub_app/lib/features/user/data/datasources/user_remote_data_source.dart create mode 100644 airhub_app/lib/features/user/data/datasources/user_remote_data_source.g.dart create mode 100644 airhub_app/lib/features/user/data/repositories/user_repository_impl.dart create mode 100644 airhub_app/lib/features/user/data/repositories/user_repository_impl.g.dart create mode 100644 airhub_app/lib/features/user/domain/repositories/user_repository.dart create mode 100644 airhub_app/lib/features/user/presentation/controllers/user_controller.dart create mode 100644 airhub_app/lib/features/user/presentation/controllers/user_controller.g.dart create mode 100644 airhub_app/macos/.gitignore create mode 100644 airhub_app/macos/Flutter/Flutter-Debug.xcconfig create mode 100644 airhub_app/macos/Flutter/Flutter-Release.xcconfig create mode 100644 airhub_app/macos/Flutter/GeneratedPluginRegistrant.swift create mode 100644 airhub_app/macos/Podfile create mode 100644 airhub_app/macos/Podfile.lock create mode 100644 airhub_app/macos/Runner.xcodeproj/project.pbxproj create mode 100644 airhub_app/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 airhub_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 airhub_app/macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 airhub_app/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 airhub_app/macos/Runner/AppDelegate.swift create mode 100644 airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png create mode 100644 airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png create mode 100644 airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png create mode 100644 airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png create mode 100644 airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png create mode 100644 airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png create mode 100644 airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png create mode 100644 airhub_app/macos/Runner/Base.lproj/MainMenu.xib create mode 100644 airhub_app/macos/Runner/Configs/AppInfo.xcconfig create mode 100644 airhub_app/macos/Runner/Configs/Debug.xcconfig create mode 100644 airhub_app/macos/Runner/Configs/Release.xcconfig create mode 100644 airhub_app/macos/Runner/Configs/Warnings.xcconfig create mode 100644 airhub_app/macos/Runner/DebugProfile.entitlements create mode 100644 airhub_app/macos/Runner/Info.plist create mode 100644 airhub_app/macos/Runner/MainFlutterWindow.swift create mode 100644 airhub_app/macos/Runner/Release.entitlements create mode 100644 airhub_app/macos/RunnerTests/RunnerTests.swift create mode 100644 airhub_app/packages/ali_auth/lib/ali_auth.dart create mode 100644 airhub_app/packages/ali_auth/lib/ali_auth_enum.dart create mode 100644 airhub_app/packages/ali_auth/lib/ali_auth_method_channel.dart create mode 100644 airhub_app/packages/ali_auth/lib/ali_auth_model.dart create mode 100644 airhub_app/packages/ali_auth/lib/ali_auth_platform_interface.dart create mode 100644 airhub_app/packages/ali_auth/lib/ali_auth_web.dart create mode 100644 airhub_app/packages/ali_auth/lib/ali_auth_web_api.dart create mode 100644 airhub_app/packages/ali_auth/lib/ali_auth_web_utils.dart create mode 100644 airhub_app/packages/ali_auth/pubspec.lock create mode 100644 airhub_app/packages/ali_auth/pubspec.yaml diff --git a/airhub_app/.metadata b/airhub_app/.metadata index 79e4428..d73f86e 100644 --- a/airhub_app/.metadata +++ b/airhub_app/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "67323de285b00232883f53b84095eb72be97d35c" + revision: "bd7a4a6b5576630823ca344e3e684c53aa1a0f46" channel: "stable" project_type: app @@ -13,17 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: 67323de285b00232883f53b84095eb72be97d35c - base_revision: 67323de285b00232883f53b84095eb72be97d35c - - platform: android - create_revision: 67323de285b00232883f53b84095eb72be97d35c - base_revision: 67323de285b00232883f53b84095eb72be97d35c - - platform: ios - create_revision: 67323de285b00232883f53b84095eb72be97d35c - base_revision: 67323de285b00232883f53b84095eb72be97d35c - - platform: web - create_revision: 67323de285b00232883f53b84095eb72be97d35c - base_revision: 67323de285b00232883f53b84095eb72be97d35c + create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46 + base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46 + - platform: macos + create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46 + base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46 # User provided section diff --git a/airhub_app/build.yaml b/airhub_app/build.yaml index bbac323..bb021b8 100644 --- a/airhub_app/build.yaml +++ b/airhub_app/build.yaml @@ -5,6 +5,9 @@ targets: options: build_extensions: '^lib/{{}}.dart': 'lib/{{}}.g.dart' + json_serializable: + options: + field_rename: snake freezed: options: build_extensions: diff --git a/airhub_app/lib/core/errors/exceptions.dart b/airhub_app/lib/core/errors/exceptions.dart new file mode 100644 index 0000000..9ebeabe --- /dev/null +++ b/airhub_app/lib/core/errors/exceptions.dart @@ -0,0 +1,20 @@ +/// 服务端业务异常（后端返回 code != 0） +class ServerException implements Exception { + final int code; + final String message; + + const ServerException(this.code, this.message); + + @override + String toString() => message; +} + +/// 网络异常（无法连接服务器） +class NetworkException implements Exception { + final String message; + + const NetworkException([this.message = '网络连接失败，请检查网络']); + + @override + String toString() => message; +} diff --git a/airhub_app/lib/core/network/api_client.dart b/airhub_app/lib/core/network/api_client.dart new file mode 100644 index 0000000..8aebc65 --- /dev/null +++ b/airhub_app/lib/core/network/api_client.dart @@ -0,0 +1,178 @@ +import 'package:dio/dio.dart'; +import 'package:riverpod_annotation/riverpod_annotation.dart'; + +import '../errors/exceptions.dart'; +import 'api_config.dart'; +import 'token_manager.dart'; + +part 'api_client.g.dart'; + +@Riverpod(keepAlive: true) +ApiClient apiClient(Ref ref) { + final tokenManager = ref.watch(tokenManagerProvider); + return ApiClient(tokenManager); +} + +class ApiClient { + final TokenManager _tokenManager; + late final Dio _dio; + + ApiClient(this._tokenManager) { + _dio = Dio(BaseOptions( + baseUrl: ApiConfig.fullBaseUrl, + connectTimeout: ApiConfig.connectTimeout, + receiveTimeout: ApiConfig.receiveTimeout, + headers: {'Content-Type': 'application/json'}, + )); + + _dio.interceptors.add(_AuthInterceptor(_tokenManager, _dio)); + } + + /// GET 请求，返回 data 字段 + Future get( + String path, { + Map? queryParameters, + }) async { + final response = await _request( + () => _dio.get(path, queryParameters: queryParameters), + ); + return response; + } + + /// POST 请求，返回 data 字段 + Future post( + String path, { + dynamic data, + }) async { + final response = await _request( + () => _dio.post(path, data: data), + ); + return response; + } + + /// PUT 请求，返回 data 字段 + Future put( + String path, { + dynamic data, + }) async { + final response = await _request( + () => _dio.put(path, data: data), + ); + return response; + } + + /// DELETE 请求，返回 data 字段 + Future delete( + String path, { + dynamic data, + }) async { + final response = await _request( + () => _dio.delete(path, data: data), + ); + return response; + } + + /// 统一请求处理：解析后端 {code, message, data} 格式 + Future _request(Future Function() request) async { + try { + final response = await request(); + final body = response.data; + + if (body is Map) { + final code = body['code'] as int? ?? -1; + final message = body['message'] as String? ?? '未知错误'; + final data = body['data']; + + if (code == 0) { + return data; + } else { + throw ServerException(code, message); + } + } + + return body; + } on DioException catch (e) { + if (e.response != null) { + final body = e.response?.data; + if (body is Map) { + final code = body['code'] as int? ?? -1; + final message = body['message'] as String? ?? '请求失败'; + throw ServerException(code, message); + } + } + throw const NetworkException(); + } + } +} + +/// Auth 拦截器：自动附加 Bearer Token +class _AuthInterceptor extends Interceptor { + final TokenManager _tokenManager; + final Dio _dio; + + _AuthInterceptor(this._tokenManager, this._dio); + + @override + void onRequest( + RequestOptions options, + RequestInterceptorHandler handler, + ) async { + // 不需要 token 的路径 + const noAuthPaths = [ + '/auth/send-code/', + '/auth/code-login/', + '/auth/phone-login/', + '/auth/refresh/', + '/version/check/', + ]; + + final needsAuth = !noAuthPaths.any((p) => options.path.contains(p)); + + if (needsAuth) { + final token = await _tokenManager.getAccessToken(); + if (token != null && token.isNotEmpty) { + options.headers['Authorization'] = 'Bearer $token'; + } + } + + handler.next(options); + } + + @override + void onError(DioException err, ErrorInterceptorHandler handler) async { + // 401: 尝试 refresh token + if (err.response?.statusCode == 401) { + try { + final refreshToken = await _tokenManager.getRefreshToken(); + if (refreshToken != null) { + final response = await _dio.post( + '/auth/refresh/', + data: {'refresh': refreshToken}, + options: Options(headers: {'Authorization': ''}), + ); + + final body = response.data; + if (body is Map && body['code'] == 0) { + final data = body['data'] as Map; + await _tokenManager.saveTokens( + access: data['access'] as String, + refresh: data['refresh'] as String, + ); + + // 用新 token 重试原请求 + final opts = err.requestOptions; + opts.headers['Authorization'] = + 'Bearer ${data['access']}'; + final retryResponse = await _dio.fetch(opts); + return handler.resolve(retryResponse); + } + } + } catch (_) { + // refresh 失败，清除 token（会触发路由守卫跳转登录） + await _tokenManager.clearTokens(); + } + } + + handler.next(err); + } +} diff --git a/airhub_app/lib/core/network/api_client.g.dart b/airhub_app/lib/core/network/api_client.g.dart new file mode 100644 index 0000000..2d28050 --- /dev/null +++ b/airhub_app/lib/core/network/api_client.g.dart @@ -0,0 +1,51 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'api_client.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(apiClient) +const apiClientProvider = ApiClientProvider._(); + +final class ApiClientProvider + extends $FunctionalProvider + with $Provider { + const ApiClientProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'apiClientProvider', + isAutoDispose: false, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$apiClientHash(); + + @$internal + @override + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(pointer); + + @override + ApiClient create(Ref ref) { + return apiClient(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(ApiClient value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$apiClientHash() => r'9d0cce119ded498b0bdf8ec8bb1ed5fc9fcfb8aa'; diff --git a/airhub_app/lib/core/network/api_config.dart b/airhub_app/lib/core/network/api_config.dart new file mode 100644 index 0000000..7abe3aa --- /dev/null +++ b/airhub_app/lib/core/network/api_config.dart @@ -0,0 +1,16 @@ +class ApiConfig { + /// 后端服务器地址（开发环境请替换为实际 IP） + static const String baseUrl = 'http://127.0.0.1:8000'; + + /// App 端 API 前缀 + static const String apiPrefix = '/api/v1'; + + /// 连接超时 + static const Duration connectTimeout = Duration(seconds: 15); + + /// 接收超时 + static const Duration receiveTimeout = Duration(seconds: 15); + + /// 拼接完整 URL + static String get fullBaseUrl => '$baseUrl$apiPrefix'; +} diff --git a/airhub_app/lib/core/network/token_manager.dart b/airhub_app/lib/core/network/token_manager.dart new file mode 100644 index 0000000..b3e654f --- /dev/null +++ b/airhub_app/lib/core/network/token_manager.dart @@ -0,0 +1,51 @@ +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +part 'token_manager.g.dart'; + +const _keyAccessToken = 'access_token'; +const _keyRefreshToken = 'refresh_token'; + +@Riverpod(keepAlive: true) +TokenManager tokenManager(Ref ref) { + return TokenManager(); +} + +class TokenManager { + SharedPreferences? _prefs; + + Future get _preferences async { + _prefs ??= await SharedPreferences.getInstance(); + return _prefs!; + } + + Future saveTokens({ + required String access, + required String refresh, + }) async { + final prefs = await _preferences; + await prefs.setString(_keyAccessToken, access); + await prefs.setString(_keyRefreshToken, refresh); + } + + Future getAccessToken() async { + final prefs = await _preferences; + return prefs.getString(_keyAccessToken); + } + + Future getRefreshToken() async { + final prefs = await _preferences; + return prefs.getString(_keyRefreshToken); + } + + Future hasToken() async { + final token = await getAccessToken(); + return token != null && token.isNotEmpty; + } + + Future clearTokens() async { + final prefs = await _preferences; + await prefs.remove(_keyAccessToken); + await prefs.remove(_keyRefreshToken); + } +} diff --git a/airhub_app/lib/core/network/token_manager.g.dart b/airhub_app/lib/core/network/token_manager.g.dart new file mode 100644 index 0000000..dfc91b3 --- /dev/null +++ b/airhub_app/lib/core/network/token_manager.g.dart @@ -0,0 +1,51 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'token_manager.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(tokenManager) +const tokenManagerProvider = TokenManagerProvider._(); + +final class TokenManagerProvider + extends $FunctionalProvider + with $Provider { + const TokenManagerProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'tokenManagerProvider', + isAutoDispose: false, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$tokenManagerHash(); + + @$internal + @override + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(pointer); + + @override + TokenManager create(Ref ref) { + return tokenManager(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(TokenManager value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$tokenManagerHash() => r'94bb9e39530e1d18331ea750bd4b6c5d4f16f1e9'; diff --git a/airhub_app/lib/core/router/app_router.dart b/airhub_app/lib/core/router/app_router.dart index 6b7c8d5..a2acb04 100644 --- a/airhub_app/lib/core/router/app_router.dart +++ b/airhub_app/lib/core/router/app_router.dart @@ -8,14 +8,28 @@ import '../../pages/home_page.dart'; import '../../pages/profile/profile_page.dart'; import '../../pages/webview_page.dart'; import '../../pages/wifi_config_page.dart'; +import '../network/token_manager.dart'; part 'app_router.g.dart'; @riverpod GoRouter goRouter(Ref ref) { + final tokenManager = ref.watch(tokenManagerProvider); + return GoRouter( - initialLocation: - '/login', // Start at login for now, logic can be added to check auth state later + initialLocation: '/login', + redirect: (context, state) async { + final hasToken = await tokenManager.hasToken(); + final isLoginRoute = state.matchedLocation == '/login'; + + if (!hasToken && !isLoginRoute) { + return '/login'; + } + if (hasToken && isLoginRoute) { + return '/home'; + } + return null; + }, routes: [ GoRoute(path: '/login', builder: (context, state) => const LoginPage()), GoRoute(path: '/home', builder: (context, state) => const HomePage()), diff --git a/airhub_app/lib/core/router/app_router.g.dart b/airhub_app/lib/core/router/app_router.g.dart index 16ea3e2..631592a 100644 --- a/airhub_app/lib/core/router/app_router.g.dart +++ b/airhub_app/lib/core/router/app_router.g.dart @@ -48,4 +48,4 @@ final class GoRouterProvider } } -String _$goRouterHash() => r'937320fb6893b1da17afec22844ae01cf2e22441'; +String _$goRouterHash() => r'b559a84bcf9ae1ffda1deba4cf213f31a4006782'; diff --git a/airhub_app/lib/core/services/phone_auth_service.dart b/airhub_app/lib/core/services/phone_auth_service.dart new file mode 100644 index 0000000..cfd1177 --- /dev/null +++ b/airhub_app/lib/core/services/phone_auth_service.dart @@ -0,0 +1,85 @@ +import 'dart:async'; +import 'package:flutter/foundation.dart' show kIsWeb; +import 'package:riverpod_annotation/riverpod_annotation.dart'; + +// 条件导入：Web 用 stub，原生用真实 ali_auth +import 'phone_auth_service_stub.dart' + if (dart.library.io) 'package:ali_auth/ali_auth.dart'; + +part 'phone_auth_service.g.dart'; + +class PhoneAuthConfig { + static const String androidSk = + 'eLg3aWBZ2JOO6eX6bmrcSGqNSE3/jWafpIh1JYL2PIW4WxkQdrUUVCKFmeErwr+ZcqotmFc+zSDYZpyO6xVNfPB+C8KdaJwO19Sn7kbFX52Gv2T7neNTGXla+lwHj4lqpL5P2zmFNeZlTeYN9YuggsPc2IeX+6T3F26r1ih7HcCfMPECqUyTY9a0HT0CCsfwva1gfRAr2MN87I3yRGsr2IpPOBvGqUoa8cD9+8EBBQzouCZ5YbrE3MP2dISTHmx+8ORYEP6NT3BmPnPR6UVQEc6nTmbMMjjLMKFaMsi+M4gg5pgnEwYhd0GYB6oV+v15'; + static const String iosSk = + 'kl3UL3GomT2sxglYyXY9LeuXAxxej24SotVP1UAZij4NI3T7E5W3NKFVv61E3bUwugtfRyucSDkws25tzZ9LoBGEg4H19MD31YmwxhYsKlS5fe/+jdigjDXsNWonTLEmFqxGJqtav2i0M9Q5L5YQcQpHYWc2IpL3WT2dTCU876ghQIm8UXF8TYhwHNGLvdjuUbp1naGjwbWxzov2Fy2b0DOkb5q1gc0DWsKQ4XAQhzwcivO88VbT/7tuFFdpGxmpwETBS0u7pkeGan2ZCKxAEA=='; +} + +@Riverpod(keepAlive: true) +PhoneAuthService phoneAuthService(Ref ref) { + return PhoneAuthService(); +} + +class PhoneAuthService { + bool _initialized = false; + + /// 初始化 SDK（只需调用一次） + Future init() async { + if (_initialized) return; + // 真机才初始化，Web 跳过 + if (kIsWeb) return; + + try { + await AliAuth.initSdk( + AliAuthModel( + PhoneAuthConfig.androidSk, + PhoneAuthConfig.iosSk, + isDebug: true, + autoQuitPage: true, + pageType: PageType.fullPort, + ), + ); + _initialized = true; + } catch (e) { + // SDK 初始化失败不阻塞 App 启动 + _initialized = false; + } + } + + /// 一键登录，返回阿里云 token（用于发给后端换手机号） + /// 返回 null 表示用户取消或认证失败 + Future getLoginToken() async { + if (!_initialized) { + await init(); + } + if (!_initialized) return null; + + final completer = Completer(); + + AliAuth.loginListen(onEvent: (event) { + final code = event['code'] as String?; + + if (code == '600000' && event['data'] != null) { + // 成功获取 token + if (!completer.isCompleted) { + completer.complete(event['data'] as String); + } + } else if (code == '700000' || code == '700001') { + // 用户取消 + if (!completer.isCompleted) { + completer.complete(null); + } + } else if (code != null && code.startsWith('6') && code != '600000') { + // 其他 6xxxxx 错误码 + if (!completer.isCompleted) { + completer.complete(null); + } + } + }); + + return completer.future.timeout( + const Duration(seconds: 30), + onTimeout: () => null, + ); + } +} diff --git a/airhub_app/lib/core/services/phone_auth_service.g.dart b/airhub_app/lib/core/services/phone_auth_service.g.dart new file mode 100644 index 0000000..e9c6387 --- /dev/null +++ b/airhub_app/lib/core/services/phone_auth_service.g.dart @@ -0,0 +1,56 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'phone_auth_service.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(phoneAuthService) +const phoneAuthServiceProvider = PhoneAuthServiceProvider._(); + +final class PhoneAuthServiceProvider + extends + $FunctionalProvider< + PhoneAuthService, + PhoneAuthService, + PhoneAuthService + > + with $Provider { + const PhoneAuthServiceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'phoneAuthServiceProvider', + isAutoDispose: false, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$phoneAuthServiceHash(); + + @$internal + @override + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(pointer); + + @override + PhoneAuthService create(Ref ref) { + return phoneAuthService(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(PhoneAuthService value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$phoneAuthServiceHash() => r'b7a4a2481eef4a3ddd0ce529c879dc5319a3106b'; diff --git a/airhub_app/lib/core/services/phone_auth_service_stub.dart b/airhub_app/lib/core/services/phone_auth_service_stub.dart new file mode 100644 index 0000000..802866f --- /dev/null +++ b/airhub_app/lib/core/services/phone_auth_service_stub.dart @@ -0,0 +1,14 @@ +/// Web 平台 stub — ali_auth 不支持 Web，提供空实现 +class AliAuth { + static Future initSdk(dynamic model) async {} + static void loginListen({required Function(Map) onEvent}) {} +} + +class AliAuthModel { + AliAuthModel(String androidSk, String iosSk, + {bool isDebug = false, bool autoQuitPage = false, dynamic pageType}); +} + +class PageType { + static const fullPort = 0; +} diff --git a/airhub_app/lib/features/auth/data/datasources/auth_remote_data_source.dart b/airhub_app/lib/features/auth/data/datasources/auth_remote_data_source.dart index 5bb74a9..83c714c 100644 --- a/airhub_app/lib/features/auth/data/datasources/auth_remote_data_source.dart +++ b/airhub_app/lib/features/auth/data/datasources/auth_remote_data_source.dart @@ -1,39 +1,72 @@ -import 'dart:async'; import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../../core/network/api_client.dart'; +import '../../domain/entities/auth_tokens.dart'; import '../../domain/entities/user.dart'; part 'auth_remote_data_source.g.dart'; abstract class AuthRemoteDataSource { - Future loginWithPhone(String phoneNumber, String code); - Future oneClickLogin(); + Future sendCode(String phone); + Future<({User user, AuthTokens tokens, bool isNewUser})> codeLogin( + String phone, String code); + Future<({User user, AuthTokens tokens, bool isNewUser})> tokenLogin( + String token); + Future logout(String refreshToken); + Future deleteAccount(); } @riverpod AuthRemoteDataSource authRemoteDataSource(Ref ref) { - return AuthRemoteDataSourceImpl(); + final apiClient = ref.watch(apiClientProvider); + return AuthRemoteDataSourceImpl(apiClient); } class AuthRemoteDataSourceImpl implements AuthRemoteDataSource { + final ApiClient _apiClient; + + AuthRemoteDataSourceImpl(this._apiClient); + @override - Future loginWithPhone(String phoneNumber, String code) async { - // Mock network delay and logic copied from original login_page.dart - await Future.delayed(const Duration(milliseconds: 1500)); - // Simulate successful login - return User( - id: '1', - phoneNumber: phoneNumber, - nickname: 'User ${phoneNumber.substring(7)}', - ); + Future sendCode(String phone) async { + await _apiClient.post('/auth/send-code/', data: {'phone': phone}); } @override - Future oneClickLogin() async { - await Future.delayed(const Duration(milliseconds: 1500)); - return const User( - id: '2', - phoneNumber: '13800138000', - nickname: 'OneClick User', + Future<({User user, AuthTokens tokens, bool isNewUser})> codeLogin( + String phone, String code) async { + final data = await _apiClient.post( + '/auth/code-login/', + data: {'phone': phone, 'code': code}, ); + return _parseLoginResponse(data as Map); + } + + @override + Future<({User user, AuthTokens tokens, bool isNewUser})> tokenLogin( + String token) async { + final data = await _apiClient.post( + '/auth/phone-login/', + data: {'token': token}, + ); + return _parseLoginResponse(data as Map); + } + + @override + Future logout(String refreshToken) async { + await _apiClient.post('/auth/logout/', data: {'refresh': refreshToken}); + } + + @override + Future deleteAccount() async { + await _apiClient.delete('/auth/account/'); + } + + ({User user, AuthTokens tokens, bool isNewUser}) _parseLoginResponse( + Map data) { + final user = User.fromJson(data['user'] as Map); + // 后端返回字段名为 'token'（非 'tokens'） + final tokens = AuthTokens.fromJson(data['token'] as Map); + final isNewUser = data['is_new_user'] as bool? ?? false; + return (user: user, tokens: tokens, isNewUser: isNewUser); } } diff --git a/airhub_app/lib/features/auth/data/datasources/auth_remote_data_source.g.dart b/airhub_app/lib/features/auth/data/datasources/auth_remote_data_source.g.dart index d0872c1..41e3fc8 100644 --- a/airhub_app/lib/features/auth/data/datasources/auth_remote_data_source.g.dart +++ b/airhub_app/lib/features/auth/data/datasources/auth_remote_data_source.g.dart @@ -55,4 +55,4 @@ final class AuthRemoteDataSourceProvider } String _$authRemoteDataSourceHash() => - r'b6a9edd1b6c48be8564688bac362316f598b4432'; + r'9f874814620b5a8bcdf56417a68ed7cba404a9e9'; diff --git a/airhub_app/lib/features/auth/data/repositories/auth_repository_impl.dart b/airhub_app/lib/features/auth/data/repositories/auth_repository_impl.dart index ce2fc96..c2d0eaf 100644 --- a/airhub_app/lib/features/auth/data/repositories/auth_repository_impl.dart +++ b/airhub_app/lib/features/auth/data/repositories/auth_repository_impl.dart @@ -1,51 +1,121 @@ +import 'dart:async'; import 'package:fpdart/fpdart.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../../core/errors/exceptions.dart'; import '../../../../core/errors/failures.dart'; +import '../../../../core/network/token_manager.dart'; import '../../domain/entities/user.dart'; import '../../domain/repositories/auth_repository.dart'; import '../datasources/auth_remote_data_source.dart'; part 'auth_repository_impl.g.dart'; -@riverpod +@Riverpod(keepAlive: true) AuthRepository authRepository(Ref ref) { final remoteDataSource = ref.watch(authRemoteDataSourceProvider); - return AuthRepositoryImpl(remoteDataSource); + final tokenManager = ref.watch(tokenManagerProvider); + return AuthRepositoryImpl(remoteDataSource, tokenManager); } class AuthRepositoryImpl implements AuthRepository { final AuthRemoteDataSource _remoteDataSource; + final TokenManager _tokenManager; + final _authStateController = StreamController.broadcast(); + User? _currentUser; - AuthRepositoryImpl(this._remoteDataSource); + AuthRepositoryImpl(this._remoteDataSource, this._tokenManager); @override - Stream get authStateChanges => Stream.value(null); // Mock stream + User? get currentUser => _currentUser; @override - Future> loginWithPhone( - String phoneNumber, - String code, - ) async { + Stream get authStateChanges => _authStateController.stream; + + @override + Future> sendCode(String phone) async { try { - final user = await _remoteDataSource.loginWithPhone(phoneNumber, code); - return right(user); - } catch (e) { - return left(const ServerFailure('Login failed')); + await _remoteDataSource.sendCode(phone); + return right(null); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); } } @override - Future> oneClickLogin() async { + Future> codeLogin(String phone, String code) async { try { - final user = await _remoteDataSource.oneClickLogin(); - return right(user); - } catch (e) { - return left(const ServerFailure('One-click login failed')); + final result = await _remoteDataSource.codeLogin(phone, code); + await _tokenManager.saveTokens( + access: result.tokens.access, + refresh: result.tokens.refresh, + ); + _currentUser = result.user; + _authStateController.add(result.user); + return right(result.user); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> tokenLogin(String token) async { + try { + final result = await _remoteDataSource.tokenLogin(token); + await _tokenManager.saveTokens( + access: result.tokens.access, + refresh: result.tokens.refresh, + ); + _currentUser = result.user; + _authStateController.add(result.user); + return right(result.user); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); } } @override Future> logout() async { - return right(null); + try { + final refreshToken = await _tokenManager.getRefreshToken(); + if (refreshToken != null) { + await _remoteDataSource.logout(refreshToken); + } + await _tokenManager.clearTokens(); + _currentUser = null; + _authStateController.add(null); + return right(null); + } on ServerException catch (_) { + // 即使 API 失败也清除本地 token + await _tokenManager.clearTokens(); + _currentUser = null; + _authStateController.add(null); + return right(null); + } on NetworkException catch (_) { + await _tokenManager.clearTokens(); + _currentUser = null; + _authStateController.add(null); + return right(null); + } + } + + @override + Future> deleteAccount() async { + try { + await _remoteDataSource.deleteAccount(); + await _tokenManager.clearTokens(); + _currentUser = null; + _authStateController.add(null); + return right(null); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } } } diff --git a/airhub_app/lib/features/auth/data/repositories/auth_repository_impl.g.dart b/airhub_app/lib/features/auth/data/repositories/auth_repository_impl.g.dart index dba5767..9cebe11 100644 --- a/airhub_app/lib/features/auth/data/repositories/auth_repository_impl.g.dart +++ b/airhub_app/lib/features/auth/data/repositories/auth_repository_impl.g.dart @@ -21,7 +21,7 @@ final class AuthRepositoryProvider argument: null, retry: null, name: r'authRepositoryProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -48,4 +48,4 @@ final class AuthRepositoryProvider } } -String _$authRepositoryHash() => r'43e05b07a705006cf920b080f78421ecc8bab1d9'; +String _$authRepositoryHash() => r'4f799a30b753954fa92b1ed1b21277bd6020a4a0'; diff --git a/airhub_app/lib/features/auth/domain/entities/auth_tokens.dart b/airhub_app/lib/features/auth/domain/entities/auth_tokens.dart new file mode 100644 index 0000000..cd43231 --- /dev/null +++ b/airhub_app/lib/features/auth/domain/entities/auth_tokens.dart @@ -0,0 +1,15 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'auth_tokens.freezed.dart'; +part 'auth_tokens.g.dart'; + +@freezed +abstract class AuthTokens with _$AuthTokens { + const factory AuthTokens({ + required String access, + required String refresh, + }) = _AuthTokens; + + factory AuthTokens.fromJson(Map json) => + _$AuthTokensFromJson(json); +} diff --git a/airhub_app/lib/features/auth/domain/entities/auth_tokens.freezed.dart b/airhub_app/lib/features/auth/domain/entities/auth_tokens.freezed.dart new file mode 100644 index 0000000..9dbd7b7 --- /dev/null +++ b/airhub_app/lib/features/auth/domain/entities/auth_tokens.freezed.dart @@ -0,0 +1,280 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// coverage:ignore-file +// ignore_for_file: type=lint +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark + +part of 'auth_tokens.dart'; + +// ************************************************************************** +// FreezedGenerator +// ************************************************************************** + +// dart format off +T _$identity(T value) => value; + +/// @nodoc +mixin _$AuthTokens { + + String get access; String get refresh; +/// Create a copy of AuthTokens +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$AuthTokensCopyWith get copyWith => _$AuthTokensCopyWithImpl(this as AuthTokens, _$identity); + + /// Serializes this AuthTokens to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is AuthTokens&&(identical(other.access, access) || other.access == access)&&(identical(other.refresh, refresh) || other.refresh == refresh)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,access,refresh); + +@override +String toString() { + return 'AuthTokens(access: $access, refresh: $refresh)'; +} + + +} + +/// @nodoc +abstract mixin class $AuthTokensCopyWith<$Res> { + factory $AuthTokensCopyWith(AuthTokens value, $Res Function(AuthTokens) _then) = _$AuthTokensCopyWithImpl; +@useResult +$Res call({ + String access, String refresh +}); + + + + +} +/// @nodoc +class _$AuthTokensCopyWithImpl<$Res> + implements $AuthTokensCopyWith<$Res> { + _$AuthTokensCopyWithImpl(this._self, this._then); + + final AuthTokens _self; + final $Res Function(AuthTokens) _then; + +/// Create a copy of AuthTokens +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? access = null,Object? refresh = null,}) { + return _then(_self.copyWith( +access: null == access ? _self.access : access // ignore: cast_nullable_to_non_nullable +as String,refresh: null == refresh ? _self.refresh : refresh // ignore: cast_nullable_to_non_nullable +as String, + )); +} + +} + + +/// Adds pattern-matching-related methods to [AuthTokens]. +extension AuthTokensPatterns on AuthTokens { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _AuthTokens value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _AuthTokens() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _AuthTokens value) $default,){ +final _that = this; +switch (_that) { +case _AuthTokens(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _AuthTokens value)? $default,){ +final _that = this; +switch (_that) { +case _AuthTokens() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( String access, String refresh)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _AuthTokens() when $default != null: +return $default(_that.access,_that.refresh);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( String access, String refresh) $default,) {final _that = this; +switch (_that) { +case _AuthTokens(): +return $default(_that.access,_that.refresh);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( String access, String refresh)? $default,) {final _that = this; +switch (_that) { +case _AuthTokens() when $default != null: +return $default(_that.access,_that.refresh);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _AuthTokens implements AuthTokens { + const _AuthTokens({required this.access, required this.refresh}); + factory _AuthTokens.fromJson(Map json) => _$AuthTokensFromJson(json); + +@override final String access; +@override final String refresh; + +/// Create a copy of AuthTokens +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$AuthTokensCopyWith<_AuthTokens> get copyWith => __$AuthTokensCopyWithImpl<_AuthTokens>(this, _$identity); + +@override +Map toJson() { + return _$AuthTokensToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _AuthTokens&&(identical(other.access, access) || other.access == access)&&(identical(other.refresh, refresh) || other.refresh == refresh)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,access,refresh); + +@override +String toString() { + return 'AuthTokens(access: $access, refresh: $refresh)'; +} + + +} + +/// @nodoc +abstract mixin class _$AuthTokensCopyWith<$Res> implements $AuthTokensCopyWith<$Res> { + factory _$AuthTokensCopyWith(_AuthTokens value, $Res Function(_AuthTokens) _then) = __$AuthTokensCopyWithImpl; +@override @useResult +$Res call({ + String access, String refresh +}); + + + + +} +/// @nodoc +class __$AuthTokensCopyWithImpl<$Res> + implements _$AuthTokensCopyWith<$Res> { + __$AuthTokensCopyWithImpl(this._self, this._then); + + final _AuthTokens _self; + final $Res Function(_AuthTokens) _then; + +/// Create a copy of AuthTokens +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? access = null,Object? refresh = null,}) { + return _then(_AuthTokens( +access: null == access ? _self.access : access // ignore: cast_nullable_to_non_nullable +as String,refresh: null == refresh ? _self.refresh : refresh // ignore: cast_nullable_to_non_nullable +as String, + )); +} + + +} + +// dart format on diff --git a/airhub_app/lib/features/auth/domain/entities/auth_tokens.g.dart b/airhub_app/lib/features/auth/domain/entities/auth_tokens.g.dart new file mode 100644 index 0000000..e051bc7 --- /dev/null +++ b/airhub_app/lib/features/auth/domain/entities/auth_tokens.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'auth_tokens.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +_AuthTokens _$AuthTokensFromJson(Map json) => _AuthTokens( + access: json['access'] as String, + refresh: json['refresh'] as String, +); + +Map _$AuthTokensToJson(_AuthTokens instance) => + {'access': instance.access, 'refresh': instance.refresh}; diff --git a/airhub_app/lib/features/auth/domain/entities/user.dart b/airhub_app/lib/features/auth/domain/entities/user.dart index 663a2e5..5e069e7 100644 --- a/airhub_app/lib/features/auth/domain/entities/user.dart +++ b/airhub_app/lib/features/auth/domain/entities/user.dart @@ -6,10 +6,12 @@ part 'user.g.dart'; @freezed abstract class User with _$User { const factory User({ - required String id, - required String phoneNumber, + required int id, + required String phone, String? nickname, - String? avatarUrl, + String? avatar, + String? gender, + String? birthday, }) = _User; factory User.fromJson(Map json) => _$UserFromJson(json); diff --git a/airhub_app/lib/features/auth/domain/entities/user.freezed.dart b/airhub_app/lib/features/auth/domain/entities/user.freezed.dart index 9ba14f0..2a0c9cb 100644 --- a/airhub_app/lib/features/auth/domain/entities/user.freezed.dart +++ b/airhub_app/lib/features/auth/domain/entities/user.freezed.dart @@ -15,7 +15,7 @@ T _$identity(T value) => value; /// @nodoc mixin _$User { - String get id; String get phoneNumber; String? get nickname; String? get avatarUrl; + int get id; String get phone; String? get nickname; String? get avatar; String? get gender; String? get birthday; /// Create a copy of User /// with the given fields replaced by the non-null parameter values. @JsonKey(includeFromJson: false, includeToJson: false) @@ -28,16 +28,16 @@ $UserCopyWith get copyWith => _$UserCopyWithImpl(this as User, _$ide @override bool operator ==(Object other) { - return identical(this, other) || (other.runtimeType == runtimeType&&other is User&&(identical(other.id, id) || other.id == id)&&(identical(other.phoneNumber, phoneNumber) || other.phoneNumber == phoneNumber)&&(identical(other.nickname, nickname) || other.nickname == nickname)&&(identical(other.avatarUrl, avatarUrl) || other.avatarUrl == avatarUrl)); + return identical(this, other) || (other.runtimeType == runtimeType&&other is User&&(identical(other.id, id) || other.id == id)&&(identical(other.phone, phone) || other.phone == phone)&&(identical(other.nickname, nickname) || other.nickname == nickname)&&(identical(other.avatar, avatar) || other.avatar == avatar)&&(identical(other.gender, gender) || other.gender == gender)&&(identical(other.birthday, birthday) || other.birthday == birthday)); } @JsonKey(includeFromJson: false, includeToJson: false) @override -int get hashCode => Object.hash(runtimeType,id,phoneNumber,nickname,avatarUrl); +int get hashCode => Object.hash(runtimeType,id,phone,nickname,avatar,gender,birthday); @override String toString() { - return 'User(id: $id, phoneNumber: $phoneNumber, nickname: $nickname, avatarUrl: $avatarUrl)'; + return 'User(id: $id, phone: $phone, nickname: $nickname, avatar: $avatar, gender: $gender, birthday: $birthday)'; } @@ -48,7 +48,7 @@ abstract mixin class $UserCopyWith<$Res> { factory $UserCopyWith(User value, $Res Function(User) _then) = _$UserCopyWithImpl; @useResult $Res call({ - String id, String phoneNumber, String? nickname, String? avatarUrl + int id, String phone, String? nickname, String? avatar, String? gender, String? birthday }); @@ -65,12 +65,14 @@ class _$UserCopyWithImpl<$Res> /// Create a copy of User /// with the given fields replaced by the non-null parameter values. -@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? phoneNumber = null,Object? nickname = freezed,Object? avatarUrl = freezed,}) { +@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? phone = null,Object? nickname = freezed,Object? avatar = freezed,Object? gender = freezed,Object? birthday = freezed,}) { return _then(_self.copyWith( id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable -as String,phoneNumber: null == phoneNumber ? _self.phoneNumber : phoneNumber // ignore: cast_nullable_to_non_nullable +as int,phone: null == phone ? _self.phone : phone // ignore: cast_nullable_to_non_nullable as String,nickname: freezed == nickname ? _self.nickname : nickname // ignore: cast_nullable_to_non_nullable -as String?,avatarUrl: freezed == avatarUrl ? _self.avatarUrl : avatarUrl // ignore: cast_nullable_to_non_nullable +as String?,avatar: freezed == avatar ? _self.avatar : avatar // ignore: cast_nullable_to_non_nullable +as String?,gender: freezed == gender ? _self.gender : gender // ignore: cast_nullable_to_non_nullable +as String?,birthday: freezed == birthday ? _self.birthday : birthday // ignore: cast_nullable_to_non_nullable as String?, )); } @@ -156,10 +158,10 @@ return $default(_that);case _: /// } /// ``` -@optionalTypeArgs TResult maybeWhen(TResult Function( String id, String phoneNumber, String? nickname, String? avatarUrl)? $default,{required TResult orElse(),}) {final _that = this; +@optionalTypeArgs TResult maybeWhen(TResult Function( int id, String phone, String? nickname, String? avatar, String? gender, String? birthday)? $default,{required TResult orElse(),}) {final _that = this; switch (_that) { case _User() when $default != null: -return $default(_that.id,_that.phoneNumber,_that.nickname,_that.avatarUrl);case _: +return $default(_that.id,_that.phone,_that.nickname,_that.avatar,_that.gender,_that.birthday);case _: return orElse(); } @@ -177,10 +179,10 @@ return $default(_that.id,_that.phoneNumber,_that.nickname,_that.avatarUrl);case /// } /// ``` -@optionalTypeArgs TResult when(TResult Function( String id, String phoneNumber, String? nickname, String? avatarUrl) $default,) {final _that = this; +@optionalTypeArgs TResult when(TResult Function( int id, String phone, String? nickname, String? avatar, String? gender, String? birthday) $default,) {final _that = this; switch (_that) { case _User(): -return $default(_that.id,_that.phoneNumber,_that.nickname,_that.avatarUrl);case _: +return $default(_that.id,_that.phone,_that.nickname,_that.avatar,_that.gender,_that.birthday);case _: throw StateError('Unexpected subclass'); } @@ -197,10 +199,10 @@ return $default(_that.id,_that.phoneNumber,_that.nickname,_that.avatarUrl);case /// } /// ``` -@optionalTypeArgs TResult? whenOrNull(TResult? Function( String id, String phoneNumber, String? nickname, String? avatarUrl)? $default,) {final _that = this; +@optionalTypeArgs TResult? whenOrNull(TResult? Function( int id, String phone, String? nickname, String? avatar, String? gender, String? birthday)? $default,) {final _that = this; switch (_that) { case _User() when $default != null: -return $default(_that.id,_that.phoneNumber,_that.nickname,_that.avatarUrl);case _: +return $default(_that.id,_that.phone,_that.nickname,_that.avatar,_that.gender,_that.birthday);case _: return null; } @@ -212,13 +214,15 @@ return $default(_that.id,_that.phoneNumber,_that.nickname,_that.avatarUrl);case @JsonSerializable() class _User implements User { - const _User({required this.id, required this.phoneNumber, this.nickname, this.avatarUrl}); + const _User({required this.id, required this.phone, this.nickname, this.avatar, this.gender, this.birthday}); factory _User.fromJson(Map json) => _$UserFromJson(json); -@override final String id; -@override final String phoneNumber; +@override final int id; +@override final String phone; @override final String? nickname; -@override final String? avatarUrl; +@override final String? avatar; +@override final String? gender; +@override final String? birthday; /// Create a copy of User /// with the given fields replaced by the non-null parameter values. @@ -233,16 +237,16 @@ Map toJson() { @override bool operator ==(Object other) { - return identical(this, other) || (other.runtimeType == runtimeType&&other is _User&&(identical(other.id, id) || other.id == id)&&(identical(other.phoneNumber, phoneNumber) || other.phoneNumber == phoneNumber)&&(identical(other.nickname, nickname) || other.nickname == nickname)&&(identical(other.avatarUrl, avatarUrl) || other.avatarUrl == avatarUrl)); + return identical(this, other) || (other.runtimeType == runtimeType&&other is _User&&(identical(other.id, id) || other.id == id)&&(identical(other.phone, phone) || other.phone == phone)&&(identical(other.nickname, nickname) || other.nickname == nickname)&&(identical(other.avatar, avatar) || other.avatar == avatar)&&(identical(other.gender, gender) || other.gender == gender)&&(identical(other.birthday, birthday) || other.birthday == birthday)); } @JsonKey(includeFromJson: false, includeToJson: false) @override -int get hashCode => Object.hash(runtimeType,id,phoneNumber,nickname,avatarUrl); +int get hashCode => Object.hash(runtimeType,id,phone,nickname,avatar,gender,birthday); @override String toString() { - return 'User(id: $id, phoneNumber: $phoneNumber, nickname: $nickname, avatarUrl: $avatarUrl)'; + return 'User(id: $id, phone: $phone, nickname: $nickname, avatar: $avatar, gender: $gender, birthday: $birthday)'; } @@ -253,7 +257,7 @@ abstract mixin class _$UserCopyWith<$Res> implements $UserCopyWith<$Res> { factory _$UserCopyWith(_User value, $Res Function(_User) _then) = __$UserCopyWithImpl; @override @useResult $Res call({ - String id, String phoneNumber, String? nickname, String? avatarUrl + int id, String phone, String? nickname, String? avatar, String? gender, String? birthday }); @@ -270,12 +274,14 @@ class __$UserCopyWithImpl<$Res> /// Create a copy of User /// with the given fields replaced by the non-null parameter values. -@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? phoneNumber = null,Object? nickname = freezed,Object? avatarUrl = freezed,}) { +@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? phone = null,Object? nickname = freezed,Object? avatar = freezed,Object? gender = freezed,Object? birthday = freezed,}) { return _then(_User( id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable -as String,phoneNumber: null == phoneNumber ? _self.phoneNumber : phoneNumber // ignore: cast_nullable_to_non_nullable +as int,phone: null == phone ? _self.phone : phone // ignore: cast_nullable_to_non_nullable as String,nickname: freezed == nickname ? _self.nickname : nickname // ignore: cast_nullable_to_non_nullable -as String?,avatarUrl: freezed == avatarUrl ? _self.avatarUrl : avatarUrl // ignore: cast_nullable_to_non_nullable +as String?,avatar: freezed == avatar ? _self.avatar : avatar // ignore: cast_nullable_to_non_nullable +as String?,gender: freezed == gender ? _self.gender : gender // ignore: cast_nullable_to_non_nullable +as String?,birthday: freezed == birthday ? _self.birthday : birthday // ignore: cast_nullable_to_non_nullable as String?, )); } diff --git a/airhub_app/lib/features/auth/domain/entities/user.g.dart b/airhub_app/lib/features/auth/domain/entities/user.g.dart index 5306719..9de667e 100644 --- a/airhub_app/lib/features/auth/domain/entities/user.g.dart +++ b/airhub_app/lib/features/auth/domain/entities/user.g.dart @@ -7,15 +7,19 @@ part of 'user.dart'; // ************************************************************************** _User _$UserFromJson(Map json) => _User( - id: json['id'] as String, - phoneNumber: json['phoneNumber'] as String, + id: (json['id'] as num).toInt(), + phone: json['phone'] as String, nickname: json['nickname'] as String?, - avatarUrl: json['avatarUrl'] as String?, + avatar: json['avatar'] as String?, + gender: json['gender'] as String?, + birthday: json['birthday'] as String?, ); Map _$UserToJson(_User instance) => { 'id': instance.id, - 'phoneNumber': instance.phoneNumber, + 'phone': instance.phone, 'nickname': instance.nickname, - 'avatarUrl': instance.avatarUrl, + 'avatar': instance.avatar, + 'gender': instance.gender, + 'birthday': instance.birthday, }; diff --git a/airhub_app/lib/features/auth/domain/repositories/auth_repository.dart b/airhub_app/lib/features/auth/domain/repositories/auth_repository.dart index e647e75..b298bba 100644 --- a/airhub_app/lib/features/auth/domain/repositories/auth_repository.dart +++ b/airhub_app/lib/features/auth/domain/repositories/auth_repository.dart @@ -3,8 +3,11 @@ import '../../../../core/errors/failures.dart'; import '../entities/user.dart'; abstract class AuthRepository { - Future> loginWithPhone(String phoneNumber, String code); - Future> oneClickLogin(); + Future> sendCode(String phone); + Future> codeLogin(String phone, String code); + Future> tokenLogin(String token); Future> logout(); + Future> deleteAccount(); Stream get authStateChanges; + User? get currentUser; } diff --git a/airhub_app/lib/features/auth/presentation/controllers/auth_controller.dart b/airhub_app/lib/features/auth/presentation/controllers/auth_controller.dart index d91392c..618866b 100644 --- a/airhub_app/lib/features/auth/presentation/controllers/auth_controller.dart +++ b/airhub_app/lib/features/auth/presentation/controllers/auth_controller.dart @@ -10,23 +10,71 @@ class AuthController extends _$AuthController { // Initial state is void (idle) } - Future loginWithPhone(String phoneNumber, String code) async { + Future sendCode(String phone) async { state = const AsyncLoading(); final repository = ref.read(authRepositoryProvider); - final result = await repository.loginWithPhone(phoneNumber, code); + final result = await repository.sendCode(phone); state = result.fold( (failure) => AsyncError(failure.message, StackTrace.current), - (user) => const AsyncData(null), + (_) => const AsyncData(null), ); } - Future oneClickLogin() async { + Future codeLogin(String phone, String code) async { state = const AsyncLoading(); final repository = ref.read(authRepositoryProvider); - final result = await repository.oneClickLogin(); + final result = await repository.codeLogin(phone, code); + return result.fold( + (failure) { + state = AsyncError(failure.message, StackTrace.current); + return false; + }, + (user) { + state = const AsyncData(null); + return true; + }, + ); + } + + Future tokenLogin(String token) async { + state = const AsyncLoading(); + final repository = ref.read(authRepositoryProvider); + final result = await repository.tokenLogin(token); + return result.fold( + (failure) { + state = AsyncError(failure.message, StackTrace.current); + return false; + }, + (user) { + state = const AsyncData(null); + return true; + }, + ); + } + + Future logout() async { + state = const AsyncLoading(); + final repository = ref.read(authRepositoryProvider); + final result = await repository.logout(); state = result.fold( (failure) => AsyncError(failure.message, StackTrace.current), - (user) => const AsyncData(null), + (_) => const AsyncData(null), + ); + } + + Future deleteAccount() async { + state = const AsyncLoading(); + final repository = ref.read(authRepositoryProvider); + final result = await repository.deleteAccount(); + return result.fold( + (failure) { + state = AsyncError(failure.message, StackTrace.current); + return false; + }, + (_) { + state = const AsyncData(null); + return true; + }, ); } } diff --git a/airhub_app/lib/features/auth/presentation/controllers/auth_controller.g.dart b/airhub_app/lib/features/auth/presentation/controllers/auth_controller.g.dart index c3d053b..fba6b23 100644 --- a/airhub_app/lib/features/auth/presentation/controllers/auth_controller.g.dart +++ b/airhub_app/lib/features/auth/presentation/controllers/auth_controller.g.dart @@ -33,7 +33,7 @@ final class AuthControllerProvider AuthController create() => AuthController(); } -String _$authControllerHash() => r'e7278df3deb6222da1e5e8b8b6ec921493441758'; +String _$authControllerHash() => r'fac48518f4825055a266b5ea7e11163320342153'; abstract class _$AuthController extends $AsyncNotifier { FutureOr build(); diff --git a/airhub_app/lib/features/auth/presentation/pages/login_page.dart b/airhub_app/lib/features/auth/presentation/pages/login_page.dart index 4548cba..ab1bda4 100644 --- a/airhub_app/lib/features/auth/presentation/pages/login_page.dart +++ b/airhub_app/lib/features/auth/presentation/pages/login_page.dart @@ -7,6 +7,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; +import '../../../../core/services/phone_auth_service.dart'; import '../../../../theme/app_colors.dart'; import '../../../../widgets/animated_gradient_background.dart'; import '../../../../widgets/gradient_button.dart'; @@ -49,17 +50,11 @@ class _LoginPageState extends ConsumerState { super.dispose(); } - void _handleListener(BuildContext context, AsyncValue next) { + void _handleListener(BuildContext context, AsyncValue? prev, AsyncValue next) { next.whenOrNull( error: (error, stack) { _showToast(error.toString(), isError: true); }, - data: (_) { - // Navigate to Home on success - if (mounted) { - context.go('/home'); - } - }, ); } @@ -209,8 +204,19 @@ class _LoginPageState extends ConsumerState { } // Logic Methods - void _doOneClickLogin() { - ref.read(authControllerProvider.notifier).oneClickLogin(); + Future _doOneClickLogin() async { + // 通过阿里云号码认证 SDK 获取 token + final phoneAuthService = ref.read(phoneAuthServiceProvider); + final token = await phoneAuthService.getLoginToken(); + if (token == null) { + if (mounted) _showToast('一键登录取消或失败，请使用验证码登录', isError: true); + return; + } + if (!mounted) return; + final success = await ref.read(authControllerProvider.notifier).tokenLogin(token); + if (success && mounted) { + context.go('/home'); + } } void _handleOneClickLogin() { @@ -234,28 +240,37 @@ class _LoginPageState extends ConsumerState { AppToast.show(context, message, isError: isError); } - void _sendCode() { + Future _sendCode() async { if (!_isValidPhone(_phoneController.text)) { _showToast('请输入正确的手机号', isError: true); return; } - setState(() => _countdown = 60); - _showToast('验证码已发送'); - _countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) { - if (_countdown <= 1) { - timer.cancel(); - if (mounted) setState(() => _countdown = 0); - } else { - if (mounted) setState(() => _countdown--); - } - }); + try { + await ref.read(authControllerProvider.notifier).sendCode(_phoneController.text); + if (!mounted) return; + setState(() => _countdown = 60); + _showToast('验证码已发送'); + _countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) { + if (_countdown <= 1) { + timer.cancel(); + if (mounted) setState(() => _countdown = 0); + } else { + if (mounted) setState(() => _countdown--); + } + }); + } catch (_) { + // 错误已通过 listener 处理 + } } - void _submitSmsLogin() { + Future _submitSmsLogin() async { if (!_canSubmitSms) return; - ref + final success = await ref .read(authControllerProvider.notifier) - .loginWithPhone(_phoneController.text, _codeController.text); + .codeLogin(_phoneController.text, _codeController.text); + if (success && mounted) { + context.go('/home'); + } } Widget _buildGradientBackground() { @@ -267,7 +282,7 @@ class _LoginPageState extends ConsumerState { // Listen to Auth State ref.listen( authControllerProvider, - (_, next) => _handleListener(context, next), + (prev, next) => _handleListener(context, prev, next), ); final isLoading = ref.watch(authControllerProvider).isLoading; diff --git a/airhub_app/lib/features/device/data/datasources/device_remote_data_source.dart b/airhub_app/lib/features/device/data/datasources/device_remote_data_source.dart new file mode 100644 index 0000000..95bed06 --- /dev/null +++ b/airhub_app/lib/features/device/data/datasources/device_remote_data_source.dart @@ -0,0 +1,115 @@ +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../../core/network/api_client.dart'; +import '../../domain/entities/device.dart'; +import '../../domain/entities/device_detail.dart'; + +part 'device_remote_data_source.g.dart'; + +abstract class DeviceRemoteDataSource { + /// GET /devices/query-by-mac/?mac=xxx (无需认证) + Future> queryByMac(String mac); + + /// POST /devices/verify/ + Future> verifyDevice(String sn); + + /// POST /devices/bind/ + Future bindDevice(String sn, {int? spiritId}); + + /// GET /devices/my_devices/ + Future> getMyDevices(); + + /// GET /devices/{id}/detail/ + Future getDeviceDetail(int userDeviceId); + + /// DELETE /devices/{id}/unbind/ + Future unbindDevice(int userDeviceId); + + /// PUT /devices/{id}/update-spirit/ + Future updateSpirit(int userDeviceId, int spiritId); + + /// PUT /devices/{id}/settings/ + Future updateSettings(int userDeviceId, Map settings); + + /// POST /devices/{id}/wifi/ + Future configWifi(int userDeviceId, String ssid); +} + +@riverpod +DeviceRemoteDataSource deviceRemoteDataSource(Ref ref) { + final apiClient = ref.watch(apiClientProvider); + return DeviceRemoteDataSourceImpl(apiClient); +} + +class DeviceRemoteDataSourceImpl implements DeviceRemoteDataSource { + final ApiClient _apiClient; + + DeviceRemoteDataSourceImpl(this._apiClient); + + @override + Future> queryByMac(String mac) async { + final data = await _apiClient.get( + '/devices/query-by-mac/', + queryParameters: {'mac': mac}, + ); + return data as Map; + } + + @override + Future> verifyDevice(String sn) async { + final data = await _apiClient.post('/devices/verify/', data: {'sn': sn}); + return data as Map; + } + + @override + Future bindDevice(String sn, {int? spiritId}) async { + final body = {'sn': sn}; + if (spiritId != null) body['spirit_id'] = spiritId; + final data = await _apiClient.post('/devices/bind/', data: body); + return UserDevice.fromJson(data as Map); + } + + @override + Future> getMyDevices() async { + final data = await _apiClient.get('/devices/my_devices/'); + final list = data as List; + return list + .map((e) => UserDevice.fromJson(e as Map)) + .toList(); + } + + @override + Future getDeviceDetail(int userDeviceId) async { + final data = await _apiClient.get('/devices/$userDeviceId/detail/'); + return DeviceDetail.fromJson(data as Map); + } + + @override + Future unbindDevice(int userDeviceId) async { + await _apiClient.delete('/devices/$userDeviceId/unbind/'); + } + + @override + Future updateSpirit(int userDeviceId, int spiritId) async { + final data = await _apiClient.put( + '/devices/$userDeviceId/update-spirit/', + data: {'spirit_id': spiritId}, + ); + return UserDevice.fromJson(data as Map); + } + + @override + Future updateSettings( + int userDeviceId, + Map settings, + ) async { + await _apiClient.put('/devices/$userDeviceId/settings/', data: settings); + } + + @override + Future configWifi(int userDeviceId, String ssid) async { + await _apiClient.post( + '/devices/$userDeviceId/wifi/', + data: {'ssid': ssid}, + ); + } +} diff --git a/airhub_app/lib/features/device/data/datasources/device_remote_data_source.g.dart b/airhub_app/lib/features/device/data/datasources/device_remote_data_source.g.dart new file mode 100644 index 0000000..020ad00 --- /dev/null +++ b/airhub_app/lib/features/device/data/datasources/device_remote_data_source.g.dart @@ -0,0 +1,58 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'device_remote_data_source.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(deviceRemoteDataSource) +const deviceRemoteDataSourceProvider = DeviceRemoteDataSourceProvider._(); + +final class DeviceRemoteDataSourceProvider + extends + $FunctionalProvider< + DeviceRemoteDataSource, + DeviceRemoteDataSource, + DeviceRemoteDataSource + > + with $Provider { + const DeviceRemoteDataSourceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'deviceRemoteDataSourceProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$deviceRemoteDataSourceHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + DeviceRemoteDataSource create(Ref ref) { + return deviceRemoteDataSource(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(DeviceRemoteDataSource value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$deviceRemoteDataSourceHash() => + r'cc457ef1f933b66a63014b7ebb123478077096c3'; diff --git a/airhub_app/lib/features/device/data/repositories/device_repository_impl.dart b/airhub_app/lib/features/device/data/repositories/device_repository_impl.dart new file mode 100644 index 0000000..368d52c --- /dev/null +++ b/airhub_app/lib/features/device/data/repositories/device_repository_impl.dart @@ -0,0 +1,147 @@ +import 'package:fpdart/fpdart.dart'; +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../../core/errors/exceptions.dart'; +import '../../../../core/errors/failures.dart'; +import '../../domain/entities/device.dart'; +import '../../domain/entities/device_detail.dart'; +import '../../domain/repositories/device_repository.dart'; +import '../datasources/device_remote_data_source.dart'; + +part 'device_repository_impl.g.dart'; + +@riverpod +DeviceRepository deviceRepository(Ref ref) { + final remoteDataSource = ref.watch(deviceRemoteDataSourceProvider); + return DeviceRepositoryImpl(remoteDataSource); +} + +class DeviceRepositoryImpl implements DeviceRepository { + final DeviceRemoteDataSource _remoteDataSource; + + DeviceRepositoryImpl(this._remoteDataSource); + + @override + Future>> queryByMac(String mac) async { + try { + final result = await _remoteDataSource.queryByMac(mac); + return right(result); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future>> verifyDevice(String sn) async { + try { + final result = await _remoteDataSource.verifyDevice(sn); + return right(result); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> bindDevice( + String sn, { + int? spiritId, + }) async { + try { + final result = await _remoteDataSource.bindDevice(sn, spiritId: spiritId); + return right(result); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future>> getMyDevices() async { + try { + final result = await _remoteDataSource.getMyDevices(); + return right(result); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> getDeviceDetail( + int userDeviceId, + ) async { + try { + final result = await _remoteDataSource.getDeviceDetail(userDeviceId); + return right(result); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> unbindDevice(int userDeviceId) async { + try { + await _remoteDataSource.unbindDevice(userDeviceId); + return right(null); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> updateSpirit( + int userDeviceId, + int spiritId, + ) async { + try { + final result = await _remoteDataSource.updateSpirit( + userDeviceId, + spiritId, + ); + return right(result); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> updateSettings( + int userDeviceId, + Map settings, + ) async { + try { + await _remoteDataSource.updateSettings(userDeviceId, settings); + return right(null); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> configWifi( + int userDeviceId, + String ssid, + ) async { + try { + await _remoteDataSource.configWifi(userDeviceId, ssid); + return right(null); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } +} diff --git a/airhub_app/lib/features/device/data/repositories/device_repository_impl.g.dart b/airhub_app/lib/features/device/data/repositories/device_repository_impl.g.dart new file mode 100644 index 0000000..22e8187 --- /dev/null +++ b/airhub_app/lib/features/device/data/repositories/device_repository_impl.g.dart @@ -0,0 +1,56 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'device_repository_impl.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(deviceRepository) +const deviceRepositoryProvider = DeviceRepositoryProvider._(); + +final class DeviceRepositoryProvider + extends + $FunctionalProvider< + DeviceRepository, + DeviceRepository, + DeviceRepository + > + with $Provider { + const DeviceRepositoryProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'deviceRepositoryProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$deviceRepositoryHash(); + + @$internal + @override + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(pointer); + + @override + DeviceRepository create(Ref ref) { + return deviceRepository(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(DeviceRepository value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$deviceRepositoryHash() => r'54eaa070bb4dfb0e34704d4525db2472f239450c'; diff --git a/airhub_app/lib/features/device/domain/entities/device.dart b/airhub_app/lib/features/device/domain/entities/device.dart new file mode 100644 index 0000000..6ef7e40 --- /dev/null +++ b/airhub_app/lib/features/device/domain/entities/device.dart @@ -0,0 +1,55 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'device.freezed.dart'; +part 'device.g.dart'; + +@freezed +abstract class DeviceType with _$DeviceType { + const factory DeviceType({ + required int id, + required String brand, + required String productCode, + required String name, + @Default(true) bool isNetworkRequired, + @Default(true) bool isActive, + String? createdAt, + }) = _DeviceType; + + factory DeviceType.fromJson(Map json) => + _$DeviceTypeFromJson(json); +} + +@freezed +abstract class DeviceInfo with _$DeviceInfo { + const factory DeviceInfo({ + required int id, + required String sn, + DeviceType? deviceType, + DeviceType? deviceTypeInfo, + String? macAddress, + @Default('') String name, + @Default('in_stock') String status, + @Default('') String firmwareVersion, + String? lastOnlineAt, + String? createdAt, + }) = _DeviceInfo; + + factory DeviceInfo.fromJson(Map json) => + _$DeviceInfoFromJson(json); +} + +@freezed +abstract class UserDevice with _$UserDevice { + const factory UserDevice({ + required int id, + required DeviceInfo device, + int? spirit, + String? spiritName, + @Default('owner') String bindType, + String? bindTime, + @Default(true) bool isActive, + }) = _UserDevice; + + factory UserDevice.fromJson(Map json) => + _$UserDeviceFromJson(json); +} diff --git a/airhub_app/lib/features/device/domain/entities/device.freezed.dart b/airhub_app/lib/features/device/domain/entities/device.freezed.dart new file mode 100644 index 0000000..a40b797 --- /dev/null +++ b/airhub_app/lib/features/device/domain/entities/device.freezed.dart @@ -0,0 +1,932 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// coverage:ignore-file +// ignore_for_file: type=lint +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark + +part of 'device.dart'; + +// ************************************************************************** +// FreezedGenerator +// ************************************************************************** + +// dart format off +T _$identity(T value) => value; + +/// @nodoc +mixin _$DeviceType { + + int get id; String get brand; String get productCode; String get name; bool get isNetworkRequired; bool get isActive; String? get createdAt; +/// Create a copy of DeviceType +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$DeviceTypeCopyWith get copyWith => _$DeviceTypeCopyWithImpl(this as DeviceType, _$identity); + + /// Serializes this DeviceType to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is DeviceType&&(identical(other.id, id) || other.id == id)&&(identical(other.brand, brand) || other.brand == brand)&&(identical(other.productCode, productCode) || other.productCode == productCode)&&(identical(other.name, name) || other.name == name)&&(identical(other.isNetworkRequired, isNetworkRequired) || other.isNetworkRequired == isNetworkRequired)&&(identical(other.isActive, isActive) || other.isActive == isActive)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,brand,productCode,name,isNetworkRequired,isActive,createdAt); + +@override +String toString() { + return 'DeviceType(id: $id, brand: $brand, productCode: $productCode, name: $name, isNetworkRequired: $isNetworkRequired, isActive: $isActive, createdAt: $createdAt)'; +} + + +} + +/// @nodoc +abstract mixin class $DeviceTypeCopyWith<$Res> { + factory $DeviceTypeCopyWith(DeviceType value, $Res Function(DeviceType) _then) = _$DeviceTypeCopyWithImpl; +@useResult +$Res call({ + int id, String brand, String productCode, String name, bool isNetworkRequired, bool isActive, String? createdAt +}); + + + + +} +/// @nodoc +class _$DeviceTypeCopyWithImpl<$Res> + implements $DeviceTypeCopyWith<$Res> { + _$DeviceTypeCopyWithImpl(this._self, this._then); + + final DeviceType _self; + final $Res Function(DeviceType) _then; + +/// Create a copy of DeviceType +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? brand = null,Object? productCode = null,Object? name = null,Object? isNetworkRequired = null,Object? isActive = null,Object? createdAt = freezed,}) { + return _then(_self.copyWith( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,brand: null == brand ? _self.brand : brand // ignore: cast_nullable_to_non_nullable +as String,productCode: null == productCode ? _self.productCode : productCode // ignore: cast_nullable_to_non_nullable +as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable +as String,isNetworkRequired: null == isNetworkRequired ? _self.isNetworkRequired : isNetworkRequired // ignore: cast_nullable_to_non_nullable +as bool,isActive: null == isActive ? _self.isActive : isActive // ignore: cast_nullable_to_non_nullable +as bool,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable +as String?, + )); +} + +} + + +/// Adds pattern-matching-related methods to [DeviceType]. +extension DeviceTypePatterns on DeviceType { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _DeviceType value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _DeviceType() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _DeviceType value) $default,){ +final _that = this; +switch (_that) { +case _DeviceType(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _DeviceType value)? $default,){ +final _that = this; +switch (_that) { +case _DeviceType() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( int id, String brand, String productCode, String name, bool isNetworkRequired, bool isActive, String? createdAt)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _DeviceType() when $default != null: +return $default(_that.id,_that.brand,_that.productCode,_that.name,_that.isNetworkRequired,_that.isActive,_that.createdAt);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( int id, String brand, String productCode, String name, bool isNetworkRequired, bool isActive, String? createdAt) $default,) {final _that = this; +switch (_that) { +case _DeviceType(): +return $default(_that.id,_that.brand,_that.productCode,_that.name,_that.isNetworkRequired,_that.isActive,_that.createdAt);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( int id, String brand, String productCode, String name, bool isNetworkRequired, bool isActive, String? createdAt)? $default,) {final _that = this; +switch (_that) { +case _DeviceType() when $default != null: +return $default(_that.id,_that.brand,_that.productCode,_that.name,_that.isNetworkRequired,_that.isActive,_that.createdAt);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _DeviceType implements DeviceType { + const _DeviceType({required this.id, required this.brand, required this.productCode, required this.name, this.isNetworkRequired = true, this.isActive = true, this.createdAt}); + factory _DeviceType.fromJson(Map json) => _$DeviceTypeFromJson(json); + +@override final int id; +@override final String brand; +@override final String productCode; +@override final String name; +@override@JsonKey() final bool isNetworkRequired; +@override@JsonKey() final bool isActive; +@override final String? createdAt; + +/// Create a copy of DeviceType +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$DeviceTypeCopyWith<_DeviceType> get copyWith => __$DeviceTypeCopyWithImpl<_DeviceType>(this, _$identity); + +@override +Map toJson() { + return _$DeviceTypeToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _DeviceType&&(identical(other.id, id) || other.id == id)&&(identical(other.brand, brand) || other.brand == brand)&&(identical(other.productCode, productCode) || other.productCode == productCode)&&(identical(other.name, name) || other.name == name)&&(identical(other.isNetworkRequired, isNetworkRequired) || other.isNetworkRequired == isNetworkRequired)&&(identical(other.isActive, isActive) || other.isActive == isActive)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,brand,productCode,name,isNetworkRequired,isActive,createdAt); + +@override +String toString() { + return 'DeviceType(id: $id, brand: $brand, productCode: $productCode, name: $name, isNetworkRequired: $isNetworkRequired, isActive: $isActive, createdAt: $createdAt)'; +} + + +} + +/// @nodoc +abstract mixin class _$DeviceTypeCopyWith<$Res> implements $DeviceTypeCopyWith<$Res> { + factory _$DeviceTypeCopyWith(_DeviceType value, $Res Function(_DeviceType) _then) = __$DeviceTypeCopyWithImpl; +@override @useResult +$Res call({ + int id, String brand, String productCode, String name, bool isNetworkRequired, bool isActive, String? createdAt +}); + + + + +} +/// @nodoc +class __$DeviceTypeCopyWithImpl<$Res> + implements _$DeviceTypeCopyWith<$Res> { + __$DeviceTypeCopyWithImpl(this._self, this._then); + + final _DeviceType _self; + final $Res Function(_DeviceType) _then; + +/// Create a copy of DeviceType +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? brand = null,Object? productCode = null,Object? name = null,Object? isNetworkRequired = null,Object? isActive = null,Object? createdAt = freezed,}) { + return _then(_DeviceType( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,brand: null == brand ? _self.brand : brand // ignore: cast_nullable_to_non_nullable +as String,productCode: null == productCode ? _self.productCode : productCode // ignore: cast_nullable_to_non_nullable +as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable +as String,isNetworkRequired: null == isNetworkRequired ? _self.isNetworkRequired : isNetworkRequired // ignore: cast_nullable_to_non_nullable +as bool,isActive: null == isActive ? _self.isActive : isActive // ignore: cast_nullable_to_non_nullable +as bool,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable +as String?, + )); +} + + +} + + +/// @nodoc +mixin _$DeviceInfo { + + int get id; String get sn; DeviceType? get deviceType; DeviceType? get deviceTypeInfo; String? get macAddress; String get name; String get status; String get firmwareVersion; String? get lastOnlineAt; String? get createdAt; +/// Create a copy of DeviceInfo +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$DeviceInfoCopyWith get copyWith => _$DeviceInfoCopyWithImpl(this as DeviceInfo, _$identity); + + /// Serializes this DeviceInfo to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is DeviceInfo&&(identical(other.id, id) || other.id == id)&&(identical(other.sn, sn) || other.sn == sn)&&(identical(other.deviceType, deviceType) || other.deviceType == deviceType)&&(identical(other.deviceTypeInfo, deviceTypeInfo) || other.deviceTypeInfo == deviceTypeInfo)&&(identical(other.macAddress, macAddress) || other.macAddress == macAddress)&&(identical(other.name, name) || other.name == name)&&(identical(other.status, status) || other.status == status)&&(identical(other.firmwareVersion, firmwareVersion) || other.firmwareVersion == firmwareVersion)&&(identical(other.lastOnlineAt, lastOnlineAt) || other.lastOnlineAt == lastOnlineAt)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,sn,deviceType,deviceTypeInfo,macAddress,name,status,firmwareVersion,lastOnlineAt,createdAt); + +@override +String toString() { + return 'DeviceInfo(id: $id, sn: $sn, deviceType: $deviceType, deviceTypeInfo: $deviceTypeInfo, macAddress: $macAddress, name: $name, status: $status, firmwareVersion: $firmwareVersion, lastOnlineAt: $lastOnlineAt, createdAt: $createdAt)'; +} + + +} + +/// @nodoc +abstract mixin class $DeviceInfoCopyWith<$Res> { + factory $DeviceInfoCopyWith(DeviceInfo value, $Res Function(DeviceInfo) _then) = _$DeviceInfoCopyWithImpl; +@useResult +$Res call({ + int id, String sn, DeviceType? deviceType, DeviceType? deviceTypeInfo, String? macAddress, String name, String status, String firmwareVersion, String? lastOnlineAt, String? createdAt +}); + + +$DeviceTypeCopyWith<$Res>? get deviceType;$DeviceTypeCopyWith<$Res>? get deviceTypeInfo; + +} +/// @nodoc +class _$DeviceInfoCopyWithImpl<$Res> + implements $DeviceInfoCopyWith<$Res> { + _$DeviceInfoCopyWithImpl(this._self, this._then); + + final DeviceInfo _self; + final $Res Function(DeviceInfo) _then; + +/// Create a copy of DeviceInfo +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? sn = null,Object? deviceType = freezed,Object? deviceTypeInfo = freezed,Object? macAddress = freezed,Object? name = null,Object? status = null,Object? firmwareVersion = null,Object? lastOnlineAt = freezed,Object? createdAt = freezed,}) { + return _then(_self.copyWith( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,sn: null == sn ? _self.sn : sn // ignore: cast_nullable_to_non_nullable +as String,deviceType: freezed == deviceType ? _self.deviceType : deviceType // ignore: cast_nullable_to_non_nullable +as DeviceType?,deviceTypeInfo: freezed == deviceTypeInfo ? _self.deviceTypeInfo : deviceTypeInfo // ignore: cast_nullable_to_non_nullable +as DeviceType?,macAddress: freezed == macAddress ? _self.macAddress : macAddress // ignore: cast_nullable_to_non_nullable +as String?,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable +as String,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable +as String,firmwareVersion: null == firmwareVersion ? _self.firmwareVersion : firmwareVersion // ignore: cast_nullable_to_non_nullable +as String,lastOnlineAt: freezed == lastOnlineAt ? _self.lastOnlineAt : lastOnlineAt // ignore: cast_nullable_to_non_nullable +as String?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable +as String?, + )); +} +/// Create a copy of DeviceInfo +/// with the given fields replaced by the non-null parameter values. +@override +@pragma('vm:prefer-inline') +$DeviceTypeCopyWith<$Res>? get deviceType { + if (_self.deviceType == null) { + return null; + } + + return $DeviceTypeCopyWith<$Res>(_self.deviceType!, (value) { + return _then(_self.copyWith(deviceType: value)); + }); +}/// Create a copy of DeviceInfo +/// with the given fields replaced by the non-null parameter values. +@override +@pragma('vm:prefer-inline') +$DeviceTypeCopyWith<$Res>? get deviceTypeInfo { + if (_self.deviceTypeInfo == null) { + return null; + } + + return $DeviceTypeCopyWith<$Res>(_self.deviceTypeInfo!, (value) { + return _then(_self.copyWith(deviceTypeInfo: value)); + }); +} +} + + +/// Adds pattern-matching-related methods to [DeviceInfo]. +extension DeviceInfoPatterns on DeviceInfo { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _DeviceInfo value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _DeviceInfo() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _DeviceInfo value) $default,){ +final _that = this; +switch (_that) { +case _DeviceInfo(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _DeviceInfo value)? $default,){ +final _that = this; +switch (_that) { +case _DeviceInfo() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( int id, String sn, DeviceType? deviceType, DeviceType? deviceTypeInfo, String? macAddress, String name, String status, String firmwareVersion, String? lastOnlineAt, String? createdAt)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _DeviceInfo() when $default != null: +return $default(_that.id,_that.sn,_that.deviceType,_that.deviceTypeInfo,_that.macAddress,_that.name,_that.status,_that.firmwareVersion,_that.lastOnlineAt,_that.createdAt);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( int id, String sn, DeviceType? deviceType, DeviceType? deviceTypeInfo, String? macAddress, String name, String status, String firmwareVersion, String? lastOnlineAt, String? createdAt) $default,) {final _that = this; +switch (_that) { +case _DeviceInfo(): +return $default(_that.id,_that.sn,_that.deviceType,_that.deviceTypeInfo,_that.macAddress,_that.name,_that.status,_that.firmwareVersion,_that.lastOnlineAt,_that.createdAt);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( int id, String sn, DeviceType? deviceType, DeviceType? deviceTypeInfo, String? macAddress, String name, String status, String firmwareVersion, String? lastOnlineAt, String? createdAt)? $default,) {final _that = this; +switch (_that) { +case _DeviceInfo() when $default != null: +return $default(_that.id,_that.sn,_that.deviceType,_that.deviceTypeInfo,_that.macAddress,_that.name,_that.status,_that.firmwareVersion,_that.lastOnlineAt,_that.createdAt);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _DeviceInfo implements DeviceInfo { + const _DeviceInfo({required this.id, required this.sn, this.deviceType, this.deviceTypeInfo, this.macAddress, this.name = '', this.status = 'in_stock', this.firmwareVersion = '', this.lastOnlineAt, this.createdAt}); + factory _DeviceInfo.fromJson(Map json) => _$DeviceInfoFromJson(json); + +@override final int id; +@override final String sn; +@override final DeviceType? deviceType; +@override final DeviceType? deviceTypeInfo; +@override final String? macAddress; +@override@JsonKey() final String name; +@override@JsonKey() final String status; +@override@JsonKey() final String firmwareVersion; +@override final String? lastOnlineAt; +@override final String? createdAt; + +/// Create a copy of DeviceInfo +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$DeviceInfoCopyWith<_DeviceInfo> get copyWith => __$DeviceInfoCopyWithImpl<_DeviceInfo>(this, _$identity); + +@override +Map toJson() { + return _$DeviceInfoToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _DeviceInfo&&(identical(other.id, id) || other.id == id)&&(identical(other.sn, sn) || other.sn == sn)&&(identical(other.deviceType, deviceType) || other.deviceType == deviceType)&&(identical(other.deviceTypeInfo, deviceTypeInfo) || other.deviceTypeInfo == deviceTypeInfo)&&(identical(other.macAddress, macAddress) || other.macAddress == macAddress)&&(identical(other.name, name) || other.name == name)&&(identical(other.status, status) || other.status == status)&&(identical(other.firmwareVersion, firmwareVersion) || other.firmwareVersion == firmwareVersion)&&(identical(other.lastOnlineAt, lastOnlineAt) || other.lastOnlineAt == lastOnlineAt)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,sn,deviceType,deviceTypeInfo,macAddress,name,status,firmwareVersion,lastOnlineAt,createdAt); + +@override +String toString() { + return 'DeviceInfo(id: $id, sn: $sn, deviceType: $deviceType, deviceTypeInfo: $deviceTypeInfo, macAddress: $macAddress, name: $name, status: $status, firmwareVersion: $firmwareVersion, lastOnlineAt: $lastOnlineAt, createdAt: $createdAt)'; +} + + +} + +/// @nodoc +abstract mixin class _$DeviceInfoCopyWith<$Res> implements $DeviceInfoCopyWith<$Res> { + factory _$DeviceInfoCopyWith(_DeviceInfo value, $Res Function(_DeviceInfo) _then) = __$DeviceInfoCopyWithImpl; +@override @useResult +$Res call({ + int id, String sn, DeviceType? deviceType, DeviceType? deviceTypeInfo, String? macAddress, String name, String status, String firmwareVersion, String? lastOnlineAt, String? createdAt +}); + + +@override $DeviceTypeCopyWith<$Res>? get deviceType;@override $DeviceTypeCopyWith<$Res>? get deviceTypeInfo; + +} +/// @nodoc +class __$DeviceInfoCopyWithImpl<$Res> + implements _$DeviceInfoCopyWith<$Res> { + __$DeviceInfoCopyWithImpl(this._self, this._then); + + final _DeviceInfo _self; + final $Res Function(_DeviceInfo) _then; + +/// Create a copy of DeviceInfo +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? sn = null,Object? deviceType = freezed,Object? deviceTypeInfo = freezed,Object? macAddress = freezed,Object? name = null,Object? status = null,Object? firmwareVersion = null,Object? lastOnlineAt = freezed,Object? createdAt = freezed,}) { + return _then(_DeviceInfo( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,sn: null == sn ? _self.sn : sn // ignore: cast_nullable_to_non_nullable +as String,deviceType: freezed == deviceType ? _self.deviceType : deviceType // ignore: cast_nullable_to_non_nullable +as DeviceType?,deviceTypeInfo: freezed == deviceTypeInfo ? _self.deviceTypeInfo : deviceTypeInfo // ignore: cast_nullable_to_non_nullable +as DeviceType?,macAddress: freezed == macAddress ? _self.macAddress : macAddress // ignore: cast_nullable_to_non_nullable +as String?,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable +as String,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable +as String,firmwareVersion: null == firmwareVersion ? _self.firmwareVersion : firmwareVersion // ignore: cast_nullable_to_non_nullable +as String,lastOnlineAt: freezed == lastOnlineAt ? _self.lastOnlineAt : lastOnlineAt // ignore: cast_nullable_to_non_nullable +as String?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable +as String?, + )); +} + +/// Create a copy of DeviceInfo +/// with the given fields replaced by the non-null parameter values. +@override +@pragma('vm:prefer-inline') +$DeviceTypeCopyWith<$Res>? get deviceType { + if (_self.deviceType == null) { + return null; + } + + return $DeviceTypeCopyWith<$Res>(_self.deviceType!, (value) { + return _then(_self.copyWith(deviceType: value)); + }); +}/// Create a copy of DeviceInfo +/// with the given fields replaced by the non-null parameter values. +@override +@pragma('vm:prefer-inline') +$DeviceTypeCopyWith<$Res>? get deviceTypeInfo { + if (_self.deviceTypeInfo == null) { + return null; + } + + return $DeviceTypeCopyWith<$Res>(_self.deviceTypeInfo!, (value) { + return _then(_self.copyWith(deviceTypeInfo: value)); + }); +} +} + + +/// @nodoc +mixin _$UserDevice { + + int get id; DeviceInfo get device; int? get spirit; String? get spiritName; String get bindType; String? get bindTime; bool get isActive; +/// Create a copy of UserDevice +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$UserDeviceCopyWith get copyWith => _$UserDeviceCopyWithImpl(this as UserDevice, _$identity); + + /// Serializes this UserDevice to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is UserDevice&&(identical(other.id, id) || other.id == id)&&(identical(other.device, device) || other.device == device)&&(identical(other.spirit, spirit) || other.spirit == spirit)&&(identical(other.spiritName, spiritName) || other.spiritName == spiritName)&&(identical(other.bindType, bindType) || other.bindType == bindType)&&(identical(other.bindTime, bindTime) || other.bindTime == bindTime)&&(identical(other.isActive, isActive) || other.isActive == isActive)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,device,spirit,spiritName,bindType,bindTime,isActive); + +@override +String toString() { + return 'UserDevice(id: $id, device: $device, spirit: $spirit, spiritName: $spiritName, bindType: $bindType, bindTime: $bindTime, isActive: $isActive)'; +} + + +} + +/// @nodoc +abstract mixin class $UserDeviceCopyWith<$Res> { + factory $UserDeviceCopyWith(UserDevice value, $Res Function(UserDevice) _then) = _$UserDeviceCopyWithImpl; +@useResult +$Res call({ + int id, DeviceInfo device, int? spirit, String? spiritName, String bindType, String? bindTime, bool isActive +}); + + +$DeviceInfoCopyWith<$Res> get device; + +} +/// @nodoc +class _$UserDeviceCopyWithImpl<$Res> + implements $UserDeviceCopyWith<$Res> { + _$UserDeviceCopyWithImpl(this._self, this._then); + + final UserDevice _self; + final $Res Function(UserDevice) _then; + +/// Create a copy of UserDevice +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? device = null,Object? spirit = freezed,Object? spiritName = freezed,Object? bindType = null,Object? bindTime = freezed,Object? isActive = null,}) { + return _then(_self.copyWith( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,device: null == device ? _self.device : device // ignore: cast_nullable_to_non_nullable +as DeviceInfo,spirit: freezed == spirit ? _self.spirit : spirit // ignore: cast_nullable_to_non_nullable +as int?,spiritName: freezed == spiritName ? _self.spiritName : spiritName // ignore: cast_nullable_to_non_nullable +as String?,bindType: null == bindType ? _self.bindType : bindType // ignore: cast_nullable_to_non_nullable +as String,bindTime: freezed == bindTime ? _self.bindTime : bindTime // ignore: cast_nullable_to_non_nullable +as String?,isActive: null == isActive ? _self.isActive : isActive // ignore: cast_nullable_to_non_nullable +as bool, + )); +} +/// Create a copy of UserDevice +/// with the given fields replaced by the non-null parameter values. +@override +@pragma('vm:prefer-inline') +$DeviceInfoCopyWith<$Res> get device { + + return $DeviceInfoCopyWith<$Res>(_self.device, (value) { + return _then(_self.copyWith(device: value)); + }); +} +} + + +/// Adds pattern-matching-related methods to [UserDevice]. +extension UserDevicePatterns on UserDevice { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _UserDevice value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _UserDevice() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _UserDevice value) $default,){ +final _that = this; +switch (_that) { +case _UserDevice(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _UserDevice value)? $default,){ +final _that = this; +switch (_that) { +case _UserDevice() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( int id, DeviceInfo device, int? spirit, String? spiritName, String bindType, String? bindTime, bool isActive)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _UserDevice() when $default != null: +return $default(_that.id,_that.device,_that.spirit,_that.spiritName,_that.bindType,_that.bindTime,_that.isActive);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( int id, DeviceInfo device, int? spirit, String? spiritName, String bindType, String? bindTime, bool isActive) $default,) {final _that = this; +switch (_that) { +case _UserDevice(): +return $default(_that.id,_that.device,_that.spirit,_that.spiritName,_that.bindType,_that.bindTime,_that.isActive);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( int id, DeviceInfo device, int? spirit, String? spiritName, String bindType, String? bindTime, bool isActive)? $default,) {final _that = this; +switch (_that) { +case _UserDevice() when $default != null: +return $default(_that.id,_that.device,_that.spirit,_that.spiritName,_that.bindType,_that.bindTime,_that.isActive);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _UserDevice implements UserDevice { + const _UserDevice({required this.id, required this.device, this.spirit, this.spiritName, this.bindType = 'owner', this.bindTime, this.isActive = true}); + factory _UserDevice.fromJson(Map json) => _$UserDeviceFromJson(json); + +@override final int id; +@override final DeviceInfo device; +@override final int? spirit; +@override final String? spiritName; +@override@JsonKey() final String bindType; +@override final String? bindTime; +@override@JsonKey() final bool isActive; + +/// Create a copy of UserDevice +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$UserDeviceCopyWith<_UserDevice> get copyWith => __$UserDeviceCopyWithImpl<_UserDevice>(this, _$identity); + +@override +Map toJson() { + return _$UserDeviceToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _UserDevice&&(identical(other.id, id) || other.id == id)&&(identical(other.device, device) || other.device == device)&&(identical(other.spirit, spirit) || other.spirit == spirit)&&(identical(other.spiritName, spiritName) || other.spiritName == spiritName)&&(identical(other.bindType, bindType) || other.bindType == bindType)&&(identical(other.bindTime, bindTime) || other.bindTime == bindTime)&&(identical(other.isActive, isActive) || other.isActive == isActive)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,device,spirit,spiritName,bindType,bindTime,isActive); + +@override +String toString() { + return 'UserDevice(id: $id, device: $device, spirit: $spirit, spiritName: $spiritName, bindType: $bindType, bindTime: $bindTime, isActive: $isActive)'; +} + + +} + +/// @nodoc +abstract mixin class _$UserDeviceCopyWith<$Res> implements $UserDeviceCopyWith<$Res> { + factory _$UserDeviceCopyWith(_UserDevice value, $Res Function(_UserDevice) _then) = __$UserDeviceCopyWithImpl; +@override @useResult +$Res call({ + int id, DeviceInfo device, int? spirit, String? spiritName, String bindType, String? bindTime, bool isActive +}); + + +@override $DeviceInfoCopyWith<$Res> get device; + +} +/// @nodoc +class __$UserDeviceCopyWithImpl<$Res> + implements _$UserDeviceCopyWith<$Res> { + __$UserDeviceCopyWithImpl(this._self, this._then); + + final _UserDevice _self; + final $Res Function(_UserDevice) _then; + +/// Create a copy of UserDevice +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? device = null,Object? spirit = freezed,Object? spiritName = freezed,Object? bindType = null,Object? bindTime = freezed,Object? isActive = null,}) { + return _then(_UserDevice( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,device: null == device ? _self.device : device // ignore: cast_nullable_to_non_nullable +as DeviceInfo,spirit: freezed == spirit ? _self.spirit : spirit // ignore: cast_nullable_to_non_nullable +as int?,spiritName: freezed == spiritName ? _self.spiritName : spiritName // ignore: cast_nullable_to_non_nullable +as String?,bindType: null == bindType ? _self.bindType : bindType // ignore: cast_nullable_to_non_nullable +as String,bindTime: freezed == bindTime ? _self.bindTime : bindTime // ignore: cast_nullable_to_non_nullable +as String?,isActive: null == isActive ? _self.isActive : isActive // ignore: cast_nullable_to_non_nullable +as bool, + )); +} + +/// Create a copy of UserDevice +/// with the given fields replaced by the non-null parameter values. +@override +@pragma('vm:prefer-inline') +$DeviceInfoCopyWith<$Res> get device { + + return $DeviceInfoCopyWith<$Res>(_self.device, (value) { + return _then(_self.copyWith(device: value)); + }); +} +} + +// dart format on diff --git a/airhub_app/lib/features/device/domain/entities/device.g.dart b/airhub_app/lib/features/device/domain/entities/device.g.dart new file mode 100644 index 0000000..733476b --- /dev/null +++ b/airhub_app/lib/features/device/domain/entities/device.g.dart @@ -0,0 +1,80 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'device.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +_DeviceType _$DeviceTypeFromJson(Map json) => _DeviceType( + id: (json['id'] as num).toInt(), + brand: json['brand'] as String, + productCode: json['product_code'] as String, + name: json['name'] as String, + isNetworkRequired: json['is_network_required'] as bool? ?? true, + isActive: json['is_active'] as bool? ?? true, + createdAt: json['created_at'] as String?, +); + +Map _$DeviceTypeToJson(_DeviceType instance) => + { + 'id': instance.id, + 'brand': instance.brand, + 'product_code': instance.productCode, + 'name': instance.name, + 'is_network_required': instance.isNetworkRequired, + 'is_active': instance.isActive, + 'created_at': instance.createdAt, + }; + +_DeviceInfo _$DeviceInfoFromJson(Map json) => _DeviceInfo( + id: (json['id'] as num).toInt(), + sn: json['sn'] as String, + deviceType: json['device_type'] == null + ? null + : DeviceType.fromJson(json['device_type'] as Map), + deviceTypeInfo: json['device_type_info'] == null + ? null + : DeviceType.fromJson(json['device_type_info'] as Map), + macAddress: json['mac_address'] as String?, + name: json['name'] as String? ?? '', + status: json['status'] as String? ?? 'in_stock', + firmwareVersion: json['firmware_version'] as String? ?? '', + lastOnlineAt: json['last_online_at'] as String?, + createdAt: json['created_at'] as String?, +); + +Map _$DeviceInfoToJson(_DeviceInfo instance) => + { + 'id': instance.id, + 'sn': instance.sn, + 'device_type': instance.deviceType, + 'device_type_info': instance.deviceTypeInfo, + 'mac_address': instance.macAddress, + 'name': instance.name, + 'status': instance.status, + 'firmware_version': instance.firmwareVersion, + 'last_online_at': instance.lastOnlineAt, + 'created_at': instance.createdAt, + }; + +_UserDevice _$UserDeviceFromJson(Map json) => _UserDevice( + id: (json['id'] as num).toInt(), + device: DeviceInfo.fromJson(json['device'] as Map), + spirit: (json['spirit'] as num?)?.toInt(), + spiritName: json['spirit_name'] as String?, + bindType: json['bind_type'] as String? ?? 'owner', + bindTime: json['bind_time'] as String?, + isActive: json['is_active'] as bool? ?? true, +); + +Map _$UserDeviceToJson(_UserDevice instance) => + { + 'id': instance.id, + 'device': instance.device, + 'spirit': instance.spirit, + 'spirit_name': instance.spiritName, + 'bind_type': instance.bindType, + 'bind_time': instance.bindTime, + 'is_active': instance.isActive, + }; diff --git a/airhub_app/lib/features/device/domain/entities/device_detail.dart b/airhub_app/lib/features/device/domain/entities/device_detail.dart new file mode 100644 index 0000000..0064cec --- /dev/null +++ b/airhub_app/lib/features/device/domain/entities/device_detail.dart @@ -0,0 +1,51 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'device_detail.freezed.dart'; +part 'device_detail.g.dart'; + +@freezed +abstract class DeviceDetail with _$DeviceDetail { + const factory DeviceDetail({ + required int id, + required String sn, + @Default('') String name, + @Default('offline') String status, + @Default(0) int battery, + @Default('') String firmwareVersion, + String? macAddress, + @Default(true) bool isAi, + String? icon, + DeviceSettings? settings, + @Default([]) List wifiList, + Map? boundSpirit, + }) = _DeviceDetail; + + factory DeviceDetail.fromJson(Map json) => + _$DeviceDetailFromJson(json); +} + +@freezed +abstract class DeviceSettings with _$DeviceSettings { + const factory DeviceSettings({ + String? nickname, + String? userName, + @Default(50) int volume, + @Default(50) int brightness, + @Default(true) bool allowInterrupt, + @Default(false) bool privacyMode, + }) = _DeviceSettings; + + factory DeviceSettings.fromJson(Map json) => + _$DeviceSettingsFromJson(json); +} + +@freezed +abstract class DeviceWifi with _$DeviceWifi { + const factory DeviceWifi({ + required String ssid, + @Default(false) bool isConnected, + }) = _DeviceWifi; + + factory DeviceWifi.fromJson(Map json) => + _$DeviceWifiFromJson(json); +} diff --git a/airhub_app/lib/features/device/domain/entities/device_detail.freezed.dart b/airhub_app/lib/features/device/domain/entities/device_detail.freezed.dart new file mode 100644 index 0000000..34704da --- /dev/null +++ b/airhub_app/lib/features/device/domain/entities/device_detail.freezed.dart @@ -0,0 +1,892 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// coverage:ignore-file +// ignore_for_file: type=lint +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark + +part of 'device_detail.dart'; + +// ************************************************************************** +// FreezedGenerator +// ************************************************************************** + +// dart format off +T _$identity(T value) => value; + +/// @nodoc +mixin _$DeviceDetail { + + int get id; String get sn; String get name; String get status; int get battery; String get firmwareVersion; String? get macAddress; bool get isAi; String? get icon; DeviceSettings? get settings; List get wifiList; Map? get boundSpirit; +/// Create a copy of DeviceDetail +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$DeviceDetailCopyWith get copyWith => _$DeviceDetailCopyWithImpl(this as DeviceDetail, _$identity); + + /// Serializes this DeviceDetail to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is DeviceDetail&&(identical(other.id, id) || other.id == id)&&(identical(other.sn, sn) || other.sn == sn)&&(identical(other.name, name) || other.name == name)&&(identical(other.status, status) || other.status == status)&&(identical(other.battery, battery) || other.battery == battery)&&(identical(other.firmwareVersion, firmwareVersion) || other.firmwareVersion == firmwareVersion)&&(identical(other.macAddress, macAddress) || other.macAddress == macAddress)&&(identical(other.isAi, isAi) || other.isAi == isAi)&&(identical(other.icon, icon) || other.icon == icon)&&(identical(other.settings, settings) || other.settings == settings)&&const DeepCollectionEquality().equals(other.wifiList, wifiList)&&const DeepCollectionEquality().equals(other.boundSpirit, boundSpirit)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,sn,name,status,battery,firmwareVersion,macAddress,isAi,icon,settings,const DeepCollectionEquality().hash(wifiList),const DeepCollectionEquality().hash(boundSpirit)); + +@override +String toString() { + return 'DeviceDetail(id: $id, sn: $sn, name: $name, status: $status, battery: $battery, firmwareVersion: $firmwareVersion, macAddress: $macAddress, isAi: $isAi, icon: $icon, settings: $settings, wifiList: $wifiList, boundSpirit: $boundSpirit)'; +} + + +} + +/// @nodoc +abstract mixin class $DeviceDetailCopyWith<$Res> { + factory $DeviceDetailCopyWith(DeviceDetail value, $Res Function(DeviceDetail) _then) = _$DeviceDetailCopyWithImpl; +@useResult +$Res call({ + int id, String sn, String name, String status, int battery, String firmwareVersion, String? macAddress, bool isAi, String? icon, DeviceSettings? settings, List wifiList, Map? boundSpirit +}); + + +$DeviceSettingsCopyWith<$Res>? get settings; + +} +/// @nodoc +class _$DeviceDetailCopyWithImpl<$Res> + implements $DeviceDetailCopyWith<$Res> { + _$DeviceDetailCopyWithImpl(this._self, this._then); + + final DeviceDetail _self; + final $Res Function(DeviceDetail) _then; + +/// Create a copy of DeviceDetail +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? sn = null,Object? name = null,Object? status = null,Object? battery = null,Object? firmwareVersion = null,Object? macAddress = freezed,Object? isAi = null,Object? icon = freezed,Object? settings = freezed,Object? wifiList = null,Object? boundSpirit = freezed,}) { + return _then(_self.copyWith( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,sn: null == sn ? _self.sn : sn // ignore: cast_nullable_to_non_nullable +as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable +as String,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable +as String,battery: null == battery ? _self.battery : battery // ignore: cast_nullable_to_non_nullable +as int,firmwareVersion: null == firmwareVersion ? _self.firmwareVersion : firmwareVersion // ignore: cast_nullable_to_non_nullable +as String,macAddress: freezed == macAddress ? _self.macAddress : macAddress // ignore: cast_nullable_to_non_nullable +as String?,isAi: null == isAi ? _self.isAi : isAi // ignore: cast_nullable_to_non_nullable +as bool,icon: freezed == icon ? _self.icon : icon // ignore: cast_nullable_to_non_nullable +as String?,settings: freezed == settings ? _self.settings : settings // ignore: cast_nullable_to_non_nullable +as DeviceSettings?,wifiList: null == wifiList ? _self.wifiList : wifiList // ignore: cast_nullable_to_non_nullable +as List,boundSpirit: freezed == boundSpirit ? _self.boundSpirit : boundSpirit // ignore: cast_nullable_to_non_nullable +as Map?, + )); +} +/// Create a copy of DeviceDetail +/// with the given fields replaced by the non-null parameter values. +@override +@pragma('vm:prefer-inline') +$DeviceSettingsCopyWith<$Res>? get settings { + if (_self.settings == null) { + return null; + } + + return $DeviceSettingsCopyWith<$Res>(_self.settings!, (value) { + return _then(_self.copyWith(settings: value)); + }); +} +} + + +/// Adds pattern-matching-related methods to [DeviceDetail]. +extension DeviceDetailPatterns on DeviceDetail { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _DeviceDetail value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _DeviceDetail() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _DeviceDetail value) $default,){ +final _that = this; +switch (_that) { +case _DeviceDetail(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _DeviceDetail value)? $default,){ +final _that = this; +switch (_that) { +case _DeviceDetail() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( int id, String sn, String name, String status, int battery, String firmwareVersion, String? macAddress, bool isAi, String? icon, DeviceSettings? settings, List wifiList, Map? boundSpirit)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _DeviceDetail() when $default != null: +return $default(_that.id,_that.sn,_that.name,_that.status,_that.battery,_that.firmwareVersion,_that.macAddress,_that.isAi,_that.icon,_that.settings,_that.wifiList,_that.boundSpirit);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( int id, String sn, String name, String status, int battery, String firmwareVersion, String? macAddress, bool isAi, String? icon, DeviceSettings? settings, List wifiList, Map? boundSpirit) $default,) {final _that = this; +switch (_that) { +case _DeviceDetail(): +return $default(_that.id,_that.sn,_that.name,_that.status,_that.battery,_that.firmwareVersion,_that.macAddress,_that.isAi,_that.icon,_that.settings,_that.wifiList,_that.boundSpirit);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( int id, String sn, String name, String status, int battery, String firmwareVersion, String? macAddress, bool isAi, String? icon, DeviceSettings? settings, List wifiList, Map? boundSpirit)? $default,) {final _that = this; +switch (_that) { +case _DeviceDetail() when $default != null: +return $default(_that.id,_that.sn,_that.name,_that.status,_that.battery,_that.firmwareVersion,_that.macAddress,_that.isAi,_that.icon,_that.settings,_that.wifiList,_that.boundSpirit);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _DeviceDetail implements DeviceDetail { + const _DeviceDetail({required this.id, required this.sn, this.name = '', this.status = 'offline', this.battery = 0, this.firmwareVersion = '', this.macAddress, this.isAi = true, this.icon, this.settings, final List wifiList = const [], final Map? boundSpirit}): _wifiList = wifiList,_boundSpirit = boundSpirit; + factory _DeviceDetail.fromJson(Map json) => _$DeviceDetailFromJson(json); + +@override final int id; +@override final String sn; +@override@JsonKey() final String name; +@override@JsonKey() final String status; +@override@JsonKey() final int battery; +@override@JsonKey() final String firmwareVersion; +@override final String? macAddress; +@override@JsonKey() final bool isAi; +@override final String? icon; +@override final DeviceSettings? settings; + final List _wifiList; +@override@JsonKey() List get wifiList { + if (_wifiList is EqualUnmodifiableListView) return _wifiList; + // ignore: implicit_dynamic_type + return EqualUnmodifiableListView(_wifiList); +} + + final Map? _boundSpirit; +@override Map? get boundSpirit { + final value = _boundSpirit; + if (value == null) return null; + if (_boundSpirit is EqualUnmodifiableMapView) return _boundSpirit; + // ignore: implicit_dynamic_type + return EqualUnmodifiableMapView(value); +} + + +/// Create a copy of DeviceDetail +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$DeviceDetailCopyWith<_DeviceDetail> get copyWith => __$DeviceDetailCopyWithImpl<_DeviceDetail>(this, _$identity); + +@override +Map toJson() { + return _$DeviceDetailToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _DeviceDetail&&(identical(other.id, id) || other.id == id)&&(identical(other.sn, sn) || other.sn == sn)&&(identical(other.name, name) || other.name == name)&&(identical(other.status, status) || other.status == status)&&(identical(other.battery, battery) || other.battery == battery)&&(identical(other.firmwareVersion, firmwareVersion) || other.firmwareVersion == firmwareVersion)&&(identical(other.macAddress, macAddress) || other.macAddress == macAddress)&&(identical(other.isAi, isAi) || other.isAi == isAi)&&(identical(other.icon, icon) || other.icon == icon)&&(identical(other.settings, settings) || other.settings == settings)&&const DeepCollectionEquality().equals(other._wifiList, _wifiList)&&const DeepCollectionEquality().equals(other._boundSpirit, _boundSpirit)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,sn,name,status,battery,firmwareVersion,macAddress,isAi,icon,settings,const DeepCollectionEquality().hash(_wifiList),const DeepCollectionEquality().hash(_boundSpirit)); + +@override +String toString() { + return 'DeviceDetail(id: $id, sn: $sn, name: $name, status: $status, battery: $battery, firmwareVersion: $firmwareVersion, macAddress: $macAddress, isAi: $isAi, icon: $icon, settings: $settings, wifiList: $wifiList, boundSpirit: $boundSpirit)'; +} + + +} + +/// @nodoc +abstract mixin class _$DeviceDetailCopyWith<$Res> implements $DeviceDetailCopyWith<$Res> { + factory _$DeviceDetailCopyWith(_DeviceDetail value, $Res Function(_DeviceDetail) _then) = __$DeviceDetailCopyWithImpl; +@override @useResult +$Res call({ + int id, String sn, String name, String status, int battery, String firmwareVersion, String? macAddress, bool isAi, String? icon, DeviceSettings? settings, List wifiList, Map? boundSpirit +}); + + +@override $DeviceSettingsCopyWith<$Res>? get settings; + +} +/// @nodoc +class __$DeviceDetailCopyWithImpl<$Res> + implements _$DeviceDetailCopyWith<$Res> { + __$DeviceDetailCopyWithImpl(this._self, this._then); + + final _DeviceDetail _self; + final $Res Function(_DeviceDetail) _then; + +/// Create a copy of DeviceDetail +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? sn = null,Object? name = null,Object? status = null,Object? battery = null,Object? firmwareVersion = null,Object? macAddress = freezed,Object? isAi = null,Object? icon = freezed,Object? settings = freezed,Object? wifiList = null,Object? boundSpirit = freezed,}) { + return _then(_DeviceDetail( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,sn: null == sn ? _self.sn : sn // ignore: cast_nullable_to_non_nullable +as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable +as String,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable +as String,battery: null == battery ? _self.battery : battery // ignore: cast_nullable_to_non_nullable +as int,firmwareVersion: null == firmwareVersion ? _self.firmwareVersion : firmwareVersion // ignore: cast_nullable_to_non_nullable +as String,macAddress: freezed == macAddress ? _self.macAddress : macAddress // ignore: cast_nullable_to_non_nullable +as String?,isAi: null == isAi ? _self.isAi : isAi // ignore: cast_nullable_to_non_nullable +as bool,icon: freezed == icon ? _self.icon : icon // ignore: cast_nullable_to_non_nullable +as String?,settings: freezed == settings ? _self.settings : settings // ignore: cast_nullable_to_non_nullable +as DeviceSettings?,wifiList: null == wifiList ? _self._wifiList : wifiList // ignore: cast_nullable_to_non_nullable +as List,boundSpirit: freezed == boundSpirit ? _self._boundSpirit : boundSpirit // ignore: cast_nullable_to_non_nullable +as Map?, + )); +} + +/// Create a copy of DeviceDetail +/// with the given fields replaced by the non-null parameter values. +@override +@pragma('vm:prefer-inline') +$DeviceSettingsCopyWith<$Res>? get settings { + if (_self.settings == null) { + return null; + } + + return $DeviceSettingsCopyWith<$Res>(_self.settings!, (value) { + return _then(_self.copyWith(settings: value)); + }); +} +} + + +/// @nodoc +mixin _$DeviceSettings { + + String? get nickname; String? get userName; int get volume; int get brightness; bool get allowInterrupt; bool get privacyMode; +/// Create a copy of DeviceSettings +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$DeviceSettingsCopyWith get copyWith => _$DeviceSettingsCopyWithImpl(this as DeviceSettings, _$identity); + + /// Serializes this DeviceSettings to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is DeviceSettings&&(identical(other.nickname, nickname) || other.nickname == nickname)&&(identical(other.userName, userName) || other.userName == userName)&&(identical(other.volume, volume) || other.volume == volume)&&(identical(other.brightness, brightness) || other.brightness == brightness)&&(identical(other.allowInterrupt, allowInterrupt) || other.allowInterrupt == allowInterrupt)&&(identical(other.privacyMode, privacyMode) || other.privacyMode == privacyMode)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,nickname,userName,volume,brightness,allowInterrupt,privacyMode); + +@override +String toString() { + return 'DeviceSettings(nickname: $nickname, userName: $userName, volume: $volume, brightness: $brightness, allowInterrupt: $allowInterrupt, privacyMode: $privacyMode)'; +} + + +} + +/// @nodoc +abstract mixin class $DeviceSettingsCopyWith<$Res> { + factory $DeviceSettingsCopyWith(DeviceSettings value, $Res Function(DeviceSettings) _then) = _$DeviceSettingsCopyWithImpl; +@useResult +$Res call({ + String? nickname, String? userName, int volume, int brightness, bool allowInterrupt, bool privacyMode +}); + + + + +} +/// @nodoc +class _$DeviceSettingsCopyWithImpl<$Res> + implements $DeviceSettingsCopyWith<$Res> { + _$DeviceSettingsCopyWithImpl(this._self, this._then); + + final DeviceSettings _self; + final $Res Function(DeviceSettings) _then; + +/// Create a copy of DeviceSettings +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? nickname = freezed,Object? userName = freezed,Object? volume = null,Object? brightness = null,Object? allowInterrupt = null,Object? privacyMode = null,}) { + return _then(_self.copyWith( +nickname: freezed == nickname ? _self.nickname : nickname // ignore: cast_nullable_to_non_nullable +as String?,userName: freezed == userName ? _self.userName : userName // ignore: cast_nullable_to_non_nullable +as String?,volume: null == volume ? _self.volume : volume // ignore: cast_nullable_to_non_nullable +as int,brightness: null == brightness ? _self.brightness : brightness // ignore: cast_nullable_to_non_nullable +as int,allowInterrupt: null == allowInterrupt ? _self.allowInterrupt : allowInterrupt // ignore: cast_nullable_to_non_nullable +as bool,privacyMode: null == privacyMode ? _self.privacyMode : privacyMode // ignore: cast_nullable_to_non_nullable +as bool, + )); +} + +} + + +/// Adds pattern-matching-related methods to [DeviceSettings]. +extension DeviceSettingsPatterns on DeviceSettings { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _DeviceSettings value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _DeviceSettings() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _DeviceSettings value) $default,){ +final _that = this; +switch (_that) { +case _DeviceSettings(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _DeviceSettings value)? $default,){ +final _that = this; +switch (_that) { +case _DeviceSettings() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( String? nickname, String? userName, int volume, int brightness, bool allowInterrupt, bool privacyMode)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _DeviceSettings() when $default != null: +return $default(_that.nickname,_that.userName,_that.volume,_that.brightness,_that.allowInterrupt,_that.privacyMode);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( String? nickname, String? userName, int volume, int brightness, bool allowInterrupt, bool privacyMode) $default,) {final _that = this; +switch (_that) { +case _DeviceSettings(): +return $default(_that.nickname,_that.userName,_that.volume,_that.brightness,_that.allowInterrupt,_that.privacyMode);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( String? nickname, String? userName, int volume, int brightness, bool allowInterrupt, bool privacyMode)? $default,) {final _that = this; +switch (_that) { +case _DeviceSettings() when $default != null: +return $default(_that.nickname,_that.userName,_that.volume,_that.brightness,_that.allowInterrupt,_that.privacyMode);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _DeviceSettings implements DeviceSettings { + const _DeviceSettings({this.nickname, this.userName, this.volume = 50, this.brightness = 50, this.allowInterrupt = true, this.privacyMode = false}); + factory _DeviceSettings.fromJson(Map json) => _$DeviceSettingsFromJson(json); + +@override final String? nickname; +@override final String? userName; +@override@JsonKey() final int volume; +@override@JsonKey() final int brightness; +@override@JsonKey() final bool allowInterrupt; +@override@JsonKey() final bool privacyMode; + +/// Create a copy of DeviceSettings +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$DeviceSettingsCopyWith<_DeviceSettings> get copyWith => __$DeviceSettingsCopyWithImpl<_DeviceSettings>(this, _$identity); + +@override +Map toJson() { + return _$DeviceSettingsToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _DeviceSettings&&(identical(other.nickname, nickname) || other.nickname == nickname)&&(identical(other.userName, userName) || other.userName == userName)&&(identical(other.volume, volume) || other.volume == volume)&&(identical(other.brightness, brightness) || other.brightness == brightness)&&(identical(other.allowInterrupt, allowInterrupt) || other.allowInterrupt == allowInterrupt)&&(identical(other.privacyMode, privacyMode) || other.privacyMode == privacyMode)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,nickname,userName,volume,brightness,allowInterrupt,privacyMode); + +@override +String toString() { + return 'DeviceSettings(nickname: $nickname, userName: $userName, volume: $volume, brightness: $brightness, allowInterrupt: $allowInterrupt, privacyMode: $privacyMode)'; +} + + +} + +/// @nodoc +abstract mixin class _$DeviceSettingsCopyWith<$Res> implements $DeviceSettingsCopyWith<$Res> { + factory _$DeviceSettingsCopyWith(_DeviceSettings value, $Res Function(_DeviceSettings) _then) = __$DeviceSettingsCopyWithImpl; +@override @useResult +$Res call({ + String? nickname, String? userName, int volume, int brightness, bool allowInterrupt, bool privacyMode +}); + + + + +} +/// @nodoc +class __$DeviceSettingsCopyWithImpl<$Res> + implements _$DeviceSettingsCopyWith<$Res> { + __$DeviceSettingsCopyWithImpl(this._self, this._then); + + final _DeviceSettings _self; + final $Res Function(_DeviceSettings) _then; + +/// Create a copy of DeviceSettings +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? nickname = freezed,Object? userName = freezed,Object? volume = null,Object? brightness = null,Object? allowInterrupt = null,Object? privacyMode = null,}) { + return _then(_DeviceSettings( +nickname: freezed == nickname ? _self.nickname : nickname // ignore: cast_nullable_to_non_nullable +as String?,userName: freezed == userName ? _self.userName : userName // ignore: cast_nullable_to_non_nullable +as String?,volume: null == volume ? _self.volume : volume // ignore: cast_nullable_to_non_nullable +as int,brightness: null == brightness ? _self.brightness : brightness // ignore: cast_nullable_to_non_nullable +as int,allowInterrupt: null == allowInterrupt ? _self.allowInterrupt : allowInterrupt // ignore: cast_nullable_to_non_nullable +as bool,privacyMode: null == privacyMode ? _self.privacyMode : privacyMode // ignore: cast_nullable_to_non_nullable +as bool, + )); +} + + +} + + +/// @nodoc +mixin _$DeviceWifi { + + String get ssid; bool get isConnected; +/// Create a copy of DeviceWifi +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$DeviceWifiCopyWith get copyWith => _$DeviceWifiCopyWithImpl(this as DeviceWifi, _$identity); + + /// Serializes this DeviceWifi to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is DeviceWifi&&(identical(other.ssid, ssid) || other.ssid == ssid)&&(identical(other.isConnected, isConnected) || other.isConnected == isConnected)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,ssid,isConnected); + +@override +String toString() { + return 'DeviceWifi(ssid: $ssid, isConnected: $isConnected)'; +} + + +} + +/// @nodoc +abstract mixin class $DeviceWifiCopyWith<$Res> { + factory $DeviceWifiCopyWith(DeviceWifi value, $Res Function(DeviceWifi) _then) = _$DeviceWifiCopyWithImpl; +@useResult +$Res call({ + String ssid, bool isConnected +}); + + + + +} +/// @nodoc +class _$DeviceWifiCopyWithImpl<$Res> + implements $DeviceWifiCopyWith<$Res> { + _$DeviceWifiCopyWithImpl(this._self, this._then); + + final DeviceWifi _self; + final $Res Function(DeviceWifi) _then; + +/// Create a copy of DeviceWifi +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? ssid = null,Object? isConnected = null,}) { + return _then(_self.copyWith( +ssid: null == ssid ? _self.ssid : ssid // ignore: cast_nullable_to_non_nullable +as String,isConnected: null == isConnected ? _self.isConnected : isConnected // ignore: cast_nullable_to_non_nullable +as bool, + )); +} + +} + + +/// Adds pattern-matching-related methods to [DeviceWifi]. +extension DeviceWifiPatterns on DeviceWifi { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _DeviceWifi value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _DeviceWifi() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _DeviceWifi value) $default,){ +final _that = this; +switch (_that) { +case _DeviceWifi(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _DeviceWifi value)? $default,){ +final _that = this; +switch (_that) { +case _DeviceWifi() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( String ssid, bool isConnected)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _DeviceWifi() when $default != null: +return $default(_that.ssid,_that.isConnected);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( String ssid, bool isConnected) $default,) {final _that = this; +switch (_that) { +case _DeviceWifi(): +return $default(_that.ssid,_that.isConnected);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( String ssid, bool isConnected)? $default,) {final _that = this; +switch (_that) { +case _DeviceWifi() when $default != null: +return $default(_that.ssid,_that.isConnected);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _DeviceWifi implements DeviceWifi { + const _DeviceWifi({required this.ssid, this.isConnected = false}); + factory _DeviceWifi.fromJson(Map json) => _$DeviceWifiFromJson(json); + +@override final String ssid; +@override@JsonKey() final bool isConnected; + +/// Create a copy of DeviceWifi +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$DeviceWifiCopyWith<_DeviceWifi> get copyWith => __$DeviceWifiCopyWithImpl<_DeviceWifi>(this, _$identity); + +@override +Map toJson() { + return _$DeviceWifiToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _DeviceWifi&&(identical(other.ssid, ssid) || other.ssid == ssid)&&(identical(other.isConnected, isConnected) || other.isConnected == isConnected)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,ssid,isConnected); + +@override +String toString() { + return 'DeviceWifi(ssid: $ssid, isConnected: $isConnected)'; +} + + +} + +/// @nodoc +abstract mixin class _$DeviceWifiCopyWith<$Res> implements $DeviceWifiCopyWith<$Res> { + factory _$DeviceWifiCopyWith(_DeviceWifi value, $Res Function(_DeviceWifi) _then) = __$DeviceWifiCopyWithImpl; +@override @useResult +$Res call({ + String ssid, bool isConnected +}); + + + + +} +/// @nodoc +class __$DeviceWifiCopyWithImpl<$Res> + implements _$DeviceWifiCopyWith<$Res> { + __$DeviceWifiCopyWithImpl(this._self, this._then); + + final _DeviceWifi _self; + final $Res Function(_DeviceWifi) _then; + +/// Create a copy of DeviceWifi +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? ssid = null,Object? isConnected = null,}) { + return _then(_DeviceWifi( +ssid: null == ssid ? _self.ssid : ssid // ignore: cast_nullable_to_non_nullable +as String,isConnected: null == isConnected ? _self.isConnected : isConnected // ignore: cast_nullable_to_non_nullable +as bool, + )); +} + + +} + +// dart format on diff --git a/airhub_app/lib/features/device/domain/entities/device_detail.g.dart b/airhub_app/lib/features/device/domain/entities/device_detail.g.dart new file mode 100644 index 0000000..bc4562f --- /dev/null +++ b/airhub_app/lib/features/device/domain/entities/device_detail.g.dart @@ -0,0 +1,76 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'device_detail.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +_DeviceDetail _$DeviceDetailFromJson(Map json) => + _DeviceDetail( + id: (json['id'] as num).toInt(), + sn: json['sn'] as String, + name: json['name'] as String? ?? '', + status: json['status'] as String? ?? 'offline', + battery: (json['battery'] as num?)?.toInt() ?? 0, + firmwareVersion: json['firmware_version'] as String? ?? '', + macAddress: json['mac_address'] as String?, + isAi: json['is_ai'] as bool? ?? true, + icon: json['icon'] as String?, + settings: json['settings'] == null + ? null + : DeviceSettings.fromJson(json['settings'] as Map), + wifiList: + (json['wifi_list'] as List?) + ?.map((e) => DeviceWifi.fromJson(e as Map)) + .toList() ?? + const [], + boundSpirit: json['bound_spirit'] as Map?, + ); + +Map _$DeviceDetailToJson(_DeviceDetail instance) => + { + 'id': instance.id, + 'sn': instance.sn, + 'name': instance.name, + 'status': instance.status, + 'battery': instance.battery, + 'firmware_version': instance.firmwareVersion, + 'mac_address': instance.macAddress, + 'is_ai': instance.isAi, + 'icon': instance.icon, + 'settings': instance.settings, + 'wifi_list': instance.wifiList, + 'bound_spirit': instance.boundSpirit, + }; + +_DeviceSettings _$DeviceSettingsFromJson(Map json) => + _DeviceSettings( + nickname: json['nickname'] as String?, + userName: json['user_name'] as String?, + volume: (json['volume'] as num?)?.toInt() ?? 50, + brightness: (json['brightness'] as num?)?.toInt() ?? 50, + allowInterrupt: json['allow_interrupt'] as bool? ?? true, + privacyMode: json['privacy_mode'] as bool? ?? false, + ); + +Map _$DeviceSettingsToJson(_DeviceSettings instance) => + { + 'nickname': instance.nickname, + 'user_name': instance.userName, + 'volume': instance.volume, + 'brightness': instance.brightness, + 'allow_interrupt': instance.allowInterrupt, + 'privacy_mode': instance.privacyMode, + }; + +_DeviceWifi _$DeviceWifiFromJson(Map json) => _DeviceWifi( + ssid: json['ssid'] as String, + isConnected: json['is_connected'] as bool? ?? false, +); + +Map _$DeviceWifiToJson(_DeviceWifi instance) => + { + 'ssid': instance.ssid, + 'is_connected': instance.isConnected, + }; diff --git a/airhub_app/lib/features/device/domain/repositories/device_repository.dart b/airhub_app/lib/features/device/domain/repositories/device_repository.dart new file mode 100644 index 0000000..663446d --- /dev/null +++ b/airhub_app/lib/features/device/domain/repositories/device_repository.dart @@ -0,0 +1,16 @@ +import 'package:fpdart/fpdart.dart'; +import '../../../../core/errors/failures.dart'; +import '../entities/device.dart'; +import '../entities/device_detail.dart'; + +abstract class DeviceRepository { + Future>> queryByMac(String mac); + Future>> verifyDevice(String sn); + Future> bindDevice(String sn, {int? spiritId}); + Future>> getMyDevices(); + Future> getDeviceDetail(int userDeviceId); + Future> unbindDevice(int userDeviceId); + Future> updateSpirit(int userDeviceId, int spiritId); + Future> updateSettings(int userDeviceId, Map settings); + Future> configWifi(int userDeviceId, String ssid); +} diff --git a/airhub_app/lib/features/device/presentation/controllers/device_controller.dart b/airhub_app/lib/features/device/presentation/controllers/device_controller.dart new file mode 100644 index 0000000..1d8c2df --- /dev/null +++ b/airhub_app/lib/features/device/presentation/controllers/device_controller.dart @@ -0,0 +1,106 @@ +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../domain/entities/device.dart'; +import '../../domain/entities/device_detail.dart'; +import '../../data/repositories/device_repository_impl.dart'; + +part 'device_controller.g.dart'; + +/// 管理用户设备列表 +@riverpod +class DeviceController extends _$DeviceController { + @override + FutureOr> build() async { + final repository = ref.read(deviceRepositoryProvider); + final result = await repository.getMyDevices(); + return result.fold( + (failure) => [], + (devices) => devices, + ); + } + + Future bindDevice(String sn, {int? spiritId}) async { + final repository = ref.read(deviceRepositoryProvider); + final result = await repository.bindDevice(sn, spiritId: spiritId); + return result.fold( + (failure) => false, + (userDevice) { + final current = state.value ?? []; + state = AsyncData([...current, userDevice]); + return true; + }, + ); + } + + Future unbindDevice(int userDeviceId) async { + final repository = ref.read(deviceRepositoryProvider); + final result = await repository.unbindDevice(userDeviceId); + return result.fold( + (failure) => false, + (_) { + final current = state.value ?? []; + state = AsyncData( + current.where((d) => d.id != userDeviceId).toList(), + ); + return true; + }, + ); + } + + Future updateSpirit(int userDeviceId, int spiritId) async { + final repository = ref.read(deviceRepositoryProvider); + final result = await repository.updateSpirit(userDeviceId, spiritId); + return result.fold( + (failure) => false, + (updated) { + ref.invalidateSelf(); + return true; + }, + ); + } + + void refresh() { + ref.invalidateSelf(); + } +} + +/// 管理单个设备详情 +@riverpod +class DeviceDetailController extends _$DeviceDetailController { + @override + FutureOr build(int userDeviceId) async { + final repository = ref.read(deviceRepositoryProvider); + final result = await repository.getDeviceDetail(userDeviceId); + return result.fold( + (failure) => null, + (detail) => detail, + ); + } + + Future updateSettings(Map settings) async { + final repository = ref.read(deviceRepositoryProvider); + final result = await repository.updateSettings(userDeviceId, settings); + return result.fold( + (failure) => false, + (_) { + ref.invalidateSelf(); + return true; + }, + ); + } + + Future configWifi(String ssid) async { + final repository = ref.read(deviceRepositoryProvider); + final result = await repository.configWifi(userDeviceId, ssid); + return result.fold( + (failure) => false, + (_) { + ref.invalidateSelf(); + return true; + }, + ); + } + + void refresh() { + ref.invalidateSelf(); + } +} diff --git a/airhub_app/lib/features/device/presentation/controllers/device_controller.g.dart b/airhub_app/lib/features/device/presentation/controllers/device_controller.g.dart new file mode 100644 index 0000000..05de583 --- /dev/null +++ b/airhub_app/lib/features/device/presentation/controllers/device_controller.g.dart @@ -0,0 +1,163 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'device_controller.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning +/// 管理用户设备列表 + +@ProviderFor(DeviceController) +const deviceControllerProvider = DeviceControllerProvider._(); + +/// 管理用户设备列表 +final class DeviceControllerProvider + extends $AsyncNotifierProvider> { + /// 管理用户设备列表 + const DeviceControllerProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'deviceControllerProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$deviceControllerHash(); + + @$internal + @override + DeviceController create() => DeviceController(); +} + +String _$deviceControllerHash() => r'9b39117bd54964ba0035aad0eca10250454efaa7'; + +/// 管理用户设备列表 + +abstract class _$DeviceController extends $AsyncNotifier> { + FutureOr> build(); + @$mustCallSuper + @override + void runBuild() { + final created = build(); + final ref = + this.ref as $Ref>, List>; + final element = + ref.element + as $ClassProviderElement< + AnyNotifier>, List>, + AsyncValue>, + Object?, + Object? + >; + element.handleValue(ref, created); + } +} + +/// 管理单个设备详情 + +@ProviderFor(DeviceDetailController) +const deviceDetailControllerProvider = DeviceDetailControllerFamily._(); + +/// 管理单个设备详情 +final class DeviceDetailControllerProvider + extends $AsyncNotifierProvider { + /// 管理单个设备详情 + const DeviceDetailControllerProvider._({ + required DeviceDetailControllerFamily super.from, + required int super.argument, + }) : super( + retry: null, + name: r'deviceDetailControllerProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$deviceDetailControllerHash(); + + @override + String toString() { + return r'deviceDetailControllerProvider' + '' + '($argument)'; + } + + @$internal + @override + DeviceDetailController create() => DeviceDetailController(); + + @override + bool operator ==(Object other) { + return other is DeviceDetailControllerProvider && + other.argument == argument; + } + + @override + int get hashCode { + return argument.hashCode; + } +} + +String _$deviceDetailControllerHash() => + r'1d9049597e39a0af3a70331378559aca0e1da54d'; + +/// 管理单个设备详情 + +final class DeviceDetailControllerFamily extends $Family + with + $ClassFamilyOverride< + DeviceDetailController, + AsyncValue, + DeviceDetail?, + FutureOr, + int + > { + const DeviceDetailControllerFamily._() + : super( + retry: null, + name: r'deviceDetailControllerProvider', + dependencies: null, + $allTransitiveDependencies: null, + isAutoDispose: true, + ); + + /// 管理单个设备详情 + + DeviceDetailControllerProvider call(int userDeviceId) => + DeviceDetailControllerProvider._(argument: userDeviceId, from: this); + + @override + String toString() => r'deviceDetailControllerProvider'; +} + +/// 管理单个设备详情 + +abstract class _$DeviceDetailController extends $AsyncNotifier { + late final _$args = ref.$arg as int; + int get userDeviceId => _$args; + + FutureOr build(int userDeviceId); + @$mustCallSuper + @override + void runBuild() { + final created = build(_$args); + final ref = this.ref as $Ref, DeviceDetail?>; + final element = + ref.element + as $ClassProviderElement< + AnyNotifier, DeviceDetail?>, + AsyncValue, + Object?, + Object? + >; + element.handleValue(ref, created); + } +} diff --git a/airhub_app/lib/features/notification/data/datasources/notification_remote_data_source.dart b/airhub_app/lib/features/notification/data/datasources/notification_remote_data_source.dart new file mode 100644 index 0000000..fe8b411 --- /dev/null +++ b/airhub_app/lib/features/notification/data/datasources/notification_remote_data_source.dart @@ -0,0 +1,74 @@ +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../../core/network/api_client.dart'; +import '../../domain/entities/app_notification.dart'; + +part 'notification_remote_data_source.g.dart'; + +abstract class NotificationRemoteDataSource { + /// GET /notifications/?type=xxx&page=1&page_size=20 + Future<({int total, int unreadCount, List items})> + listNotifications({String? type, int page = 1, int pageSize = 20}); + + /// DELETE /notifications/{id}/ + Future deleteNotification(int id); + + /// POST /notifications/{id}/read/ + Future markAsRead(int id); + + /// POST /notifications/read-all/ + Future markAllAsRead(); +} + +@riverpod +NotificationRemoteDataSource notificationRemoteDataSource(Ref ref) { + final apiClient = ref.watch(apiClientProvider); + return NotificationRemoteDataSourceImpl(apiClient); +} + +class NotificationRemoteDataSourceImpl implements NotificationRemoteDataSource { + final ApiClient _apiClient; + + NotificationRemoteDataSourceImpl(this._apiClient); + + @override + Future<({int total, int unreadCount, List items})> + listNotifications({String? type, int page = 1, int pageSize = 20}) async { + final queryParams = { + 'page': page, + 'page_size': pageSize, + }; + if (type != null) queryParams['type'] = type; + + final data = await _apiClient.get( + '/notifications/', + queryParameters: queryParams, + ); + final map = data as Map; + final items = (map['items'] as List) + .map((e) => AppNotification.fromJson(e as Map)) + .toList(); + + return ( + total: map['total'] as int, + unreadCount: map['unread_count'] as int, + items: items, + ); + } + + @override + Future deleteNotification(int id) async { + await _apiClient.delete('/notifications/$id/'); + } + + @override + Future markAsRead(int id) async { + await _apiClient.post('/notifications/$id/read/'); + } + + @override + Future markAllAsRead() async { + final data = await _apiClient.post('/notifications/read-all/'); + final map = data as Map; + return map['count'] as int; + } +} diff --git a/airhub_app/lib/features/notification/data/datasources/notification_remote_data_source.g.dart b/airhub_app/lib/features/notification/data/datasources/notification_remote_data_source.g.dart new file mode 100644 index 0000000..ebe9b12 --- /dev/null +++ b/airhub_app/lib/features/notification/data/datasources/notification_remote_data_source.g.dart @@ -0,0 +1,59 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'notification_remote_data_source.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(notificationRemoteDataSource) +const notificationRemoteDataSourceProvider = + NotificationRemoteDataSourceProvider._(); + +final class NotificationRemoteDataSourceProvider + extends + $FunctionalProvider< + NotificationRemoteDataSource, + NotificationRemoteDataSource, + NotificationRemoteDataSource + > + with $Provider { + const NotificationRemoteDataSourceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'notificationRemoteDataSourceProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$notificationRemoteDataSourceHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + NotificationRemoteDataSource create(Ref ref) { + return notificationRemoteDataSource(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(NotificationRemoteDataSource value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$notificationRemoteDataSourceHash() => + r'4e9f903c888936a1f5ff6367213f079547b47047'; diff --git a/airhub_app/lib/features/notification/data/repositories/notification_repository_impl.dart b/airhub_app/lib/features/notification/data/repositories/notification_repository_impl.dart new file mode 100644 index 0000000..3eed7bb --- /dev/null +++ b/airhub_app/lib/features/notification/data/repositories/notification_repository_impl.dart @@ -0,0 +1,78 @@ +import 'package:fpdart/fpdart.dart'; +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../../core/errors/exceptions.dart'; +import '../../../../core/errors/failures.dart'; +import '../../domain/entities/app_notification.dart'; +import '../../domain/repositories/notification_repository.dart'; +import '../datasources/notification_remote_data_source.dart'; + +part 'notification_repository_impl.g.dart'; + +@riverpod +NotificationRepository notificationRepository(Ref ref) { + final remoteDataSource = ref.watch(notificationRemoteDataSourceProvider); + return NotificationRepositoryImpl(remoteDataSource); +} + +class NotificationRepositoryImpl implements NotificationRepository { + final NotificationRemoteDataSource _remoteDataSource; + + NotificationRepositoryImpl(this._remoteDataSource); + + @override + Future items})>> + listNotifications({ + String? type, + int page = 1, + int pageSize = 20, + }) async { + try { + final result = await _remoteDataSource.listNotifications( + type: type, + page: page, + pageSize: pageSize, + ); + return right(result); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> deleteNotification(int id) async { + try { + await _remoteDataSource.deleteNotification(id); + return right(null); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> markAsRead(int id) async { + try { + await _remoteDataSource.markAsRead(id); + return right(null); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> markAllAsRead() async { + try { + final count = await _remoteDataSource.markAllAsRead(); + return right(count); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } +} diff --git a/airhub_app/lib/features/notification/data/repositories/notification_repository_impl.g.dart b/airhub_app/lib/features/notification/data/repositories/notification_repository_impl.g.dart new file mode 100644 index 0000000..fa25848 --- /dev/null +++ b/airhub_app/lib/features/notification/data/repositories/notification_repository_impl.g.dart @@ -0,0 +1,58 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'notification_repository_impl.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(notificationRepository) +const notificationRepositoryProvider = NotificationRepositoryProvider._(); + +final class NotificationRepositoryProvider + extends + $FunctionalProvider< + NotificationRepository, + NotificationRepository, + NotificationRepository + > + with $Provider { + const NotificationRepositoryProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'notificationRepositoryProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$notificationRepositoryHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + NotificationRepository create(Ref ref) { + return notificationRepository(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(NotificationRepository value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$notificationRepositoryHash() => + r'ecfecb73514b4e3713b54be327ce323b398df355'; diff --git a/airhub_app/lib/features/notification/domain/entities/app_notification.dart b/airhub_app/lib/features/notification/domain/entities/app_notification.dart new file mode 100644 index 0000000..cd983f6 --- /dev/null +++ b/airhub_app/lib/features/notification/domain/entities/app_notification.dart @@ -0,0 +1,21 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'app_notification.freezed.dart'; +part 'app_notification.g.dart'; + +@freezed +abstract class AppNotification with _$AppNotification { + const factory AppNotification({ + required int id, + required String type, // system, device, activity + required String title, + @Default('') String description, + @Default('') String content, + @Default('') String imageUrl, + @Default(false) bool isRead, + required String createdAt, + }) = _AppNotification; + + factory AppNotification.fromJson(Map json) => + _$AppNotificationFromJson(json); +} diff --git a/airhub_app/lib/features/notification/domain/entities/app_notification.freezed.dart b/airhub_app/lib/features/notification/domain/entities/app_notification.freezed.dart new file mode 100644 index 0000000..42d7700 --- /dev/null +++ b/airhub_app/lib/features/notification/domain/entities/app_notification.freezed.dart @@ -0,0 +1,300 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// coverage:ignore-file +// ignore_for_file: type=lint +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark + +part of 'app_notification.dart'; + +// ************************************************************************** +// FreezedGenerator +// ************************************************************************** + +// dart format off +T _$identity(T value) => value; + +/// @nodoc +mixin _$AppNotification { + + int get id; String get type;// system, device, activity + String get title; String get description; String get content; String get imageUrl; bool get isRead; String get createdAt; +/// Create a copy of AppNotification +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$AppNotificationCopyWith get copyWith => _$AppNotificationCopyWithImpl(this as AppNotification, _$identity); + + /// Serializes this AppNotification to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is AppNotification&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.content, content) || other.content == content)&&(identical(other.imageUrl, imageUrl) || other.imageUrl == imageUrl)&&(identical(other.isRead, isRead) || other.isRead == isRead)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,type,title,description,content,imageUrl,isRead,createdAt); + +@override +String toString() { + return 'AppNotification(id: $id, type: $type, title: $title, description: $description, content: $content, imageUrl: $imageUrl, isRead: $isRead, createdAt: $createdAt)'; +} + + +} + +/// @nodoc +abstract mixin class $AppNotificationCopyWith<$Res> { + factory $AppNotificationCopyWith(AppNotification value, $Res Function(AppNotification) _then) = _$AppNotificationCopyWithImpl; +@useResult +$Res call({ + int id, String type, String title, String description, String content, String imageUrl, bool isRead, String createdAt +}); + + + + +} +/// @nodoc +class _$AppNotificationCopyWithImpl<$Res> + implements $AppNotificationCopyWith<$Res> { + _$AppNotificationCopyWithImpl(this._self, this._then); + + final AppNotification _self; + final $Res Function(AppNotification) _then; + +/// Create a copy of AppNotification +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? type = null,Object? title = null,Object? description = null,Object? content = null,Object? imageUrl = null,Object? isRead = null,Object? createdAt = null,}) { + return _then(_self.copyWith( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable +as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable +as String,description: null == description ? _self.description : description // ignore: cast_nullable_to_non_nullable +as String,content: null == content ? _self.content : content // ignore: cast_nullable_to_non_nullable +as String,imageUrl: null == imageUrl ? _self.imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable +as String,isRead: null == isRead ? _self.isRead : isRead // ignore: cast_nullable_to_non_nullable +as bool,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable +as String, + )); +} + +} + + +/// Adds pattern-matching-related methods to [AppNotification]. +extension AppNotificationPatterns on AppNotification { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _AppNotification value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _AppNotification() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _AppNotification value) $default,){ +final _that = this; +switch (_that) { +case _AppNotification(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _AppNotification value)? $default,){ +final _that = this; +switch (_that) { +case _AppNotification() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( int id, String type, String title, String description, String content, String imageUrl, bool isRead, String createdAt)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _AppNotification() when $default != null: +return $default(_that.id,_that.type,_that.title,_that.description,_that.content,_that.imageUrl,_that.isRead,_that.createdAt);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( int id, String type, String title, String description, String content, String imageUrl, bool isRead, String createdAt) $default,) {final _that = this; +switch (_that) { +case _AppNotification(): +return $default(_that.id,_that.type,_that.title,_that.description,_that.content,_that.imageUrl,_that.isRead,_that.createdAt);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( int id, String type, String title, String description, String content, String imageUrl, bool isRead, String createdAt)? $default,) {final _that = this; +switch (_that) { +case _AppNotification() when $default != null: +return $default(_that.id,_that.type,_that.title,_that.description,_that.content,_that.imageUrl,_that.isRead,_that.createdAt);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _AppNotification implements AppNotification { + const _AppNotification({required this.id, required this.type, required this.title, this.description = '', this.content = '', this.imageUrl = '', this.isRead = false, required this.createdAt}); + factory _AppNotification.fromJson(Map json) => _$AppNotificationFromJson(json); + +@override final int id; +@override final String type; +// system, device, activity +@override final String title; +@override@JsonKey() final String description; +@override@JsonKey() final String content; +@override@JsonKey() final String imageUrl; +@override@JsonKey() final bool isRead; +@override final String createdAt; + +/// Create a copy of AppNotification +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$AppNotificationCopyWith<_AppNotification> get copyWith => __$AppNotificationCopyWithImpl<_AppNotification>(this, _$identity); + +@override +Map toJson() { + return _$AppNotificationToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _AppNotification&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.content, content) || other.content == content)&&(identical(other.imageUrl, imageUrl) || other.imageUrl == imageUrl)&&(identical(other.isRead, isRead) || other.isRead == isRead)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,type,title,description,content,imageUrl,isRead,createdAt); + +@override +String toString() { + return 'AppNotification(id: $id, type: $type, title: $title, description: $description, content: $content, imageUrl: $imageUrl, isRead: $isRead, createdAt: $createdAt)'; +} + + +} + +/// @nodoc +abstract mixin class _$AppNotificationCopyWith<$Res> implements $AppNotificationCopyWith<$Res> { + factory _$AppNotificationCopyWith(_AppNotification value, $Res Function(_AppNotification) _then) = __$AppNotificationCopyWithImpl; +@override @useResult +$Res call({ + int id, String type, String title, String description, String content, String imageUrl, bool isRead, String createdAt +}); + + + + +} +/// @nodoc +class __$AppNotificationCopyWithImpl<$Res> + implements _$AppNotificationCopyWith<$Res> { + __$AppNotificationCopyWithImpl(this._self, this._then); + + final _AppNotification _self; + final $Res Function(_AppNotification) _then; + +/// Create a copy of AppNotification +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? type = null,Object? title = null,Object? description = null,Object? content = null,Object? imageUrl = null,Object? isRead = null,Object? createdAt = null,}) { + return _then(_AppNotification( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable +as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable +as String,description: null == description ? _self.description : description // ignore: cast_nullable_to_non_nullable +as String,content: null == content ? _self.content : content // ignore: cast_nullable_to_non_nullable +as String,imageUrl: null == imageUrl ? _self.imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable +as String,isRead: null == isRead ? _self.isRead : isRead // ignore: cast_nullable_to_non_nullable +as bool,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable +as String, + )); +} + + +} + +// dart format on diff --git a/airhub_app/lib/features/notification/domain/entities/app_notification.g.dart b/airhub_app/lib/features/notification/domain/entities/app_notification.g.dart new file mode 100644 index 0000000..24b2dfe --- /dev/null +++ b/airhub_app/lib/features/notification/domain/entities/app_notification.g.dart @@ -0,0 +1,31 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'app_notification.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +_AppNotification _$AppNotificationFromJson(Map json) => + _AppNotification( + id: (json['id'] as num).toInt(), + type: json['type'] as String, + title: json['title'] as String, + description: json['description'] as String? ?? '', + content: json['content'] as String? ?? '', + imageUrl: json['image_url'] as String? ?? '', + isRead: json['is_read'] as bool? ?? false, + createdAt: json['created_at'] as String, + ); + +Map _$AppNotificationToJson(_AppNotification instance) => + { + 'id': instance.id, + 'type': instance.type, + 'title': instance.title, + 'description': instance.description, + 'content': instance.content, + 'image_url': instance.imageUrl, + 'is_read': instance.isRead, + 'created_at': instance.createdAt, + }; diff --git a/airhub_app/lib/features/notification/domain/repositories/notification_repository.dart b/airhub_app/lib/features/notification/domain/repositories/notification_repository.dart new file mode 100644 index 0000000..f71d324 --- /dev/null +++ b/airhub_app/lib/features/notification/domain/repositories/notification_repository.dart @@ -0,0 +1,11 @@ +import 'package:fpdart/fpdart.dart'; +import '../../../../core/errors/failures.dart'; +import '../entities/app_notification.dart'; + +abstract class NotificationRepository { + Future items})>> + listNotifications({String? type, int page, int pageSize}); + Future> deleteNotification(int id); + Future> markAsRead(int id); + Future> markAllAsRead(); +} diff --git a/airhub_app/lib/features/notification/presentation/controllers/notification_controller.dart b/airhub_app/lib/features/notification/presentation/controllers/notification_controller.dart new file mode 100644 index 0000000..a55543c --- /dev/null +++ b/airhub_app/lib/features/notification/presentation/controllers/notification_controller.dart @@ -0,0 +1,75 @@ +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../domain/entities/app_notification.dart'; +import '../../data/repositories/notification_repository_impl.dart'; + +part 'notification_controller.g.dart'; + +@riverpod +class NotificationController extends _$NotificationController { + int _unreadCount = 0; + + int get unreadCount => _unreadCount; + + @override + FutureOr> build() async { + final repository = ref.read(notificationRepositoryProvider); + final result = await repository.listNotifications(); + return result.fold( + (failure) => [], + (data) { + _unreadCount = data.unreadCount; + return data.items; + }, + ); + } + + Future markAsRead(int id) async { + final repository = ref.read(notificationRepositoryProvider); + final result = await repository.markAsRead(id); + return result.fold( + (failure) => false, + (_) { + // Update local state + final current = state.value ?? []; + state = AsyncData( + current.map((n) => n.id == id ? n.copyWith(isRead: true) : n).toList(), + ); + if (_unreadCount > 0) _unreadCount--; + return true; + }, + ); + } + + Future markAllAsRead() async { + final repository = ref.read(notificationRepositoryProvider); + final result = await repository.markAllAsRead(); + return result.fold( + (failure) => false, + (count) { + final current = state.value ?? []; + state = AsyncData( + current.map((n) => n.copyWith(isRead: true)).toList(), + ); + _unreadCount = 0; + return true; + }, + ); + } + + Future deleteNotification(int id) async { + final repository = ref.read(notificationRepositoryProvider); + final result = await repository.deleteNotification(id); + return result.fold( + (failure) => false, + (_) { + final current = state.value ?? []; + state = AsyncData(current.where((n) => n.id != id).toList()); + return true; + }, + ); + } + + void refresh() { + ref.invalidateSelf(); + } +} diff --git a/airhub_app/lib/features/notification/presentation/controllers/notification_controller.g.dart b/airhub_app/lib/features/notification/presentation/controllers/notification_controller.g.dart new file mode 100644 index 0000000..56aadc8 --- /dev/null +++ b/airhub_app/lib/features/notification/presentation/controllers/notification_controller.g.dart @@ -0,0 +1,63 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'notification_controller.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(NotificationController) +const notificationControllerProvider = NotificationControllerProvider._(); + +final class NotificationControllerProvider + extends + $AsyncNotifierProvider> { + const NotificationControllerProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'notificationControllerProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$notificationControllerHash(); + + @$internal + @override + NotificationController create() => NotificationController(); +} + +String _$notificationControllerHash() => + r'99d80e49eb8e81fbae49f9f06f666ef934326a67'; + +abstract class _$NotificationController + extends $AsyncNotifier> { + FutureOr> build(); + @$mustCallSuper + @override + void runBuild() { + final created = build(); + final ref = + this.ref + as $Ref>, List>; + final element = + ref.element + as $ClassProviderElement< + AnyNotifier< + AsyncValue>, + List + >, + AsyncValue>, + Object?, + Object? + >; + element.handleValue(ref, created); + } +} diff --git a/airhub_app/lib/features/spirit/data/datasources/spirit_remote_data_source.dart b/airhub_app/lib/features/spirit/data/datasources/spirit_remote_data_source.dart new file mode 100644 index 0000000..a5c990a --- /dev/null +++ b/airhub_app/lib/features/spirit/data/datasources/spirit_remote_data_source.dart @@ -0,0 +1,71 @@ +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../../core/network/api_client.dart'; +import '../../domain/entities/spirit.dart'; + +part 'spirit_remote_data_source.g.dart'; + +abstract class SpiritRemoteDataSource { + Future> listSpirits(); + Future createSpirit(Map data); + Future getSpirit(int id); + Future updateSpirit(int id, Map data); + Future deleteSpirit(int id); + Future unbindSpirit(int id); + Future injectSpirit(int id, int userDeviceId); +} + +@riverpod +SpiritRemoteDataSource spiritRemoteDataSource(Ref ref) { + final apiClient = ref.watch(apiClientProvider); + return SpiritRemoteDataSourceImpl(apiClient); +} + +class SpiritRemoteDataSourceImpl implements SpiritRemoteDataSource { + final ApiClient _apiClient; + + SpiritRemoteDataSourceImpl(this._apiClient); + + @override + Future> listSpirits() async { + final data = await _apiClient.get('/spirits/'); + final list = data as List; + return list + .map((e) => Spirit.fromJson(e as Map)) + .toList(); + } + + @override + Future createSpirit(Map data) async { + final result = await _apiClient.post('/spirits/', data: data); + return Spirit.fromJson(result as Map); + } + + @override + Future getSpirit(int id) async { + final data = await _apiClient.get('/spirits/$id/'); + return Spirit.fromJson(data as Map); + } + + @override + Future updateSpirit(int id, Map data) async { + final result = await _apiClient.put('/spirits/$id/', data: data); + return Spirit.fromJson(result as Map); + } + + @override + Future deleteSpirit(int id) async { + await _apiClient.delete('/spirits/$id/'); + } + + @override + Future unbindSpirit(int id) async { + await _apiClient.post('/spirits/$id/unbind/'); + } + + @override + Future injectSpirit(int id, int userDeviceId) async { + await _apiClient.post('/spirits/$id/inject/', data: { + 'user_device_id': userDeviceId, + }); + } +} diff --git a/airhub_app/lib/features/spirit/data/datasources/spirit_remote_data_source.g.dart b/airhub_app/lib/features/spirit/data/datasources/spirit_remote_data_source.g.dart new file mode 100644 index 0000000..c3211e6 --- /dev/null +++ b/airhub_app/lib/features/spirit/data/datasources/spirit_remote_data_source.g.dart @@ -0,0 +1,58 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'spirit_remote_data_source.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(spiritRemoteDataSource) +const spiritRemoteDataSourceProvider = SpiritRemoteDataSourceProvider._(); + +final class SpiritRemoteDataSourceProvider + extends + $FunctionalProvider< + SpiritRemoteDataSource, + SpiritRemoteDataSource, + SpiritRemoteDataSource + > + with $Provider { + const SpiritRemoteDataSourceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'spiritRemoteDataSourceProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$spiritRemoteDataSourceHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + SpiritRemoteDataSource create(Ref ref) { + return spiritRemoteDataSource(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(SpiritRemoteDataSource value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$spiritRemoteDataSourceHash() => + r'd968cc481ea0216cb82b898a1ea926094f8ee8f4'; diff --git a/airhub_app/lib/features/spirit/data/repositories/spirit_repository_impl.dart b/airhub_app/lib/features/spirit/data/repositories/spirit_repository_impl.dart new file mode 100644 index 0000000..07055ed --- /dev/null +++ b/airhub_app/lib/features/spirit/data/repositories/spirit_repository_impl.dart @@ -0,0 +1,116 @@ +import 'package:fpdart/fpdart.dart'; +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../../core/errors/exceptions.dart'; +import '../../../../core/errors/failures.dart'; +import '../../domain/entities/spirit.dart'; +import '../../domain/repositories/spirit_repository.dart'; +import '../datasources/spirit_remote_data_source.dart'; + +part 'spirit_repository_impl.g.dart'; + +@riverpod +SpiritRepository spiritRepository(Ref ref) { + final remoteDataSource = ref.watch(spiritRemoteDataSourceProvider); + return SpiritRepositoryImpl(remoteDataSource); +} + +class SpiritRepositoryImpl implements SpiritRepository { + final SpiritRemoteDataSource _remoteDataSource; + + SpiritRepositoryImpl(this._remoteDataSource); + + @override + Future>> listSpirits() async { + try { + final spirits = await _remoteDataSource.listSpirits(); + return right(spirits); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> createSpirit({ + required String name, + String? avatar, + String? prompt, + String? memory, + String? voiceId, + }) async { + try { + final data = {'name': name}; + if (avatar != null) data['avatar'] = avatar; + if (prompt != null) data['prompt'] = prompt; + if (memory != null) data['memory'] = memory; + if (voiceId != null) data['voice_id'] = voiceId; + final spirit = await _remoteDataSource.createSpirit(data); + return right(spirit); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> getSpirit(int id) async { + try { + final spirit = await _remoteDataSource.getSpirit(id); + return right(spirit); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> updateSpirit(int id, Map data) async { + try { + final spirit = await _remoteDataSource.updateSpirit(id, data); + return right(spirit); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> deleteSpirit(int id) async { + try { + await _remoteDataSource.deleteSpirit(id); + return right(null); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> unbindSpirit(int id) async { + try { + await _remoteDataSource.unbindSpirit(id); + return right(null); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> injectSpirit(int id, int userDeviceId) async { + try { + await _remoteDataSource.injectSpirit(id, userDeviceId); + return right(null); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } +} diff --git a/airhub_app/lib/features/spirit/data/repositories/spirit_repository_impl.g.dart b/airhub_app/lib/features/spirit/data/repositories/spirit_repository_impl.g.dart new file mode 100644 index 0000000..94d9b77 --- /dev/null +++ b/airhub_app/lib/features/spirit/data/repositories/spirit_repository_impl.g.dart @@ -0,0 +1,56 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'spirit_repository_impl.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(spiritRepository) +const spiritRepositoryProvider = SpiritRepositoryProvider._(); + +final class SpiritRepositoryProvider + extends + $FunctionalProvider< + SpiritRepository, + SpiritRepository, + SpiritRepository + > + with $Provider { + const SpiritRepositoryProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'spiritRepositoryProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$spiritRepositoryHash(); + + @$internal + @override + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(pointer); + + @override + SpiritRepository create(Ref ref) { + return spiritRepository(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(SpiritRepository value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$spiritRepositoryHash() => r'c8ba175770cb9a4aa04b60abac3276ac87f17bc1'; diff --git a/airhub_app/lib/features/spirit/domain/entities/spirit.dart b/airhub_app/lib/features/spirit/domain/entities/spirit.dart new file mode 100644 index 0000000..827bc4a --- /dev/null +++ b/airhub_app/lib/features/spirit/domain/entities/spirit.dart @@ -0,0 +1,21 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'spirit.freezed.dart'; +part 'spirit.g.dart'; + +@freezed +abstract class Spirit with _$Spirit { + const factory Spirit({ + required int id, + required String name, + String? avatar, + String? prompt, + String? memory, + String? voiceId, + @Default(true) bool isActive, + String? createdAt, + String? updatedAt, + }) = _Spirit; + + factory Spirit.fromJson(Map json) => _$SpiritFromJson(json); +} diff --git a/airhub_app/lib/features/spirit/domain/entities/spirit.freezed.dart b/airhub_app/lib/features/spirit/domain/entities/spirit.freezed.dart new file mode 100644 index 0000000..f3d8ec4 --- /dev/null +++ b/airhub_app/lib/features/spirit/domain/entities/spirit.freezed.dart @@ -0,0 +1,301 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// coverage:ignore-file +// ignore_for_file: type=lint +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark + +part of 'spirit.dart'; + +// ************************************************************************** +// FreezedGenerator +// ************************************************************************** + +// dart format off +T _$identity(T value) => value; + +/// @nodoc +mixin _$Spirit { + + int get id; String get name; String? get avatar; String? get prompt; String? get memory; String? get voiceId; bool get isActive; String? get createdAt; String? get updatedAt; +/// Create a copy of Spirit +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$SpiritCopyWith get copyWith => _$SpiritCopyWithImpl(this as Spirit, _$identity); + + /// Serializes this Spirit to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is Spirit&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.avatar, avatar) || other.avatar == avatar)&&(identical(other.prompt, prompt) || other.prompt == prompt)&&(identical(other.memory, memory) || other.memory == memory)&&(identical(other.voiceId, voiceId) || other.voiceId == voiceId)&&(identical(other.isActive, isActive) || other.isActive == isActive)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,name,avatar,prompt,memory,voiceId,isActive,createdAt,updatedAt); + +@override +String toString() { + return 'Spirit(id: $id, name: $name, avatar: $avatar, prompt: $prompt, memory: $memory, voiceId: $voiceId, isActive: $isActive, createdAt: $createdAt, updatedAt: $updatedAt)'; +} + + +} + +/// @nodoc +abstract mixin class $SpiritCopyWith<$Res> { + factory $SpiritCopyWith(Spirit value, $Res Function(Spirit) _then) = _$SpiritCopyWithImpl; +@useResult +$Res call({ + int id, String name, String? avatar, String? prompt, String? memory, String? voiceId, bool isActive, String? createdAt, String? updatedAt +}); + + + + +} +/// @nodoc +class _$SpiritCopyWithImpl<$Res> + implements $SpiritCopyWith<$Res> { + _$SpiritCopyWithImpl(this._self, this._then); + + final Spirit _self; + final $Res Function(Spirit) _then; + +/// Create a copy of Spirit +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = null,Object? avatar = freezed,Object? prompt = freezed,Object? memory = freezed,Object? voiceId = freezed,Object? isActive = null,Object? createdAt = freezed,Object? updatedAt = freezed,}) { + return _then(_self.copyWith( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable +as String,avatar: freezed == avatar ? _self.avatar : avatar // ignore: cast_nullable_to_non_nullable +as String?,prompt: freezed == prompt ? _self.prompt : prompt // ignore: cast_nullable_to_non_nullable +as String?,memory: freezed == memory ? _self.memory : memory // ignore: cast_nullable_to_non_nullable +as String?,voiceId: freezed == voiceId ? _self.voiceId : voiceId // ignore: cast_nullable_to_non_nullable +as String?,isActive: null == isActive ? _self.isActive : isActive // ignore: cast_nullable_to_non_nullable +as bool,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable +as String?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable +as String?, + )); +} + +} + + +/// Adds pattern-matching-related methods to [Spirit]. +extension SpiritPatterns on Spirit { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _Spirit value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _Spirit() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _Spirit value) $default,){ +final _that = this; +switch (_that) { +case _Spirit(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _Spirit value)? $default,){ +final _that = this; +switch (_that) { +case _Spirit() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( int id, String name, String? avatar, String? prompt, String? memory, String? voiceId, bool isActive, String? createdAt, String? updatedAt)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _Spirit() when $default != null: +return $default(_that.id,_that.name,_that.avatar,_that.prompt,_that.memory,_that.voiceId,_that.isActive,_that.createdAt,_that.updatedAt);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( int id, String name, String? avatar, String? prompt, String? memory, String? voiceId, bool isActive, String? createdAt, String? updatedAt) $default,) {final _that = this; +switch (_that) { +case _Spirit(): +return $default(_that.id,_that.name,_that.avatar,_that.prompt,_that.memory,_that.voiceId,_that.isActive,_that.createdAt,_that.updatedAt);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( int id, String name, String? avatar, String? prompt, String? memory, String? voiceId, bool isActive, String? createdAt, String? updatedAt)? $default,) {final _that = this; +switch (_that) { +case _Spirit() when $default != null: +return $default(_that.id,_that.name,_that.avatar,_that.prompt,_that.memory,_that.voiceId,_that.isActive,_that.createdAt,_that.updatedAt);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _Spirit implements Spirit { + const _Spirit({required this.id, required this.name, this.avatar, this.prompt, this.memory, this.voiceId, this.isActive = true, this.createdAt, this.updatedAt}); + factory _Spirit.fromJson(Map json) => _$SpiritFromJson(json); + +@override final int id; +@override final String name; +@override final String? avatar; +@override final String? prompt; +@override final String? memory; +@override final String? voiceId; +@override@JsonKey() final bool isActive; +@override final String? createdAt; +@override final String? updatedAt; + +/// Create a copy of Spirit +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$SpiritCopyWith<_Spirit> get copyWith => __$SpiritCopyWithImpl<_Spirit>(this, _$identity); + +@override +Map toJson() { + return _$SpiritToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _Spirit&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.avatar, avatar) || other.avatar == avatar)&&(identical(other.prompt, prompt) || other.prompt == prompt)&&(identical(other.memory, memory) || other.memory == memory)&&(identical(other.voiceId, voiceId) || other.voiceId == voiceId)&&(identical(other.isActive, isActive) || other.isActive == isActive)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,id,name,avatar,prompt,memory,voiceId,isActive,createdAt,updatedAt); + +@override +String toString() { + return 'Spirit(id: $id, name: $name, avatar: $avatar, prompt: $prompt, memory: $memory, voiceId: $voiceId, isActive: $isActive, createdAt: $createdAt, updatedAt: $updatedAt)'; +} + + +} + +/// @nodoc +abstract mixin class _$SpiritCopyWith<$Res> implements $SpiritCopyWith<$Res> { + factory _$SpiritCopyWith(_Spirit value, $Res Function(_Spirit) _then) = __$SpiritCopyWithImpl; +@override @useResult +$Res call({ + int id, String name, String? avatar, String? prompt, String? memory, String? voiceId, bool isActive, String? createdAt, String? updatedAt +}); + + + + +} +/// @nodoc +class __$SpiritCopyWithImpl<$Res> + implements _$SpiritCopyWith<$Res> { + __$SpiritCopyWithImpl(this._self, this._then); + + final _Spirit _self; + final $Res Function(_Spirit) _then; + +/// Create a copy of Spirit +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = null,Object? avatar = freezed,Object? prompt = freezed,Object? memory = freezed,Object? voiceId = freezed,Object? isActive = null,Object? createdAt = freezed,Object? updatedAt = freezed,}) { + return _then(_Spirit( +id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable +as int,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable +as String,avatar: freezed == avatar ? _self.avatar : avatar // ignore: cast_nullable_to_non_nullable +as String?,prompt: freezed == prompt ? _self.prompt : prompt // ignore: cast_nullable_to_non_nullable +as String?,memory: freezed == memory ? _self.memory : memory // ignore: cast_nullable_to_non_nullable +as String?,voiceId: freezed == voiceId ? _self.voiceId : voiceId // ignore: cast_nullable_to_non_nullable +as String?,isActive: null == isActive ? _self.isActive : isActive // ignore: cast_nullable_to_non_nullable +as bool,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable +as String?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable +as String?, + )); +} + + +} + +// dart format on diff --git a/airhub_app/lib/features/spirit/domain/entities/spirit.g.dart b/airhub_app/lib/features/spirit/domain/entities/spirit.g.dart new file mode 100644 index 0000000..8519e62 --- /dev/null +++ b/airhub_app/lib/features/spirit/domain/entities/spirit.g.dart @@ -0,0 +1,31 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'spirit.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +_Spirit _$SpiritFromJson(Map json) => _Spirit( + id: (json['id'] as num).toInt(), + name: json['name'] as String, + avatar: json['avatar'] as String?, + prompt: json['prompt'] as String?, + memory: json['memory'] as String?, + voiceId: json['voice_id'] as String?, + isActive: json['is_active'] as bool? ?? true, + createdAt: json['created_at'] as String?, + updatedAt: json['updated_at'] as String?, +); + +Map _$SpiritToJson(_Spirit instance) => { + 'id': instance.id, + 'name': instance.name, + 'avatar': instance.avatar, + 'prompt': instance.prompt, + 'memory': instance.memory, + 'voice_id': instance.voiceId, + 'is_active': instance.isActive, + 'created_at': instance.createdAt, + 'updated_at': instance.updatedAt, +}; diff --git a/airhub_app/lib/features/spirit/domain/repositories/spirit_repository.dart b/airhub_app/lib/features/spirit/domain/repositories/spirit_repository.dart new file mode 100644 index 0000000..c384486 --- /dev/null +++ b/airhub_app/lib/features/spirit/domain/repositories/spirit_repository.dart @@ -0,0 +1,19 @@ +import 'package:fpdart/fpdart.dart'; +import '../../../../core/errors/failures.dart'; +import '../entities/spirit.dart'; + +abstract class SpiritRepository { + Future>> listSpirits(); + Future> createSpirit({ + required String name, + String? avatar, + String? prompt, + String? memory, + String? voiceId, + }); + Future> getSpirit(int id); + Future> updateSpirit(int id, Map data); + Future> deleteSpirit(int id); + Future> unbindSpirit(int id); + Future> injectSpirit(int id, int userDeviceId); +} diff --git a/airhub_app/lib/features/spirit/presentation/controllers/spirit_controller.dart b/airhub_app/lib/features/spirit/presentation/controllers/spirit_controller.dart new file mode 100644 index 0000000..ae57e8d --- /dev/null +++ b/airhub_app/lib/features/spirit/presentation/controllers/spirit_controller.dart @@ -0,0 +1,85 @@ +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../domain/entities/spirit.dart'; +import '../../data/repositories/spirit_repository_impl.dart'; + +part 'spirit_controller.g.dart'; + +@riverpod +class SpiritController extends _$SpiritController { + @override + FutureOr> build() async { + final repository = ref.read(spiritRepositoryProvider); + final result = await repository.listSpirits(); + return result.fold( + (failure) => [], + (spirits) => spirits, + ); + } + + Future create({ + required String name, + String? avatar, + String? prompt, + String? memory, + String? voiceId, + }) async { + final repository = ref.read(spiritRepositoryProvider); + final result = await repository.createSpirit( + name: name, + avatar: avatar, + prompt: prompt, + memory: memory, + voiceId: voiceId, + ); + return result.fold( + (failure) => false, + (spirit) { + final current = state.value ?? []; + state = AsyncData([...current, spirit]); + return true; + }, + ); + } + + Future delete(int id) async { + final repository = ref.read(spiritRepositoryProvider); + final result = await repository.deleteSpirit(id); + return result.fold( + (failure) => false, + (_) { + final current = state.value ?? []; + state = AsyncData(current.where((s) => s.id != id).toList()); + return true; + }, + ); + } + + Future unbind(int id) async { + final repository = ref.read(spiritRepositoryProvider); + final result = await repository.unbindSpirit(id); + return result.fold( + (failure) => false, + (_) { + // 刷新列表以获取最新状态 + ref.invalidateSelf(); + return true; + }, + ); + } + + Future inject(int spiritId, int userDeviceId) async { + final repository = ref.read(spiritRepositoryProvider); + final result = await repository.injectSpirit(spiritId, userDeviceId); + return result.fold( + (failure) => false, + (_) { + ref.invalidateSelf(); + return true; + }, + ); + } + + void refresh() { + ref.invalidateSelf(); + } +} diff --git a/airhub_app/lib/features/spirit/presentation/controllers/spirit_controller.g.dart b/airhub_app/lib/features/spirit/presentation/controllers/spirit_controller.g.dart new file mode 100644 index 0000000..83160fe --- /dev/null +++ b/airhub_app/lib/features/spirit/presentation/controllers/spirit_controller.g.dart @@ -0,0 +1,55 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'spirit_controller.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(SpiritController) +const spiritControllerProvider = SpiritControllerProvider._(); + +final class SpiritControllerProvider + extends $AsyncNotifierProvider> { + const SpiritControllerProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'spiritControllerProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$spiritControllerHash(); + + @$internal + @override + SpiritController create() => SpiritController(); +} + +String _$spiritControllerHash() => r'fc0837a87a58b59ba7e8c3b92cf448c55c8c508a'; + +abstract class _$SpiritController extends $AsyncNotifier> { + FutureOr> build(); + @$mustCallSuper + @override + void runBuild() { + final created = build(); + final ref = this.ref as $Ref>, List>; + final element = + ref.element + as $ClassProviderElement< + AnyNotifier>, List>, + AsyncValue>, + Object?, + Object? + >; + element.handleValue(ref, created); + } +} diff --git a/airhub_app/lib/features/system/data/datasources/system_remote_data_source.dart b/airhub_app/lib/features/system/data/datasources/system_remote_data_source.dart new file mode 100644 index 0000000..54848df --- /dev/null +++ b/airhub_app/lib/features/system/data/datasources/system_remote_data_source.dart @@ -0,0 +1,50 @@ +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../../core/network/api_client.dart'; + +part 'system_remote_data_source.g.dart'; + +abstract class SystemRemoteDataSource { + /// POST /feedback/ + Future> submitFeedback(String content, {String? contact}); + + /// GET /version/check/?platform=xxx¤t_version=xxx + Future> checkVersion(String platform, String currentVersion); +} + +@riverpod +SystemRemoteDataSource systemRemoteDataSource(Ref ref) { + final apiClient = ref.watch(apiClientProvider); + return SystemRemoteDataSourceImpl(apiClient); +} + +class SystemRemoteDataSourceImpl implements SystemRemoteDataSource { + final ApiClient _apiClient; + + SystemRemoteDataSourceImpl(this._apiClient); + + @override + Future> submitFeedback( + String content, { + String? contact, + }) async { + final body = {'content': content}; + if (contact != null && contact.isNotEmpty) body['contact'] = contact; + final data = await _apiClient.post('/feedback/', data: body); + return data as Map; + } + + @override + Future> checkVersion( + String platform, + String currentVersion, + ) async { + final data = await _apiClient.get( + '/version/check/', + queryParameters: { + 'platform': platform, + 'current_version': currentVersion, + }, + ); + return data as Map; + } +} diff --git a/airhub_app/lib/features/system/data/datasources/system_remote_data_source.g.dart b/airhub_app/lib/features/system/data/datasources/system_remote_data_source.g.dart new file mode 100644 index 0000000..40875dc --- /dev/null +++ b/airhub_app/lib/features/system/data/datasources/system_remote_data_source.g.dart @@ -0,0 +1,58 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'system_remote_data_source.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(systemRemoteDataSource) +const systemRemoteDataSourceProvider = SystemRemoteDataSourceProvider._(); + +final class SystemRemoteDataSourceProvider + extends + $FunctionalProvider< + SystemRemoteDataSource, + SystemRemoteDataSource, + SystemRemoteDataSource + > + with $Provider { + const SystemRemoteDataSourceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'systemRemoteDataSourceProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$systemRemoteDataSourceHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + SystemRemoteDataSource create(Ref ref) { + return systemRemoteDataSource(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(SystemRemoteDataSource value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$systemRemoteDataSourceHash() => + r'ada09ecf278e031e82b96b36b847d4977356d4aa'; diff --git a/airhub_app/lib/features/user/data/datasources/user_remote_data_source.dart b/airhub_app/lib/features/user/data/datasources/user_remote_data_source.dart new file mode 100644 index 0000000..a1df361 --- /dev/null +++ b/airhub_app/lib/features/user/data/datasources/user_remote_data_source.dart @@ -0,0 +1,45 @@ +import 'package:dio/dio.dart'; +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../../core/network/api_client.dart'; +import '../../../auth/domain/entities/user.dart'; + +part 'user_remote_data_source.g.dart'; + +abstract class UserRemoteDataSource { + Future getMe(); + Future updateMe(Map data); + Future uploadAvatar(String filePath); +} + +@riverpod +UserRemoteDataSource userRemoteDataSource(Ref ref) { + final apiClient = ref.watch(apiClientProvider); + return UserRemoteDataSourceImpl(apiClient); +} + +class UserRemoteDataSourceImpl implements UserRemoteDataSource { + final ApiClient _apiClient; + + UserRemoteDataSourceImpl(this._apiClient); + + @override + Future getMe() async { + final data = await _apiClient.get('/users/me/'); + return User.fromJson(data as Map); + } + + @override + Future updateMe(Map data) async { + final result = await _apiClient.put('/users/update_me/', data: data); + return User.fromJson(result as Map); + } + + @override + Future uploadAvatar(String filePath) async { + final formData = FormData.fromMap({ + 'file': await MultipartFile.fromFile(filePath), + }); + final data = await _apiClient.post('/users/avatar/', data: formData); + return (data as Map)['avatar_url'] as String; + } +} diff --git a/airhub_app/lib/features/user/data/datasources/user_remote_data_source.g.dart b/airhub_app/lib/features/user/data/datasources/user_remote_data_source.g.dart new file mode 100644 index 0000000..d80b285 --- /dev/null +++ b/airhub_app/lib/features/user/data/datasources/user_remote_data_source.g.dart @@ -0,0 +1,58 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'user_remote_data_source.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(userRemoteDataSource) +const userRemoteDataSourceProvider = UserRemoteDataSourceProvider._(); + +final class UserRemoteDataSourceProvider + extends + $FunctionalProvider< + UserRemoteDataSource, + UserRemoteDataSource, + UserRemoteDataSource + > + with $Provider { + const UserRemoteDataSourceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'userRemoteDataSourceProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$userRemoteDataSourceHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + UserRemoteDataSource create(Ref ref) { + return userRemoteDataSource(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(UserRemoteDataSource value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$userRemoteDataSourceHash() => + r'61338314bdae7e01a494e565c89fd02ab8d731b7'; diff --git a/airhub_app/lib/features/user/data/repositories/user_repository_impl.dart b/airhub_app/lib/features/user/data/repositories/user_repository_impl.dart new file mode 100644 index 0000000..549849c --- /dev/null +++ b/airhub_app/lib/features/user/data/repositories/user_repository_impl.dart @@ -0,0 +1,65 @@ +import 'package:fpdart/fpdart.dart'; +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../../core/errors/exceptions.dart'; +import '../../../../core/errors/failures.dart'; +import '../../../auth/domain/entities/user.dart'; +import '../../domain/repositories/user_repository.dart'; +import '../datasources/user_remote_data_source.dart'; + +part 'user_repository_impl.g.dart'; + +@riverpod +UserRepository userRepository(Ref ref) { + final remoteDataSource = ref.watch(userRemoteDataSourceProvider); + return UserRepositoryImpl(remoteDataSource); +} + +class UserRepositoryImpl implements UserRepository { + final UserRemoteDataSource _remoteDataSource; + + UserRepositoryImpl(this._remoteDataSource); + + @override + Future> getMe() async { + try { + final user = await _remoteDataSource.getMe(); + return right(user); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> updateMe({ + String? nickname, + String? gender, + String? birthday, + }) async { + try { + final data = {}; + if (nickname != null) data['nickname'] = nickname; + if (gender != null) data['gender'] = gender; + if (birthday != null) data['birthday'] = birthday; + final user = await _remoteDataSource.updateMe(data); + return right(user); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } + + @override + Future> uploadAvatar(String filePath) async { + try { + final url = await _remoteDataSource.uploadAvatar(filePath); + return right(url); + } on ServerException catch (e) { + return left(ServerFailure(e.message)); + } on NetworkException catch (e) { + return left(NetworkFailure(e.message)); + } + } +} diff --git a/airhub_app/lib/features/user/data/repositories/user_repository_impl.g.dart b/airhub_app/lib/features/user/data/repositories/user_repository_impl.g.dart new file mode 100644 index 0000000..85a3b9c --- /dev/null +++ b/airhub_app/lib/features/user/data/repositories/user_repository_impl.g.dart @@ -0,0 +1,51 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'user_repository_impl.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(userRepository) +const userRepositoryProvider = UserRepositoryProvider._(); + +final class UserRepositoryProvider + extends $FunctionalProvider + with $Provider { + const UserRepositoryProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'userRepositoryProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$userRepositoryHash(); + + @$internal + @override + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(pointer); + + @override + UserRepository create(Ref ref) { + return userRepository(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(UserRepository value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$userRepositoryHash() => r'bcdf0718d6e048bec2e3321db1595c5263baa8d2'; diff --git a/airhub_app/lib/features/user/domain/repositories/user_repository.dart b/airhub_app/lib/features/user/domain/repositories/user_repository.dart new file mode 100644 index 0000000..ae3856d --- /dev/null +++ b/airhub_app/lib/features/user/domain/repositories/user_repository.dart @@ -0,0 +1,13 @@ +import 'package:fpdart/fpdart.dart'; +import '../../../../core/errors/failures.dart'; +import '../../../auth/domain/entities/user.dart'; + +abstract class UserRepository { + Future> getMe(); + Future> updateMe({ + String? nickname, + String? gender, + String? birthday, + }); + Future> uploadAvatar(String filePath); +} diff --git a/airhub_app/lib/features/user/presentation/controllers/user_controller.dart b/airhub_app/lib/features/user/presentation/controllers/user_controller.dart new file mode 100644 index 0000000..ae5d256 --- /dev/null +++ b/airhub_app/lib/features/user/presentation/controllers/user_controller.dart @@ -0,0 +1,64 @@ +import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../auth/domain/entities/user.dart'; +import '../../data/repositories/user_repository_impl.dart'; + +part 'user_controller.g.dart'; + +@riverpod +class UserController extends _$UserController { + @override + FutureOr build() async { + final repository = ref.read(userRepositoryProvider); + final result = await repository.getMe(); + return result.fold( + (failure) => null, + (user) => user, + ); + } + + Future updateProfile({ + String? nickname, + String? gender, + String? birthday, + }) async { + final repository = ref.read(userRepositoryProvider); + final result = await repository.updateMe( + nickname: nickname, + gender: gender, + birthday: birthday, + ); + return result.fold( + (failure) { + state = AsyncError(failure.message, StackTrace.current); + return false; + }, + (user) { + state = AsyncData(user); + return true; + }, + ); + } + + Future changeAvatar(String filePath) async { + final repository = ref.read(userRepositoryProvider); + final uploadResult = await repository.uploadAvatar(filePath); + return uploadResult.fold( + (failure) { + state = AsyncError(failure.message, StackTrace.current); + return false; + }, + (avatarUrl) { + // 更新本地用户数据的头像字段 + final currentUser = state.value; + if (currentUser != null) { + state = AsyncData(currentUser.copyWith(avatar: avatarUrl)); + } + return true; + }, + ); + } + + void refresh() { + ref.invalidateSelf(); + } +} diff --git a/airhub_app/lib/features/user/presentation/controllers/user_controller.g.dart b/airhub_app/lib/features/user/presentation/controllers/user_controller.g.dart new file mode 100644 index 0000000..13e11e3 --- /dev/null +++ b/airhub_app/lib/features/user/presentation/controllers/user_controller.g.dart @@ -0,0 +1,55 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'user_controller.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(UserController) +const userControllerProvider = UserControllerProvider._(); + +final class UserControllerProvider + extends $AsyncNotifierProvider { + const UserControllerProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'userControllerProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$userControllerHash(); + + @$internal + @override + UserController create() => UserController(); +} + +String _$userControllerHash() => r'0f45b9c210e52b75b8a04003b9dbcb08e3e1ed39'; + +abstract class _$UserController extends $AsyncNotifier { + FutureOr build(); + @$mustCallSuper + @override + void runBuild() { + final created = build(); + final ref = this.ref as $Ref, User?>; + final element = + ref.element + as $ClassProviderElement< + AnyNotifier, User?>, + AsyncValue, + Object?, + Object? + >; + element.handleValue(ref, created); + } +} diff --git a/airhub_app/lib/main.dart b/airhub_app/lib/main.dart index 3a3fa4f..aaffd05 100644 --- a/airhub_app/lib/main.dart +++ b/airhub_app/lib/main.dart @@ -6,6 +6,7 @@ import 'core/router/app_router.dart'; import 'theme/app_theme.dart'; void main() { + WidgetsFlutterBinding.ensureInitialized(); runApp(const ProviderScope(child: AirhubApp())); } diff --git a/airhub_app/lib/pages/device_control_page.dart b/airhub_app/lib/pages/device_control_page.dart index a0ca392..9c2ab85 100644 --- a/airhub_app/lib/pages/device_control_page.dart +++ b/airhub_app/lib/pages/device_control_page.dart @@ -1,6 +1,7 @@ import 'dart:math'; import 'dart:ui'; import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'story_detail_page.dart'; @@ -16,15 +17,16 @@ import '../widgets/dashed_rect.dart'; import '../widgets/ios_toast.dart'; import '../widgets/animated_gradient_background.dart'; import '../widgets/gradient_button.dart'; +import '../features/device/presentation/controllers/device_controller.dart'; -class DeviceControlPage extends StatefulWidget { +class DeviceControlPage extends ConsumerStatefulWidget { const DeviceControlPage({super.key}); @override - State createState() => _DeviceControlPageState(); + ConsumerState createState() => _DeviceControlPageState(); } -class _DeviceControlPageState extends State +class _DeviceControlPageState extends ConsumerState with SingleTickerProviderStateMixin { int _currentIndex = 0; // 0: Home, 1: Story, 2: Music, 3: User @@ -175,71 +177,8 @@ class _DeviceControlPageState extends State // Add Animation Trigger Logic for testing or real use // We'll hook this up to the Generator Modal return value. - // Status Pill - Container( - height: 44, - padding: const EdgeInsets.symmetric(horizontal: 16), - decoration: BoxDecoration( - color: Colors.white.withOpacity(0.25), - borderRadius: BorderRadius.circular(24), - border: Border.all(color: Colors.white.withOpacity(0.4)), - ), - child: Row( - children: [ - // Live Dot - Container( - width: 8, - height: 8, - decoration: BoxDecoration( - color: const Color(0xFF22C55E), // Green - shape: BoxShape.circle, - boxShadow: [ - BoxShadow( - color: const Color(0xFF22C55E).withOpacity(0.2), - blurRadius: 0, - spreadRadius: 2, - ), - ], - ), - ), - const SizedBox(width: 8), - Text( - '在线', - style: GoogleFonts.dmSans( - fontSize: 13, - fontWeight: FontWeight.w600, - color: const Color(0xFF4B5563), - ), - ), - // Divider - Container( - margin: const EdgeInsets.symmetric(horizontal: 12), - width: 1, - height: 16, - color: Colors.black.withOpacity(0.1), - ), - // Battery - SvgPicture.asset( - 'assets/www/icons/icon-battery-full.svg', - width: 18, - height: 18, - colorFilter: const ColorFilter.mode( - Color(0xFF4B5563), - BlendMode.srcIn, - ), - ), - const SizedBox(width: 4), - Text( - '85%', - style: GoogleFonts.dmSans( - fontSize: 13, - fontWeight: FontWeight.w600, - color: const Color(0xFF4B5563), - ), - ), - ], - ), - ), + // Status Pill — dynamic from device detail + _buildStatusPill(), // Settings Button _buildIconBtn( @@ -297,6 +236,92 @@ class _DeviceControlPageState extends State ); } + Widget _buildStatusPill() { + final devicesAsync = ref.watch(deviceControllerProvider); + final devices = devicesAsync.value ?? []; + final firstDevice = devices.isNotEmpty ? devices.first : null; + + // If we have a device, try to load its detail for status/battery + String statusText = '离线'; + Color dotColor = const Color(0xFF9CA3AF); + String batteryText = '--'; + + if (firstDevice != null) { + final detailAsync = ref.watch( + deviceDetailControllerProvider(firstDevice.id), + ); + final detail = detailAsync.value; + if (detail != null) { + final isOnline = detail.status == 'online'; + statusText = isOnline ? '在线' : '离线'; + dotColor = isOnline ? const Color(0xFF22C55E) : const Color(0xFF9CA3AF); + batteryText = '${detail.battery}%'; + } + } + + return Container( + height: 44, + padding: const EdgeInsets.symmetric(horizontal: 16), + decoration: BoxDecoration( + color: Colors.white.withOpacity(0.25), + borderRadius: BorderRadius.circular(24), + border: Border.all(color: Colors.white.withOpacity(0.4)), + ), + child: Row( + children: [ + Container( + width: 8, + height: 8, + decoration: BoxDecoration( + color: dotColor, + shape: BoxShape.circle, + boxShadow: [ + BoxShadow( + color: dotColor.withOpacity(0.2), + blurRadius: 0, + spreadRadius: 2, + ), + ], + ), + ), + const SizedBox(width: 8), + Text( + statusText, + style: GoogleFonts.dmSans( + fontSize: 13, + fontWeight: FontWeight.w600, + color: const Color(0xFF4B5563), + ), + ), + Container( + margin: const EdgeInsets.symmetric(horizontal: 12), + width: 1, + height: 16, + color: Colors.black.withOpacity(0.1), + ), + SvgPicture.asset( + 'assets/www/icons/icon-battery-full.svg', + width: 18, + height: 18, + colorFilter: const ColorFilter.mode( + Color(0xFF4B5563), + BlendMode.srcIn, + ), + ), + const SizedBox(width: 4), + Text( + batteryText, + style: GoogleFonts.dmSans( + fontSize: 13, + fontWeight: FontWeight.w600, + color: const Color(0xFF4B5563), + ), + ), + ], + ), + ); + } + // --- Home View --- Widget _buildHomeView() { return Center( @@ -683,15 +708,6 @@ class _DeviceControlPageState extends State ); } - Widget _buildPlaceholderView(String title) { - return Center( - child: Text( - title, - style: const TextStyle(fontSize: 16, color: Colors.grey), - ), - ); - } - Widget _buildBottomNavBar() { return Center( child: ClipRRect( diff --git a/airhub_app/lib/pages/profile/agent_manage_page.dart b/airhub_app/lib/pages/profile/agent_manage_page.dart index 51cc9ad..7ffef35 100644 --- a/airhub_app/lib/pages/profile/agent_manage_page.dart +++ b/airhub_app/lib/pages/profile/agent_manage_page.dart @@ -1,39 +1,24 @@ import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:airhub_app/theme/design_tokens.dart'; import 'package:airhub_app/widgets/animated_gradient_background.dart'; import 'package:airhub_app/widgets/glass_dialog.dart'; import 'package:airhub_app/widgets/ios_toast.dart'; +import 'package:airhub_app/features/spirit/domain/entities/spirit.dart'; +import 'package:airhub_app/features/spirit/presentation/controllers/spirit_controller.dart'; -class AgentManagePage extends StatefulWidget { +class AgentManagePage extends ConsumerStatefulWidget { const AgentManagePage({super.key}); @override - State createState() => _AgentManagePageState(); + ConsumerState createState() => _AgentManagePageState(); } -class _AgentManagePageState extends State { - // Mock data matching HTML - final List> _agents = [ - { - 'id': 'Airhub_Mem_01', - 'date': '2025/01/15', - 'icon': '🧠', - 'bind': 'Airhub_5G', - 'nickname': '小毛球', - 'status': 'bound', // bound, unbound - }, - { - 'id': 'Airhub_Mem_02', - 'date': '2024/08/22', - 'icon': '🐾', - 'bind': '未绑定设备', - 'nickname': '豆豆', - 'status': 'unbound', - }, - ]; - +class _AgentManagePageState extends ConsumerState { @override Widget build(BuildContext context) { + final spiritsAsync = ref.watch(spiritControllerProvider); + return Scaffold( backgroundColor: Colors.transparent, body: Stack( @@ -43,16 +28,63 @@ class _AgentManagePageState extends State { children: [ _buildHeader(context), Expanded( - child: ListView.builder( - padding: EdgeInsets.only( - top: 20, - left: 20, - right: 20, - bottom: 40 + MediaQuery.of(context).padding.bottom, + child: spiritsAsync.when( + loading: () => const Center( + child: CircularProgressIndicator(color: Colors.white), ), - itemCount: _agents.length, - itemBuilder: (context, index) { - return _buildAgentCard(_agents[index]); + error: (error, _) => Center( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + '加载失败', + style: TextStyle( + color: Colors.white.withOpacity(0.8), + fontSize: 16, + ), + ), + const SizedBox(height: 12), + GestureDetector( + onTap: () => ref.read(spiritControllerProvider.notifier).refresh(), + child: Container( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8), + decoration: BoxDecoration( + color: Colors.white.withOpacity(0.2), + borderRadius: BorderRadius.circular(20), + ), + child: const Text( + '重试', + style: TextStyle(color: Colors.white), + ), + ), + ), + ], + ), + ), + data: (spirits) { + if (spirits.isEmpty) { + return Center( + child: Text( + '暂无角色记忆', + style: TextStyle( + color: Colors.white.withOpacity(0.6), + fontSize: 16, + ), + ), + ); + } + return ListView.builder( + padding: EdgeInsets.only( + top: 20, + left: 20, + right: 20, + bottom: 40 + MediaQuery.of(context).padding.bottom, + ), + itemCount: spirits.length, + itemBuilder: (context, index) { + return _buildAgentCard(spirits[index]); + }, + ); }, ), ), @@ -127,7 +159,11 @@ class _AgentManagePageState extends State { ); } - Widget _buildAgentCard(Map agent) { + Widget _buildAgentCard(Spirit spirit) { + final dateStr = spirit.createdAt != null + ? spirit.createdAt!.substring(0, 10).replaceAll('-', '/') + : ''; + return Container( margin: const EdgeInsets.only(bottom: 16), padding: const EdgeInsets.all(20), @@ -171,7 +207,7 @@ class _AgentManagePageState extends State { mainAxisAlignment: MainAxisAlignment.end, children: [ Text( - agent['date']!, + dateStr, style: TextStyle( color: Colors.white.withOpacity(0.85), fontSize: 12, @@ -190,10 +226,19 @@ class _AgentManagePageState extends State { borderRadius: BorderRadius.circular(12), ), alignment: Alignment.center, - child: Text( - agent['icon']!, - style: const TextStyle(fontSize: 24), - ), + child: spirit.avatar != null && spirit.avatar!.isNotEmpty + ? ClipRRect( + borderRadius: BorderRadius.circular(12), + child: Image.network( + spirit.avatar!, + width: 48, + height: 48, + fit: BoxFit.cover, + errorBuilder: (_, __, ___) => + const Text('🧠', style: TextStyle(fontSize: 24)), + ), + ) + : const Text('🧠', style: TextStyle(fontSize: 24)), ), const SizedBox(width: 12), Expanded( @@ -201,7 +246,7 @@ class _AgentManagePageState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - agent['id']!, + spirit.name, style: const TextStyle( fontSize: 16, fontWeight: FontWeight.w600, @@ -221,9 +266,7 @@ class _AgentManagePageState extends State { ], ), const SizedBox(height: 12), - _buildDetailRow('已绑定：', agent['bind']!), - const SizedBox(height: 4), - _buildDetailRow('角色昵称：', agent['nickname']!), + _buildDetailRow('状态：', spirit.isActive ? '活跃' : '未激活'), const SizedBox(height: 12), Container(height: 1, color: Colors.white.withOpacity(0.2)), @@ -232,18 +275,17 @@ class _AgentManagePageState extends State { Row( mainAxisAlignment: MainAxisAlignment.end, children: [ - if (agent['status'] == 'bound') - _buildActionBtn( - '解绑', - isDanger: true, - onTap: () => _showUnbindDialog(agent['id']!), - ) - else - _buildActionBtn( - '注入设备', - isInject: true, - onTap: () => _showInjectDialog(agent['id']!), - ), + _buildActionBtn( + '解绑', + isDanger: true, + onTap: () => _showUnbindDialog(spirit), + ), + const SizedBox(width: 8), + _buildActionBtn( + '删除', + isDanger: true, + onTap: () => _showDeleteDialog(spirit), + ), ], ), ], @@ -294,7 +336,7 @@ class _AgentManagePageState extends State { Icons.link_off, size: 14, color: AppColors.danger.withOpacity(0.9), - ), // Use icon for visual + ), const SizedBox(width: 4), ] else if (isInject) ...[ Icon(Icons.download, size: 14, color: const Color(0xFFB07D5A)), @@ -316,23 +358,39 @@ class _AgentManagePageState extends State { ); } - void _showUnbindDialog(String id) { + void _showUnbindDialog(Spirit spirit) { showGlassDialog( context: context, title: '确认解绑角色记忆?', description: '解绑后，该角色记忆将与当前设备断开连接，但数据会保留在云端。', cancelText: '取消', confirmText: '确认解绑', - isDanger: - true, // Note: GlassDialog implementation currently doesn't distinct danger style strongly but passed prop - onConfirm: () { + isDanger: true, + onConfirm: () async { Navigator.pop(context); // Close dialog - AppToast.show(context, '已解绑: $id'); + final success = await ref.read(spiritControllerProvider.notifier).unbind(spirit.id); + if (mounted) { + AppToast.show(context, success ? '已解绑: ${spirit.name}' : '解绑失败'); + } }, ); } - void _showInjectDialog(String id) { - AppToast.show(context, '正在查找附近的可用设备以注入: $id'); + void _showDeleteDialog(Spirit spirit) { + showGlassDialog( + context: context, + title: '确认删除角色记忆?', + description: '删除后，该角色记忆数据将无法恢复。', + cancelText: '取消', + confirmText: '确认删除', + isDanger: true, + onConfirm: () async { + Navigator.pop(context); + final success = await ref.read(spiritControllerProvider.notifier).delete(spirit.id); + if (mounted) { + AppToast.show(context, success ? '已删除: ${spirit.name}' : '删除失败'); + } + }, + ); } } diff --git a/airhub_app/lib/pages/profile/notification_page.dart b/airhub_app/lib/pages/profile/notification_page.dart index 1e52f3f..1799ba7 100644 --- a/airhub_app/lib/pages/profile/notification_page.dart +++ b/airhub_app/lib/pages/profile/notification_page.dart @@ -1,81 +1,40 @@ import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:airhub_app/theme/design_tokens.dart'; import 'package:airhub_app/widgets/animated_gradient_background.dart'; +import 'package:airhub_app/features/notification/domain/entities/app_notification.dart'; +import 'package:airhub_app/features/notification/presentation/controllers/notification_controller.dart'; -/// 消息通知页面 — 还原 notifications.html -class NotificationPage extends StatefulWidget { +/// 消息通知页面 — 接入真实 API +class NotificationPage extends ConsumerStatefulWidget { const NotificationPage({super.key}); @override - State createState() => _NotificationPageState(); + ConsumerState createState() => _NotificationPageState(); } -class _NotificationPageState extends State { - /// 当前展开的通知 index（-1 表示全部折叠，手风琴模式） - int _expandedIndex = -1; +class _NotificationPageState extends ConsumerState { + /// 当前展开的通知 id（null 表示全部折叠） + int? _expandedId; - /// 已读标记（index set） - final Set _readIndices = {}; - - /// 示例通知数据 - final List<_NotificationData> _notifications = [ - _NotificationData( - type: _NotifType.system, - icon: Icons.warning_amber_rounded, - title: '系统更新', - time: '10:30', - desc: 'Airhub V1.2.0 版本更新已准备就绪', - detail: 'Airhub V1.2.0 版本更新说明：\n\n' - '• 新增"喂养指南"功能，现在您可以查看详细的电子宠物养成手册了。\n' - '• 优化了设备连接的稳定性，修复了部分机型搜索不到设备的问题。\n' - '• 提升了整体界面的流畅度，增加了更多微交互动画。\n\n' - '建议您连接 Wi-Fi 后进行更新，以获得最佳体验。', - isUnread: true, - ), - _NotificationData( - type: _NotifType.activity, - emojiIcon: '🎁', - title: '新春活动', - time: '昨天', - desc: '领取您的新春限定水豚皮肤"招财进宝"', - detail: '🎉 新春限定皮肤上线啦！\n\n' - '为了庆祝即将到来的春节，我们特别推出了水豚的"招财进宝"限定皮肤。\n\n' - '活动亮点：\n' - '• 限定版红色唐装外观\n' - '• 专属的春节互动音效\n' - '• 限时免费领取的节庆道具\n\n' - '活动截止日期：2月15日', - isUnread: false, - ), - _NotificationData( - type: _NotifType.system, - icon: Icons.person_add_alt_1_outlined, - title: '新设备绑定', - time: '1月20日', - desc: '您的新设备"Airhub_5G"已成功绑定', - detail: '恭喜！您已成功绑定新设备 Airhub_5G。\n\n' - '接下来的几步可以帮助您快速上手：\n' - '• 前往角色记忆页面，注入您喜欢的角色人格。\n' - '• 进入设置页面配置您的偏好设置。\n' - '• 查看帮助中心的入门指南，解锁更多互动玩法。\n\n' - '祝您开启一段奇妙的 AI 陪伴旅程！', - isUnread: false, - ), - ]; - - void _toggleNotification(int index) { + void _toggleNotification(AppNotification notif) { setState(() { - if (_expandedIndex == index) { - _expandedIndex = -1; // 折叠 + if (_expandedId == notif.id) { + _expandedId = null; } else { - _expandedIndex = index; // 展开，并标记已读 - _readIndices.add(index); + _expandedId = notif.id; + // Mark as read when expanded + if (!notif.isRead) { + ref.read(notificationControllerProvider.notifier).markAsRead(notif.id); + } } }); } @override Widget build(BuildContext context) { + final notificationsAsync = ref.watch(notificationControllerProvider); + return Scaffold( backgroundColor: Colors.transparent, body: Stack( @@ -85,24 +44,69 @@ class _NotificationPageState extends State { children: [ _buildHeader(context), Expanded( - child: ShaderMask( - shaderCallback: (Rect rect) { - return const LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Colors.transparent, - Colors.black, - Colors.black, - Colors.transparent, + child: notificationsAsync.when( + loading: () => const Center( + child: CircularProgressIndicator(color: Colors.white), + ), + error: (error, _) => Center( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + '加载失败', + style: TextStyle( + color: Colors.white.withOpacity(0.8), + fontSize: 16, + ), + ), + const SizedBox(height: 12), + GestureDetector( + onTap: () => ref.read(notificationControllerProvider.notifier).refresh(), + child: Container( + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8), + decoration: BoxDecoration( + color: Colors.white.withOpacity(0.2), + borderRadius: BorderRadius.circular(20), + ), + child: const Text('重试', style: TextStyle(color: Colors.white)), + ), + ), ], - stops: [0.0, 0.03, 0.95, 1.0], - ).createShader(rect); + ), + ), + data: (notifications) { + if (notifications.isEmpty) { + return _buildEmptyState(); + } + return ShaderMask( + shaderCallback: (Rect rect) { + return const LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + Colors.transparent, + Colors.black, + Colors.black, + Colors.transparent, + ], + stops: [0.0, 0.03, 0.95, 1.0], + ).createShader(rect); + }, + blendMode: BlendMode.dstIn, + child: ListView.builder( + padding: EdgeInsets.only( + top: 8, + left: 20, + right: 20, + bottom: 40 + MediaQuery.of(context).padding.bottom, + ), + itemCount: notifications.length, + itemBuilder: (context, index) { + return _buildNotificationCard(notifications[index]); + }, + ), + ); }, - blendMode: BlendMode.dstIn, - child: _notifications.isEmpty - ? _buildEmptyState() - : _buildNotificationList(context), ), ), ], @@ -112,7 +116,6 @@ class _NotificationPageState extends State { ); } - // ─── Header ─── Widget _buildHeader(BuildContext context) { return Container( padding: EdgeInsets.only( @@ -141,13 +144,12 @@ class _NotificationPageState extends State { ), ), Text('消息通知', style: AppTextStyles.title), - const SizedBox(width: 40), // 右侧占位保持标题居中 + const SizedBox(width: 40), ], ), ); } - // ─── 空状态 ─── Widget _buildEmptyState() { return Center( child: Column( @@ -156,8 +158,8 @@ class _NotificationPageState extends State { Container( width: 100, height: 100, - decoration: BoxDecoration( - color: const Color(0x1A9CA3AF), + decoration: const BoxDecoration( + color: Color(0x1A9CA3AF), shape: BoxShape.circle, ), child: const Icon( @@ -188,27 +190,10 @@ class _NotificationPageState extends State { ); } - // ─── 通知列表 ─── - Widget _buildNotificationList(BuildContext context) { - return ListView.builder( - padding: EdgeInsets.only( - top: 8, - left: 20, - right: 20, - bottom: 40 + MediaQuery.of(context).padding.bottom, - ), - itemCount: _notifications.length, - itemBuilder: (context, index) { - return _buildNotificationCard(index); - }, - ); - } - - // ─── 单条通知卡片 ─── - Widget _buildNotificationCard(int index) { - final notif = _notifications[index]; - final isExpanded = _expandedIndex == index; - final isUnread = notif.isUnread && !_readIndices.contains(index); + Widget _buildNotificationCard(AppNotification notif) { + final isExpanded = _expandedId == notif.id; + final isUnread = !notif.isRead; + final timeStr = _formatTime(notif.createdAt); return Padding( padding: const EdgeInsets.only(bottom: 12), @@ -217,29 +202,24 @@ class _NotificationPageState extends State { curve: Curves.easeInOut, decoration: BoxDecoration( color: isExpanded - ? const Color(0xD9FFFFFF) // 0.85 opacity - : const Color(0xB3FFFFFF), // 0.7 opacity + ? const Color(0xD9FFFFFF) + : const Color(0xB3FFFFFF), borderRadius: BorderRadius.circular(16), - border: Border.all( - color: const Color(0x66FFFFFF), // rgba(255,255,255,0.4) - ), + border: Border.all(color: const Color(0x66FFFFFF)), boxShadow: const [AppShadows.card], ), child: Column( children: [ - // ── 卡片头部（可点击） ── GestureDetector( - onTap: () => _toggleNotification(index), + onTap: () => _toggleNotification(notif), behavior: HitTestBehavior.opaque, child: Padding( padding: const EdgeInsets.all(16), child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - // 图标 _buildNotifIcon(notif), const SizedBox(width: 14), - // 文字区域 Expanded( child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -247,16 +227,20 @@ class _NotificationPageState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text( - notif.title, - style: const TextStyle( - fontSize: 15, - fontWeight: FontWeight.w600, - color: AppColors.textPrimary, + Expanded( + child: Text( + notif.title, + style: const TextStyle( + fontSize: 15, + fontWeight: FontWeight.w600, + color: AppColors.textPrimary, + ), + overflow: TextOverflow.ellipsis, ), ), + const SizedBox(width: 8), Text( - notif.time, + timeStr, style: const TextStyle( fontSize: 12, color: AppColors.textSecondary, @@ -266,7 +250,7 @@ class _NotificationPageState extends State { ), const SizedBox(height: 4), Text( - notif.desc, + notif.description, style: const TextStyle( fontSize: 13, color: Color(0xFF6B7280), @@ -277,7 +261,6 @@ class _NotificationPageState extends State { ), ), const SizedBox(width: 8), - // 箭头 + 未读红点 Column( children: [ AnimatedRotation( @@ -306,23 +289,19 @@ class _NotificationPageState extends State { ), ), ), - - // ── 展开详情区域 ── AnimatedCrossFade( firstChild: const SizedBox.shrink(), secondChild: Container( width: double.infinity, decoration: const BoxDecoration( - color: Color(0x80F9FAFB), // rgba(249, 250, 251, 0.5) + color: Color(0x80F9FAFB), border: Border( - top: BorderSide( - color: Color(0x0D000000), // rgba(0,0,0,0.05) - ), + top: BorderSide(color: Color(0x0D000000)), ), ), padding: const EdgeInsets.all(20), child: Text( - notif.detail, + notif.content, style: const TextStyle( fontSize: 14, color: Color(0xFF374151), @@ -342,57 +321,71 @@ class _NotificationPageState extends State { ); } - // ─── 通知图标 ─── - Widget _buildNotifIcon(_NotificationData notif) { - final isSystem = notif.type == _NotifType.system; + Widget _buildNotifIcon(AppNotification notif) { + final isSystem = notif.type == 'system'; + final isActivity = notif.type == 'activity'; + + IconData icon; + if (isSystem) { + icon = Icons.info_outline; + } else if (isActivity) { + icon = Icons.card_giftcard; + } else { + icon = Icons.devices; + } + return Container( width: 40, height: 40, decoration: BoxDecoration( color: isSystem - ? const Color(0xFFEFF6FF) // 蓝色系统背景 - : const Color(0xFFFFF7ED), // 橙色活动背景 + ? const Color(0xFFEFF6FF) + : isActivity + ? const Color(0xFFFFF7ED) + : const Color(0xFFF0FDF4), borderRadius: BorderRadius.circular(20), ), alignment: Alignment.center, - child: notif.emojiIcon != null - ? Text( - notif.emojiIcon!, - style: const TextStyle(fontSize: 18), + child: notif.imageUrl.isNotEmpty + ? ClipRRect( + borderRadius: BorderRadius.circular(20), + child: Image.network( + notif.imageUrl, + width: 40, + height: 40, + fit: BoxFit.cover, + errorBuilder: (_, __, ___) => Icon( + icon, + size: 20, + color: isSystem ? const Color(0xFF3B82F6) : const Color(0xFFF97316), + ), + ), ) : Icon( - notif.icon ?? Icons.info_outline, + icon, size: 20, color: isSystem ? const Color(0xFF3B82F6) - : const Color(0xFFF97316), + : isActivity + ? const Color(0xFFF97316) + : const Color(0xFF22C55E), ), ); } -} - -// ─── 数据模型 ─── - -enum _NotifType { system, activity } - -class _NotificationData { - final _NotifType type; - final IconData? icon; - final String? emojiIcon; - final String title; - final String time; - final String desc; - final String detail; - final bool isUnread; - - _NotificationData({ - required this.type, - this.icon, - this.emojiIcon, - required this.title, - required this.time, - required this.desc, - required this.detail, - this.isUnread = false, - }); + + String _formatTime(String createdAt) { + try { + final dt = DateTime.parse(createdAt); + final now = DateTime.now(); + final diff = now.difference(dt); + + if (diff.inMinutes < 60) return '${diff.inMinutes}分钟前'; + if (diff.inHours < 24) return '${diff.inHours}小时前'; + if (diff.inDays < 2) return '昨天'; + if (diff.inDays < 7) return '${diff.inDays}天前'; + return '${dt.month}月${dt.day}日'; + } catch (_) { + return createdAt; + } + } } diff --git a/airhub_app/lib/pages/profile/profile_info_page.dart b/airhub_app/lib/pages/profile/profile_info_page.dart index 0d95495..3741630 100644 --- a/airhub_app/lib/pages/profile/profile_info_page.dart +++ b/airhub_app/lib/pages/profile/profile_info_page.dart @@ -1,35 +1,65 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:airhub_app/theme/design_tokens.dart'; import 'package:airhub_app/widgets/animated_gradient_background.dart'; import 'package:airhub_app/widgets/ios_toast.dart'; +import 'package:airhub_app/features/user/presentation/controllers/user_controller.dart'; import 'package:image_picker/image_picker.dart'; -import 'dart:io'; +import 'dart:typed_data'; -class ProfileInfoPage extends StatefulWidget { +class ProfileInfoPage extends ConsumerStatefulWidget { const ProfileInfoPage({super.key}); @override - State createState() => _ProfileInfoPageState(); + ConsumerState createState() => _ProfileInfoPageState(); } -class _ProfileInfoPageState extends State { - String _gender = '男'; - String _birthday = '1994-12-09'; - File? _avatarImage; - final TextEditingController _nicknameController = TextEditingController( - text: '土豆', - ); +class _ProfileInfoPageState extends ConsumerState { + String _gender = ''; + String _birthday = ''; + Uint8List? _avatarBytes; + String? _avatarUrl; + late final TextEditingController _nicknameController; + bool _initialized = false; + + @override + void initState() { + super.initState(); + _nicknameController = TextEditingController(); + } + + @override + void dispose() { + _nicknameController.dispose(); + super.dispose(); + } + + void _initFromUser() { + if (_initialized) return; + final userAsync = ref.read(userControllerProvider); + final user = userAsync.value; + if (user != null) { + _nicknameController.text = user.nickname ?? ''; + _gender = user.gender ?? ''; + _birthday = user.birthday ?? ''; + _avatarUrl = user.avatar; + _initialized = true; + } + } @override Widget build(BuildContext context) { + final userAsync = ref.watch(userControllerProvider); + + // 首次从用户数据初始化表单 + userAsync.whenData((_) => _initFromUser()); + return Scaffold( backgroundColor: Colors.transparent, body: Stack( children: [ - // 动态渐变背景 const AnimatedGradientBackground(), - Column( children: [ _buildHeader(context), @@ -98,11 +128,7 @@ class _ProfileInfoPageState extends State { Widget _buildSaveButton() { return GestureDetector( - onTap: () { - // Save logic - show success toast - AppToast.show(context, '保存成功'); - Navigator.pop(context); - }, + onTap: _saveProfile, child: Container( padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10), decoration: BoxDecoration( @@ -125,6 +151,31 @@ class _ProfileInfoPageState extends State { ); } + Future _saveProfile() async { + // 转换性别为后端格式 + String? genderCode; + if (_gender == '男') { + genderCode = 'M'; + } else if (_gender == '女') { + genderCode = 'F'; + } + + final success = await ref.read(userControllerProvider.notifier).updateProfile( + nickname: _nicknameController.text.trim(), + gender: genderCode, + birthday: _birthday.isNotEmpty ? _birthday : null, + ); + + if (mounted) { + if (success) { + AppToast.show(context, '保存成功'); + Navigator.pop(context); + } else { + AppToast.show(context, '保存失败，请重试', isError: true); + } + } + } + Widget _buildAvatarSection() { return Stack( children: [ @@ -140,21 +191,28 @@ class _ProfileInfoPageState extends State { ), boxShadow: [ BoxShadow( - color: Color(0x338B5E3C), // rgba(139, 94, 60, 0.2) + color: Color(0x338B5E3C), blurRadius: 24, offset: Offset(0, 8), ), ], ), child: ClipOval( - child: _avatarImage != null - ? Image.file(_avatarImage!, fit: BoxFit.cover) - : Image.asset( - 'assets/www/Capybara.png', - fit: BoxFit.cover, - errorBuilder: (ctx, err, stack) => - const Icon(Icons.person, color: Colors.white, size: 40), - ), + child: _avatarBytes != null + ? Image.memory(_avatarBytes!, fit: BoxFit.cover) + : (_avatarUrl != null && _avatarUrl!.isNotEmpty) + ? Image.network( + _avatarUrl!, + fit: BoxFit.cover, + errorBuilder: (ctx, err, stack) => + Image.asset('assets/www/Capybara.png', fit: BoxFit.cover), + ) + : Image.asset( + 'assets/www/Capybara.png', + fit: BoxFit.cover, + errorBuilder: (ctx, err, stack) => + const Icon(Icons.person, color: Colors.white, size: 40), + ), ), ), Positioned( @@ -197,13 +255,19 @@ class _ProfileInfoPageState extends State { final XFile? image = await picker.pickImage(source: ImageSource.gallery); if (image != null) { + final bytes = await image.readAsBytes(); setState(() { - _avatarImage = File(image.path); + _avatarBytes = bytes; }); + // 上传头像到服务器 + final success = await ref.read(userControllerProvider.notifier).changeAvatar(image.path); + if (mounted && !success) { + AppToast.show(context, '头像上传失败', isError: true); + } } } catch (e) { if (mounted) { - AppToast.show(context, '选择图片失败: $e', isError: true); + AppToast.show(context, '选择图片失败', isError: true); } } } @@ -218,10 +282,14 @@ class _ProfileInfoPageState extends State { child: Column( children: [ _buildInputItem('昵称', _nicknameController), - _buildSelectionItem('性别', _gender, onTap: _showGenderModal), + _buildSelectionItem( + '性别', + _gender.isEmpty ? '未设置' : _gender, + onTap: _showGenderModal, + ), _buildSelectionItem( '生日', - _birthday, + _birthday.isEmpty ? '未设置' : _birthday, showDivider: false, onTap: _showBirthdayInput, ), @@ -330,8 +398,8 @@ class _ProfileInfoPageState extends State { begin: Alignment.topCenter, end: Alignment.bottomCenter, colors: [ - Color(0xFFFFFDF9), // warm white top - Color(0xFFFFF8F0), // slightly warmer bottom + Color(0xFFFFFDF9), + Color(0xFFFFF8F0), ], ), borderRadius: BorderRadius.vertical(top: Radius.circular(24)), @@ -347,7 +415,6 @@ class _ProfileInfoPageState extends State { child: Column( mainAxisSize: MainAxisSize.min, children: [ - // Handle bar Container( width: 36, height: 4, @@ -359,13 +426,10 @@ class _ProfileInfoPageState extends State { const SizedBox(height: 20), Text('选择性别', style: AppTextStyles.title), const SizedBox(height: 24), - // Male option _buildGenderOption('男'), const SizedBox(height: 12), - // Female option _buildGenderOption('女'), const SizedBox(height: 16), - // Cancel GestureDetector( onTap: () => Navigator.pop(context), child: Container( @@ -406,12 +470,12 @@ class _ProfileInfoPageState extends State { padding: const EdgeInsets.symmetric(vertical: 16), decoration: BoxDecoration( color: isSelected - ? const Color(0xFFFFF5EB) // warm selected bg + ? const Color(0xFFFFF5EB) : Colors.white.withOpacity(0.8), borderRadius: BorderRadius.circular(16), border: Border.all( color: isSelected - ? const Color(0xFFECCFA8) // warm gold border + ? const Color(0xFFECCFA8) : const Color(0xFFE5E7EB), width: isSelected ? 1.5 : 1, ), @@ -434,7 +498,7 @@ class _ProfileInfoPageState extends State { fontSize: 16, fontWeight: FontWeight.w600, color: isSelected - ? const Color(0xFFB07D5A) // warm brown text + ? const Color(0xFFB07D5A) : const Color(0xFF374151), ), ), @@ -444,7 +508,6 @@ class _ProfileInfoPageState extends State { ); } - // iOS-style wheel date picker void _showBirthdayInput() { DateTime tempDate = DateTime.tryParse(_birthday) ?? DateTime(1994, 12, 9); @@ -473,7 +536,6 @@ class _ProfileInfoPageState extends State { ), child: Column( children: [ - // Header Container( padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16), decoration: const BoxDecoration( @@ -527,7 +589,6 @@ class _ProfileInfoPageState extends State { ], ), ), - // Cupertino date picker wheel Expanded( child: CupertinoTheme( data: const CupertinoThemeData( diff --git a/airhub_app/lib/pages/profile/profile_page.dart b/airhub_app/lib/pages/profile/profile_page.dart index 9ec9db8..7149362 100644 --- a/airhub_app/lib/pages/profile/profile_page.dart +++ b/airhub_app/lib/pages/profile/profile_page.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:airhub_app/theme/design_tokens.dart'; import 'package:airhub_app/widgets/feedback_dialog.dart'; import 'package:airhub_app/widgets/animated_gradient_background.dart'; @@ -9,12 +10,15 @@ import 'package:airhub_app/pages/profile/help_page.dart'; import 'package:airhub_app/pages/product_selection_page.dart'; import 'package:airhub_app/pages/profile/notification_page.dart'; import 'package:airhub_app/widgets/ios_toast.dart'; +import 'package:airhub_app/features/user/presentation/controllers/user_controller.dart'; -class ProfilePage extends StatelessWidget { +class ProfilePage extends ConsumerWidget { const ProfilePage({super.key}); @override - Widget build(BuildContext context) { + Widget build(BuildContext context, WidgetRef ref) { + final userAsync = ref.watch(userControllerProvider); + final user = userAsync.value; return Scaffold( backgroundColor: Colors.transparent, body: Stack( @@ -35,7 +39,7 @@ class ProfilePage extends StatelessWidget { children: [ const SizedBox(height: 20), // Top spacing const SizedBox(height: 20), // Top spacing - _buildUserCard(context), + _buildUserCard(context, user), const SizedBox(height: 20), _buildMenuList(context), const SizedBox(height: 140), // Bottom padding for footer @@ -117,7 +121,14 @@ class ProfilePage extends StatelessWidget { ); } - Widget _buildUserCard(BuildContext context) { + Widget _buildUserCard(BuildContext context, dynamic user) { + final nickname = user?.nickname ?? '未设置昵称'; + final phone = user?.phone ?? ''; + final maskedPhone = phone.length >= 7 + ? '${phone.substring(0, 3)}****${phone.substring(phone.length - 4)}' + : phone; + final avatarUrl = user?.avatar as String?; + return GestureDetector( onTap: () { Navigator.push( @@ -146,12 +157,19 @@ class ProfilePage extends StatelessWidget { ), ), child: ClipOval( - child: Image.asset( - 'assets/www/Capybara.png', - fit: BoxFit.cover, - errorBuilder: (ctx, err, stack) => - const Icon(Icons.person, color: Colors.white), - ), // Fallback + child: (avatarUrl != null && avatarUrl.isNotEmpty) + ? Image.network( + avatarUrl, + fit: BoxFit.cover, + errorBuilder: (ctx, err, stack) => + Image.asset('assets/www/Capybara.png', fit: BoxFit.cover), + ) + : Image.asset( + 'assets/www/Capybara.png', + fit: BoxFit.cover, + errorBuilder: (ctx, err, stack) => + const Icon(Icons.person, color: Colors.white), + ), ), ), const SizedBox(width: AppSpacing.md), @@ -159,9 +177,9 @@ class ProfilePage extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text('土豆', style: AppTextStyles.userName), + Text(nickname, style: AppTextStyles.userName), const SizedBox(height: 4), - Text('ID: 138****3069', style: AppTextStyles.userId), + Text('ID: $maskedPhone', style: AppTextStyles.userId), ], ), ), diff --git a/airhub_app/lib/pages/profile/settings_page.dart b/airhub_app/lib/pages/profile/settings_page.dart index 9e2369d..6aa576a 100644 --- a/airhub_app/lib/pages/profile/settings_page.dart +++ b/airhub_app/lib/pages/profile/settings_page.dart @@ -1,19 +1,24 @@ +import 'package:flutter/foundation.dart' show defaultTargetPlatform, TargetPlatform; import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:airhub_app/theme/design_tokens.dart'; import 'package:airhub_app/widgets/animated_gradient_background.dart'; +import 'package:airhub_app/widgets/ios_toast.dart'; import 'package:airhub_app/pages/profile/settings_sub_pages.dart'; import 'package:airhub_app/pages/product_selection_page.dart'; import 'package:airhub_app/widgets/glass_dialog.dart'; +import 'package:airhub_app/features/auth/presentation/controllers/auth_controller.dart'; +import 'package:airhub_app/features/system/data/datasources/system_remote_data_source.dart'; -class SettingsPage extends StatefulWidget { +class SettingsPage extends ConsumerStatefulWidget { const SettingsPage({super.key}); @override - State createState() => _SettingsPageState(); + ConsumerState createState() => _SettingsPageState(); } -class _SettingsPageState extends State { +class _SettingsPageState extends ConsumerState { bool _notificationEnabled = true; @override @@ -70,8 +75,8 @@ class _SettingsPageState extends State { _buildItem( '🔄', '检查更新', - value: '当前最新 1.0.0', - onTap: () => _showMessage('检查更新', '当前已是最新版本 v1.0.0'), + value: '当前 1.0.0', + onTap: _checkUpdate, ), _buildItem( '💻', @@ -289,6 +294,27 @@ class _SettingsPageState extends State { ); } + Future _checkUpdate() async { + try { + final ds = ref.read(systemRemoteDataSourceProvider); + final platform = defaultTargetPlatform == TargetPlatform.iOS ? 'ios' : 'android'; + final result = await ds.checkVersion(platform, '1.0.0'); + if (!mounted) return; + final needUpdate = result['need_update'] as bool? ?? false; + if (needUpdate) { + final latestVersion = result['latest_version'] ?? ''; + final description = result['description'] ?? '有新版本可用'; + _showMessage('发现新版本 v$latestVersion', description as String); + } else { + _showMessage('检查更新', '当前已是最新版本 v1.0.0'); + } + } catch (_) { + if (mounted) { + AppToast.show(context, '检查更新失败，请稍后重试', isError: true); + } + } + } + void _showLogoutDialog() { showGlassDialog( context: context, @@ -297,10 +323,10 @@ class _SettingsPageState extends State { cancelText: '取消', confirmText: '退出', isDanger: true, - onConfirm: () { + onConfirm: () async { Navigator.pop(context); // Close dialog - // In real app: clear session and nav to login - context.go('/login'); + await ref.read(authControllerProvider.notifier).logout(); + if (mounted) context.go('/login'); }, ); } @@ -313,9 +339,16 @@ class _SettingsPageState extends State { cancelText: '取消', confirmText: '确认注销', isDanger: true, - onConfirm: () { + onConfirm: () async { Navigator.pop(context); - _showMessage('已提交', '账号注销申请已提交，将在7个工作日内处理。'); + final success = + await ref.read(authControllerProvider.notifier).deleteAccount(); + if (!mounted) return; + if (success) { + context.go('/login'); + } else { + AppToast.show(context, '注销失败，请稍后重试', isError: true); + } }, ); } diff --git a/airhub_app/lib/pages/settings_page.dart b/airhub_app/lib/pages/settings_page.dart index b881dc5..a1ca3c1 100644 --- a/airhub_app/lib/pages/settings_page.dart +++ b/airhub_app/lib/pages/settings_page.dart @@ -1,27 +1,58 @@ import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'product_selection_page.dart'; import '../widgets/glass_dialog.dart'; import '../widgets/animated_gradient_background.dart'; +import '../widgets/ios_toast.dart'; +import '../features/device/presentation/controllers/device_controller.dart'; -class SettingsPage extends StatefulWidget { +class SettingsPage extends ConsumerStatefulWidget { const SettingsPage({super.key}); @override - State createState() => _SettingsPageState(); + ConsumerState createState() => _SettingsPageState(); } -class _SettingsPageState extends State { - // State for mock data - String _deviceName = '小毛球'; - String _userName = '土豆'; - double _volume = 60; - double _brightness = 85; +class _SettingsPageState extends ConsumerState { + // Local state — initialized from device detail + String _deviceName = ''; + String _userName = ''; + double _volume = 50; + double _brightness = 50; bool _allowInterrupt = true; + bool _privacyMode = false; + int? _userDeviceId; + bool _initialized = false; @override Widget build(BuildContext context) { + // Load current device's detail to populate settings + final devicesAsync = ref.watch(deviceControllerProvider); + final devices = devicesAsync.value ?? []; + if (devices.isNotEmpty) { + _userDeviceId = devices.first.id; + final detailAsync = ref.watch( + deviceDetailControllerProvider(_userDeviceId!), + ); + final detail = detailAsync.value; + if (detail != null && !_initialized) { + _initialized = true; + final s = detail.settings; + if (s != null) { + _deviceName = s.nickname ?? detail.name; + _userName = s.userName ?? ''; + _volume = s.volume.toDouble(); + _brightness = s.brightness.toDouble(); + _allowInterrupt = s.allowInterrupt; + _privacyMode = s.privacyMode; + } else { + _deviceName = detail.name; + } + } + } + return Scaffold( backgroundColor: Colors.transparent, body: Stack( @@ -96,6 +127,7 @@ class _SettingsPageState extends State { '修改设备昵称', _deviceName, (val) => setState(() => _deviceName = val), + settingsKey: 'nickname', ), ), _buildDivider(), @@ -106,6 +138,7 @@ class _SettingsPageState extends State { '修改你的称呼', _userName, (val) => setState(() => _userName = val), + settingsKey: 'user_name', ), ), ]), @@ -117,7 +150,10 @@ class _SettingsPageState extends State { _volume, '🔈', '🔊', - (val) => setState(() => _volume = val), + (val) { + setState(() => _volume = val); + }, + onChangeEnd: (val) => _saveSettings({'volume': val.toInt()}), ), _buildDivider(), _buildSliderItem( @@ -125,7 +161,10 @@ class _SettingsPageState extends State { _brightness, '☀', '☼', - (val) => setState(() => _brightness = val), + (val) { + setState(() => _brightness = val); + }, + onChangeEnd: (val) => _saveSettings({'brightness': val.toInt()}), ), ]), @@ -152,10 +191,20 @@ class _SettingsPageState extends State { _buildToggleItem( '允许打断', _allowInterrupt, - (val) => setState(() => _allowInterrupt = val), + (val) { + setState(() => _allowInterrupt = val); + _saveSettings({'allow_interrupt': val}); + }, ), _buildDivider(), - _buildListTile('隐私模式', '已开启'), + _buildToggleItem( + '隐私模式', + _privacyMode, + (val) { + setState(() => _privacyMode = val); + _saveSettings({'privacy_mode': val}); + }, + ), ]), ], ), @@ -303,8 +352,9 @@ class _SettingsPageState extends State { double value, String iconL, String iconR, - ValueChanged onChanged, - ) { + ValueChanged onChanged, { + ValueChanged? onChangeEnd, + }) { return Padding( padding: const EdgeInsets.all(16), child: Column( @@ -353,6 +403,7 @@ class _SettingsPageState extends State { min: 0, max: 100, onChanged: onChanged, + onChangeEnd: onChangeEnd, ), ), ), @@ -376,11 +427,23 @@ class _SettingsPageState extends State { ); } + Future _saveSettings(Map settings) async { + if (_userDeviceId == null) return; + final controller = ref.read( + deviceDetailControllerProvider(_userDeviceId!).notifier, + ); + final success = await controller.updateSettings(settings); + if (mounted && !success) { + AppToast.show(context, '保存失败', isError: true); + } + } + void _showEditDialog( String title, String initialValue, - ValueSetter onSaved, - ) { + ValueSetter onSaved, { + String? settingsKey, + }) { final controller = TextEditingController(text: initialValue); showGlassDialog( context: context, @@ -394,6 +457,9 @@ class _SettingsPageState extends State { ), onConfirm: () { onSaved(controller.text); + if (settingsKey != null) { + _saveSettings({settingsKey: controller.text}); + } Navigator.pop(context); }, ); @@ -417,15 +483,26 @@ class _SettingsPageState extends State { showGlassDialog( context: context, title: '确认解绑设备?', - description: '解绑后，设备 Airhub_5G 将无法使用。您与 小毛球 的交互数据已形成角色记忆，可注入其他设备。', + description: '解绑后，设备将无法使用。您的交互数据已形成角色记忆，可注入其他设备。', confirmText: '解绑', isDanger: true, - onConfirm: () { - Navigator.pop(context); - Navigator.pop(context); - Navigator.of(context).pushReplacement( - MaterialPageRoute(builder: (context) => const ProductSelectionPage()), - ); + onConfirm: () async { + Navigator.pop(context); // close dialog + if (_userDeviceId != null) { + final success = await ref + .read(deviceControllerProvider.notifier) + .unbindDevice(_userDeviceId!); + if (mounted) { + if (success) { + Navigator.pop(context); // close settings + Navigator.of(context).pushReplacement( + MaterialPageRoute(builder: (context) => const ProductSelectionPage()), + ); + } else { + AppToast.show(context, '解绑失败', isError: true); + } + } + } }, ); } diff --git a/airhub_app/lib/pages/wifi_config_page.dart b/airhub_app/lib/pages/wifi_config_page.dart index 8c06de5..6fc01d7 100644 --- a/airhub_app/lib/pages/wifi_config_page.dart +++ b/airhub_app/lib/pages/wifi_config_page.dart @@ -1,19 +1,21 @@ import 'dart:async'; import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:flutter_svg/flutter_svg.dart'; import '../widgets/animated_gradient_background.dart'; import '../widgets/gradient_button.dart'; +import '../features/device/presentation/controllers/device_controller.dart'; -class WifiConfigPage extends StatefulWidget { +class WifiConfigPage extends ConsumerStatefulWidget { const WifiConfigPage({super.key}); @override - State createState() => _WifiConfigPageState(); + ConsumerState createState() => _WifiConfigPageState(); } -class _WifiConfigPageState extends State +class _WifiConfigPageState extends ConsumerState with TickerProviderStateMixin { int _currentStep = 1; String _selectedWifiSsid = ''; @@ -96,6 +98,8 @@ class _WifiConfigPageState extends State stepIndex++; } else { timer.cancel(); + // Record WiFi config on server + _recordWifiConfig(); if (mounted) { setState(() { _currentStep = 4; @@ -105,6 +109,16 @@ class _WifiConfigPageState extends State }); } + Future _recordWifiConfig() async { + final userDeviceId = _deviceInfo['userDeviceId'] as int?; + if (userDeviceId != null && _selectedWifiSsid.isNotEmpty) { + final controller = ref.read( + deviceDetailControllerProvider(userDeviceId).notifier, + ); + await controller.configWifi(_selectedWifiSsid); + } + } + @override Widget build(BuildContext context) { return Scaffold( diff --git a/airhub_app/lib/widgets/feedback_dialog.dart b/airhub_app/lib/widgets/feedback_dialog.dart index 2011123..cddcefd 100644 --- a/airhub_app/lib/widgets/feedback_dialog.dart +++ b/airhub_app/lib/widgets/feedback_dialog.dart @@ -1,11 +1,56 @@ import 'dart:ui'; import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:airhub_app/theme/design_tokens.dart'; import 'package:airhub_app/widgets/ios_toast.dart'; +import 'package:airhub_app/features/system/data/datasources/system_remote_data_source.dart'; -class FeedbackDialog extends StatelessWidget { +class FeedbackDialog extends ConsumerStatefulWidget { const FeedbackDialog({super.key}); + @override + ConsumerState createState() => _FeedbackDialogState(); +} + +class _FeedbackDialogState extends ConsumerState { + final _contentController = TextEditingController(); + final _contactController = TextEditingController(); + bool _submitting = false; + + @override + void dispose() { + _contentController.dispose(); + _contactController.dispose(); + super.dispose(); + } + + Future _submit() async { + final content = _contentController.text.trim(); + if (content.isEmpty) { + AppToast.show(context, '请输入反馈内容', isError: true); + return; + } + + setState(() => _submitting = true); + + try { + final dataSource = ref.read(systemRemoteDataSourceProvider); + await dataSource.submitFeedback( + content, + contact: _contactController.text.trim(), + ); + if (mounted) { + AppToast.show(context, '感谢您的反馈！'); + Navigator.of(context).pop(); + } + } catch (_) { + if (mounted) { + AppToast.show(context, '提交失败，请稍后重试', isError: true); + setState(() => _submitting = false); + } + } + } + @override Widget build(BuildContext context) { return Dialog( @@ -19,7 +64,7 @@ class FeedbackDialog extends StatelessWidget { width: double.infinity, padding: const EdgeInsets.all(24), decoration: BoxDecoration( - color: Colors.white.withOpacity(0.9), // Glass effect + color: Colors.white.withOpacity(0.9), borderRadius: BorderRadius.circular(20), border: Border.all(color: Colors.white.withOpacity(0.5)), ), @@ -38,9 +83,10 @@ class FeedbackDialog extends StatelessWidget { color: const Color(0xFFF3F4F6), borderRadius: BorderRadius.circular(12), ), - child: const TextField( + child: TextField( + controller: _contentController, maxLines: null, - decoration: InputDecoration( + decoration: const InputDecoration( hintText: '请输入您的意见或建议...', border: InputBorder.none, hintStyle: TextStyle( @@ -48,7 +94,27 @@ class FeedbackDialog extends StatelessWidget { fontSize: 14, ), ), - style: TextStyle(fontSize: 14), + style: const TextStyle(fontSize: 14), + ), + ), + const SizedBox(height: 12), + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: const Color(0xFFF3F4F6), + borderRadius: BorderRadius.circular(12), + ), + child: TextField( + controller: _contactController, + decoration: const InputDecoration( + hintText: '联系方式（选填）', + border: InputBorder.none, + hintStyle: TextStyle( + color: Color(0xFF9CA3AF), + fontSize: 14, + ), + ), + style: const TextStyle(fontSize: 14), ), ), const SizedBox(height: 20), @@ -56,7 +122,7 @@ class FeedbackDialog extends StatelessWidget { children: [ Expanded( child: TextButton( - onPressed: () => Navigator.of(context).pop(), + onPressed: _submitting ? null : () => Navigator.of(context).pop(), style: TextButton.styleFrom( padding: const EdgeInsets.symmetric(vertical: 12), backgroundColor: const Color(0xFFF3F4F6), @@ -76,10 +142,7 @@ class FeedbackDialog extends StatelessWidget { const SizedBox(width: 12), Expanded( child: TextButton( - onPressed: () { - AppToast.show(context, '感谢您的反馈！'); - Navigator.of(context).pop(); - }, + onPressed: _submitting ? null : _submit, style: TextButton.styleFrom( padding: const EdgeInsets.symmetric(vertical: 12), backgroundColor: const Color(0xFF1F2937), @@ -87,10 +150,19 @@ class FeedbackDialog extends StatelessWidget { borderRadius: BorderRadius.circular(12), ), ), - child: const Text( - '提交', - style: TextStyle(color: Colors.white, fontSize: 16), - ), + child: _submitting + ? const SizedBox( + width: 20, + height: 20, + child: CircularProgressIndicator( + strokeWidth: 2, + color: Colors.white, + ), + ) + : const Text( + '提交', + style: TextStyle(color: Colors.white, fontSize: 16), + ), ), ), ], diff --git a/airhub_app/macos/.gitignore b/airhub_app/macos/.gitignore new file mode 100644 index 0000000..746adbb --- /dev/null +++ b/airhub_app/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/airhub_app/macos/Flutter/Flutter-Debug.xcconfig b/airhub_app/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000..4b81f9b --- /dev/null +++ b/airhub_app/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/airhub_app/macos/Flutter/Flutter-Release.xcconfig b/airhub_app/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000..5caa9d1 --- /dev/null +++ b/airhub_app/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/airhub_app/macos/Flutter/GeneratedPluginRegistrant.swift b/airhub_app/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..6b54f39 --- /dev/null +++ b/airhub_app/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,22 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import audio_session +import file_selector_macos +import flutter_blue_plus_darwin +import just_audio +import shared_preferences_foundation +import webview_flutter_wkwebview + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin")) + FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) + FlutterBluePlusPlugin.register(with: registry.registrar(forPlugin: "FlutterBluePlusPlugin")) + JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin")) + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) + WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin")) +} diff --git a/airhub_app/macos/Podfile b/airhub_app/macos/Podfile new file mode 100644 index 0000000..ff5ddb3 --- /dev/null +++ b/airhub_app/macos/Podfile @@ -0,0 +1,42 @@ +platform :osx, '10.15' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/airhub_app/macos/Podfile.lock b/airhub_app/macos/Podfile.lock new file mode 100644 index 0000000..5f0ff20 --- /dev/null +++ b/airhub_app/macos/Podfile.lock @@ -0,0 +1,56 @@ +PODS: + - audio_session (0.0.1): + - FlutterMacOS + - file_selector_macos (0.0.1): + - FlutterMacOS + - flutter_blue_plus_darwin (0.0.2): + - Flutter + - FlutterMacOS + - FlutterMacOS (1.0.0) + - just_audio (0.0.1): + - Flutter + - FlutterMacOS + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS + - webview_flutter_wkwebview (0.0.1): + - Flutter + - FlutterMacOS + +DEPENDENCIES: + - audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`) + - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`) + - flutter_blue_plus_darwin (from `Flutter/ephemeral/.symlinks/plugins/flutter_blue_plus_darwin/darwin`) + - FlutterMacOS (from `Flutter/ephemeral`) + - just_audio (from `Flutter/ephemeral/.symlinks/plugins/just_audio/darwin`) + - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) + - webview_flutter_wkwebview (from `Flutter/ephemeral/.symlinks/plugins/webview_flutter_wkwebview/darwin`) + +EXTERNAL SOURCES: + audio_session: + :path: Flutter/ephemeral/.symlinks/plugins/audio_session/macos + file_selector_macos: + :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos + flutter_blue_plus_darwin: + :path: Flutter/ephemeral/.symlinks/plugins/flutter_blue_plus_darwin/darwin + FlutterMacOS: + :path: Flutter/ephemeral + just_audio: + :path: Flutter/ephemeral/.symlinks/plugins/just_audio/darwin + shared_preferences_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin + webview_flutter_wkwebview: + :path: Flutter/ephemeral/.symlinks/plugins/webview_flutter_wkwebview/darwin + +SPEC CHECKSUMS: + audio_session: eaca2512cf2b39212d724f35d11f46180ad3a33e + file_selector_macos: 9e9e068e90ebee155097d00e89ae91edb2374db7 + flutter_blue_plus_darwin: 20a08bfeaa0f7804d524858d3d8744bcc1b6dbc3 + FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1 + just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed + shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb + webview_flutter_wkwebview: 8ebf4fded22593026f7dbff1fbff31ea98573c8d + +PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009 + +COCOAPODS: 1.16.2 diff --git a/airhub_app/macos/Runner.xcodeproj/project.pbxproj b/airhub_app/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..7931f62 --- /dev/null +++ b/airhub_app/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,801 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + 6D999EE5BBA59F7D1818B436 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 215332CEB40E691199867340 /* Pods_Runner.framework */; }; + FB1D261227CA33C7DF9B5A8A /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E99DAA670872DCBD38DA9F /* Pods_RunnerTests.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 215332CEB40E691199867340 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 233001A3A073A38C751D7BBB /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* airhub_app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = airhub_app.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 34A38E1E0F7E112BF790D046 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 6BA93F107E621159A288BC20 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 72CB4B5CDF9C7D67884A99B4 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 82E99DAA670872DCBD38DA9F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + AAD98D714344307041516A88 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + EBC958545224BB7F7AC26750 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + FB1D261227CA33C7DF9B5A8A /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 6D999EE5BBA59F7D1818B436 /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 331C80D6294CF71000263BE5 /* RunnerTests */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + 6597D0BE9D7B206A2E3DE1AE /* Pods */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* airhub_app.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + 6597D0BE9D7B206A2E3DE1AE /* Pods */ = { + isa = PBXGroup; + children = ( + 6BA93F107E621159A288BC20 /* Pods-Runner.debug.xcconfig */, + 72CB4B5CDF9C7D67884A99B4 /* Pods-Runner.release.xcconfig */, + AAD98D714344307041516A88 /* Pods-Runner.profile.xcconfig */, + 34A38E1E0F7E112BF790D046 /* Pods-RunnerTests.debug.xcconfig */, + 233001A3A073A38C751D7BBB /* Pods-RunnerTests.release.xcconfig */, + EBC958545224BB7F7AC26750 /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 215332CEB40E691199867340 /* Pods_Runner.framework */, + 82E99DAA670872DCBD38DA9F /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 842A7AB26902591B3509C369 /* [CP] Check Pods Manifest.lock */, + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 1E8019FA59B44C60956D134B /* [CP] Check Pods Manifest.lock */, + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + 03735CEC23B9AA0EAA7A363F /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* airhub_app.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 331C80D4294CF70F00263BE5 /* RunnerTests */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C80D3294CF70F00263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 03735CEC23B9AA0EAA7A363F /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 1E8019FA59B44C60956D134B /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; + 842A7AB26902591B3509C369 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C80D1294CF70F00263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 34A38E1E0F7E112BF790D046 /* Pods-RunnerTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.airlab.airhub.airhubApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/airhub_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/airhub_app"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 233001A3A073A38C751D7BBB /* Pods-RunnerTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.airlab.airhub.airhubApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/airhub_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/airhub_app"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = EBC958545224BB7F7AC26750 /* Pods-RunnerTests.profile.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.airlab.airhub.airhubApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/airhub_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/airhub_app"; + }; + name = Profile; + }; + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C80DB294CF71000263BE5 /* Debug */, + 331C80DC294CF71000263BE5 /* Release */, + 331C80DD294CF71000263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/airhub_app/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/airhub_app/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/airhub_app/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/airhub_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/airhub_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..775e644 --- /dev/null +++ b/airhub_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/airhub_app/macos/Runner.xcworkspace/contents.xcworkspacedata b/airhub_app/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..21a3cc1 --- /dev/null +++ b/airhub_app/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/airhub_app/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/airhub_app/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/airhub_app/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/airhub_app/macos/Runner/AppDelegate.swift b/airhub_app/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000..b3c1761 --- /dev/null +++ b/airhub_app/macos/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Cocoa +import FlutterMacOS + +@main +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } +} diff --git a/airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..a2ec33f --- /dev/null +++ b/airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..82b6f9d9a33e198f5747104729e1fcef999772a5 GIT binary patch literal 102994 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ⅅ8MglG&ER{i5lN315cO?EdHNLrg? zgxkP+ytd)OMWe7QvTf8yj4;V=?m172!BEt@6*TPUT4m3)yir}esnIodFGatGnsSfJ z**;;yw=1VCb2J|A7cBz-F5QFOQh2JDQFLarE>;4ZMzQ$s^)fOscIVv2-o{?ct3~Zv zy{0zU>3`+-PluS|ADraI9n~=3#Tvfx{pDr^5i$^-h5tL*CV@AeQFLxv4Y<$xI{9y< zZ}li*WIQ+XS!IK;?IVD0)C?pNBA(DMxqozMy1L#j+ba1Cd+2w&{^d-OEWSSHmNH>9 z%1Ldo(}5*>a8rjQF&@%Ka`-M|HM+m<^E#bJtVg&YM}uMb7UVJ|OVQI-zt-*BqQ zG&mq`Bn7EY;;+b%Obs9i{gC^%>kUz`{Qnc=ps7ra_UxEP$!?f&|5fHnU(rr?7?)D z$3m9e{&;Zu6yfa1ixTr;80IP7KLgkKCbgv1%f_weZK6b7tY+AS%fyjf6dR(wQa9TD zYG9`#!N4DqpMim|{uViKVf0B+Vmsr7p)Y+;*T~-2HFr!IOedrpiXXz+BDppd5BTf3 ztsg4U?0wR?9@~`iV*nwGmtYFGnq`X< zf?G%=o!t50?gk^qN#J(~!sxi=_yeg?Vio04*w<2iBT+NYX>V#CFuQGLsX^u8dPIkP zPraQK?ro`rqA4t7yUbGYk;pw6Z})Bv=!l-a5^R5Ra^TjoXI?=Qdup)rtyhwo<(c9_ zF>6P%-6Aqxb8gf?wY1z!4*hagIch)&A4treifFk=E9v@kRXyMm?V*~^LEu%Y%0u(| z52VvVF?P^D<|fG)_au(!iqo~1<5eF$Sc5?)*$4P3MAlSircZ|F+9T66-$)0VUD6>e zl2zlSl_QQ?>ULUA~H?QbWazYeh61%B!!u;c(cs`;J|l z=7?q+vo^T#kzddr>C;VZ5h*;De8^F2y{iA#9|(|5@zYh4^FZ-3r)xej=GghMN3K2Y z=(xE`TM%V8UHc4`6Cdhz4%i0OY^%DSguLUXQ?Y3LP+5x3jyN)-UDVhEC}AI5wImt; zHY|*=UW}^bS3va-@L$-fJz2P2LbCl)XybkY)p%2MjPJd-FzkdyWW~NBC@NlPJkz{v z+6k6#nif`E>>KCGaP34oY*c#nBFm#G8a0^px1S6mm6Cs+d}E8{J;DX=NEHb|{fZm0 z@Ors@ebTgbf^Jg&DzVS|h&Or)56$+;%&sh0)`&6VkS@QxQ=#6WxF5g+FWSr7Lp9uF zV#rc`yLe?f*u6oZoi3WpOkKFf^>lHb2GC6t!)dyGaQbK7&BNZ7oyP)hUX1Y(LdW-I z6LI2$i%+g!zsjT(5l}5ROLb)8`9kkldbklcq6tfLSrAyh#s(C1U2Sz9`h3#T9eX#Hryi1AU^!uv*&6I~qdM_B7-@`~8#O^jN&t7+S zTKI6;T$1@`Kky-;;$rU1*TdY;cUyg$JXalGc&3-Rh zJ&7kx=}~4lEx*%NUJA??g8eIeavDIDC7hTvojgRIT$=MlpU}ff0BTTTvjsZ0=wR)8 z?{xmc((XLburb0!&SA&fc%%46KU0e&QkA%_?9ZrZU%9Wt{*5DCUbqIBR%T#Ksp?)3 z%qL(XlnM!>F!=q@jE>x_P?EU=J!{G!BQq3k#mvFR%lJO2EU2M8egD?0r!2s*lL2Y} zdrmy`XvEarM&qTUz4c@>Zn}39Xi2h?n#)r3C4wosel_RUiL8$t;FSuga{9}-%FuOU z!R9L$Q!njtyY!^070-)|#E8My)w*~4k#hi%Y77)c5zfs6o(0zaj~nla0Vt&7bUqfD zrZmH~A50GOvk73qiyfXX6R9x3Qh)K=>#g^^D65<$5wbZjtrtWxfG4w1f<2CzsKj@e zvdsQ$$f6N=-%GJk~N7G(+-29R)Cbz8SIn_u|(VYVSAnlWZhPp8z6qm5=hvS$Y zULkbE?8HQ}vkwD!V*wW7BDBOGc|75qLVkyIWo~3<#nAT6?H_YSsvS+%l_X$}aUj7o z>A9&3f2i-`__#MiM#|ORNbK!HZ|N&jKNL<-pFkqAwuMJi=(jlv5zAN6EW`ex#;d^Z z<;gldpFcVD&mpfJ1d7><79BnCn~z8U*4qo0-{i@1$CCaw+<$T{29l1S2A|8n9ccx0!1Pyf;)aGWQ15lwEEyU35_Y zQS8y~9j9ZiByE-#BV7eknm>ba75<_d1^*% zB_xp#q`bpV1f9o6C(vbhN((A-K+f#~3EJtjWVhRm+g$1$f2scX!eZkfa%EIZd2ZVG z6sbBo@~`iwZQC4rH9w84rlHjd!|fHc9~12Il&?-FldyN50A`jzt~?_4`OWmc$qkgI zD_@7^L@cwg4WdL(sWrBYmkH;OjZGE^0*^iWZM3HBfYNw(hxh5>k@MH>AerLNqUg*Og9LiYmTgPw zX9IiqU)s?_obULF(#f~YeK#6P>;21x+cJ$KTL}|$xeG?i`zO;dAk0{Uj6GhT-p-=f zP2NJUcRJ{fZy=bbsN1Jk3q}(!&|Fkt_~GYdcBd7^JIt)Q!!7L8`3@so@|GM9b(D$+ zlD&69JhPnT>;xlr(W#x`JJvf*DPX(4^OQ%1{t@)Lkw5nc5zLVmRt|s+v zn(25v*1Z(c8RP@=3l_c6j{{=M$=*aO^ zPMUbbEKO7m2Q$4Xn>GIdwm#P_P4`or_w0+J+joK&qIP#uEiCo&RdOaP_7Z;PvfMh@ zsXUTn>ppdoEINmmq5T1BO&57*?QNLolW-8iz-jv7VAIgoV&o<<-vbD)--SD%FFOLd z>T$u+V>)4Dl6?A24xd1vgm}MovrQjf-@YH7cIk6tP^eq-xYFymnoSxcw}{lsbCP1g zE_sX|c_nq(+INR3iq+Oj^TwkjhbdOo}FmpPS2*#NGxNgl98|H0M*lu)Cu0TrA|*t=i`KIqoUl(Q7jN zb6!H-rO*!&_>-t)vG5jG>WR6z#O9O&IvA-4ho9g;as~hSnt!oF5 z6w(4pxz|WpO?HO<>sC_OB4MW)l`-E9DZJ$!=ytzO}fWXwnP>`8yWm5tYw`b1KDdg zp@oD;g===H+sj+^v6DCpEu7R?fh7>@pz>f74V5&#PvBN+95?28`mIdGR@f*L@j2%% z%;Rz5R>l#1U zYCS_5_)zUjgq#0SdO#)xEfYJ)JrHLXfe8^GK3F*CA(Y)jsSPJ{j&Ae!SeWN%Ev727 zxdd3Y0n^OBOtBSKdglEBL)i5=NdKfqK=1n~6LX`ja;#Tr!II$AAH{Z#sp%`rwNGT5 zvHT%(LJB+kD{5N}7c_Rk6}@tikIeq%@MqxX%$P!(238YD(H<_d;xxo*oMiv^1io>g zt5z&6`}cjci90q2r0hutQXr!UA~|4e*u=k81D(Cp7n{4LVCa+u0%-8Uha+sqI#Om~ z!&)KN(#Zone^~&@Ja{|l?X64Dxk)q>tLRv{=0|t$`Kdaj z#{AJr>{_BtpS|XEgTVJ4WMvBRk-(mk@ZYGdY1VwI z81;z(MBGV|2j*Cj%dvl8?b2{{B#e0B7&7wfv+>g`R2^Ai5C_WUx|CnTrHm+RFGXrt zs<~zBtk@?Niu%|o6IEL+y60Q>zJlv``ePCa07C%*O~lj?74|}&A0!uA)3V7ST8b_- z6CBP1;x+S@xTzgOY2#s%@=bhZ@i@BwmS)neQG&=9KUtRf^K=MvjC5JnqLqykCE_P0 zjf#V4SdH2#%2EuDb!>FLHK7j;nd6VLW|$3gJuegpEl3DZ`BpJU$<}}A(rW?<6OB@9 zKP9G3An?T5BztrLdlximA;{>Tr7GAeSU=^<*y;%RHj+7;v+tonyh(8d;Izn}2{oz& zW)fsZ9gHYpI?B|uekS3zHUue3mI zb7?0+&Zm>Kq(F>~%VYEn)0b32I3~O^?Wx-HI|Zu?1-OA2yfyJ;gWygLOeU;)vRm3u z5J4vDIQYztnEm=QauX2(WJO{yzI0HUFl+oO&isMf!Yh2pu@p}65)|0EdWRbg(@J6qo5_Els>#|_2a1p0&y&UP z8x#Z69q=d663NPPi>DHx3|QhJl5Ka$Cfqbvl*oRLYYXiH>g8*vriy!0XgmT~&jh3l z+!|~l=oCj<*PD>1EY*#+^a{rVk3T(66rJ^DxGt|~XTNnJf$vix1v1qdYu+d@Jn~bh z!7`a`y+IEcS#O*fSzA;I`e_T~XYzpW7alC%&?1nr);tSkNwO&J`JnX+7X1Q8fRh_d zx%)Xh_YjI3hwTCmGUeq_Z@H#ovkk_b(`osa$`aNmt`9A#t&<^jvuf z1E1DrW(%7PpAOQGwURz@luEW9-)L!`Jy*aC*4mcD?Si~mb=3Kn#M#1il9%`C0wkZ` zbpJ-qEPaOE5Y5iv_z%Wr{y4jh#U+o^KtP{pPCq-Qf&!=Uu)cEE(Iu9`uT#oHwHj+w z_R=kr7vmr~{^5sxXkj|WzNhAlXkW^oB4V)BZ{({~4ylOcM#O>DR)ZhD;RWwmf|(}y zDn)>%iwCE=*82>zP0db>I4jN#uxcYWod+<;#RtdMGPDpQW;riE;3cu``1toL|FaWa zK)MVA%ogXt3q55(Q&q+sjOG`?h=UJE9P;8i#gI*#f}@JbV(DuGEkee;La*9{p&Z?;~lE!&-kUFCtoDHY*MS zzj+S$L9+aTs(F^4ufZe6>SBg;m@>0&+kEZMFmD*~p~sx?rx=!>Ge;KYw<33y#*&77 zFZI`YE(Iz?+tH;Fq;y=MaSqT{Ayh*HFv0(z{_?Q+7@nE%p?S8%X6c!+y;!0NLXwJV8Co_}R3*7>n+oMsQpv8}8ZS-P@(Rg|gmxZHzf=nMOUAAY}AZGfWVzZjE@4$=7xkIrs8BE%606aVU%kxz_04ipig51k& z(>c9rJL2q%xvU%Zj#GR9C9)HLCR;#zQBB@x;e_9$ayn(JmSg_*0G?+wOF?&iu@}S{ zt$;TPf*Lj$3=d<}Q3o!Hq@3~lFxoiCyeEt}o3fihIn{x2s1)e2@3##&GYDq~YO|!q zUs0P-zy)+ohl-VQ`bhvUpC{-d$lkpML_M%Kl6@#_@A}w{jWCDsPa#cSbWA#C4Sf|*C*&Z{ zz?hOU7Cc`?>H$WGqITA2P~fYudnQHxB8^;0ZFKC;19F#~n_2P@{cE{Czq-#K5L_8| zc3aOEwq4%zL5>YU_mc9fc-p~{fBTWUkxTiZvxt9FOqC{s#TBp(#dWc+{Ee{dZ#B!g zHnaOJ8;KO1G;QU2ciodE+#Z$Wuz*Hc6NRO!AUMi|gov=>=cwcZeL&`>Jfn!35hV1J z;B2@0!bIR853w%T*m6)gQ?DPnQ)o6EtKaN3L;o?*q<83d&lG&U=A|6hcT?f0)4h6{ zGIZ0|!}-?*n{zr}-}cC}qWxEN%g60+{my)o^57{QEn(tSrmD7o)|r0+HVpQPopFu; z0<S}pW8W2vXzSxEqGD+qePj^x?R$e2LO&*ewsLo{+_Z)Wl|Z1K47j zsKoNRlX)h2z^ls_>IZ0!2X5t&irUs%RAO$Dr>0o$-D+$!Kb9puSgpoWza1jnX6(eG zTg-U z6|kf1atI!_>#@|=d01Ro@Rg)BD?mY3XBsG7U9%lmq>4;Gf&2k3_oyEOdEN&X6Hl5K zCz^hyt67G;IE&@w1n~%ji_{sob_ssP#Ke|qd!Xx?J&+|2K=^`WfwZ-zt|sklFouxC zXZeDgluD2a?Zd3e{MtE$gQfAY9eO@KLX;@8N`(?1-m`?AWp!a8bA%UN>QTntIcJX zvbY+C-GD&F?>E?jo$xhyKa@ps9$Dnwq>&)GB=W~2V3m)k;GNR$JoPRk%#f3#hgVdZ zhW3?cSQ*((Fog26jiEeNvum-6ID-fbfJ?q1ZU#)dgnJ^FCm`+sdP?g;d4VD$3XKx{ zs|Y4ePJp|93fpu)RL+#lIN9Ormd;<_5|oN!k5CENnpO>{60X;DN>vgHCX$QZYtgrj z*1{bEA1LKi8#U%oa!4W-4G+458~`5O4S1&tuyv>%H9DjLip7cC~RRS@HvdJ<|c z$TxEL=)r)XTfTgVxaG!gtZhLL`$#=gz1X=j|I@n~eHDUCW39r=o_ml@B z0cDx$5;3OA2l)&41kiKY^z7sO_U%1=)Ka4gV(P#(<^ z_zhThw=}tRG|2|1m4EP|p{Swfq#eNzDdi&QcVWwP+7920UQB*DpO0(tZHvLVMIGJl zdZ5;2J%a!N1lzxFwAkq05DPUg2*6SxcLRsSNI6dLiK0&JRuYAqwL}Z!YVJ$?mdnDF z82)J_t=jbY&le6Hq$Qs}@AOZGpB1}$Ah#i;&SzD1QQNwi6&1ddUf7UG0*@kX?E zDCbHypPZ9+H~KnDwBeOXZ-W-Y80wpoGB*A) z_;26Z`#s0tKrf~QBi2rl2=>;CS1w)rcD3-sB!8NI*1iQo59PJ>OLnqeV4iK7`RBi^ zFW{*6;nlD&cSunmU3v4JKj|K4xeN(q>H%;SsY8yDdw5BJ75q8>Ov)&D5OPZ`XiRHl z;)mAA0Woy6f!xCK(9H2rq?qzp83liZAIpBPl-dQ&$2=&H?Im~%g;vnIw1I+8q|kr! z36&^9}CMmR(U2rf|j12oG=vb%Ypsq8u9Kq}U*ANX*)9uK}fAi8;V_7Z;0_4*iydDxN-? zv?qJ=T*{MzL~-xUv{_Kh_q9#F{8gPV!yPUUS8pEq*=}2-#1d=sC_|U-rX~F0 zBLawgCWy#?#ax{~DAnDvh^`}wyUO`ioMK~jgh%L7^}#h?beSyvQ_g>+`2`}`-1h7# zg*?qJdm=53hwN8~B=^|LPmYtOVrQ(W{sNm4uofq=4P@dUA%$onWbw_m-KWia&n9iv zi)!9#OJ#^}eg8tE{wSb9(c0D^PS1 z9EBS5*ypSiVRS_G0v?$hyoZOS7hFWlp4qbYkf9Y&{%OzhsIdHskLptn96@k6@^K@U zszd8POehITDK+AyW#JKpnWY;ju#MC$JjB1Y*~(E6N%{p#kO+bVxG3X<34n3fW=k{A zCZt|KP%x^GQ9%mU)KE0{LA=vaZvRQbxSlK~eAkwWo2Z<{j5eS5NVTMe`m%re8%~7K zZLtU&b~YDN%~uA9wPf>x2=PI=MA6_oVe>Ek$s5&&Z=8vvF5EODP4Av(b|dlNgF1O8 zy83W0WRdzjz2iNA~t1piEqlyU&`$yZtqR`6X_PmuP>W+D|8iH;FQ zN{JuU#Tz9mV=4R_IewROL1|mK^`lLat#LcIBfggzM(iO$pQT*-c_ z94^LUWw#5B9~sp2W1p`c)Y(xfR<{O^9n4E6vDDw{#-R4UMBKo{>Hqlqn*a9rl_>+0 zS5MwJC~nCC`1X%VCyWFsiDX;bfAJQAUkU#105f_s5U-8rqO}n8fA1{b>Fr6Q|Ea(V z5B11Lo^ooWF?`^{-U#?iatokWI-e$632frzY?Yzzx(xJc@LFM4A~-eg!u|tl{)8Nx ztZLXsSC*68g%9TFu(f&J9nmc^9hgyy#uUOMJFCaifSaDcyQ&6=8e9=t zIFEAQ{EK{|73{($!a4=!wj4ABcQrUQp#+gGM?wEUp(w@+Fzi{!lt}|3`PM%&d-seeR zB$}BrFGD3R10CE>Hsb>;PrP}pd` zaY4}6+Wu(`#uAV+E5SV7VIT7ES#b(U0%%DgN1}USJH>)mm;CHPv>}B18&0F~Kj@1= z&^Jyo+z-E)GRT4U*7$8wJO1OibWg0Jw>C$%Ge|=YwV@Y1(4fR>cV#6aGtRoF@I`*w_V4;)V231NzNqb6g@jdpjmjv*<2j02yU$F8ZS$fTvCC`%|Yn#x< zXUnP&b!GLpOY-TY3d?<-Hhxom_LM9`JC9LEX2{t1P-Nj%nG+0Vq)vQwvO^}coPH-> zAo8w#s>Je^Yy*#PlK=XDxpVS~pFe-j#jN-(As&LRewOf(kN-aKF(H+s*{*!0xrlZw zchJu@XAvQWX7DI1E8?F}Wc8m46eT+C<0eXVB+Z^(g=Kl@FG-cn@u$suj)1V2(KNg_ zh29ws6&6(q~+sOAoHY^o86A<#n*?Pg2)cK$+y;cY$hJLq4)4V84=j+3ShSr##Tk5kgmxB zkW+8A1GtceEx~^Ebhwm36U?oA)h)!mt=eg0QE$D1QsLNZ_T3NH?=B&0j~#298!6iv zhc0|-{46*3`Rx&nKSXnf1&w-Rs>#PGAGuY@cBTU-j|Fxbn3z49S#6KBaP^Lx*AOXxIibr z!1ysMi(&kr!1wwQB5w`BDH2~>T4bI`T1}A2RM0zd7ikC&kuBRsB`Z2@J!Udm{AmSN zrr0k6_qCZL**=)xRW`MFu(OY=OT;3G8eF~ z2mmkXZ9X(sjuKmq+_<=LSjphB$~R1o^Yb=rO!j!(4ErIox^x55o{pXSE9X$!76^*$ zoKhlAX6y%n^U=C~@!vIlEgXQGD@>oOU=_(aXF-Sjas*$AKESfRzxQ8#3yOj|y0OCU z>6Z-0%LCcjla&7I+CXm&caKp@@jQ!5M`(_{CL=@4#JJ}cHeZw>^b6fpv269LSV?gV5Q{kk?4;;y9RIsy5vk%DIRiL(9xe1aA@4!VX zDh2}xgUd5X?6nji%&7-%QuyKSYA-Z{PwJijUQ}In+EJl|x@dF1P<5bPa5W3&&?^h$ zZCo8LepKo0a(Fsln*cHL;D(gu9MMkoiM0*n31u)jHqX5x^F95tnI&^}^yKx3YwEm@ zo8?EZ710ykx@19{=yz5IXb8w4yjdveWb{IVL6Z(Cs>!a_0X^1E27o!4e&b43+J*u2Gb(59k2uK0goLwhO{ujLS ziI9LA9`&x~Y$6JNX!aEXR``}LUI}Gr#=<^wBHmg%v<)zRWDVtq)kT$-P7iU1R)2XZ zi~bYhV@EZ`@prgK(cs{>2jn$pxg$<|KjJ7%26Km>%KcXh^bU@y@V_Lf@=j1x%R4{v zOcQn{I}!2W<~08FOVnoV>zOTH=+>v9!jFo|q)ucqIe!N4{U5_G`>>*sVD{8I~4FqyU8imZ**-Gy`~Xd z4w35GMf%7^i65HdX{Iz|f2Kg193#KhPIeR)-=eYx3Z!%RM=JjwLrdk^B#6rg!ym2w zPbFqYyO4>W_Z6PonAwiu7?!h=x%sR-T+_*xZOGh2wWhWr%}%2^$$ zQvACIB~pi=m|`hXIMvoq`TOCx=J_D2>pi6$NPy3&8#vy|oX)=kM0Z}$BR$r0G}MzOk-OqG+VmZtOZoj6x4(tLh|5h) zBv64Y{DPHsy&_H(5_l(&Y}FhVvr9m_*_Q~Zy-}V9+VmGnvndEjYW4qt4K~N&Y&6g| zfpz*V=A#^mVmuOAz)(KVI<%v5NY0%Goy!{9&o41upsPWk(yFuRP|A4q6NMnX%V~MT zi_Rb-Bno2kI+j0Cw`@ydy{e%ARS#Z%b6I%_yfo_ZKXr4BLVoHzBKJ^ZG z-2>2IzU)55@9C|?_P$ew^-7zEiAKG1XAi{!3h%1m#9s%^pGy6S9wKFYY4<$djeoJP z{GI}Vd%idY$4_fh(7NXm7#;cC!DS&-{tGr!Qze{^%bUx2jgG@-kMta^q-EwrKB}d8 z{%FT>rFk_bzW<{lc%eYlrsiYTZXGgzD1&lmRyp+c1O=0=zAX=KV62bx-a~JP{cPF4 zU$-XT#(9&T>l@bMu3nSr{)%-5lV+0t&bxip4DVJ~vlL$J2P6X~ zd{FS8vm{Lhrieul*7&(AgPuXhjpGila%6_?-+k#b)cdk#M1jB*nE>G6NGOr+Ek{`= z9b%S1`$`=g0CC$>0$Db;l_szReLYVmce*(()9%Zz1`*fNXhI*oRlerWHarD(v^W^c zuc1Vuw6Gbp7ZsoRH>QGt#&lv;5G~Ovt$%7VFd*-rN2>UjbOWBFGNGO`bru7CFB4tn zL`^?69Lj_g_TA&`9`dSI8s|)K|QM0 zybvV7!>xDY|6c6y;Q}qs`){1+WQu_5Dgd8Qe|q}}bxjH+joQQtqs1IVZn6{e7T{ia zF|=^xa%eWO%(x<7j*QZbcU_;aVaVP!arexOLOtoSNt*hvsRL%}%)jPetSich(`b-^ zMZ$PM9%s@%*jPVz0Z^W*cK_>G4f}+eEVX`HOaHg#!B`<4v;x}zDLMR*M27`kNfp!! zOfdt(>k-g>7jf^{Se@3$8<+;R*cYtw+wD_Z8Pl~!JDCUEPq{Ea*!J9`%ihyNJZ30i zmfve}S5<$Uso}_?SuI$ks|{-ddGLu9WR9`^9)Kdi@Vs;x#SY-xp}wHPU0|vEA7234 z@BN1z7OF=OOQtPF$4twn3!HTVlUVD_)ubMM7PEPoiC6lQgL2q9PK4~e8v-OuH%lie z?NgBLkIdPMG$QBq(>r^AOHB`|*1#*!2Z? zuU8H|FD`OBRu^(R?Z-Vhr0j;FLpS~a34KREnd}B=EYHS*>Hm+f%tgJt!4J8Q`qn^4 z9F=tO#JRJ}tzA`vx$nZ)O%wC?Uiv0+_nz}5Lj4ki*&=K&*#U`=rv z`Q@Q{+IhAj@6lrNK2B=8Yln!O2%zomfRehFT~;!O@(@Xy|1Jlw*uOB-M$#6K^)QBm z_7%#QVUDPwnW{iOV-grMQQU|3{=BQMh}c5(yMGdoQf*)k9-B zMQ(^GdJh+y)>qJprknS!%WxqM>HlHOP#7UVdy>%PW$!l72J`n-p7j(DBKoGxXWh(Y z>BFDZl|7knU_jg_SSbvFk8)39%2)Hu5W0}HKlh>EaqvFoXI&56Yy)3) zQkE4X^P0QnPn?iUUVHJZXzPp`s5uv?pG{K9IgGoHvcmlBxubi|iF7n{)mhenIcxGs zgr0OpQy#Y#u=5lOyiECfE_Sn?Fj1LyoRKcbTgX{p<T*v!CGkPc)pcA2D=4Ekp0Gb*wpy7S88C%Ywsbr?MI(3UdsCM?XJ1X%*hNjB)XqZ*W(qDdtSb z<3XN74ARXL3=c^bfW~F%NM^5*Zx92>Wq`&M625p~j$8mYwLbk%Kf)jbn#<2z$%vP5 zy#b>-tF-S2_AB4;R^K&^-1LJrUmi@9rB^FLF)-k&YHK8P+k@RCJ1qSTZ@=kHxA3l$ zmK_ZG)l6(nmCR1a8|;QF-B5e_ELnjJ1$m-;4UXX?WytF_wz7#&AjwZYTMVieLbq@R z3t-q|G4^BB#EpNu4uyfDebB+-uu_$9>y-dzB30Y9F=R zrW-Heqnj*InPTWHgR9v^R7~hokldh&h8=HDhMW(EFfim1*{)5Lc1-+eBVkK-2!u=N zuZKABgJs3I--NbjE;>Undg6uK`^U>AQ6V zhc!RhYgvrmeGNsftr+(C<_MtuV$`5RZTf#5r=DR?gWG->#})#=(td%C3`oO+2B7im zUqY}&a_QNTn?s+?=mNXiREN%x_=(H)L|DtYPY>SR3pQfBOel7G_jR_{!9`dSj8Up-`JgcB;=Oor)U=_EVjF3C5{Sqh8cq=~bRjoBpoc$kJCgtTyZGSpQ4= zYi$6b$-dGmuTDF&@amhV?cU05g(AZV&v2$4m&j_~GZk;&keSO(@LRESRZ&p`dV*6w z2$em~p*8yM6j;SYorw`M5K2mluJq7P5Yn$VtZj8DEs2Zk=O@4T&Q}>~f31Z{uk}`E z{Dp{KObh1kk~~MfLUod72{Pk6G@T$_0_N??lOrdR=Z;VV#m0l)&@hz{Z?)@sgImi-&i1@95g53rON83v!yVPDHRU*Mzc4yZ(-Fr z{8{WXmIJf7jeswk$;6s~Qac6QyM3W&`}m#gRt=rr95A+Ad&wSAgvXZ|F))rBJVJ5W1CsjN`QaOzct2ocq#0!v zmj#075)C!3oS>&N;aHS@<+c>RHL)8j^p)k(8#7$LEx!1g_1^02!4_qA=;uhKW=+ix zGX%+vBMiRiF^^jm{mdO(?GdWJ#unO#_F^7mhT8)s(z_WlwFyJ#Xh)k5+RG2f;LC*K**1dr`#}~6A=0B=I&V;%zDA1)d@G!X#Rng)7G*2k8Kg447r0ox> z5NK`d(H-afBwo9feDOUi>;BbPsu!2|=@g=3j*PY}@YrOb+SX6?#Yb2xaaK!?>SX1J z_!VsB`2n1=wwSftkydm!39|-1?c%Epx?TO<(#GO~I&{f4+)XwRk<7RQ1~5>QcKH|D z?!}j1ueO0Lk;FZ{k4FA_(S`Ot0w~tl&m0duID*f6RY#bkw||o;kZ# zISYNTb|{~|X$m$Q-Jv#uxyw)eM0gIv`V#wOAp&Vv@>X4_tSZ&L#juM@$S9 zx_X_tLh<_^-F;LAQ09s@sPb%PMTrcw*HUV0P=RYSlM&AXEOI&&R&YCm_S<7DRBx^L zA^R^iwW+LMk(r*$Pq-fKU5X@=mQ=`ErO30H@@&qqnI7zJcrbSh+H<V ze&7Uli0xj@WrW#&-9%*FP~kPYF_YYM_hs5~|ExMynQ%qvq`leRB6W0yhC@pCb8>_P zlf=F~WMv_u*-DV=UaVu#2rlzK{q8D95VwZrfV?gj@rSNWXFvktUq)V5+YrlxwX302ae(;aG4e>L-M@3J+-f3IT{b9l!kg*2M zC1+ND9}6m^()LE87Mt+^Q|)!y#suc&v26C=0W88%a{?)E8Yvo@kM&KNMaOst#|-_CbUTm}WS@-c>nRb;&z^ zYr)+IE$1=jov(CZ%3uR+`~NI>1&Gs6W(jaamjcN$a`2!*nO}l|b%?)Q%%UWzw>A`C zR@px(P*7j$TK?jbv*%x)e^|jcLsv}aF(Z0=7(%Oa7+1wY>{B>d+i&ZA$}k(qgZPZY z;VkW~8eWnU&HPIAbco?&tc2O1$6=7n{u|^Y*nXoac{o1W-6aXfy~KlNbJfLoq~6;+ zDYmnv--Fhqrl+UV#k@_(1=gWNtqhyVKN=9CZ-{Ohi>e=~bm4IKbhM%%W zW8oXE!rGpV7Wt(_^4nndH1_imheaWzDi|I})9ZVZ9>pN+P%dVc5wG`Ze*4`@rjn1^ z`ln(;vPBHQUb}y8S>=8q__r7g+=z$>!pReVB0@XKchAvyGjLQs-u>+w%`frV4FeIG zj=7n~hGrwx*&5aHy(7X$bDZ7YhcP%(*>G^lAYMK;qG~V8Jz@b7oNg;IA1z$9@TbzW z;@I51@Ekef#qbxnG$Y8Z%bm~ibZ=4#%yKr%#b)CDrfKN`ujIY?tA4h9)i~dZ4E;ZM znvb$n2)zn$Wx&zlW%mJZDh28ox$@%`w3i7YFepXUChw}$UXKI=-TM51`M#FH=tdr*mQ!c=aB1296Lu>iTTKZWss0f z5~ihdImPN$aTle_AdbYC^31}_^EK|9R&l#%3hbx;8vJ+Gp^tm{9JDILu*1PW!rh^Dn9p<)h#Sl4kKM%nm<+!ESSk* zC;lLNT$fgr-!+{aBsSx$41b}yy6o>r3F#1&iv3cfY2N<+`0qJ+>=&Qxs}JOEkD?^l-F5i`t5+zNuvJf z3Fh4$mNqiFXL-aq4U4K@Ae$fq-TDT`rvrx;gqx96w^*@s=mcthCaIyPe(w)6kI{EqV10tcShHU9eeAPs)s?6#vrq}>y3FeTJu$Udha+z zs7}rmA@yR(L&>35sNjQqrw}o^)UitMU!5g6nnG)(tgst!^`FKJEzI1(d@j_w@;^hr zgYxlIRYjho4U$bhczfq&YySCqCE(5_d>l(4tk1v9!V7PB%Vx{QO=G2NC@c1%3rEzw zN<6i?h;CJX>h)kn49Sr)g#Em6km6ESP`1qc5C3ZHizN>r>V-fSS=X1nT{+Thh@kC! z(H=PlqDt7V6gOYezXUK-dretz!1?IUD6&eL2b!4=9h+HUO&DYZKMM>|YhlEEg?q?S z^XT4$2Fd|zT=x3U#L1|F;-#`to-Y6hiYkWdO=rRC)meY72pIfl`3zEGDU8($iWR^K zI$nq80aSJII<;#W5Pj>^_T&013BJ*O89Uoq z5>;Paa^E}xar^r=!pexg&OTM8wluk4R~Ru=)Hgk`Y#i_$jk{jc8hx}?(dW*X!l4vs z6_%$s#duJJFmaFc-5#>v6Yea=I~)s_pXGS>Tkz?s+WS}>Qp<9MappMLXpkXpSM~SmH6u)`Z5>o02kJs;w@KhdiZ3}29y*xr|6tMo zBHzGic+b+dTd!xOJ;p{Rguh^corJ;K?R6daayQKm+0rf7|AXg0qs!R9eS7t4{G=fs z1$=?kK1Ih=gEkI>@jgXDWHZt*C7FUEWs|u^pE3Z``^K|1KEC^sbN*4nQUfRc_AyE0 zn)?RrGjgPkzfE~_s!rDB!fDsV+*|kEX4+DyS#8%!cshn;s8svwBXSsDGX2ZRa0={* z=`p1F{zD17*Rk>Uk_cw3t5j=9-d6$}MoM~z{v{t^M!g75-+o8_XkP@CZWUQ2z!^26 zCNOu~hgrrK)y>bgqb{`Q_1^zrG4;cGarP!nb4E~(ZKWc`LVeEq;IewVneLp^ZU2+% z95PgN*M5v7Q;ZlGvM#`&u2NdHm%&gZ{bZM5wBCp&?HeZhwU87wyT_z!n4z+1?=RvXZ^72d*%+R1s1$KbAFtR|= zw;MEq=O7pMIKpFwKH6$OOszJAf<_Z<1)36cB>D>|Z6$gJL~jH`n3MMou$#Si%rDAu z4pSkJspG|^CJ86vg6kkfXsA_`8@8iOryOe!Qhn8SV6}mPlof3=WJRVqAr_b;e->`Z zMR(p|K|$L0^6;u~USxg#B6-ZNc%E1dv*^P=|2k*^NOBni#G%9Y?##{=)8KZwh85OL zSBG9|gb|hdmY^gn(ziY&O5#@I?W)W;361Yb^VQNpz0A7&^(7HRAsUvw#)fvhocvja zLxV65J0_$>&cVRctJFsn^qLos^tG`+B0_gQ{NeOwKt-!C^gGFufdtPT*Vi>l#X1|V z2XxsAcixN)Ekq=a##_^=k_^BFH5_zpvPDRP>u6+3$}i&b zy0@FdzAHw?i9OqnlTts_w5D@Nd#eM)KKEuN#m{|AJyscxa}(eA?z4&4yvXo{OBS65 z-?gW;<+;+ntM}U_yTmHm6*2zj0Imj<&ZgE9Wj|gfsXhrVH-c0p$7HXnR8bxDYOi z=_r3FA~u`L&2;Vir8}P3)k|@c?sK1U@&iWo{HEXcoy>6wQSuJ+b4l%aTBuigs&k@Y<2c=S3Ef?p zH>ki4yDuXdo_eu>X1{E$g(Q-u#zVXN^&%70guoizo7x(kQ0OZ}H$O9UB}(FaX8Ct1 zFpx~}EbHf2r6V;x=@8GH$C2|6*?K~?LrtMYd^bw*WYXhA z_))@RMH;nZedW3+qfWbv<|_#BYOxX^rhbN+!za)|!|8K*LRs(R$O*2SDM{g9k7e{u zN4VIdi}e#0&h?sBxu$>Yy%)j(k1V2fuhp8r!}gfF@b;F?U`6}YnnMh1&sSU&lR^?# zu!61+lGsuFEfDraX3+$QZibCbKzc{75G^T7@WZSQ)j5898G1AOXB*H*TSd`f<`IK# zm1%&t?i|2Z-a&r!pJehzg@!awNp)R)aa?q_SqGrxE5u+T#f?K2;GAHV?O&>!W@Q*k)7=g2vDW+7K zbyY9i{|nOF*SbMYoRQSAbSH2y$bE5(@d6xKxcF#@TE~X#3o=;`0sc!RupdRmQsML? z&>SCwS{FOpSr+@6Uuz3m`hj}(^g`Jz|6?({!%WVJn$H|ugxW+x-GEA?J&U^ugj3Nb z;65~)W<}iH2PJ@st8LtLfSOLXYgj=9<;?ih7rq$bXW9J#!B8!Wu6#U`A$wlcoC*&` z_9Js~7%m79#+edeT&P`@_Ng@e&5J+pqpx%31tAF71)pcz~-yJ>P5yX(nuM4;bUHDa8E(~~l{j~JeCGkX>nHJDpgSf&bTHEf)qw8{Q~CBPEVen|MW2P3vmf`8X9-g|>>ddp zcgfjbl~(?3Wa*NzQH>4nsM$3}Ul>pX1xC0oF3TZXe7=V!9!n?WgvH|R zpbruczmB%z=zkZ>=1R|gXwGThLELqD5KCUhtiRGT*JwKIvzbzV%ZU!e!VcNHSSX3> zObH|oohc8nvQZ2}q??C}@>!fe3gH+HF@4(qWqi>;ag~md#D;cl8&gQb^?2a@5cikT z=7r78@&5gV3Ggc9f=<<8v~yz`NcEGvbX1V_`IL(&+Z>LB zM~$ok2qXzod@1$TEl*U~H$V5g$er{Uj^($sWb7Nr{gsIbE(`$LRGECTOraXiU%=uq z0zvpi1S%)RxTjzoVcR4#10)fs()4Mtsa@e?9j)Bk!LsYyXIZga2q7d%`vQE!V@<1Y zmkpH3LeXJNO9f7l>F84g;huc=4nk(UnU}RLZmYk2TtB#lv34K(?8~gyx-mN%g=U44 zOPdr_!j-;IEbe|l9-buuKEy^Q9MLjSKG$S6dz)!U_32{1)N}L)3+COmlg=nY1@od$ zJ<0z-B%sisAR1yh>z-RfQQb6M4i-d#vxvb~f69M{JLPZv1JSCh1$gQ*LxOF-tH9!k zbQ0ZW)S7)qCSF|=2`q_A3}OHBNBueZwTTz^ar~gz#2KA74&&D)KHt~m4F_nK<^*7_ z!!pN@xiGkq%>1N(rNxw$zu-=1t*IpAy$ z4~dD0w%9;E?(greVWZ3(o9ux`elM>Rek#0 zO=#-(4p5B+wFzlEU7^k{3EdL6sIp|K*>xrriI`}E8ze|z-$YpN`^_teL_7P`%e>IN z7tNiH619P+0Q1hBR|W#POOta)1|LkIRtgz zMJ9VOxXN#o)mlXS=u%`Q>~PBuKEmOWsIuQRp{y%!ty{fEyL0gV)$LQeL#pqX3L@SR zJ2Gb^E9+KVd?;joVOXlGie3?z6>(>u(i!(qGz(W( ze~^xj&IRF<98ypEis{Y_FoHn%C0bW(XeF#Lj=2WUEBqKNPPFppEH?_a3}-h906X}C zSYKcZFU`Om5YlWhh@ogzCn3NvuM~F9jOX|xe-X*!YL+#ceh_tJoHXz`aTnvSrOAZ| zOtdGz?QdT!oAJr3(XL2G(p%2X4{xEohU&vd_zQ(U%ihHOlKPWnb$&YYhx48?|R++>`5?sxvM?!;ru|9 zZ#nwuTK^S%ce<+ggdJBE&fRrXN7O!{nu`%q`M{2Ef_+IRad2cf01P9pST9AOK>y75c!9}~)Et^6$`&Nm{wzWcm4c0j9DF!xJTpGrMp3esI4D_iiDe`sswXSu{dQZE_`^A11 z?Z@Hw=65mVu^%X`>;$mciK}XiZ{xw7I_!t)S00^JuxdCXhIRO~S*lPS(S^je`DH4E zxbKNs8RL`N?gCQ@YSOU=>0FE#Ku#DRO7JA&fu-X8b;3!^#{=7`WsDXUxfUsE(FKSQ z&=N`A7IwLq%+vt(F;z+T=uZNl=@K4|E%p{p^o5(BGjsE|WOR`%8+XgGW8xJTFJc4L zVY#L`OdnSM{HyS$fX1)3_JuNNH1aDsDqi>CzCT5=kY5zV<~29bX)c^I8R5n&ymHkx zj(QC4t#mDK;2xi8O%V;C{HqDQeM64=b4@sa*N_K0a&ro4+8LY6cFHz< ze|!g}zF|tDrP=`+U7KwKl20gdW1%!iN>1=uxA|NZJ2peruBOj?RBPb~8G;s6xIi6- z?_odhafsxoxiBf zwZZ)c*)FLc0#wE~bXw0TPBYl+h9hs|DYr_B4LR_YL@S1hQs=p zNEh%_fUvWZCbJtaF#kP5=(O#{8|g&Kmz1&8{@Lufw^DhtvKx955~aqxi2C=)Z-!Kd z+m-u+#^U4(HYn6a1w652kO0bYBt&goyx(n?MR^kI+{Q?0Y{G~W2) z0dS3fuJ?SU(6ZDp=kUley%PK}K_;YQyK|U|?7t9SHiyIfpT4a_kUVIhH4PSaj@3mo z`z}|mHhx1Pq?@(3vTBb5HTXuFAzFZEt0D-fw_kd=XvwIUh3VXTm{wbDA~cESd5cI1 zd>6=&AvG3yu+)`9oxmfrDQ(1fzv(_0l?bp{a364dXLRRBI8kBv!KsL;brY)#E3`o{ z3TlWUsS0{Voci?6MejccG9x_KiqN>So*1{25r6BSl9jUyR}1TgXBLL7Pr6Wv~Nu47;fbiU7TbL}>qmtl36YSZ() zVf@nqW(As~#`@bIC+AxSw!O5Pocf&rYaCFm?Jd?XR)p#@{!|5^Ws@wd855)mI^8y{ zws+VvGXW6%xoj@JkGb=~%oJ~7m6+uhOv?bH+jJJ~eFgp+}~*^C+3>R-MY!IZQoabCh( zN(T+z@Oyc^C)WqQESmh{d!!T8zS(!wX=R#hEKxMXy(eg zZ+Cwm1a%?;RH$h2_ws|nRjn8ZY!>3gn+6Ep4xT|AeFox7!rac2Lw?jsz}JqPE?5JG zok0}q1P;cuzs%Yrze|&d$oTr<`Lx{fbq2OV=!3v-ODq(n?|WxuhtmwJBIoW^^FB+D z-?Ok9HBKc5@)L(W&vmI{prL?4^OE9TR)bELS=<>*w%&aKjzi*@;5#P3moG@dm{Eke zhE#Is;&=o|{2GWai}7LYEI+gmc^Kj4K7w7n)+9godg?yB2?xs}pF1<*!Sv?D~Uvbkgs9xx9s#6zBv9l@ox>d#H6eqw^KZO;Vg}h!q zI33^$4}yF*q+q{DsJsa(SsV!YQ#zi^IF9MQV6i{SiN4dWWCi%YQ+hNc1r!^+<(YnB zG62-D`M3w3Q2;@X{S`n`{QO>migDpz0FK`->sYDOESs6u>-~<}_XN_6><2g7U#XC{ z$#Ig;n{_yEMnlvx-lP*;ts#DHV0r8j518>~33?Ak#jocW>uk>6V||p7{4rov#RS9c zdPD6r`qF1om9r!zS4Jk1>7fn#GCnmD=JIt1Na`X)=*LP7R!3XATgk`;&U*P<(0d z9p<0T&eYqQ9jot39FxpfuPSPYlfQ$s-*;+c1KL+cHIVcG5`H~^Ryu1Hk7%Nf$TCwR!SzG31@NHpm`mcp8v!wyWM49TjTxASJ-8JP*MTHLC}hF==PUOh8kaaXeGFGd<|e29vSDaS ztPeu&zv0^wN}Hahi`$pcDs~FVt2F;K!q}q*Y@{7i#stWfU`u2La4aerBKhV`^zG~j zJWvtZpcHIP7x*tfLSQcng6D(`HVp4=LWp_0Xt=2wEHjK)!DSz_Z?5J@>awRyk?azj zU-kdSs~cp))*pfJ_q7u`IsCq8F|OShB~D56S(Mwwlt?{yURE7#eI&WcpVq(@9Fd~g zeUiD!a4w51Nj(YzLnau+O3MDub|?loF0=<#jLztAM>PruE7yNDD0L}y=Ayuc?^?Ni zf~%GK=iEhn2}xKp7GonJx!JpDmDsco$|$XtRdUDwbM9$9s7x9-of2nKNj~?b@UOKz z9{`=Irz^ba-c&1vSQxSh;I2`cKc8-4)aCy%#bam;3_8vSJ-jw`_}lyukEC~z00EbC zI*dU3F21A)dSZr{qA5QF+{a%D`h#?8o%M?)*hWxuqnQD(TpcmfNq&UN$BmB)0!r8) zxno@Q?$_D&*4(rW6b+?-Y^5|*P`DHmJ%pI<6*yP)o}2^?>d7P#bd2j=vvx2mfLW@R zQLD`%buR*}nzNYNf%68w-D$7%v|=bXg1mYrdZy~}(@RRZ-U+Gx=nmCjVxr5Ag# zLw3R29-MHJl|`mRxj#sv@EfyR#-q>BE-XFEENbV$#dWM?!VjU8~kKZsd@G=HPrI{HiqN&j<92*-3$^M*;n@rG*i! zvi#?j;lc5w>@+r!6*CVUrN9as=S3?(ZBT979$5R#ZpPm?2VjIyQcEFp9orGR>f;G? zK<~FiYY6ow-&}|v7k?+03TC++so$)2~rN``u z>N%j$AbNQLX_!evzG8abf=15260vIXdz7K^a$YS)iw{@x5<|Rr#ii|ov=LJ{eu>dZYe_ip$ZuzvRu1dpjQK1BvP zH~m#t=2_wy>9+YkdNF-z` zQ*#7=^r%R*pIi2AI`>n9>(QJVE1k8?Ilav<)NUjW^O$}^yZZ{_Uwn!4Fq1`aslX;Y zj`XDIm`E1sz|wShA=?a@ZGKDSMU#Z3$E!1nZ)g^Eg3ZDoSN6@RXrGVCHvMIauS7d> zuJltXf9)LdTWdF!n%-iA9b#2$W#i??K)zYho^((ZqluvhAr@{H{diy0%@-~VW zKYC|2Ma)2^=skdLT@ZVqJfiCDqS@~qIGexL(BKy6Aw9ch0hoHN&E+m3*uka9+AIh3gTWdSe~W({-&^oFw`!j7$DcsF$7`pO?kRMK<9h=SV?cmyJIe`$4|zoI(6u9#qY9zM?#zNe^!Dl2>Z^dH`>`wSY# ztU;V*+g0R0DH6EnJA$U{QL&T~&s{`smeC2I-5mzv=v$l@iF;yN0hMibU=CG^e>J;+9k`Si9PzLaj$>}QKI6lWmO_o+_( zmhxA*0|-Na`+*J1qEMIXZf9rb#;pcOw>EDeDjb!|GumQ2!1ac;YqU|X;F@l1_lemzTN0J|U zFJF(kO21aHg)*KfuKT=BA{VDkOvlx(b{f|A9D69_BHUm#S$F>~`Mt@GesjLp3;reY zP~q>6Tt;`XkjqV?i7lqPbWGh`y<7dq<}pDHl-dDA4QG6`QDq)+vq_&HfW!}P6Cp4d zt>Qnli5ri*I1ILEOGD~3Y!@2^Jmcy1xDXmKolC?at}_6;neEfca0rLHT}NLpoUYh` zDbCtfZnYN&>}m-(F{5d1=)bBuZ?OcP`GmsQV@kn%JMJUIep`Avon#8=ATpEo-@hg& z12f-)R=HCD%pUjvbWa|P!}u)=wInpZG*LHKrZDMeC>Qils^IyY)x;kDRs4c3!DDOG zAptSsf#1X>kSli|Qka@S)6O4un-2aKL?bcV;$*>KSxHovjrfZ^-+c#>;(42yj71K| zzRyFiLrwv$rPcNA{mtv=o(*JDA0kS93>OE0D{KMJzLk$cc_5dCLWnJcFJd6_>BpE< z?aW9;^!;arQcIjloW&YL+~MkNO&a>N=pmhg>{SM<@`a&VeUA`ay*P@R$_+WS2%r?_ zs&Z%c`>ie+%!I=Lz>$9$7a`-`hoc&*dl60^whsaQ;~9~@JYn1Oc_bmgVVyAzUOYgZ z#j{`#D_YZ)(wa5;qzR#zo4a|-ANJjBB90r4Iun3*BkMxw_Ti>SjhktsmR|BPCLt>9 zZ_3eQjweI*-8+HNt)$9^s|+10w@sU!PY{`#BnF!ULS=#{k0Zr5`yOS?p8PfWbKT`6 z@T+PeRJ4`fj5t8bMs)0>o9|C>mBTlfQ*nFG#Rri-Q7}E}+eaz`LmO!`Y_pHkoAruu z`&!5VNnA3IG$}Pz)V&pt&AF!$E{J-;or3vWv3&Sl&9KzG+ae73Zf}=aP*SCI1{?0T z9SAC)W(?DSKOkcmW$(K5Bl?c@(5#>J#j@eq#ctX~$TIjkl>Wrfv%Ey+bl1Z-v?NxJ zwZ9!ae-MsHPUx&_W22?9$mCE%&~lzVG?hDXM%~gXGk+Q!Jf0BspkMWxy;^!n<6JIrSYjv z6F%~$8)0^qbUho9Sdf97b_n({$;|XH9-RHrohHuPcro@03KEPFejN&q?&nJFoIQY; zSI#uL6>2^^yOR!51OLO65xGas55dPG;3=uQ35ZYW04#+~byXQf^7Vq`G z zKpxF`G*X(YOz2^@7i#D+s-~A1E;3&x%%qL5hkiy^JhYjJ74{hvVmAx*6BH`M`!qGC zO9pjEsR)A-n1`6KLACSL%FS_Kcm+?4*z-V?WAZPs?RkzoijIr~I+oh1^~T`q^dCFvG$Gbd8AnTYBjLKYUmayaQz#S1le7Q^Hyr#;X&h*1wDpm+gZC!rSKom zq|+o&UGpeXtlQ1;?@JukKG!8PGS1Io0z6O}ZeL&DsON^I0K+>Mxv#ohK+;ByAZ`Eb z2orY{j0Pa3edA(#-pJA0AaJ6h& z81Gl(pd#j~mrizktoid14K5ig7u8FvZmLLP%l@dl05IprCyqDB?mA2fc*6UB+49lb zZ8`V9epdo=OeZoiY%zw-w`8DNwTORV_>>3T{r)1-YsGSo0E2s>tix9OBqKFBjg#}G z`pgkCblKMYs!Z)r^(qT_c+}gLhR|gnq!1~Qr|~kt&2@_yswx{i$KEn`8J1W8BGljl zr@GEG#W(s#AKKyuqLp+cl1C}7%`m#-!$15XF{M(M*-fD%+i#mFbP35jlgN3{8#A-dmj&OQtG)!031jTwGMal=&YtPfq2AUWekP9J-JT(p099!L`+yen$ zVH1?kRrhV7(mGKkm_jPP_U@Xd;x=ppk}4WY0Rbr> z0MJM_;$GGxL*P68y%KBqHntF{>X&<{aeI4m6+{TQ%~Zp}v%Pujr)zg5mV;cFKqeA- zQm5`#Sd{B6Rc*4PS-rO(vf>YEdXmOK?>K@`L5}|9q}#t_IE%g+U<-1qw3mr5&v;2A zCQ}BEn9_u;;>n5N#dP0RhCF-_UplC+U(i~Zjh>U5+b8%@p3HK(R*IMQwE!uritb}< zF)AK2?+0@-aE3LYkg`B*&N&m~JWB9>(Z>`aqRwgioU)0w{U1K4?>-#i|ZfhNa9hV)2)(%ch zJMH1twoeZWwkE@I!dz$ma+;9GeACv>Ncupl@+gBSeU_uzfj!$+h&@EACkZG_vwLGA z(?^;rcJu1$5H~xI@6lHIYC-$+b&hF1p`AoAOKqw{t0Fu#X`OGt$)7Q!nmJ=&)xjq@ zHoxT4pcYKSPT5(4yzIuQ^S*N2NJpR4v0?rB-^JuaXNLis?E(l>Jo8mUw(gsFLLOy? zEszHWGaCn|lw$LSwoj{G7Uq(zK0W^VVWu#ms8BMRlF2z%-g`fOXmndgC(na8fc)s` zz$GAoxP+l|+T_S4$r1sLwkV77ew1Gug*`|HiE*?FGLm1q; z^p0A0eqqbmk3?|!CB9DBN1Zof6d7+ zJSn!`VD~tVaqy<*Mw^8dM5v3Bvj2VdVFb=)U3L2eDM3@>n(P z?Rr_=I17+r4fE{>1LBQG0&o97nef67n-aNnVP<{dd6*B!Q344 zZbsAof&jw+;CLeK2d87t9s~YZ5?6Qwf&{NPEBN+)LbjOcZRXNcR&h)x`TtdpI+b!>$E~h0o1L*2OddpR9!Gw~-E^Cj(7i69S<66ak$)AYMv|xG+;uR(`;h zGIV3}?+Qxdjz)s;s}jHY{JPmeo@-tN$H@hxaV@)}K?y~ts~E6H(F|SlsN5oH8g7*h zGiC!8c1doE3U|D}Vul1yPmXuCk*hmyU4MG2ml#V0+(G5I+`L_=3cD$%$I=@*8m-LU-!fn&-sZO1%ls63+w}AiAK`Jv z>`q~ztr&&(gCkFpci+*1Ekdv*MhBCzGfPBj9dM|YEjZk(tWBuz4?MGeq+*)t>Q=z6UXF_w z{QDUT4^JQ8J%hW;d2xGB>Fl4Y-bRT!ttP2GE5jYoI1e(eVK0&V5W+>zludt=nf|UN zi1IV;MK$Fy%$yw<oGeW?JIGjmfGLH$Y;l|T0p1V!N*Jvu zHSAG0WpwPip0vm7%VRq8$2O2>P5b!WBfTz*6dZ4Wd6O9Y(8A;nOuG((y?F`ac_u2( z#~17CoTK)1G<~~Z4jXlout{e&nZbDHyHf(=a?OtaJ(2Q(!g#)Ugw-QQ?A?mN#yN%T zBtJ`sA6Lpg`k>Pi8a7GssiY$eG0Be8LCoQL{GDqi-;j0pLmT!Z)szldvbN7GVcu*S zzb1rEq|M)1qa7rM*I8!<#w7FnQ?{v^? z0`MlS3+`#ZB5$DT4+`7e-Hlp_2G0`*F@STbRJ|!tk3cC~1T%NR-p4s=sTT+RqsMjF zyrp-Jv?CD4Y3N&Zb1gr=%`MFR8;|r)uxQ6*X{OpEhQ~+tu}^n8Wijiy`pSMw0uKNi zSNX^Z1y;WirM0o_x%zft0U2GcLm_2BS`b{Z>g|9VOVr%QF*R?pTpiJsEbj4jLVAyd zTA;x15=f~b0^(e*Vo;Tn;WTJSxpI9LmL($Lxob<^S!k7mGhnnVNnAC*g!$ms0#Q|q zs=25I0<>fUw_&+KU`}5P9wlmjRWdMYh%Np6n?AAHQ;JzG?s(Z9UR`pNh79Nzk~DF+ zX~jy>>f-2bl?drlM8 z3NfIQnrT@pLmv+QA6efWPv!sqe;mh3_RcOj5>Ya;4hhN13dtx*_TJ-=kX_kZQDkPz zIw}#e_dK%au@1*L&iUP^cfH?zf1iK)tHv=t|>-9mMT!;;Vg|svSzWkN7q#t$c4N$Q;tl3EYwef_4q>GO<#I89VhY;`X*hz$n*GZ%f+;uViG z?uLlxD1OIeid}0r9%Ssoc7@vJjZIsZlU9zvYpjhYiOrzD5sq3OC zpf-X;Nb!DLpxqX^zDIK%=46-Z3%i-bac`RIBS5*wcw5Pu>G|kF>TQP$dGRYh#1hwD z{|cbbTOKL>Gb1-;X6?vWLC+KJ_^Ij?KzJ7eZ?^8XNgoYU9^z&>d zsIjX*uOK`#Wu!`>L@y!=XpQcW+mBaRjm|XrB@etLdr}Ob57e7EkE;7a*t7=M#XFL6 za;KHHk-rBNTjp-gS^;ehKNv>K>+_jPQ45J%4><1HyKJ?;T9#~k_23?xD}B&@Wp{%H z($hU+nWR?g!9dsJkgVz(J_Yrdns+m~9V_gQ7Sb`&F4wZZ!k}##j$>O{4{?avCbCZfyW zO$)m7LE=P?$CXHDU_RUD+sYwT;nKI7 zSs_XTv!BuxpJ!7(b~uYfsgzt~mj5(vf2r~`LHwpePs!o2A3zEr@#sxo8HEe8>V||d zBiz0@e&6}p*}!6jsm}I0bN9Mc2(c#jg@;Nu6!Kv&4&P8-UcQ-00WJIO%4OuUn;^jU z;I3r=T3KQtiMQ7&x32eVtB`mCe)9ws^7u%2P`B%Xc}=Qc&O^{FmS^{~Rho}^s`B+H z=1_T);9LRK?{$Vx22!5m)Er8aoPOA8&{7fyt`t@~Vw%gtx~+g3qs8LFR%(2Uny28A6dFYnNQgcUa>Sq=%alFh&8#@1o_qgwve* zVFimnUtL{4aHP6s?FB%bu2SP=e*VGqXC8iuZ-JOc{5%Lx0g|VvyWkdh&FD^Gkc!0N zhoolXvp6GC8wj?Y+V;r*EN+<1ac`-+!8Mqb@Nz)=OqV?4gxhR^t7*+^+AfxxVt(n{ z+fkk|-xSGqmkZa@Q%`;;r`-Z|? z0fR6b@l%pTwK*@xY+(MwBUwf^z+F*~piC64BWTrz}-HS1-XF-IA%?Zs_#F8 zcmUuEZ6Of>YIJOe$&{V;3vIBw7|jSGPeS6cvTMdj96Y~pI-z7InGW;(DhFqaiTTO9@KWvQi9__j0btLZ9 zAa~-Po%^sDFfme4@Yiq}r`BgnYK2eTwCjg9_zC4V{{&_GTm-!qHGVR6JXDjw;}GzF z6lXA{xo1+tQM{9vwb1&sRXPdGDHbEMbnwh}t+%tvcw5p4J4r#hEpDl=A{;Mjc%0)T zsG}v<$^HhdcE)5IJ^iBWK{7?Zn)vb%c!5eIj4 zbT}CGO*u)Od@^LuIC@_2{=AP2-O99NglFudj{!T}0e8wtTQcB@F9QW6$J!0Ye`T+U zXDx84b$!hD#4YzSyZLy~!IIZuFa3%eU zG4eg5?}sZ6Yj29P^-PcXG*8%VzLL$0!oL?c(!oQ+G!kORsa+lsf5YER>PX83R4LgF zgPNQJ#Bo#)MXU%J9k?RWD;c>|as5b5p>xAwau=X5XbERX`_ZHB8_XSNDe`s?n(e>) zGF$G%n6o+W{6A-@4hsIK0*J%jpB#Y*G^B48eQD(CDZR5oBl-P=)r7fH^PLf?!aK6V zwkIM35?l*I6p@;^H}JIDNs-fF*IFN?k?kj(M)QKM%%?dSkf1d$Nly2z(>)oq8z}0H zH?Qa{x&36#W@y04!9zx@x7un@ob$&)V8#f~0n1|jF0kFs4aZ{ND1~QjWHToIY5)LY zrgKDCj@dFCx&-w$QMi=CqD*=`$NqC~2k366pPXl#>Y7A=iQD}f`)+B-pS@LIW_M?9 zlBS_)(vGz!L$#P`?<3Hvonw@B1uJ244y)M?0)z0-hq++sJ0GZ+{oiiH;lFi&wy(C! z0Bv9z^M;`4@)USP)7dhg@K5K&U&|7&-@I0Sk>I+ZH75_xEn>qh9qmc%aA@NEKBsVBgUuK zC=b{w-0oU|)~tAVI zyJ3BAB}%rsjz7qZ?x_XCWe6!_u-{e_3u68Asso0IvwKdxq1lN#%4w>J zi>}P;$JZ>58(ZAjsmSJl6BWUTe`0eGEf3f_yS#H6vx;UJWO7CCK!{)4C}`C$j5gNj|k znb$4QRurEE3tPEe!JzG-a0DmvXePO zSD#Q-qOAjTMm|=aBSnvwHoEbgyVIz@J$hT*legak-hhb}e#%cm2$nR2 zV9A{kc)WT$np=5coPQIskbGMO@Fn2NxPv$@SJZdG6}jV;+%(cH+*RFQ(+DjsJlman zy`D(yN?8MCtjWD3w}Q|jQccb$}BDW%M$zZZnri2+5ls)@@(wQD`jt_GpTKL_^CO&SSCcHbfMX#JXYFI^*947 zPh&S-G=l*C@`E5CU1$m7ao(Q&oSmY7)ZZ#5_fEyYzLsFJwJ%GfErFeRN@7lUbUrL| z$6;gQSNsI91LJvT+$Zb0>g<4g8T{B!U05lfKmoSRH^pB^^8sJ3{8PzVq0NeypMF5k zU3qOqksdq{>AUjm3O~dZx^vS6C$ldgCWszl?xd8-sJ;-kPnISB*-f=L*8XggOx$?u zg%B-QovSjBbj}%sShZv~r?`*6PiiQW;nee<-=+y4}S#}q_BgXIJoSOf$YbE7vXt4;Np zrKzZf6Ny0aES8(-cqmnIGMg&ieYWryBZ0VTB=4<*@auP4NdIk&q(Mt(OLPm|Yl za!0OpC9sA#tk>OsaCSx0;!$5r6naw ztzLBo>#LKaxxsO=yWe%yGilL`A|6E#TK! z+1VRQlo*D?(k0-mlRM+`OMT8kVB*-%ZGv}Aj1u^j!wu*~>L<-T+u?6sX!3C}lQte- zk(6_=iwXsQ0JbRvJDwMnk!c99w~s~uD_4vMB=m~-ft-*|z~$*g4g;pgG~Ap1m@@Fx zWS)8IKSN6`^vVQ8hv^Oc+O(Rt7!U%wVsGP+Y6fyS%GG+v+dIdVfCXPzAV~~li+3m5 ztFQmbE)(#2#Oi@k$1#zUS6ijD_yYsa{+BHZAw+^zAEI3bc(h0qm?|pNf?oS}Km#OG zrOfCKn_-CVO;}DXu|5YE#d8I2o>}vUxYlv&>=+I28WY>a1;uI)HUM_IvpF;Ln4ROT zf!=1rpKihNFUo=R@sD-pT!EOm%%ncl43f;aem^;|A#s3`b6vjeAzO!M-gwc`-Kj~{ zBX)tq64*kJl#TrgW4o%hTY3x$P01nD6a6s2#MmwM$vyX5PU|YngU*wXGK*?f?#Eg$~^OWW3I@of-=XVuu-b%A1Z|nqY_2 z;~jD&=QnB#WGU>;RwFq(I< z34K1fCMwf9F}G%k(&?~2EY&)W*-_z0ReS$;7+I1)zz`)M zpAF{5ZHLPMJhYU z;GE*@hM1NM{G{L94dL$!Y-h6A9K9W=I6AYb`Y=v{(tpyLQz^^Aibea(q()R*TU|-m zozpyr!|-BZ_Dn+$*2|vq2Y@ghHo!-`WjVtU-bab(SJp2*2i-}$UP9^qnF_OIFS~-< zYj^VS!)Wu}vn6!LDIt!HJ1SU-@ce>z8f4cT4R9V@O^Xg9)4`VpjsXm*~@%l^Ux;Rf#Zck`BNXu0Y(!C zj%Z}UAmD00nsOS%Uull)dU(fZgJ$bo>3Oa`8h~Wt)EM?v(ndlTS1p0|E9Pg>=&>58 zghD~%R;YpqZAw;F;M(lx5b_wkVbnd+ER+6A-SYj^1XUgNGn0I~ES|f|5emjyPIW)S z0z8i6)BZt&h(qQxih4HbFYa6~jyeKbc_`QEdLD@9SBGButjw|b^l*oQjDk<7Nig08IK zb`ATVGzK%LP+>9aFM0hr8t+m`uNr?h&8o3Rp$T&ql||K}7GgobFhCViaDH~+F#yC- zt>7T3&_PZ*feTKTyd6vlF~JmEA1f+*>CCE4ex}5N^$4o)YuxX&3T$P0(IS!+kan^J z_p>v#1J8bWELml|S02YAQe-&yVew+kipZr~H-I@yc$=8#rZ-8L<_nDx&Qv3dJDwUX z!)@=h1`~R2M{$J8bM^1O&Gy2oxe1T;K?NA{iv_eYuhpLyc3%xu%z`dVc}Z}%cHGHQ<7P!Q|e?dwnSpL!AUf!B^!?#^Q#W!Ry+7ofwPZ1mZq z(Id0{htmX1W?2cAYWZo_lOtT#+Us-nlP$=CGK|Ri4x0Xh>(|iN9y1 z=9y26A4Y}ViRi9Fxzm{>J`YM>GX1D|$4BY9xJrY{oY2~Z&};B{Zq9Pp!pox`8e#0C z-h~@fohA74(#ws!{7kIe4v6XUX<)9bd)g66Bz%^Y4p0~OF+rY;l$v&7T<3~4y!bv> zR$r#LblZcVgy2lq!ff+>yuR4qCcljQa03x|dTcG7`CHcxh#POtGKt6ymNd_0qF7Wf zBj_KC8{jl!zZ>0neDp19n3sD?HC=|WM3!}cK4zCnu6Uoj*hbV1<#F2BD)@A~y%@VXx+u}Hcn=_s-({PxzmMZ^xJ1SV zoZMY*FarYvO_@z8Lr2ep)%HgIL7rhYa~#X&&V8oYSw zA4m{3{hw1Vb~~26K^xro&e7i9eg^SqK0i}kG3z(!_~E?sjJlSWIWXJqKiHAWTG*SpPcCMD`kEc1gx`R^YkYWz zEN4vEIkj@&e4tC!(_~x`-K$w6CU%X7U2Y z)Y}T5stEyoSsB{H{+xfST3tov~6@lO}2gx#N(rHXiOAHT!dp6FiV8V)B4{L_P_% zmX0rPa^-{1xG6|#uEGo+!v)QAOjRe|jg2ICcXU!|Cr+LMbLHlhJ)ErR*P9*z$NLlt zmYjAUbljq004ZyOco?HJovV7M*Wb2nF8vT2D;3kGi%F)6Kr#TVW>}zTHnUQxoGmD0CY9J`|d%8@}n;_co2q zWr98`R_c@PQbMi}x3bWo4XZj{it6qYj+o*XvNoS4>rF;7WNn;vA*|A!3H}Wh-uk@n z*hV0S+XnX;K;BOoz?&*9_{NnM25s4^^QUt|>R!()^Z6#G3OmL{CU^-IG_M7_a~B+& zCrV;ouC1ljbK(K=ygqAE_-}ewnH2&&t0enS7}I4i0wJgNvCf|P$`|DHku`K`HfDa2=n@DCg8MRi_)vpMR2Mxy4PE2Qe! zD||kNXy=0WeU(43v%md9Hg9Zu#CP%d%C67gk_#pfXs8lf>M=betm(}0fdDKq0{26# z_c?J!Cgo-~*=wswLXkR|W8d+rDdV00`22Ouv=_Hod9bmB!=D$I4r@7DZX7e+0tO!9 zR{0d}A6^K#yRx@ykotO4(WUJsmFvN)d-o-wZ(wcDSUS`8jO-JSAMa4y@MK4fDP`(P zzxQ2})ofiauWKj9{Rm$Yw^?g=?`oO(Vf|T^I+-A+o1#F`>tn59d=FtgVJAV=y;G&` z0GMvtEeil5;e$Ln8-41(UeMl2kYLk%vPl?0+Egg_;g)494o5FsvdeZKP;&&fjw7o{ z|B+e%Z|)8Ts?=>@p|hr!nYXgV=ZjI4Cp#$E>+g^6r7Nd3<>-t=G%B5IyZUI{e{49G zqnIXEB=M@5Ndf1J#l5YWcLG=A4ufF8S{z5Kz-uM?Ni{{%mr);=l0=473h#cIc{K3> zZ-VUw_Ng5^HgWQhs5tQU@qv-YBej9`R$a^|lknX<*+sSVXue8M0#EPBJ6_Liwl*8l z_zoD#!l%WIXJZ$jm?|zUu0LdeP&8IW*(|39&QzKGnem$6--u{ZGtHt#Hro*h)?lu zXGKo-4Hv1WP*VLj;uA6UwGSV*6ro%PRbwR{@tXoCOb=OFTB4ru-|Id!rP5Y6LF*-D zy|t0qDSVPo$ffyoj#CIZV?l3VsPRYye$F^xxv~Z78_fwlCWbwW!nYCR2nx0_+@tg3C_UDMVa2Br=X3hfP}^Cp4Yg=#OK}K zKYVY`V9jEKD!UrCbSX6Xym2T-cg}!n;?;o{mM|zWj0P@D|FO-rQ zKt#ApEh#AX%_f%9!G6`I*K=bSnMIhQ%W5&BOMntzVr*eS;WR;FgM)+k`#+Vze*z&V zkU^I-R|!Nwy<~>eeQ~hJqa2|DdpX15kD=6U73Du;T|VarycBP^n#IZeIJ&H3S9#@oec~poZELqX$DAc>XZyuIqd^GK0Jq~0kI=d zA7gMo8%zmkEdnqMh)tkp?V0I;Tm3`>aU3^~dXw zlhdd3=iygnUgYu#GRhxln}4D?Gokczq?T;RjCk0=fUHy18$lt!-q!%sNxee7No^+N$9d?Es*``)0UJ4SC&FNY0pf z_MlbGdUy$|F}YDvJ9GTCkZbsNKj3DL5;=BGBx8xI;n)=A0d0j6MP7Mi6MQdk@Tux2Qy`oI_&*%EQ0bE?|R>P$rDhcFa8O?JIK zPOpFDa?-L*+Q7RrCg#y5z$l0d>n@+OYo3g>-Z*x&`Jj5|=*UOYaJer6;FAbdtt0O? zrFGUE?!XeUG}G8wMgeTs%+r;3uUU;Nq5EuU{h-g&UOBKhdS`;J=m!~xn*ztv_p@dD zR)tR!P=~5kX)FRsx9)uyuu?0dh%Ht7`PTM@e#Cq!z2ts;O;L)tQ1ipDiWqbGz@o_p z^D=UKR#`S7HAt4vQtD(_SeWyj_av~#tJKlb9>-s5Ykuzx_E1ZNl4)~f=zG$*;-y=T z2ozmFva9az<{2&63fQ?(Q8{IPx@t1LuFcxP-LXVctWh3AwazVTt2)w^*Zn-#eB`bD zSHoAusjOBK5(>uQPGj=ijdOH3jqG?(<5#C{*JQ?Lt~@zow=Ii4Al$Vr!#+Cf-gx)A z`_h(>b@7?*6bYM8%628gGW^rwWoG$mK_eCk`}B&llStfwHf12*{5spmTeNH$4{gCY z@Yuwr*k@%m;T<60bw9z6^WpWi@Bu^qe-g;YAzI+VjgsuZaGA=^G*I{KLy@rIjSpWb zFQNsCp2T;S$VaJtZ<(waRu8y7^X;>YhsWp zM)mKgCeE@K;J4vQSV z&-(Gl5AJCp>K*2-`U|4i;u3p8xo6(isu-38>cY zml1Eo&FBBKJpour?}q&nggpFiGM%m+YX`ng8P+uRnJiMyWcv*_AZ8KAB$w;rfmN8C z<-2EB6TqZO>A~P{*<);wYqZgxQS8E*syOXvGkGxF@s(scud0uv?T)fQ z(DGrwM7lvpitUG~6!*}kZUpBn9PuP`5^nMK@($xI^0Q~axP5qU>L~uF{R_<9&m z({}$$WuD1y-QzMVb3jLPk`~bDJNkw(Dv-6cKUb4uzD= z-w?i0NZ2K}AbT}Zi^uOZ32xmSxJw+6(3j%a!~Tdy-@RxVx6YUw2|V6JX+mSJNclfl zF~SD#eo+lnB=ZpHLl{)E+`sI^-V1Vn!6#Ml_W4aH*Pe(++sNI`M=5L3?X1z0;CJeE zJiX5Mp6JH*=R9W0t(1@>>1y=lP^F=yJil6JxU~I}EpTsBx?rJ5LbCbQ zuLBmmX1MO&!E}khx=+#hCesIB53`IWwqyFtR{AUv7vJ{Q^dn1S0@*^UOmRwctFy&> zd={(J@avBzmu$MbyamRMt_$kfHY<*v)%%&nY4hUDH=$k)$8LHlUG0G3Kv#T~-vQjw z)hXbsNIg?~b-jRw)ir5Q(gfwM+Zk+0haf z+4ER%>T8RnKAoJ-(s&tu&-iZ@A?^J|d z6md=9C4am*v2r=aa&a?~37bc($n#wQ<8UGXL+!RtrRXGSj-2INJ#+3J=}e6nOC}G8 zN~lvCS@rxoq7w$CLg-wx!%V%ymw>~xhUw4cADX*$A}D~{21F$!Y61aHwpdL!QcrsN zl~$s5kk%7HWHkZ43%mOcwlk3RcbKGQ*}K(Fxput)rpE0zH0vY(EyY=blQZ`odG#hD z)~{&r6XkSE(^csqsaMm>2c%xsT2&g_Nab1bTY%fIoNHatDY@C@Ei~v@19|F?szU6SWRS)uDXqNY!48RlAb;S*ijqus; zp;bteR835>3BXML2CewOM<^q3M*ubU`}gnI-oS&(vf=GF|JJB-inGOH_dc1xb|iqR zWgrcNy?1*8)vAlAaiBE%K3Q>5Ygy-#Wf$>FqL|Kvgb&6H?iQC*Z|PN)xZJhH#d#=a z@s9O0oea6Lg}submzNZ{iZ*_okZ$6G*h5YO!dE=7c4=YA9g$y%1xjkVl#|1DShEjM zH3(sS?uRfB3mhW5Wrm} zrY>KpBxM&CC;s5Ie_{o}upN{vdb8x<_$5iiQN49`z`+Zz`&E`yLAim;X&}$HAfKmT zkO2Dgdno95mWMH~h2c4);H=MigT8hyzl|4g;dU7F;p^X>w!fa0zf{^rf?>~ z0w{=F_R}ru{g5i@&xwC%R-!-1x|(k6pSb5_)$f`zyErIvSCs{z`iVvU4x_znFKti!!av6BkRX_=+kEc;*`_rla zB`g4ruCJGT3XVTTrlh3Yj>1>PNIy?sV%Yo*=qaBIOY87_?P04yx6TV?_{~K? zOHEo3|2EA2JAMPYZM!H<{|!s-$r>l5{19icxV`Wf-{<0I>{v&H4FZaCy$B6Ludz{v zRH!!HV#JGP?5(L!Zp#}NlOODgWqjO+yo~+LasPYxH+ht2KjdfCFQr(oovP3?vkFK^5FvPJ4^LD=DpYQi4tUXuY1;erJaBQ79 zHcp(>mKvoD+)bq5SX9siR>(%CL??*D>Snn%p}NfGO4(RY^puLI+j$Pw)NZLb5bKo{s|0L~ z-A3R~;QHMg0bHSgESOM&N&@oF4|8gkPF-nVM=sQ;d}wcS{{!iW-)yQ``D6t#xlh(O zRF0Z@O>0uMz9g)u{P))ptV5lH2(gC8I5i(FDRG5Gp1bgBydKgxJy5gBfK(#D7NzZU zatG}S^z#KL*Do5=K*F7hk(`mbdgI1XoM!8*-};#UzNtEG@Nki#`7)GfV;VlfW^)=` zBaAjK5>gx@wf_D!B!2C6xBK^K4%x|+#?P@5N7tlfWo6xWJD~Wz^cnPfFF($Ixt4!j z9%x^1$on56XZB0Irm^kw-*rd1YVO;(*LbB21@7OPJspo%WO676#~oUMws(zP#+shG+$ns0IC3W z_{kYU>N5<_6=j>*0d}r-?8U+--eXfy2M+opoYL|=I932TMp=&k#tzJ^72OtRJ8BVOvTYPh;@EE=LJLeOk`y?d|Dd9%fWlhON^LnB^6x0LyZqz@imyogJ`$C@Lr9Z4o)ZQz>NCavG$$@e2#r3 z4I=}I5KgV>wl)~_Ja7gLQGju0c1{h%cV&6c`doWWv$>q*=ZLc8J{hBiKXNK?zx2Nr zz!pph;BLU2OaZTv>Pzj(VpSp2&OWNCF<~>NgL!nezhxEgj;&2 zl>z@V#>sykFCnFL?|(j)J3SFr|FFa`n@KbhC2pZB7 z#3>qIn&~mG_Vki=p8_x&CFeD4V7MvgJlk^G7H;(apFxr+7Gc0+1KfI6$@aeF+d7DJ~_-A|H=0?Da#&^Cqb=!=fVz>giW5nw=jWQBS%L^t1EZ@ zCm9;qlG{($@0W3T&l17ownc5pWhfM8Mwn-fLtb7H|IYl)8@QikEc_Le+s60x?&B*m z5kObB5{BD}gGr7l84~vP{N)C~3V;xhBWd%=^j0&KBw3T3-HU`;hqWA3OWW~<8nl-M zfYn-BI0_?g`3$_;&Exw<(G{QM|8)Kq28x9NF-F$>r@_BO)t^T*i-U1bX01<)zC_uE zR@8qEQQ#cm$YbXIUPVO?z7KI$pw@r=-V{V@>dC9Hn==1QBVy_b;#*jR+&f*$AwCl?o&G?2Uk4=*Ej zFK^Yvw*HTO9n!XRBWe++o3)4O!OC9PC=_l_<$M(W8(Akk`zv5?nJifb^rH3N?Hhio zo$=nNmSEz_QFHj|XF!vQEcdqPyZz_4|M_GBH)k)KA9XGRlTJD;3*y1c#?ZWkeaQM* z^`Bf04#Z)ARgrE4rMmlk8E5F=NpaW8xKNd3)-orW$m+kh(W12jQbQ7oi z)=#qbmhkplt}u`FC0sV9sdnb5$E!zX_xlA{4wW&j0*DCm`=1;Sh_sB1xiH@C89Z93;8d)EUk=lPNIZ`o3H`Vd+Ig`=CV}#?PAXvzWk{x96fn z0(rYh<>?PJ>Hd8v@c8=*vm+)>P1k@i2>yMaKw2nihLV6Z;wcdc*E2{8=xNh(FkEe3 zq_pc;ISw&}`?lqKx<4vIa67!xu|P}G$c3MDyg?u^InS?uM6Zzys0QM9ChW>g-ypzA zkOUSfvhTTWq{_>TJ{+kpgwX{@>P5ptiJ1NTO5)8 z8BiLUY_!*AJ$V386^TicK@z0qOPWP#Ea5?}!$_&fQ zOcRKuR^tLX*&CM(ahYftiNg!a=uU|He)2nU2(~iX@Yo|foZp906;o=d%aK09YEW7_ z-yX*;XE#z@?zZ&fQ?2fYX!T8@-$(K5Jo+AkyOM+(944x4B%2NR&avFFJY^9_br5UtzSX5@gmYYm@ z@S$jtqFn18bXQr0IYhQ=+2~ZDB_DRW3d=*B+3q`-*1P$i!GVIG(AMp=vBQ#^_mNxp z(;4Iz#_~&9jZ}}7oW?R;_x8&h?b0N326NJq4~>W^TeI^!o4=G5G{|9ff|`NN5+?ns zL@IWva(*@PXPmVGQ#rgIOY*nnoqNDDy$hd2uMT>wBgzg>YT&BV2U{k1ah1(1j_v0` z@o;6~SUGW=!+j!oa9ko_2^G75?VolPmWk=Pb-h{k=phZga( z88Rp7QzbHkpYG!aug9e^DF63Bi|1#CeAW^CpakO9DTT!p$yhuT8Aq10^cl2O@Zl-2RXr`+zCPj#_FqXs}W2{Qvn2Y{BmNsG45? zB{BF_rVgT$u0 zE8o6|@C>uOK1Ba}!V zx!M$9J1B7#_JSs90cKlucib?T&HqQpLE9YV1?v{gh2NWKEt9FX8;3DePnCL5Z=k)Flp=?-i$<5H4zc z`?2ZZ+p~Y8FYr;m3Vn2(u5Z`Av6#S}zkpQpZ|vNP0DY^I-oa$HXzg+ajQC7%wldRN zfOAL!UwFtuphqqR41v|3He4cQF5;UU9M~lti-k<HSTs^#>-Tf|C2&~#m%6WZAy1jz!Q_-IbpZP z8ht8}UG13lz+N-7+01+RlE)6OT^3px7fn@1|_b7^{bhPet}< z_)77(<^>8-qQ2X(n4faVhm@T0@Z{5HFSWs~EDXtV@7IAMbVUP6;v8^%l3PZ#wOZ-* z*Vk4lRj6OYpAZ_$*`t|tYKmLar&&{5{d+5cst)rQTn`n8>Xi+0zXc6YbTPMgzewFg z23F=+`8=FXXF6b*CDVN$v3|6iy;TSFSYh$qrbhKDcT^U9l zj}3g#zty{k*>s8S+>t|cng#3@Rz`z}njy{*?90mV6_Mkvv=iL9pb0ttHf$7;TxkX1 z-klTGb`2~-Mxx6~+{b-KiFd3XG`p?+6-0PMorB#Q@TY_CH5)En#5WrmHqj;@Fvi1A zeGpO@wuYIPOgRY&02e-U+j7!$LZ#5mS72R3MJS^gfheL5`kQV_n{8}KXaj)V%4b~As zFrQ7yZal}~{ELX@8c#V?2LlM@)g(|;VvcBjEuTJ=`WkOem{DL!+7Lr!U;F!mGm_^~ z+V^T?%bz+8noq9{ybcq16Gzd^fS2`skac)@6|;8X8l6Q19epZ@l^3@1ES!x2XLNA4 z_FI8#x5sq7hXVr83D;_5$sU!*Ye}zyx1wMC?Q{DSgrUx#fM?_Fj@{syA2x2yL^J{S zPPLkQ#O+9E9a^H*USdriL6rGHDt$B!vu~t7^)@_e=(<|SVd!MenX48AP(Z$4WoC9_ zeN;I;hEAr{ZvB^gK*1AWfI~5H0a{Y#2UBjn9`7;3JDrI5leeufemoZol*pDlVTSHP z3#8@6kxsJwUFg9(;)>Xm!{nsFC<7}Xwv_?o=eP)$>vvvj>yw z=YS7{pIOg(u@mJ%G0G^TM@L6>l)?_{_e`(yLxmX%h*D zMJS13@e!}HFR{?GNtq;%=4#zUgfFP^$g|Ax1<`vC&qIPbwGNo}3>ZM?=Evk6r|J&S zi$UD-za)A$kcqu)8)1mG z{FI*zS4{wM6S3;RP-!$0&8!6*;>|%T%HJxZt}cmap#~4vD0Pkx22gBbPo~=2iEMFa zSN<~qRz>jf54?e)>3%j;Gc6C1_YO0C|CDQDt7+bE({$0($tizZ)xn2L?@6_ zR3$`yiwH?E%X*^k*^oQ=z!1GA|E&fXHPR=rIEGq4%0=SGvror2Y%k#d`aPmx5@~7a zdkmPa1d-<`6M%& zp9rn|?C(5SRowEcasXoE$)s`=GvJk9wPt|2VX31T2F}6x3#(&IMqZND*a1muBh9?X zX_HSLo?$y$a;qFx^U1W|YAd%)Gaf|AEHqZ*{PW96FF*&nO-@c?c6t5=K_z@2f$8<^ zY}d|9NRviy7sF$61>@bV$B3*VeDg4DX3qScxVTL~5Go^T?}aG+th- z2`EduJx~ZcSssR;yX%oW&ze|$TF?;>HGHp~Eq?$w&SAD?d#s$$|4F@l*T7}X$7>}7 zRvPwxrPaLO5X-qYiQ7{P^4Ui2GDbq&DJ3Yu`)8zfMi1{>HEq`+uR1bJ4x!#n0D6_M8Zs_# z3mc%u30aK|avL-!XI&?{^%v4OXUr4OzaL*|-HV&M5GPx)SUqYMWw@Ex;%DHx^&FOD zncjYHD@AiYbGx1O(rsKW>Eg}cid)6bqA}!r!G{?x#)c?^k+q_uv%Xh3ha^A^{%wnpRPY({1LqK{NQy>!UjUc8f7x2` zgyLiGpsKlFO75ee2#drn3Glyna)PvUP}e(t6P z(8^W6g23+fzT5gZQQ^L-Yg#^P;QK8FTZAe)*|CKS6(I>8a2aoN+XEkYf2jAF!Zi3! zjS($tF@bu(ypeC>`IZtF;jz`F6A-Y7ZUQBuZxp&q4zHb9cc*!1`T3p9xL9`nWhNVr z!2lf=fCA>;1E&E|yfmrHqB#XnUCu28b*4#eZ{lLL(42#`ui?BO&uZj|d_Fh!Bw8g$ zn@2uezsJz@^XM(T{!CEw+EyG*eaF`FuTN%C zOZg)khBpDobCl(3ud$bhr>EdmuQ^l^Cic|y2m>LM+gsZGYKUAeJE5YUX9}j^JDoojv<}Cm&t+agmp?JE0%d#fo}m_cYogpjn5&egilTvDFz-Df}1i zB4)bXfn$dqb!cCa13DdCgMNehaa&${n5Mw&bxeKfNmHq%e{T_H@WB!H3QgFK2gNpB zP<;xkez-y-Lr(0^P^G!YH~WLut`0=mPXbVN64iv6Nd`s=eUQ;?V((+QU0&B4SF3*{Pm$AVrq;v&)c>VLy_UCe45VEsI@ZWM2TaB# zRU6XaLx0^H=0)Z!$rIu`3*s{Z!W7pU@6aHvX*vUuzME+!B5H}k_gFD)3=f;nI zi1|B!@iO%p;L{!JSEI~vyUByf_{HY=;RuAK##-h!06XFwxYi?xl}oWStJ*P{OcVe~ z_v(y8!+BaLQB`(D(XrL0ReKMn$R)8mU2@$q$Pq; zbZq-$IkP4V(`m}e<)cwnZLrjiA-X0@VY~Gi5-PKX20#Eag!JOw1br%7Rr}`(v@d!u zCo@&wE1SwM=zt~$K!eJ**9GAv!}Cogn9(d0X~BwPkU4gaWh?WVRcE3N?C%_R_D)Vw z(YmJTJ_0~fhItqHPqoIFGQYE2!~?aSRa{vjcDWhy5>oT zGOMFTWfL`aLx-!QL(9r?~D6y9Uhq=af8z!rqg#p zXk%gE-;=@G>MUv7p@P#ni@zP*$YQwA0Dlc21`%pV;p!_F@xI(^eA5&SZ{rU?^Wj}! z6Y%C^eMYilc_~MAwqV`h=I0;WA)MqJ^$IvyJ-O0)*RuLYjTL1TWd|(NbhIZ;nOop( z`4bc=fsxaeI@zc!vvYFFetFRKSMjef2_#oIzzPIxZ4oB0sxKOzX4Wltz#G@LD2Qr5 zm9o~xF;EU*_!O`}IigC{sU%1^$$B@>Fa_H0*>*1Amc^7tnKxcPpr8zZTme`6(0@J| zXfBE;0)lcuv%tqq05V8P2B^)Nhq~qdR|1KCfe>(GeuFaNc)T~zvma>o)FZv;sVD@D zynx%jpd8m<{zI zz44BQcmN85TNhy2plu`Nt$b;sKELSBpW)my@*ZnL{lFaD|7-8c-;zw*wh@(1yH+~o zQd6mwOU~P(B4CS|mX=v+F44&NRvMbQpcpDmU!|BhndzGgrsa}~;RGs*v>~aLX|A9$ zxrCyC3y6ZiciVh3@BH@t1LJY%FM8{e94DY4JQ} zYS0fcOC|N!{@iq*a@H$Qe9ONriBWJrhLhC?o5K2)!=~i)0hGh-mMd~RkqdIGCB(fU zy5*IvHssJ&gxudt>g(3w2{)axskJ_#h96qTc~<{c!`n^f zg+SOfdm8=UI!4%}d%RkXd}yWU1H66h)eDTsQr!qkcZE^zbI#F$k(dn7l7z}@YSv1+ zIcEYw{HJjfg()x7R@zQ&o;LdJ2vi6Fkl?OHM-Ga!%w}co(6=I5LZ>n{9pr~6!z|S$ zq_VfE7##n|{H(t$wPI-D`~L#((@V(MZ>p6Eb8k%4{lIGT;hZ9cg%~HhcbDCd%0RbM zs?uZG1wSL{Z0f+NzDiO?w9~XT^dWptKJ@M~0(@5*az*ZgabU465JN9eFY7vD8Wdz_ zlAIonnlivB;uDXov3sIgoKx2>G6a;@?v0qg;r`RnZ{4wMw2%}(e*c8k`R7sNT@>H} zfUU~mHR~8!4rJTHVlT=v3wz2kx&95Nz?@Tj8)s5E}t{|AFA=d_Y zOTqb{ATx>U``k~NJ2hYk3r#Gn1}|1Xj}jq!9%;{k(?9!WZt1z#{OATvapC-}#$LWi zi2R>~v0v6A<|?Eg)Ye#VyRyr7RJ$N4vFEFfmb1jHF(yZN^rc!ULDen>KWu(D9Z5!P ze(qg(G2HmSqyi2B&W`vo@N=3l?+dXbWn-`1LrY1^_mSilpKLLxQp}@s?=Tqw6Do5Pui*IhPZtaT|GAE&MF$;(4s9Bt5f+vbITElRv3( ze&@3GgY%ltiz;PZXq||TeA+sP9bc(#*G<2ck&zF3W?0$Bxit`EwvZb7jke;810>h3 zb}}!oS_xUbJ^$_PWrSlJ-;v4qq!@|L9uM#ALcMu|+|fni+AqPpu+CtjBrs#Y1jKVU zEc6L$d!2l-MgMi5&7?{Dfxj)qn;mIZudn7I6V$88%05A!PtCQTGSxXKMGh;qXa|fE zJBUmhM!}@e#A?s%bajm+=Ka1WxHZWaj;k#XT{T#;bH9c5zA8txVHEz(EeE*PP9eD9 z<2|evdxmVLj_n@`lp>6@ zy_ZTczm54_lGjPwPaq$dF1HdIks&Mp;%bge$QZnnp${}#&Z3)z95ei@b9;c=kJpY- z$G#RZbgyTi3&d4=3%+gXOSp|g^~^%K1id>re4gTka;7m@WA}bFo`GUbT8-n19VVdO}IkuW(H_iil_S}@$xy(Q*fCcNaD60 zxqsWK5lESLWnKgy^ci@da#k9^aW5)oLzbFxlUVBA&UM~79PF7=rW@Ot`>9(Gju3N{A4%EK0dPuz{=J_LUv|Pe^*x3eq_ExMNjB3?{$+xH^_Y z;e5pH)*~Lo@y=;b=P$Iqp9KR|j(>D-kaI4WeI&&HPFRtbZBMiQ^PwE`pF$Z7#(@UF zP2~&InXDTNx3`4)H2mD8yHl{Jk(|C(VA2vwY}3IRqo*qy9HvN7a!$$hlZqjmb6tZy zp1fLd^be5LmcI`_d3@@A`jLDS!b0qXVvP%y>+DfL86Ie=*TZ)PL??Lk^F};4=dwv; zPRBV>*)f&NE0vtjYHw@vs9l(Dk*g-}ARSciwv!f)E361d_9y<;9b7)PBw$3dh`AZi zAY4)BVh3t>;gR=s)nZW3PT_3bOLDK)eTZT^*m%P!HdC!FvK=Z=_iA>Bg!`SsC|P3u zz+oMr^PUcTebccFK>bqp475+?5RUC{Y7klp^p=Q;ZM+c8Zq6wBtH*5c=QHlp7wZS%6AszeebN>>_2^H7uuK@g%1{vF}DT>U{h`}c+u5ubXcFMH)fZ6-l z!y=qVN>jqgj)3T!mALcM;1!8}PDcMCU6<9?l#euNff${zE=b0d%;TcPFfw`y>zjLg#_WgnwatH|t}Y&WrR32m5W_AWNa`OqIc{ zW{_mX(Ck1psRCgMhJ*hXhcAG1ocb_kuY)%9rlYzq8h$K;X}=5m+8CYpJ4Yw6zLi%S zpu}dkAc_hVv>NfWy9eLsQ-6OzoBl{WAkRi|U;anmJ5dFwz(C9~-A(!Vfw z(E!S5ua;@}(q5GrIc6|PAOSPg{il$s$UBI}tk5xuP-VedGyZd}xqXvWvU_`{;Cf0> z5fN79T(#iq-q$RLb(of0ZA0lfepj^!a2-6 zv{v^7r2J*xmj&XVgZ>Wd=RqwGGe1`-Svll~bz(-y7*N1ooU5J*aY@&5ea5ss6n(a? z`N9l?w~=^1g2wLDVRD5ovqLc^Z#YRDFR+QYV4emH*fzOpzer3>Pudh??f``be>dD3 z)xB}1O6bZpnt=j(m92Fxq0dz89n>B05xx10QDL-YDz&e>h_u@9+RG)Pv4{2IYNiMy z8auH}j+fW*;q%Ymtbq+KI_r4gxGUeYJ>hq~vbe!N3%NntH+Dyh7I70!cu(qE_`Vp; z07NvH4Q2s#9;mKj;>umoviK|H+#CbgGq`D+QxI*$r6&D`yf%-M^{H;6gi4*j3?c9c z8$}NK?0I4%b?c`p2;SvL3*xY`0fe_KIZqPm`M%{DCrPUt{bS|zlhbHBNlUe7zcK}E z$L2zIl+z#Z!thJW!}{G&JAC@Pg`H(}GLM_m;uV}C9Yt(vF+F0Dy7{`k zY&v=ZZf?8^qSD>~2iP#{qQK632aMplZye6Q3X>dctS@JHSz2)zJaqXvFEZlr>9$oY z^&9^4pN`1EJcEw_wi@P{zJqQX470?WZTB*5Y7F!3#xJO^z|Gw@)bFoY5#daTP5OgI zcbKI$Ok(|9g_%#If*$3ga=U0_n%|#}eWwyeW~(19Te+!xF*(rd=LU(nM15;<7Z&oA zrqIw#r7}&_qgCdvS7+!|3?8w7JNRtHQ$~8Yyw(xC+n=- z7SQBo3+)tbg2NJn^=lukNOCkiEsgt~4tCrZ{aSnrHRMk@_?1^whFrEn3mT1NSC9B&c-(JrWu@FUhSNf+(>-_%kX#@LYnzq`^M#XX}(*!_LZCY za24(5Y$WH^=;GY^#0c{Y4{_!GPvm_bd#&6ypUpfwu%|+=UEe^Q+oe$7cXnyF@O67L3%SKO#rdayD^4^vH2hG{w%vp|_*jKf4 z=jb?40UP4S+Mi~(Uz(^cvgVB+r+Rt|;wnFRYcz(i=&Q14Ok=V-tTPw4%v&;ZrxI#w z6&rvLjj#yzBr5~N*7o09CkIE=>EWwo`ceL*@Y=504RB*xY#SY{)p3Gvn9zBL_FCN0 zl^axu8p~su8HpiDNi{%5ojAv1{0?t7*mflF9&Y_x4#)X(jyLl~c+s6*I1G7{zBI;tH*_ z94)o##4$cU4ohj~e#C^E><)3E`d;ftdwTQZpDmp)9)n5^+h%BE?)8LI2A`L!zjTBL zPYE&+#0&jDFc&4Tg}VC}E@4ZGyWbiK2dvn6Mpu!cQT_^6!RG!7)fE>V>?PNFm?vc5 z>A8gcW=5Xm2#LEW_;XgMQ$=Y-#lc|zs2}}2ny_4Kb%D@Vrtu6rOmUe!ph7;;L`XHi zXcDHc;OYbIk44?|A9-=Ml{Xap)^{jb5$Kl?v`CIT`bDXV*x{h+UARtzOd}#US>a%X zOdU`5^_P@lkQxB*B<&RQB?FgJOH2-~rMnXf_{5%~s&OlUM^i30FeOM{`XOXs)3_BU zEAyNr%bz8RJ=Cvw8y=)3p z`K|i!j$l~LqQ)kabHK}7WeyB$x*({t#cQWf98qh&X{R*Y--9)~g)?XCL>&z;v9#hY zTFY?DV&1fPE&*z}6Ki`Y5#(-eVYB;OzZjPSDnN%ArA8D>wODpQT4Jt}ah556JE+G_! z_P0uQ!qDhR94VdpAqajIOl4~>oTaQ8H5yXaTZUOb%cRAkWYV?KSNlTqgSM=Wgf)JP zz=?Q5f5zPEVO!NbOCbqEwP^Ff_O_`gdm67#U{Mp^_bKcq2IoO%zcJb(M5z`cjv1Ck z+!awNRhwjj6CQqu+xC#{UWo^3+h?6ymzq3r?3JV}<|u_9x=MWAm`1AqAnOsJ*@)^4 zr|`FkZlg{Cd!#Chmhn=_ZQe;~-DTUOv>)Tbmh0{z_42vWa|vNUO% z_5KA1xNHBgw0zjUH|s5xg$b4k z@Koa#-AFizrr6h2#$k*41tm7_jp$yL4X*DZcklq!u+>9E0WnhcOFPn7Vh^ao@~tno z@RwY)*+8&|Hpdq)`a=L*Teuw;_B@u;o!a!YaOO@bs-?*gqpm?nRkXl~mKFfF z+OVzE%RlC`M5-+KM_GXZ@9b;=2C(sq+R&Ko_RzZ%5P~kDieK3yzV4BN*{$E%KY;4k z)s?*vacHYN~u+?SoI`e@S2!9Co!cdvz;@N@{yj`0-9^8osR(V7PR-O&gM)x3owqs5oJpIwc zgY`#VzjI$V>YYDrIr8D;0JK<10@ycefw z;;oV(!gUR*xBg%xTl-#d>u(5}#jFrLKo}q0b{IuuZhuO7n++ zo@9)d#`(AT$mbW5g;c;&z>1_2Nk%;L?TIhfeK%PYp>5N<5wdihxw4-qvVsN6t@bol zDFgi~t`B&ZU3ek!#fXVE5Ao$7AwI+@amT_m2SclwQE{cLcv3kwhokq+!S%>Fe_*(Z z75)vhq@YqZqa~Hf$0S?T@nr_%mV%*aT${~4)6|(P@Bq_Q!VC4tZa`7?ra`4?oV+wSr2`TVSUmKS_>V@3%0*S#!+L=3f@oF=4k9U9xv0p1;Fx&}V;X2J~h zcz^}G3|;s8JyEFR*LB*fPUm+?f+ofnBQ5uK%NrwA+RV_~h<6-mw_wU?NGRI!zNTh% z&>ty6x8&gW75gdW)?p->&%?{*brS|k@b|(>&<^nyO55Pi_q*eK)=J*Uunw2cw--p%E!VXuDa? ztZ$HPKJ6$Sh7!UrpxVBLFSnpZOw$(ftvg!Nk1LVfL+FL(u zh1Abu(oCSmgqQ2IrE;Zz2f2DAD%T4XO6tU&)2IB}vV3{^xpz1MYFEPy_09RP2QvmA zIqw<(UaCnCs!mFX$+3sjnV*(O5)y`jW!*wzF-l^K`Bxgap+0Ej z@c^nf{Ic`6I5#9bcE7fwiiP8JZ9dr3FsD~SBiW_`8{UgFt*{$@qj#E)90JYra>Zs3 z$sCTuzOye2GdTO;4@;wgJK@!ij-|c--insluCR}{#q=D6Xz#nL6;`rkc*UzLTR%Y{ zN2YK;Zcz4YY=+|(0_?E=#~3U@I1fIyRiBF zIeWj=id+b|L;kSMs>NMfeB^(={IdrC;NYJy_$L+olL`OdOqgH0OpSa?FTRhwb<|%A Pe7HEdAEg|=c=LY&YVNkY literal 0 HcmV?d00001 diff --git a/airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..13b35eba55c6dabc3aac36f33d859266c18fa0d0 GIT binary patch literal 5680 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 literal 0 HcmV?d00001 diff --git a/airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000000000000000000000000000000000000..0a3f5fa40fb3d1e0710331a48de5d256da3f275d GIT binary patch literal 520 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 literal 0 HcmV?d00001 diff --git a/airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/airhub_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000000000000000000000000000000000000..2f1632cfddf3d9dade342351e627a0a75609fb46 GIT binary patch literal 2218 zcmV;b2vzrqP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuE6iGxuRCodHTWf3-RTMruyW6Fu zQYeUM04eX6D5c0FCjKKPrco1(K`<0SL=crI{PC3-^hZU0kQie$gh-5!7z6SH6Q0J% zqot*`H1q{R5fHFYS}dje@;kG=v$L0(yY0?wY2%*c?A&{2?!D*x?m71{of2gv!$5|C z3>qG_BW}7K_yUcT3A5C6QD<+{aq?x;MAUyAiJn#Jv8_zZtQ{P zTRzbL3U9!qVuZzS$xKU10KiW~Bgdcv1-!uAhQxf3a7q+dU6lj?yoO4Lq4TUN4}h{N z*fIM=SS8|C2$(T>w$`t@3Tka!(r!7W`x z-isCVgQD^mG-MJ;XtJuK3V{Vy72GQ83KRWsHU?e*wrhKk=ApIYeDqLi;JI1e zuvv}5^Dc=k7F7?nm3nIw$NVmU-+R>> zyqOR$-2SDpJ}Pt;^RkJytDVXNTsu|mI1`~G7yw`EJR?VkGfNdqK9^^8P`JdtTV&tX4CNcV4 z&N06nZa??Fw1AgQOUSE2AmPE@WO(Fvo`%m`cDgiv(fAeRA%3AGXUbsGw{7Q`cY;1BI#ac3iN$$Hw z0LT0;xc%=q)me?Y*$xI@GRAw?+}>=9D+KTk??-HJ4=A>`V&vKFS75@MKdSF1JTq{S zc1!^8?YA|t+uKigaq!sT;Z!&0F2=k7F0PIU;F$leJLaw2UI6FL^w}OG&!;+b%ya1c z1n+6-inU<0VM-Y_s5iTElq)ThyF?StVcebpGI znw#+zLx2@ah{$_2jn+@}(zJZ{+}_N9BM;z)0yr|gF-4=Iyu@hI*Lk=-A8f#bAzc9f z`Kd6K--x@t04swJVC3JK1cHY-Hq+=|PN-VO;?^_C#;coU6TDP7Bt`;{JTG;!+jj(` zw5cLQ-(Cz-Tlb`A^w7|R56Ce;Wmr0)$KWOUZ6ai0PhzPeHwdl0H(etP zUV`va_i0s-4#DkNM8lUlqI7>YQLf)(lz9Q3Uw`)nc(z3{m5ZE77Ul$V%m)E}3&8L0 z-XaU|eB~Is08eORPk;=<>!1w)Kf}FOVS2l&9~A+@R#koFJ$Czd%Y(ENTV&A~U(IPI z;UY+gf+&6ioZ=roly<0Yst8ck>(M=S?B-ys3mLdM&)ex!hbt+ol|T6CTS+Sc0jv(& z7ijdvFwBq;0a{%3GGwkDKTeG`b+lyj0jjS1OMkYnepCdoosNY`*zmBIo*981BU%%U z@~$z0V`OVtIbEx5pa|Tct|Lg#ZQf5OYMUMRD>Wdxm5SAqV2}3!ceE-M2 z@O~lQ0OiKQp}o9I;?uxCgYVV?FH|?Riri*U$Zi_`V2eiA>l zdSm6;SEm6#T+SpcE8Ro_f2AwxzI z44hfe^WE3!h@W3RDyA_H440cpmYkv*)6m1XazTqw%=E5Xv7^@^^T7Q2wxr+Z2kVYr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/airhub_app/macos/Runner/Configs/AppInfo.xcconfig b/airhub_app/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000..1ae370c --- /dev/null +++ b/airhub_app/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = airhub_app + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.airlab.airhub.airhubApp + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2026 com.airlab.airhub. All rights reserved. diff --git a/airhub_app/macos/Runner/Configs/Debug.xcconfig b/airhub_app/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000..36b0fd9 --- /dev/null +++ b/airhub_app/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/airhub_app/macos/Runner/Configs/Release.xcconfig b/airhub_app/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000..dff4f49 --- /dev/null +++ b/airhub_app/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/airhub_app/macos/Runner/Configs/Warnings.xcconfig b/airhub_app/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000..42bcbf4 --- /dev/null +++ b/airhub_app/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/airhub_app/macos/Runner/DebugProfile.entitlements b/airhub_app/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000..08c3ab1 --- /dev/null +++ b/airhub_app/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,14 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + com.apple.security.network.client + + + diff --git a/airhub_app/macos/Runner/Info.plist b/airhub_app/macos/Runner/Info.plist new file mode 100644 index 0000000..4789daa --- /dev/null +++ b/airhub_app/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/airhub_app/macos/Runner/MainFlutterWindow.swift b/airhub_app/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000..3cc05eb --- /dev/null +++ b/airhub_app/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/airhub_app/macos/Runner/Release.entitlements b/airhub_app/macos/Runner/Release.entitlements new file mode 100644 index 0000000..ee95ab7 --- /dev/null +++ b/airhub_app/macos/Runner/Release.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.network.client + + + diff --git a/airhub_app/macos/RunnerTests/RunnerTests.swift b/airhub_app/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..61f3bd1 --- /dev/null +++ b/airhub_app/macos/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Cocoa +import FlutterMacOS +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/airhub_app/packages/ali_auth/lib/ali_auth.dart b/airhub_app/packages/ali_auth/lib/ali_auth.dart new file mode 100644 index 0000000..dc9f534 --- /dev/null +++ b/airhub_app/packages/ali_auth/lib/ali_auth.dart @@ -0,0 +1,107 @@ +import 'dart:async'; +import 'ali_auth_model.dart'; +import 'ali_auth_platform_interface.dart'; + +export 'ali_auth_enum.dart'; +export 'ali_auth_model.dart'; + +/// 阿里云一键登录类 +/// 原来的全屏登录和dialog 统一有配置参数isDislog来控制 +class AliAuth { + /// 初始化监听 + static Stream? onChange({bool type = true}) { + return AliAuthPlatform.instance.onChange(type: type); + } + + /// 获取设备版本信息 + static Future get platformVersion async { + return AliAuthPlatform.instance.getPlatformVersion(); + } + + /// 获取SDK版本号 + static Future get sdkVersion async { + return AliAuthPlatform.instance.getSdkVersion(); + } + + /// 初始化SDK sk 必须 + /// isDialog 是否使用Dialog 弹窗登录 非必须 默认值false 非Dialog登录 + /// debug 是否开启调试模式 非必须 默认true 开启 + /// 使用一键登录传入 SERVICE_TYPE_LOGIN 2 使用号码校验传入 SERVICE_TYPE_AUTH 1 默认值 2 + static Future initSdk(AliAuthModel? config) async { + return AliAuthPlatform.instance.initSdk(config); + } + + /// 一键登录 + static Future login({int timeout = 5000}) async { + return AliAuthPlatform.instance.login(timeout: timeout); + } + + /// 强制关闭一键登录授权页面 + static Future quitPage() async { + return AliAuthPlatform.instance.quitPage(); + } + + /// 强制关闭Loading + static Future hideLoading() async { + return AliAuthPlatform.instance.hideLoading(); + } + + /// 强制关闭一键登录授权页面 + static Future getCurrentCarrierName() async { + return AliAuthPlatform.instance.getCurrentCarrierName(); + } + + /// pageRoute + static Future openPage(String? pageRoute) async { + return AliAuthPlatform.instance.openPage(pageRoute); + } + + static Future get checkCellularDataEnable async { + return AliAuthPlatform.instance.checkCellularDataEnable; + } + + /// 苹果登录iOS专用 + static Future get appleLogin async { + return AliAuthPlatform.instance.appleLogin; + } + + /// 数据监听 + static loginListen( + {bool type = true, + required Function onEvent, + Function? onError, + isOnlyOne = true}) async { + return AliAuthPlatform.instance.loginListen( + type: type, onEvent: onEvent, onError: onError, isOnlyOne: isOnlyOne); + } + + /// 暂停 + static pause() { + return AliAuthPlatform.instance.pause(); + } + + /// 恢复 + static resume() { + return AliAuthPlatform.instance.resume(); + } + + /// 销毁监听 + static dispose() { + return AliAuthPlatform.instance.dispose(); + } + + /// WEB专用接口 + static Future checkAuthAvailable(String accessToken, String jwtToken, + {required Function(dynamic) success, + required Function(dynamic) error}) async { + await AliAuthPlatform.instance + .checkAuthAvailable(accessToken, jwtToken, success, error); + } + + /// WEB专用接口 + static Future getVerifyToken( + {required Function(dynamic) success, + required Function(dynamic) error}) async { + await AliAuthPlatform.instance.getVerifyToken(success, error); + } +} diff --git a/airhub_app/packages/ali_auth/lib/ali_auth_enum.dart b/airhub_app/packages/ali_auth/lib/ali_auth_enum.dart new file mode 100644 index 0000000..98fe3c2 --- /dev/null +++ b/airhub_app/packages/ali_auth/lib/ali_auth_enum.dart @@ -0,0 +1,242 @@ +import 'dart:io'; + +/// 本机号码校验,一键登录 +enum SdkType { auth, login } + +/// ScaleType 可选类型 +enum ScaleType { + matrix, + fitXy, + fitStart, + fitCenter, + fitEnd, + center, + centerCrop, + centerInside, +} + +enum ContentMode { + scaleToFill, + scaleAspectFit, // contents scaled to fit with fixed aspect. remainder is transparent + scaleAspectFill, // contents scaled to fill with fixed aspect. some portion of content may be clipped. + redraw, // redraw on bounds change (calls -setNeedsDisplay) + center, // contents remain same size. positioned adjusted. + top, + bottom, + left, + right, + topLeft, + topRight, + bottomLeft, + bottomRight, +} + +enum Gravity { centerHorizntal, left, right } + +enum UIFAG { + systemUiFalgLowProfile, + systemUiFalgHideNavigation, + systemUiFalgFullscreen, + systemUiFalgLayoutStable, + systemUiFalgLayoutHideNavigtion, + systemUiFalgLayoutFullscreen, + systemUiFalgImmersive, + systemUiFalgImmersiveSticky, + systemUiFalgLightStatusBar, + systemUiFalgLightNavigationBar +} + +enum PNSPresentationDirection { + presentationDirectionBottom, + presentationDirectionRight, + presentationDirectionTop, + presentationDirectionLeft, +} + +enum PageType { + ///全屏（竖屏） + fullPort, + + ///全屏（横屏） + fullLand, + + ///弹窗（竖屏） + dialogPort, + + ///"弹窗（横屏） + dialogLand, + + ///底部弹窗 + dialogBottom, + + ///自定义View + customView, + + ///自定义View（Xml） + customXml, + + /// 自定义背景GIF + customGif, + + /// 自定义背景视频 + customMOV, + + /// 自定义背景图片 + customPIC, +} + +class EnumUtils { + static int formatGravityValue(Gravity? status) { + switch (status) { + case Gravity.centerHorizntal: + return 1; + case Gravity.left: + if (Platform.isAndroid) { + return 3; + } else { + return 0; + } + case Gravity.right: + if (Platform.isAndroid) { + return 5; + } else { + return 2; + } + default: + return 4; + } + } + + static int formatUiFagValue(UIFAG? status) { + switch (status) { + case UIFAG.systemUiFalgLowProfile: + return 1; + case UIFAG.systemUiFalgHideNavigation: + return 2; + case UIFAG.systemUiFalgFullscreen: + return 4; + case UIFAG.systemUiFalgLayoutStable: + return 256; + case UIFAG.systemUiFalgLayoutHideNavigtion: + return 512; + case UIFAG.systemUiFalgLayoutFullscreen: + return 1024; + case UIFAG.systemUiFalgImmersive: + return 2048; + case UIFAG.systemUiFalgImmersiveSticky: + return 4096; + case UIFAG.systemUiFalgLightStatusBar: + return 8192; + default: + return 16; + } + } +} + +/// 第三方布局实体 +class CustomThirdView { + late int? top; + late int? right; + late int? bottom; + late int? left; + late int? width; + late int? height; + late int? space; + late int? size; + late String? color; + late int? itemWidth; + late int? itemHeight; + late List? viewItemName; + late List? viewItemPath; + CustomThirdView( + this.top, + this.right, + this.bottom, + this.left, + this.width, + this.height, + this.space, + this.size, + this.color, + this.itemWidth, + this.itemHeight, + this.viewItemName, + this.viewItemPath); + + factory CustomThirdView.fromJson(Map srcJson) => + _$CustomThirdViewFromJson(srcJson); + Map toJson() => _$CustomThirdViewToJson(this); +} + +/// 第三方布局json转实体 +CustomThirdView _$CustomThirdViewFromJson(Map json) { + return CustomThirdView( + json['top'], + json['right'], + json['bottom'], + json['left'], + json['width'], + json['height'], + json['space'], + json['size'], + json['color'], + json['itemWidth'], + json['itemHeight'], + json['viewItemName'], + json['viewItemPath']); +} + +/// 第三方布局实体转json +Map _$CustomThirdViewToJson(CustomThirdView instance) => + { + 'top': instance.top, + 'right': instance.right, + 'bottom': instance.bottom, + 'left': instance.left, + 'width': instance.width, + 'height': instance.height, + 'space': instance.space, + 'size': instance.size, + 'color': instance.color, + 'itemWidth': instance.itemWidth, + 'itemHeight': instance.itemHeight, + 'viewItemName': instance.viewItemName, + 'viewItemPath': instance.viewItemPath, + }; + +/// 自定义布局实体 +class CustomView { + late int? top; + late int? right; + late int? bottom; + late int? left; + late int? width; + late int? height; + late String? imgPath; + late ScaleType? imgScaleType; + CustomView(this.top, this.right, this.bottom, this.left, this.width, + this.height, this.imgPath, this.imgScaleType); + + factory CustomView.fromJson(Map srcJson) => + _$CustomViewFromJson(srcJson); + Map toJson() => _$CustomViewToJson(this); +} + +/// 自定义布局json转实体 +CustomView _$CustomViewFromJson(Map json) { + return CustomView(json['top'], json['right'], json['bottom'], json['left'], + json['width'], json['height'], json['imgPath'], json['imgScaleType']); +} + +/// 自定义布局实体转json +Map _$CustomViewToJson(CustomView instance) => + { + 'top': instance.top ?? 0, + 'right': instance.right ?? 0, + 'bottom': instance.bottom ?? 0, + 'left': instance.left ?? 0, + 'width': instance.width, + 'height': instance.height, + 'imgPath': instance.imgPath, + 'imgScaleType': (instance.imgScaleType ?? ScaleType.centerCrop).index, + }; diff --git a/airhub_app/packages/ali_auth/lib/ali_auth_method_channel.dart b/airhub_app/packages/ali_auth/lib/ali_auth_method_channel.dart new file mode 100644 index 0000000..7fa39f6 --- /dev/null +++ b/airhub_app/packages/ali_auth/lib/ali_auth_method_channel.dart @@ -0,0 +1,161 @@ +import 'dart:async'; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/services.dart'; +import 'ali_auth_model.dart'; +import 'ali_auth_platform_interface.dart'; + +/// 阿里云一键登录类 +/// 原来的全屏登录和dialog 统一有配置参数isDislog来控制 +class MethodChannelAliAuth extends AliAuthPlatform { + /// 声明回调通道 + @visibleForTesting + final methodChannel = const MethodChannel('ali_auth'); + + /// 声明监听回调通道 + @visibleForTesting + final EventChannel eventChannel = const EventChannel("ali_auth/event"); + + /// 监听器 + static Stream? onListener; + + /// 为了控制Stream 暂停。恢复。取消监听 新建 + static StreamSubscription? streamSubscription; + + @override + Future getPlatformVersion() async { + final version = + await methodChannel.invokeMethod('getPlatformVersion'); + return version; + } + + @override + Future getSdkVersion() async { + final version = await methodChannel.invokeMethod('getSdkVersion'); + return version; + } + + /// 初始化监听 + @override + Stream? onChange({bool type = true}) { + onListener ??= eventChannel.receiveBroadcastStream(type); + return onListener; + } + + /// 初始化SDK sk 必须 + /// isDialog 是否使用Dialog 弹窗登录 非必须 默认值false 非Dialog登录 + /// debug 是否开启调试模式 非必须 默认true 开启 + /// 使用一键登录传入 SERVICE_TYPE_LOGIN 2 使用号码校验传入 SERVICE_TYPE_AUTH 1 默认值 2 + @override + Future initSdk(AliAuthModel? config) async { + config ??= AliAuthModel("", ""); + return await methodChannel.invokeMethod("initSdk", config.toJson()); + } + + /// 一键登录 + @override + Future login({int timeout = 5000}) async { + return await methodChannel.invokeMethod('login', {"timeout": timeout}); + } + + /// 强制关闭一键登录授权页面 + @override + Future quitPage() async { + return await methodChannel.invokeMethod('quitPage'); + } + + /// SDK环境检查函数，检查终端是否支持号码认证。 + /// + /// @see PhoneNumberAuthHelper#SERVICE_TYPE_AUTH 本机号码校验 + /// @see PhoneNumberAuthHelper#SERVICE_TYPE_LOGIN 一键登录校验 + @override + Future checkEnvAvailable() async { + return await methodChannel.invokeMethod('checkEnvAvailable'); + } + + /// 获取授权页协议勾选框选中状态 + @override + Future queryCheckBoxIsChecked() async { + return await methodChannel.invokeMethod('queryCheckBoxIsChecked'); + } + + /// 获取授权页协议勾选框选中状态 + @override + Future setCheckboxIsChecked() async { + return await methodChannel.invokeMethod('setCheckboxIsChecked'); + } + + /// 强制关闭Loading + @override + Future hideLoading() async { + return await methodChannel.invokeMethod('hideLoading'); + } + + /// 强制关闭一键登录授权页面 + @override + Future getCurrentCarrierName() async { + return await methodChannel.invokeMethod('getCurrentCarrierName'); + } + + /// pageRoute + @override + Future openPage(String? pageRoute) async { + return await methodChannel + .invokeMethod('openPage', {'pageRoute': pageRoute ?? 'main_page'}); + } + + @override + Future get checkCellularDataEnable async { + return await methodChannel.invokeMethod('checkCellularDataEnable'); + } + + /// 苹果登录iOS专用 + @override + Future get appleLogin async { + return await methodChannel.invokeMethod('appleLogin'); + } + + /// 数据监听 + @override + loginListen( + {bool type = true, + required Function onEvent, + Function? onError, + isOnlyOne = true}) async { + /// 默认为初始化单监听 + if (isOnlyOne && streamSubscription != null) { + /// 原来监听被移除 + dispose(); + } + streamSubscription = onChange(type: type)!.listen( + onEvent as void Function(dynamic)?, + onError: onError, + onDone: null, + cancelOnError: null); + } + + /// 暂停 + @override + pause() { + if (streamSubscription != null) { + streamSubscription!.pause(); + } + } + + /// 恢复 + @override + resume() { + if (streamSubscription != null) { + streamSubscription!.resume(); + } + } + + /// 销毁监听 + @override + dispose() { + if (streamSubscription != null) { + streamSubscription!.cancel(); + streamSubscription = null; + } + } +} diff --git a/airhub_app/packages/ali_auth/lib/ali_auth_model.dart b/airhub_app/packages/ali_auth/lib/ali_auth_model.dart new file mode 100644 index 0000000..4b030c8 --- /dev/null +++ b/airhub_app/packages/ali_auth/lib/ali_auth_model.dart @@ -0,0 +1,1114 @@ +import 'ali_auth_enum.dart'; + +/// 登录窗口配置 +class AliAuthModel { + /// aliyun sk + late String? androidSk; + + /// aliyun sk + late String? iosSk; + + /// 是否开启debug模式 + late bool? isDebug; + + /// 是否延迟 + late bool? isDelay; + + /// 页面类型 必须 + late PageType? pageType; + + // /// 8. ⻚⾯相关函数 + // + // /// 设置授权⻚进场动画 + // late String? authPageActIn; + // + // /// 设置授权⻚退出动画 + // late String? authPageActOut; + // + // /// 设置授权⻚背景图drawable资源的⽬录，不需要加后缀，⽐如图⽚在drawable中的存放⽬录是res/drawablexxhdpi/loading.png,则传⼊参数为"loading"，setPageBackgroundPath("loading")。 + // late String? pageBackgroundPath; + // + // /// dialog 蒙层的透明度 + // late double? dialogAlpha; + // + // /// 设置弹窗模式授权⻚宽度，单位dp,设置⼤于0即为弹窗模式 + // late int? dialogWidth; + // + // /// 设置弹窗模式授权⻚⾼度，单位dp，设置⼤于0即为弹窗模式 + // late int? dialogHeight; + // + // /// 设置弹窗模式授权⻚X轴偏移，单位dp + // late int? dialogOffsetX; + // + // /// 设置弹窗模式授权⻚Y轴偏移,单位dp + // late int? dialogOffsetY; + // + // /// 设置授权⻚是否居于底部 + // late bool? dialogBottom; + // + /// ------- 一、状态栏 --------- /// + + /// statusBarColor 设置状态栏颜⾊（系统版本 5.0 以上可设置） + late String? statusBarColor; + + /// 设置状态栏文字颜色(系统版本6.0以上可设置黑色白色)，true为黑色 + late bool? lightColor; + + /// 设置状态栏是否隐藏 + late bool? isStatusBarHidden; + + /// 设置状态栏U属性 + late UIFAG? statusBarUIFlag; + + /// 设置协议⻚状态栏颜⾊（系统版本 5.0 以上可设置）不设置则与授权⻚设置⼀致 + late String? webViewStatusBarColor; + + /// ------- 二、导航栏 --------- /// + + /// 设置默认导航栏是否隐藏 + late bool? navHidden; + + /// 设置导航栏主题色 + late String? navColor; + + /// 设置导航栏标题文案内容 + late String? navText; + + /// 设置导航栏标题文字颜色 + late String? navTextColor; + + /// 设置导航栏标题文字大小 + /// @Deprecated("即将删除的属性......") + late int? navTextSize; + + /// 设置导航栏返回按钮图片路径 + late String? navReturnImgPath; + + /// 设置导航栏返回按钮隐藏 + late bool? navReturnHidden; + + /// 设置导航栏返回按钮宽度 + late int? navReturnImgWidth; + + /// 设置导航栏返回按钮隐藏高度 + late int? navReturnImgHeight; + + /// 自定义返回按钮参数 + late CustomView? customReturnBtn; + + /// 设置导航栏返回按钮缩放模式 + late ScaleType? navReturnScaleType; + + /// 设置协议页顶部导航栏背景色不设置则与授权页设置一致 + late String? webNavColor; + + /// 设置协议页顶部导航栏标题颜色不设置则与授权页设置一致 + late String? webNavTextColor; + + /// 设置协议页顶部导航栏文字大小不设置则与授权页设置一 + late int? webNavTextSize; + + /// 设置协议页导航栏返回按钮图片路径不设置则与授权页设 + late String? webNavReturnImgPath; + + /// ------- 三、LOGO区 --------- /// + + /// 设置logo 图⽚ + late String? logoImgPath; + + /// 隐藏logo + late bool? logoHidden; + + /// 设置logo 控件宽度 + late int? logoWidth; + + /// 设置logo 控件⾼度 + late int? logoHeight; + + /// 设置logo 控件相对导航栏顶部的位移，单位dp + late int? logoOffsetY; + + /// 设置logo 控件相对底部的位移，单位dp + // ignore: non_constant_identifier_names + late int? logoOffsetY_B; + + /// 设置logo图⽚缩放模式 + /// FIT_XY, + /// FIT_START, + /// FIT_CENTER, + /// FIT_END, + /// CENTER, + /// CENTER_CROP, + /// CENTER_INSIDE + late ScaleType? logoScaleType; + + /// ------- 四、slogan区 --------- /// + + /// 设置是否隐藏slogan + late bool? sloganHidden; + + /// 设置slogan ⽂字内容 + late String? sloganText; + + /// 设置slogan ⽂字颜⾊ + late String? sloganTextColor; + + /// 设置slogan ⽂字⼤⼩ + /// @Deprecated("即将删除的属性......") + late int? sloganTextSize; + + /// 设置slogan 相对导航栏顶部的 位移，单位dp + late int? sloganOffsetY; + + /// 设置slogan 相对底部的 位移，单位dp + // ignore: non_constant_identifier_names + late int? sloganOffsetY_B; + + /// ------- 五、掩码栏 --------- /// + + /// 设置⼿机号码字体颜⾊ + late String? numberColor; + + /// 设置⼿机号码字体⼤⼩ + /// @Deprecated("即将删除的属性......") + late int? numberSize; + + /// 设置号码栏控件相对导航栏顶部的位移，单位 dp + late int? numFieldOffsetY; + + /// 设置号码栏控件相对底部的位移，单位 dp + // ignore: non_constant_identifier_names + late int? numFieldOffsetY_B; + + /// 设置号码栏相对于默认位置的X轴偏移量，单位dp + late int? numberFieldOffsetX; + + /// 设置⼿机号掩码的布局对⻬⽅式，只⽀持 + /// Gravity.CENTER_HORIZONTAL、 + /// Gravity.LEFT、 + /// Gravity.RIGHT三种对⻬⽅式 + late Gravity? numberLayoutGravity; + + /// ------- 六、登录按钮 --------- /// + + /// 设置登录按钮⽂字 + late String? logBtnText; + + /// 设置登录按钮⽂字颜⾊ + late String? logBtnTextColor; + + /// 设置登录按钮⽂字⼤⼩ + /// @Deprecated("即将删除的属性......") + late int? logBtnTextSize; + + /// 设置登录按钮宽度，单位 dp + late int? logBtnWidth; + + /// 设置登录按钮⾼度，单位dp + late int? logBtnHeight; + + /// 设置登录按钮相对于屏幕左右边缘边距 + late int? logBtnMarginLeftAndRight; + + /// login_btn_bg_xml + /// 设置登录按钮背景图⽚路径 是一个逗号拼接的图片路径 例如：'assets/login_btn_normal.png,assets/login_btn_unable.png,assets/login_btn_press.png' + /// 如果设置错误或者找不到图片则使用默认样式 + late String? logBtnBackgroundPath; + + /// 设置登录按钮相对导航栏顶部的位移，单位 dp + late int? logBtnOffsetY; + + /// 设置登录按钮相对底部的位移，单位 dp + // ignore: non_constant_identifier_names + late int? logBtnOffsetY_B; + + /// 设置登录loading dialog 背景图⽚路径24 + late String? loadingImgPath; + + /// 设置登陆按钮X轴偏移量，如果设置了setLogBtnMarginLeftAndRight，并且布局对⻬⽅式为左对⻬或者右对⻬,则会在margin的基础上再增加offsetX的偏移量，如果是居中对⻬，则仅仅会在居中的基础上再做offsetX的偏移。 + late int? logBtnOffsetX; + + /// 设置登陆按钮布局对⻬⽅式， + /// 只⽀持Gravity.CENTER_HORIZONTAL、 + /// Gravity.LEFT、 + /// Gravity.RIGHT三种对⻬⽅式 + late Gravity? logBtnLayoutGravity; + + /// ------- 七、切换到其他方式 --------- /// + + /// 设置切换按钮点是否可⻅ + late bool? switchAccHidden; + + /// 是否需要点击切换按钮时校验是否勾选协议 默认值true + late bool? switchCheck; + + /// 设置切换按钮⽂字内容 + late String? switchAccText; + + /// 设置切换按钮⽂字颜⾊ + late String? switchAccTextColor; + + /// 设置切换按钮⽂字⼤⼩ + /// @Deprecated("即将删除的属性......") + late int? switchAccTextSize; + + /// 设置换按钮相对导航栏顶部的位移，单位 dp + late int? switchOffsetY; + + /// 设置换按钮相对底部的位移，单位 dp + // ignore: non_constant_identifier_names + late int? switchOffsetY_B; + + /// ------- 八、自定义控件区 --------- /// + + /// 是否隐藏第三方布局 + late bool? isHiddenCustom; + + // late bool? isCheckboxCustomViewClick; + + /// 第三方图标相关参数只对iOS有效，android 请使用布局文件实现 + /// 第三方图标按钮居中布局 + /// 第三方布局图片路径 + late CustomThirdView? customThirdView; + + /// ------- 九、协议栏 --------- /// + + /// 自定义第一条名称 + late String? protocolOneName; + + /// 自定义第一条url + late String? protocolOneURL; + + /// 设置授权页运营商协议文本颜色。 + late String? protocolOwnColor; + + /// 设置授权页协议1文本颜色。 + late String? protocolOwnOneColor; + + /// 授权页协议2文本颜色。 + late String? protocolOwnTwoColor; + + /// 授权页协议3文本颜色。 + late String? protocolOwnThreeColor; + + /// 自定义第二条名称 + late String? protocolTwoName; + + /// 自定义第二条url + late String? protocolTwoURL; + + /// 自定义第三条名称 + late String? protocolThreeName; + + /// 自定义第三条url + late String? protocolThreeURL; + + /// 自定义协议名称颜色 + late String? protocolCustomColor; + + /// 基础文字颜色 + late String? protocolColor; + + /// ------- 十、其它全屏属性 --------- /// + + /// 设置隐私条款相对导航栏顶部的位移，单位dp + late int? privacyOffsetY; + + /// 设置隐私条款相对底部的位移，单位dp + // ignore: non_constant_identifier_names + late int? privacyOffsetY_B; + + /// 设置隐私条款是否默认勾选 + late bool? privacyState; + + /// 设置隐私条款文字对齐方式，单位Gravity.xx + late Gravity? protocolLayoutGravity; + + /// 设置隐私条款文字大小 + late int? privacyTextSize; + + /// 设置隐私条款距离手机左右边缘的边距，单位dp + late int? privacyMargin; + + /// 设置开发者隐私条款前置自定义文案 + late String? privacyBefore; + + /// 设置开发者隐私条款尾部自定义文案 + late String? privacyEnd; + + /// 设置复选框是否隐藏 + late bool? checkboxHidden; + + /// 设置复选框未选中时图片 + late String? uncheckedImgPath; + + /// 设置复选框未选中时图片 + late String? checkedImgPath; + + /// 复选框图片的宽度 + late int? checkBoxWidth; + + /// 复选框图片的高度 + late int? checkBoxHeight; + + /// 设置隐私栏的布局对齐方式，该接口控制了整个隐私栏 + late Gravity? protocolGravity; + + /// 设置隐私条款X的位移，单位dp + late int? privacyOffsetX; + + /// 设置运营商协议后缀符号，只能设置⼀个字符，且只能设置<>()《》【】『』[]（）中的⼀个 + late String? vendorPrivacyPrefix; + + /// 设置运营商协议后缀符号，只能设置⼀个字符，且只能设置<>()《》【】『』[]（）中的⼀个 + late String? vendorPrivacySuffix; + + /// 设置checkbox未勾选时，点击登录按钮toast是否隐藏 (android 独有) + late bool? logBtnToastHidden; + + /// 设置底部虚拟按键背景⾊（系统版本 5.0 以上可设置） + late String? bottomNavColor; + + /// 授权页弹窗模式点击非弹窗区域关闭授权页 + late bool? tapAuthPageMaskClosePage; + + /// 弹窗宽度 + late int? dialogWidth; + + /// 弹窗高度 + late int? dialogHeight; + + /// 是否是底部弹窗默认false + late bool? dialogBottom; + late int? dialogOffsetX; + late int? dialogOffsetY; + late List? dialogCornerRadiusArray; + late double? dialogAlpha; + + /// 背景图片圆角 + /// dialog安卓端有效 iOS无效 + late int? pageBackgroundRadius; + late bool? webSupportedJavascript; + + /// setAuthPageActIn + late String? authPageActIn; + late String? activityOut; + + /// setAuthPageActOut + late String? authPageActOut; + late String? activityIn; + + late int? screenOrientation; + late List? privacyConectTexts; + late int? privacyOperatorIndex; + + /// 暴露名 + late String? protocolAction; + + /// 包名 + late String? packageName; + + late String? loadingBackgroundPath; + + /// 是否隐藏loading + late bool? isHiddenToast; + + /// 是否隐藏loading + late bool? autoHideLoginLoading; + + /// 底部虚拟导航栏 + late String? bottomNavBarColor; + + /// 授权页面背景色 + late String? backgroundColor; + + /// 授权页面背景路径支持视频mp4，mov等、图片jpeg，jpg，png等、动图gif + late String? pageBackgroundPath; + + /// + late ContentMode? backgroundImageContentMode; + + /// /// ------- 十一、ios 弹窗设置参数 --------- /// + /// 是否隐藏bar bar 为true 时 alertCloseItemIsHidden 也为true + late bool? alertBarIsHidden; + + /// bar的背景色 默认颜色为白色 #FFFFFF + late String? alertTitleBarColor; + + /// bar的关闭按钮 + late bool? alertCloseItemIsHidden; + + /// 关闭按钮的图片路径 + late String? alertCloseImagePath; + + /// 关闭按钮的图片X坐标 + late int? alertCloseImageX; + + /// 关闭按钮的图片Y坐标 + late int? alertCloseImageY; + + /// 关闭按钮的图片宽度 + late int? alertCloseImageW; + + /// 关闭按钮的图片高度 + late int? alertCloseImageH; + + /// 底部蒙层背景颜色，默认黑色 + late String? alertBlurViewColor; + + /// 底部蒙层背景透明度，默认0.5 0 ~ 1 + late double? alertBlurViewAlpha; + + late PNSPresentationDirection? presentDirection; + + /// /// ------- 十二、二次弹窗设置 --------- /// + /// 设置二次隐私协议弹窗是否需要显示。false（默认值） + late bool? privacyAlertIsNeedShow; + + /// 设置二次隐私协议弹窗点击按钮是否需要执行登录 true（默认值） + late bool? privacyAlertIsNeedAutoLogin; + + /// 设置二次隐私协议弹窗显示自定义动画。 + late String? privacyAlertEntryAnimation; + + /// 设置二次隐私协议弹窗隐藏自定义动画。 + late String? privacyAlertExitAnimation; + + /// 设置二次隐私协议弹窗的四个圆角值。说明 顺序为左上、右上、右下、左下，需要填充4个值，不足4个值则无效，如果值小于等于0则为直角。 + late List? privacyAlertCornerRadiusArray; + + /// 设置二次隐私协议弹窗背景色（同意并继续按钮区域）。 + late String? privacyAlertBackgroundColor; + + /// 设置二次隐私协议弹窗透明度。默认值1.0。 + late double privacyAlertAlpha; + + /// 二次隐私协议弹窗标题文字内容默认"请阅读并同意以下条款" + late String? privacyAlertTitleContent; + + /// 设置标题文字大小，默认值18 sp。 + late int? privacyAlertTitleTextSize; + + /// 设置标题文字颜色。 + late String? privacyAlertTitleColor; + + /// 设置二次隐私协议弹窗标题背景颜色。 + late String? privacyAlertTitleBackgroundColor; + + /// 设置二次隐私协议弹窗标题支持居中、居左，默认居中显示。 + late Gravity? privacyAlertTitleAlignment; + + /// 设置服务协议文字大小，默认值16 sp。 + late int? privacyAlertContentTextSize; + + /// 设置协议内容背景颜色。 + late String? privacyAlertContentBackgroundColor; + + /// 设置二次隐私协议弹窗背景蒙层是否显示。true（默认值） + late bool privacyAlertMaskIsNeedShow; + + /// 设置二次隐私协议弹窗蒙层透明度。默认值0.3 + late double privacyAlertMaskAlpha; + + /// 蒙层颜色。 + late String? privacyAlertMaskColor; + + /// 设置屏幕居中、居上、居下、居左、居右，默认居中显示。 + late Gravity? privacyAlertAlignment; + + /// 设置弹窗宽度。 + late int? privacyAlertWidth; + + /// 设置弹窗高度。 + late int? privacyAlertHeight; + + /// 设置弹窗水平偏移量。（单位：dp） + late int? privacyAlertOffsetX; + + /// 设置弹窗竖直偏移量。（单位：dp） + late int? privacyAlertOffsetY; + + /// 设置标题文字水平偏移量。（单位：dp） + late int? privacyAlertTitleOffsetX; + + /// 设置标题文字竖直偏移量。（单位：dp） + late int? privacyAlertTitleOffsetY; + + /// 设置二次隐私协议弹窗协议文案支持居中、居左，默认居左显示。 + late Gravity? privacyAlertContentAlignment; + + /// 设置服务协议文字颜色。 + late String? privacyAlertContentColor; + + /// 设置授权页协议1文本颜色。 + late String? privacyAlertOwnOneColor; + + /// 设置授权页协议2文本颜色。 + late String? privacyAlertOwnTwoColor; + + /// 设置授权页协议3文本颜色。 + late String? privacyAlertOwnThreeColor; + + /// 设置授权页运营商协议文本颜色。 + late String? privacyAlertOperatorColor; + + /// 设置服务协议非协议文字颜色。 + late String? privacyAlertContentBaseColor; + + /// 二次弹窗协议名称是否添加下划线, 默认false + late bool? privacyAlertProtocolNameUseUnderLine; + + /// 设置服务协议左右两侧间距。 + late int? privacyAlertContentHorizontalMargin; + + /// 设置服务协议上下间距。 + late int? privacyAlertContentVerticalMargin; + + /// 设置按钮背景图片路径。 + late String? privacyAlertBtnBackgroundImgPath; + + /// 二次弹窗协议前缀。 + late String? privacyAlertBefore; + + /// 二次弹窗协议后缀。 + late String? privacyAlertEnd; + + /// 设置确认按钮文本。 + late String? privacyAlertBtnText; + + /// 设置按钮文字颜色。 + late String? privacyAlertBtnTextColor; + + /// 设置按钮文字大小，默认值18 sp。 + late int? privacyAlertBtnTextSize; + + /// 设置按钮宽度。（单位：dp） + late int? privacyAlertBtnWidth; + + /// 设置按钮高度。（单位：dp） + late int? privacyAlertBtnHeigth; + + /// 设置右上角的关闭按钮。true（默认值）：显示关闭按钮。 + late bool? privacyAlertCloseBtnShow; + + /// 关闭按钮图片路径。 + late String? privacyAlertCloseImagPath; + + /// 关闭按钮缩放类型。 + late ScaleType? privacyAlertCloseScaleType; + + /// 关闭按钮宽度。（单位：dp） + late int? privacyAlertCloseImgWidth; + + /// 关闭按钮高度。（单位：dp） + late int? privacyAlertCloseImgHeight; + + /// 设置二次隐私协议弹窗点击背景蒙层是否关闭弹窗。true（默认值）：表示关闭 + late bool tapPrivacyAlertMaskCloseAlert; + + /// 成功获取token后是否自动关闭授权页面 + late bool? autoQuitPage; + + /// /// ------- 十三、toast设置 --------- /// + /// 为勾选用户协议时的提示文字 + late bool? isHideToast; + + /// 为勾选用户协议时的提示文字 + late String? toastText; + + /// toast的背景色 + late String? toastBackground; + + /// 文字颜色 + late String? toastColor; + + /// toast的padding + late int? toastPadding; + + /// 只有设置mode为top时才起作用，距离顶部的距离 + late int? toastMarginTop; + + /// 只有设置mode为bottom时才起作用，距离低部的距离 + late int? toastMarginBottom; + + /// toast的显示位置可用值 top、center、bottom + late String? toastPositionMode; + + /// 关闭的时长 默认3s + late int? toastDelay; + + /// 横屏水滴屏全屏适配 默认false + late bool? fullScreen; + + /// 授权页是否跟随系统深色模式 默认false + late bool? authPageUseDayLight; + + /// SDK内置所有界面隐藏底部导航栏 默认false + late bool? keepAllPageHideNavigationBar; + + /// 授权页物理返回键禁用 默认false + late bool? closeAuthPageReturnBack; + + AliAuthModel( + this.androidSk, + this.iosSk, { + this.isDebug = true, + this.isDelay = false, + this.pageType = PageType.fullPort, + this.privacyOffsetX, + this.statusBarColor, + this.bottomNavColor, + this.lightColor, + this.isStatusBarHidden, + this.statusBarUIFlag, + this.navColor, + this.navText, + this.navTextColor, + this.navReturnImgPath, + this.navReturnImgWidth, + this.navReturnImgHeight, + this.customReturnBtn, + this.navReturnHidden, + this.navReturnScaleType, + this.navHidden, + this.logoImgPath, + this.logoHidden, + this.numberColor, + this.numberSize, + this.switchAccHidden, + this.switchCheck, + this.switchAccTextColor, + this.logBtnText, + this.logBtnTextSize, + this.logBtnTextColor, + this.protocolOneName, + this.protocolOneURL, + this.protocolTwoName, + this.protocolTwoURL, + this.protocolThreeName, + this.protocolThreeURL, + this.protocolCustomColor, + this.protocolColor, + this.protocolLayoutGravity, + this.sloganTextColor, + + /// 授权页运营商协议文本颜色。 + this.protocolOwnColor, + + /// 授权页协议1文本颜色。 + this.protocolOwnOneColor, + + /// 授权页协议2文本颜色。 + this.protocolOwnTwoColor, + + /// 授权页协议3文本颜色。 + this.protocolOwnThreeColor, + this.sloganText, + this.logBtnBackgroundPath, + this.loadingImgPath, + this.sloganOffsetY, + this.logoOffsetY, + // ignore: non_constant_identifier_names + this.logoOffsetY_B, + this.logoScaleType, + this.numFieldOffsetY, + // ignore: non_constant_identifier_names + this.numFieldOffsetY_B, + this.numberFieldOffsetX, + this.numberLayoutGravity, + this.switchOffsetY, + // ignore: non_constant_identifier_names + this.switchOffsetY_B, + this.logBtnOffsetY, + // ignore: non_constant_identifier_names + this.logBtnOffsetY_B, + this.logBtnWidth, + this.logBtnHeight, + this.logBtnOffsetX, + this.logBtnMarginLeftAndRight, + this.logBtnLayoutGravity, + this.privacyOffsetY, + // ignore: non_constant_identifier_names + this.privacyOffsetY_B, + // ignore: non_constant_identifier_names + this.sloganOffsetY_B, + this.checkBoxWidth, + this.checkBoxHeight, + this.checkboxHidden, + this.navTextSize, + this.logoWidth, + this.logoHeight, + this.switchAccTextSize, + this.switchAccText, + this.sloganTextSize, + this.sloganHidden, + this.uncheckedImgPath, + this.checkedImgPath, + this.privacyState = false, + this.protocolGravity, + this.privacyTextSize, + this.privacyMargin, + this.privacyBefore, + this.privacyEnd, + this.vendorPrivacyPrefix, + this.vendorPrivacySuffix, + this.tapAuthPageMaskClosePage = false, + this.dialogWidth, + this.dialogHeight, + this.dialogBottom, + this.dialogOffsetX, + this.dialogOffsetY, + this.dialogCornerRadiusArray, + this.pageBackgroundRadius, + this.webViewStatusBarColor, + this.webNavColor, + this.webNavTextColor, + this.webNavTextSize, + this.webNavReturnImgPath, + this.webSupportedJavascript, + this.authPageActIn, + this.activityOut, + this.authPageActOut, + this.activityIn, + this.screenOrientation, + this.logBtnToastHidden, + this.dialogAlpha, + this.privacyOperatorIndex, + this.privacyConectTexts, + this.protocolAction, + this.packageName, + this.loadingBackgroundPath, + this.isHiddenToast, + this.autoHideLoginLoading, + this.isHiddenCustom, + this.customThirdView, + this.backgroundColor, + /** + * "assets/background_gif.gif" + * "assets/background_gif1.gif" + * "assets/background_gif2.gif" + * "assets/background_image.jpeg" + * "assets/background_video.mp4" + * + * "https://upfile.asqql.com/2009pasdfasdfic2009s305985-ts/2018-7/20187232061776607.gif" + * "https://img.zcool.cn/community/01dda35912d7a3a801216a3e3675b3.gif", + */ + this.pageBackgroundPath = "assets/background_image.jpeg", + this.backgroundImageContentMode = ContentMode.scaleAspectFill, + this.bottomNavBarColor, + this.alertBarIsHidden, + this.alertTitleBarColor, + this.alertCloseItemIsHidden, + this.alertCloseImagePath, + this.alertCloseImageX, + this.alertCloseImageY, + this.alertCloseImageW, + this.alertCloseImageH, + this.alertBlurViewColor, + this.alertBlurViewAlpha, + this.presentDirection, + this.privacyAlertIsNeedShow = false, + this.privacyAlertIsNeedAutoLogin = true, + this.privacyAlertMaskIsNeedShow = true, + this.privacyAlertMaskAlpha = 0.5, + this.privacyAlertMaskColor, + this.privacyAlertAlpha = 1, + this.privacyAlertBackgroundColor, + this.privacyAlertEntryAnimation, + this.privacyAlertExitAnimation, + this.privacyAlertCornerRadiusArray, + this.privacyAlertAlignment, + this.privacyAlertWidth, + this.privacyAlertHeight, + this.privacyAlertOffsetX, + this.privacyAlertOffsetY, + this.privacyAlertTitleContent, + this.privacyAlertTitleBackgroundColor, + this.privacyAlertTitleAlignment, + this.privacyAlertTitleOffsetX, + this.privacyAlertTitleOffsetY, + this.privacyAlertTitleTextSize = 18, + this.privacyAlertTitleColor, + this.privacyAlertContentBackgroundColor, + this.privacyAlertContentTextSize = 16, + this.privacyAlertContentAlignment, + this.privacyAlertContentColor, + this.privacyAlertContentBaseColor, + this.privacyAlertProtocolNameUseUnderLine = false, + this.privacyAlertContentHorizontalMargin, + this.privacyAlertContentVerticalMargin, + this.privacyAlertBtnBackgroundImgPath, + this.privacyAlertBefore, + this.privacyAlertEnd, + this.privacyAlertBtnText, + this.privacyAlertBtnTextColor, + this.privacyAlertBtnTextSize = 18, + this.privacyAlertBtnWidth, + this.privacyAlertBtnHeigth, + this.privacyAlertCloseBtnShow = true, + this.privacyAlertCloseImagPath, + this.privacyAlertCloseScaleType, + this.privacyAlertCloseImgWidth, + this.privacyAlertCloseImgHeight, + + /// 授权页协议1文本颜色。 + this.privacyAlertOwnOneColor, + + /// 授权页协议2文本颜色。 + this.privacyAlertOwnTwoColor, + + /// 授权页协议3文本颜色。 + this.privacyAlertOwnThreeColor, + + /// 授权页运营商协议文本颜色。 + this.privacyAlertOperatorColor, + this.tapPrivacyAlertMaskCloseAlert = true, + this.autoQuitPage = true, + this.isHideToast = false, + this.toastText = '请先阅读用户协议', + this.toastBackground = '#FF000000', + this.toastColor = '#FFFFFFFF', + this.toastPadding = 9, + this.toastMarginTop = 0, + this.toastMarginBottom = 0, + this.toastPositionMode = 'bottom', + this.toastDelay = 3, + this.fullScreen=false, + this.authPageUseDayLight=false, + this.keepAllPageHideNavigationBar=false, + this.closeAuthPageReturnBack=false, + }) : assert(androidSk != null || iosSk != null), + assert(pageType != null), + assert(isDelay != null); + + Map toJson() => _$AliAuthModelToJson(this); +} + +Map _$AliAuthModelToJson(AliAuthModel instance) => + { + 'androidSk': instance.androidSk, + 'iosSk': instance.iosSk, + 'isDebug': instance.isDebug ?? false, + 'isDelay': instance.isDelay ?? false, + 'pageType': instance.pageType?.index ?? 0, + 'statusBarColor': instance.statusBarColor, + 'bottomNavColor': instance.bottomNavColor, + 'lightColor': instance.lightColor, + 'isStatusBarHidden': instance.isStatusBarHidden, + 'statusBarUIFlag': EnumUtils.formatUiFagValue(instance.statusBarUIFlag), + 'navColor': instance.navColor, + 'navText': instance.navText, + 'navTextColor': instance.navTextColor ?? "#000000", + 'navReturnImgPath': instance.navReturnImgPath, + 'navReturnImgWidth': instance.navReturnImgWidth, + 'navReturnImgHeight': instance.navReturnImgHeight, + 'customReturnBtn': instance.customReturnBtn?.toJson() ?? {}, + 'navReturnHidden': instance.navReturnHidden, + 'navReturnScaleType': instance.navReturnScaleType?.index ?? 0, + 'navHidden': instance.navHidden, + 'logoImgPath': instance.logoImgPath, + 'logoHidden': instance.logoHidden, + 'numberColor': instance.numberColor, + 'numberSize': instance.numberSize, + 'switchAccHidden': instance.switchAccHidden, + 'switchCheck': instance.switchCheck, + 'switchAccTextColor': instance.switchAccTextColor, + 'logBtnText': instance.logBtnText ?? "本机一键登录", + 'logBtnTextSize': instance.logBtnTextSize, + 'logBtnTextColor': instance.logBtnTextColor, + 'sloganTextColor': instance.sloganTextColor, + 'protocolOwnColor': instance.protocolOwnColor, + 'protocolOwnOneColor': instance.protocolOwnOneColor, + 'protocolOwnTwoColor': instance.protocolOwnTwoColor, + 'sloganText': instance.sloganText, + 'logBtnBackgroundPath': instance.logBtnBackgroundPath, + 'loadingImgPath': instance.loadingImgPath, + 'sloganOffsetY': instance.sloganOffsetY, + 'logoOffsetY': instance.logoOffsetY, + 'logoOffsetY_B': instance.logoOffsetY_B, + 'logoScaleType': instance.logoScaleType?.index ?? 2, + 'numFieldOffsetY': instance.numFieldOffsetY, + 'numFieldOffsetY_B': instance.numFieldOffsetY_B, + 'numberFieldOffsetX': instance.numberFieldOffsetX, + 'numberLayoutGravity': + EnumUtils.formatGravityValue(instance.numberLayoutGravity), + 'switchOffsetY': instance.switchOffsetY, + 'switchOffsetY_B': instance.switchOffsetY_B, + 'logBtnOffsetY': instance.logBtnOffsetY, + 'logBtnOffsetY_B': instance.logBtnOffsetY_B, + 'logBtnWidth': instance.logBtnWidth, + 'logBtnHeight': instance.logBtnHeight, + 'logBtnOffsetX': instance.logBtnOffsetX, + 'logBtnMarginLeftAndRight': instance.logBtnMarginLeftAndRight, + 'logBtnLayoutGravity': + EnumUtils.formatGravityValue(instance.logBtnLayoutGravity), + 'sloganOffsetY_B': instance.sloganOffsetY_B, + 'checkBoxWidth': instance.checkBoxWidth, + 'checkBoxHeight': instance.checkBoxHeight, + 'checkboxHidden': instance.checkboxHidden, + 'navTextSize': instance.navTextSize, + 'logoWidth': instance.logoWidth, + 'logoHeight': instance.logoHeight, + 'switchAccTextSize': instance.switchAccTextSize, + 'switchAccText': instance.switchAccText ?? "切换到其他方式", + 'sloganTextSize': instance.sloganTextSize, + 'sloganHidden': instance.sloganHidden, + 'uncheckedImgPath': instance.uncheckedImgPath, + 'checkedImgPath': instance.checkedImgPath, + 'vendorPrivacyPrefix': instance.vendorPrivacyPrefix ?? "《", + 'vendorPrivacySuffix': instance.vendorPrivacySuffix ?? "》", + 'tapAuthPageMaskClosePage': instance.tapAuthPageMaskClosePage ?? false, + 'dialogWidth': instance.dialogWidth, + 'dialogHeight': instance.dialogHeight, + 'dialogBottom': instance.dialogBottom ?? false, + 'dialogOffsetX': instance.dialogOffsetX, + 'dialogOffsetY': instance.dialogOffsetY, + 'dialogAlpha': instance.dialogAlpha, + 'dialogCornerRadiusArray': instance.dialogCornerRadiusArray, + 'webViewStatusBarColor': instance.webViewStatusBarColor, + 'webNavColor': instance.webNavColor, + 'webNavTextColor': instance.webNavTextColor, + 'webNavTextSize': instance.webNavTextSize, + 'webNavReturnImgPath': instance.webNavReturnImgPath, + 'webSupportedJavascript': instance.webSupportedJavascript, + 'authPageActIn': instance.authPageActIn, + 'activityOut': instance.activityOut, + 'authPageActOut': instance.authPageActOut, + 'activityIn': instance.activityIn, + 'screenOrientation': instance.screenOrientation, + 'logBtnToastHidden': instance.logBtnToastHidden, + 'pageBackgroundRadius': instance.pageBackgroundRadius, + 'protocolOneName': instance.protocolOneName, + 'protocolOneURL': instance.protocolOneURL, + 'protocolTwoName': instance.protocolTwoName, + 'protocolTwoURL': instance.protocolTwoURL, + 'protocolColor': instance.protocolColor, + 'protocolLayoutGravity': + EnumUtils.formatGravityValue(instance.protocolLayoutGravity), + 'protocolThreeName': instance.protocolThreeName, + 'protocolThreeURL': instance.protocolThreeURL, + 'protocolCustomColor': instance.protocolCustomColor, + 'protocolAction': instance.protocolAction, + 'privacyState': instance.privacyState, + 'protocolGravity': EnumUtils.formatGravityValue(instance.protocolGravity), + 'privacyOffsetY': instance.privacyOffsetY, + 'privacyOffsetY_B': instance.privacyOffsetY_B, + 'privacyTextSize': instance.privacyTextSize, + 'privacyMargin': instance.privacyMargin, + 'privacyBefore': instance.privacyBefore ?? "我已阅读并同意", + 'privacyEnd': instance.privacyEnd, + 'packageName': instance.packageName, + 'privacyOperatorIndex': instance.privacyOperatorIndex, + 'privacyConectTexts': instance.privacyConectTexts ?? [",", "", "和"], + 'isHiddenCustom': instance.isHiddenCustom, + 'customThirdView': instance.customThirdView?.toJson() ?? {}, + 'backgroundColor': instance.backgroundColor ?? "#000000", + 'pageBackgroundPath': instance.pageBackgroundPath, + 'backgroundImageContentMode': + instance.backgroundImageContentMode?.index ?? 0, + 'bottomNavBarColor': instance.bottomNavBarColor, + 'alertBarIsHidden': instance.alertBarIsHidden, + 'alertTitleBarColor': + instance.alertTitleBarColor ?? instance.navColor ?? "#ffffff", + 'alertCloseItemIsHidden': instance.alertCloseItemIsHidden, + 'alertCloseImagePath': instance.alertCloseImagePath, + 'alertCloseImageX': instance.alertCloseImageX, + 'alertCloseImageY': instance.alertCloseImageY, + 'alertCloseImageW': instance.alertCloseImageW, + 'alertCloseImageH': instance.alertCloseImageH, + 'alertBlurViewColor': instance.alertBlurViewColor ?? "#000000", + 'alertBlurViewAlpha': instance.alertBlurViewAlpha ?? 0.5, + 'presentDirection': instance.presentDirection, + 'privacyAlertIsNeedShow': instance.privacyAlertIsNeedShow ?? false, + 'privacyAlertIsNeedAutoLogin': instance.privacyAlertIsNeedAutoLogin, + 'privacyAlertMaskIsNeedShow': instance.privacyAlertMaskIsNeedShow, + 'privacyAlertMaskAlpha': instance.privacyAlertMaskAlpha, + 'privacyAlertMaskColor': instance.privacyAlertMaskColor ?? "#000000", + 'privacyAlertAlpha': instance.privacyAlertAlpha, + 'privacyAlertBackgroundColor': + instance.privacyAlertBackgroundColor ?? "#ffffff", + 'privacyAlertEntryAnimation': instance.privacyAlertEntryAnimation, + 'privacyAlertExitAnimation': instance.privacyAlertExitAnimation, + 'privacyAlertCornerRadiusArray': + instance.privacyAlertCornerRadiusArray ?? [10, 10, 10, 10], + 'privacyAlertAlignment': + EnumUtils.formatGravityValue(instance.privacyAlertAlignment), + 'privacyAlertWidth': instance.privacyAlertWidth, + 'privacyAlertHeight': instance.privacyAlertHeight, + 'privacyAlertOffsetX': instance.privacyAlertOffsetX, + 'privacyAlertOffsetY': instance.privacyAlertOffsetY, + 'privacyAlertTitleContent': + instance.privacyAlertTitleContent ?? "请阅读并同意以下条款", + 'privacyAlertTitleBackgroundColor': + instance.privacyAlertTitleBackgroundColor ?? "#ffffff", + 'privacyAlertTitleAlignment': EnumUtils.formatGravityValue( + instance.privacyAlertTitleAlignment ?? Gravity.centerHorizntal), + 'privacyAlertTitleOffsetX': instance.privacyAlertTitleOffsetX, + 'privacyAlertTitleOffsetY': instance.privacyAlertTitleOffsetY, + 'privacyAlertTitleTextSize': instance.privacyAlertTitleTextSize ?? 22, + 'privacyAlertTitleColor': instance.privacyAlertTitleColor ?? "#000000", + 'privacyAlertContentBackgroundColor': + instance.privacyAlertContentBackgroundColor ?? "#ffffff", + 'privacyAlertContentTextSize': instance.privacyAlertContentTextSize ?? 12, + 'privacyAlertContentAlignment': + EnumUtils.formatGravityValue(instance.privacyAlertContentAlignment), + 'privacyAlertContentColor': instance.privacyAlertContentColor, + 'privacyAlertContentBaseColor': instance.privacyAlertContentBaseColor, + 'privacyAlertProtocolNameUseUnderLine': + instance.privacyAlertProtocolNameUseUnderLine, + 'privacyAlertContentHorizontalMargin': + instance.privacyAlertContentHorizontalMargin, + 'privacyAlertContentVerticalMargin': + instance.privacyAlertContentVerticalMargin ?? 10, + 'privacyAlertBtnBackgroundImgPath': + instance.privacyAlertBtnBackgroundImgPath ?? "", + 'privacyAlertBefore': instance.privacyAlertBefore ?? "", + 'privacyAlertEnd': instance.privacyAlertEnd ?? "", + 'privacyAlertBtnText': instance.privacyAlertBtnText ?? "同意并登录", + 'privacyAlertBtnTextColor': instance.privacyAlertBtnTextColor, + 'privacyAlertBtnTextSize': instance.privacyAlertBtnTextSize ?? 10, + 'privacyAlertBtnWidth': instance.privacyAlertBtnWidth, + 'privacyAlertBtnHeigth': instance.privacyAlertBtnHeigth, + 'privacyAlertCloseBtnShow': instance.privacyAlertCloseBtnShow, + 'privacyAlertCloseImagPath': instance.privacyAlertCloseImagPath, + 'privacyAlertCloseScaleType': + instance.privacyAlertCloseScaleType?.index ?? 0, + 'privacyAlertCloseImgWidth': instance.privacyAlertCloseImgWidth, + 'privacyAlertCloseImgHeight': instance.privacyAlertCloseImgHeight, + 'privacyAlertOwnOneColor': instance.privacyAlertOwnOneColor, + 'privacyAlertOwnTwoColor': instance.privacyAlertOwnTwoColor, + 'privacyAlertOwnThreeColor': instance.privacyAlertOwnThreeColor, + 'tapPrivacyAlertMaskCloseAlert': instance.tapPrivacyAlertMaskCloseAlert, + 'isHiddenToast': instance.isHiddenToast, + 'autoHideLoginLoading': instance.autoHideLoginLoading ?? true, + 'autoQuitPage': instance.autoQuitPage, + 'isHideToast': instance.isHideToast, + 'toastText': instance.toastText, + 'toastBackground': instance.toastBackground, + 'toastColor': instance.toastColor, + 'toastPadding': instance.toastPadding, + 'toastMarginTop': instance.toastMarginTop, + 'toastMarginBottom': instance.toastMarginBottom, + 'toastPositionMode': instance.toastPositionMode, + 'toastDelay': instance.toastDelay, + 'fullScreen': instance.fullScreen ?? false, + 'authPageUseDayLight': instance.authPageUseDayLight ?? false, + 'keepAllPageHideNavigationBar': instance.keepAllPageHideNavigationBar ?? false, + 'closeAuthPageReturnBack': instance.closeAuthPageReturnBack ?? false, + }; + +/// 初始配置&注意事项 +/// 所有关于路径的字段需要在android/app/src/main/res/drawable 或者 drawable-xxxxxx 目录下有对应资源 +/// 所有设置的大小都为dp 或者 单位 如果px 单位需要转换 +/// 所有颜色设置为 十六进制颜色代码 加上两位数的透明度 例如 #00ffffff 为透明 #ffffff为白色 +/// 当设置参数isdialog为false时 dialog 相关设置参数设置无效 +/// 默认开启自定义第三方布局 加载文件为android/app/src/main/res/layout/custom_login.xml 名称的xml布局文件 如果自定义，修改改文件即可 +/// 在自定义登录布局中点击事件返回的状态吗统一为returnCode：700005 returnData：点击的第几个按钮 // 具体看md +/// 参数dialogOffsetX dialogOffsetY 设置为-1 默认为居中 +/// 关于弹窗的梦层设置 android/app/src/main/res/value/style.xml authsdk_activity_dialog参数设置 +/// 当开启customPageBackgroundLyout 参数时 请确保layout 文件夹下有custom_page_background 名称布局文件，否则加载默认布局文件 +/// ios 当开启customPageBackgroundLyout时 navReturnImgPath navReturnImgWidth/navReturnImgHeight理论最大高度45左右参数为必须参数否则报错 +/// 'appPrivacyOne'、'appPrivacyTwo' 字段中的逗号拼接处请勿使用多余的空格，以免出现未知错误 +/// dialogBottom 为false时 默认水平垂直居中 +/// 如果需要修改弹窗的圆角背景可修改android/app/src/main/res/drawable/dialog_background_color.xml 文件 +/// 'appPrivacyOne'、'appPrivacyTwo' 字段中的逗号拼接处请勿使用多余的空格，以免出现未知错误 diff --git a/airhub_app/packages/ali_auth/lib/ali_auth_platform_interface.dart b/airhub_app/packages/ali_auth/lib/ali_auth_platform_interface.dart new file mode 100644 index 0000000..7f51132 --- /dev/null +++ b/airhub_app/packages/ali_auth/lib/ali_auth_platform_interface.dart @@ -0,0 +1,118 @@ +import 'package:ali_auth/ali_auth_model.dart'; +import 'package:plugin_platform_interface/plugin_platform_interface.dart'; +import 'ali_auth_method_channel.dart' + if (dart.library.html) "ali_auth_web.dart"; + +abstract class AliAuthPlatform extends PlatformInterface { + /// Constructs a AliAuthPlatform. + AliAuthPlatform() : super(token: _token); + + static final Object _token = Object(); + + static AliAuthPlatform _instance = MethodChannelAliAuth(); + + /// The default instance of [AliAuthPlatform] to use. + /// + /// Defaults to [MethodChannelAliAuth]. + static AliAuthPlatform get instance => _instance; + + Future? get appleLogin => null; + + Future? get checkCellularDataEnable => null; + + /// Platform-specific implementations should set this with their own + /// platform-specific class that extends [AliAuthPlatform] when + /// they register themselves. + static set instance(AliAuthPlatform instance) { + PlatformInterface.verifyToken(instance, _token); + _instance = instance; + } + + Future getPlatformVersion() { + throw UnimplementedError('platformVersion() has not been implemented.'); + } + + Future getSdkVersion() { + throw UnimplementedError('getSdkVersion() has not been implemented.'); + } + + Stream? onChange({bool type = true}) { + throw UnimplementedError('onChange() has not been implemented.'); + } + + resume() { + throw UnimplementedError('resume() has not been implemented.'); + } + + dispose() { + throw UnimplementedError('dispose() has not been implemented.'); + } + + pause() { + throw UnimplementedError('pause() has not been implemented.'); + } + + Future openPage(String? pageRoute) { + throw UnimplementedError('openPage() has not been implemented.'); + } + + Future quitPage() { + throw UnimplementedError('quitPage() has not been implemented.'); + } + + Future checkEnvAvailable() { + throw UnimplementedError('checkEnvAvailable() has not been implemented.'); + } + + Future queryCheckBoxIsChecked() { + throw UnimplementedError('queryCheckBoxIsChecked() has not been implemented.'); + } + + Future setCheckboxIsChecked() { + throw UnimplementedError('setCheckboxIsChecked() has not been implemented.'); + } + + Future hideLoading() { + throw UnimplementedError('quitPage() has not been implemented.'); + } + + Future getCurrentCarrierName() { + throw UnimplementedError('quitPage() has not been implemented.'); + } + + Future login({int timeout = 5000}) { + throw UnimplementedError('login() has not been implemented.'); + } + + Future initSdk(AliAuthModel? config) { + throw UnimplementedError('login() has not been implemented.'); + } + + loginListen( + {bool type = true, + required Function onEvent, + Function? onError, + isOnlyOne = true}) { + throw UnimplementedError('loginListen() has not been implemented.'); + } + + Future getConnection() { + throw UnimplementedError('getSdkVersion() has not been implemented.'); + } + + Future setLoggerEnable(bool isEnable) { + throw UnimplementedError('getSdkVersion() has not been implemented.'); + } + + /// 调用之前先去用户服务端获取accessToken和jwtToken + Future checkAuthAvailable(String accessToken, String jwtToken, + Function(dynamic) success, Function(dynamic) error) async { + throw UnimplementedError('getSdkVersion() has not been implemented.'); + } + + /// 身份鉴权成功后才可调用获取Token接口。 + Future getVerifyToken( + Function(dynamic) success, Function(dynamic) error) async { + throw UnimplementedError('getSdkVersion() has not been implemented.'); + } +} diff --git a/airhub_app/packages/ali_auth/lib/ali_auth_web.dart b/airhub_app/packages/ali_auth/lib/ali_auth_web.dart new file mode 100644 index 0000000..7232087 --- /dev/null +++ b/airhub_app/packages/ali_auth/lib/ali_auth_web.dart @@ -0,0 +1,48 @@ +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; +import 'ali_auth_web_api.dart'; +import 'ali_auth_platform_interface.dart'; +export 'ali_auth_method_channel.dart'; + +/// A web implementation of the AliAuthPlatform of the AliAuth plugin. +class AliAuthPluginWeb extends AliAuthPlatform { + AliAuthPluginWeb(); + + AliAuthPluginWebApi aliAuthPluginWebApi = AliAuthPluginWebApi(); + + static void registerWith(Registrar registrar) { + AliAuthPlatform.instance = AliAuthPluginWeb(); + } + + @override + Future getPlatformVersion() async { + return 'web'; + } + + @override + Future getSdkVersion() async { + return await aliAuthPluginWebApi.getVersion(); + } + + @override + Future getConnection() async { + return await aliAuthPluginWebApi.getConnection(); + } + + @override + Future setLoggerEnable(bool isEnable) async { + return await aliAuthPluginWebApi.setLoggerEnable(isEnable); + } + + @override + Future checkAuthAvailable(String accessToken, String jwtToken, + Function(dynamic) success, Function(dynamic) error) async { + aliAuthPluginWebApi.checkAuthAvailable( + accessToken, jwtToken, success, error); + } + + @override + Future getVerifyToken( + Function(dynamic) success, Function(dynamic) error) async { + aliAuthPluginWebApi.getVerifyToken(success, error); + } +} diff --git a/airhub_app/packages/ali_auth/lib/ali_auth_web_api.dart b/airhub_app/packages/ali_auth/lib/ali_auth_web_api.dart new file mode 100644 index 0000000..e652473 --- /dev/null +++ b/airhub_app/packages/ali_auth/lib/ali_auth_web_api.dart @@ -0,0 +1,16 @@ +/// Web stub for ali_auth — provides matching API surface without dart:js_interop @JS classes. +/// These are never actually called since the app uses conditional imports to skip ali_auth on web. + +class AliAuthPluginWebApi { + Future getConnection() async => null; + + Future setLoggerEnable(bool isEnable) async {} + + Future getVersion() async => null; + + Future checkAuthAvailable(String accessToken, String jwtToken, + Function(dynamic ststus) success, Function(dynamic ststus) error) async {} + + Future getVerifyToken( + Function(dynamic ststus) success, Function(dynamic ststus) error) async {} +} diff --git a/airhub_app/packages/ali_auth/lib/ali_auth_web_utils.dart b/airhub_app/packages/ali_auth/lib/ali_auth_web_utils.dart new file mode 100644 index 0000000..32f171a --- /dev/null +++ b/airhub_app/packages/ali_auth/lib/ali_auth_web_utils.dart @@ -0,0 +1,31 @@ +import 'dart:async'; +import 'dart:js_util'; +import 'dart:js_interop'; + +typedef Func1 = R Function(A a); + +@JS('JSON.stringify') +external String stringify(Object obj); + +@JS('console.log') +external void log(Object obj); + +@JS('alert') +external void alert(Object obj); + +@JS('Promise') +class PromiseJsImpl extends ThenableJsImpl { + external PromiseJsImpl(Function resolver); + external static PromiseJsImpl all(List values); + external static PromiseJsImpl reject(error); + external static PromiseJsImpl resolve(value); +} + +@anonymous +@JS() +abstract class ThenableJsImpl { + external ThenableJsImpl then([Func1 onResolve, Func1 onReject]); +} + +Future handleThenable(ThenableJsImpl thenable) => + promiseToFuture(thenable); diff --git a/airhub_app/packages/ali_auth/pubspec.lock b/airhub_app/packages/ali_auth/pubspec.lock new file mode 100644 index 0000000..f724d0a --- /dev/null +++ b/airhub_app/packages/ali_auth/pubspec.lock @@ -0,0 +1,218 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + async: + dependency: transitive + description: + name: async + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + url: "https://pub.dev" + source: hosted + version: "2.13.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + clock: + dependency: transitive + description: + name: clock + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" + source: hosted + version: "1.1.2" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1" + url: "https://pub.dev" + source: hosted + version: "6.0.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" + url: "https://pub.dev" + source: hosted + version: "11.0.2" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" + url: "https://pub.dev" + source: hosted + version: "3.0.10" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + lints: + dependency: transitive + description: + name: lints + sha256: "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df" + url: "https://pub.dev" + source: hosted + version: "6.1.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" + source: hosted + version: "0.12.17" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" + source: hosted + version: "0.11.1" + meta: + dependency: transitive + description: + name: meta + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + url: "https://pub.dev" + source: hosted + version: "1.17.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + plugin_platform_interface: + dependency: "direct main" + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_span: + dependency: transitive + description: + name: source_span + sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab" + url: "https://pub.dev" + source: hosted + version: "1.10.2" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" + source: hosted + version: "1.12.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 + url: "https://pub.dev" + source: hosted + version: "0.7.7" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + url: "https://pub.dev" + source: hosted + version: "2.2.0" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" + url: "https://pub.dev" + source: hosted + version: "15.0.2" +sdks: + dart: ">=3.8.0 <=3.38.9" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/airhub_app/packages/ali_auth/pubspec.yaml b/airhub_app/packages/ali_auth/pubspec.yaml new file mode 100644 index 0000000..bfdcd91 --- /dev/null +++ b/airhub_app/packages/ali_auth/pubspec.yaml @@ -0,0 +1,78 @@ +name: ali_auth +description: This is a plug-in for one click login in the alicloud number authentication service. Alibaba cloud is also used in the one click login function +version: 1.3.7 +homepage: https://github.com/CodeGather/flutter_ali_auth +repository: https://github.com/CodeGather/flutter_ali_auth/tree/master/example +issue_tracker: https://github.com/CodeGather/flutter_ali_auth/issues +topics: [aliyun, phone] + +environment: + sdk: ">=2.19.0 <=3.38.9" + flutter: ">=3.16.8" + +dependencies: + flutter: + sdk: flutter + flutter_web_plugins: + sdk: flutter + plugin_platform_interface: ^2.1.8 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^6.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter. +flutter: + # This section identifies this Flutter project as a plugin project. + # The 'pluginClass' and Android 'package' identifiers should not ordinarily + # be modified. They are used by the tooling to maintain consistency when + # adding or updating assets for this project. + plugin: + platforms: + android: + package: com.sean.rao.ali_auth + pluginClass: AliAuthPlugin + ios: + pluginClass: AliAuthPlugin + web: + pluginClass: AliAuthPluginWeb + fileName: ali_auth_web.dart + + # To add assets to your plugin package, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + # + # For details regarding assets in packages, see + # https://flutter.dev/assets-and-images/#from-packages + # + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware. + + # To add custom fonts to your plugin package, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts in packages, see + # https://flutter.dev/custom-fonts/#from-packages + +screenshots: + - description: The flutter ali_auth package logo. + path: screenshots/logo.png \ No newline at end of file diff --git a/airhub_app/pubspec.lock b/airhub_app/pubspec.lock index a8aeb50..72b06ee 100644 --- a/airhub_app/pubspec.lock +++ b/airhub_app/pubspec.lock @@ -6,15 +6,22 @@ packages: description: name: _fe_analyzer_shared sha256: c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "91.0.0" + ali_auth: + dependency: "direct main" + description: + path: "packages/ali_auth" + relative: true + source: path + version: "1.3.7" analyzer: dependency: transitive description: name: analyzer sha256: a40a0cee526a7e1f387c6847bd8a5ccbf510a75952ef8a28338e989558072cb0 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "8.4.0" analyzer_buffer: @@ -22,7 +29,7 @@ packages: description: name: analyzer_buffer sha256: aba2f75e63b3135fd1efaa8b6abefe1aa6e41b6bd9806221620fa48f98156033 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.1.11" analyzer_plugin: @@ -30,7 +37,7 @@ packages: description: name: analyzer_plugin sha256: "08cfefa90b4f4dd3b447bda831cecf644029f9f8e22820f6ee310213ebe2dd53" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.13.10" args: @@ -38,7 +45,7 @@ packages: description: name: args sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.7.0" async: @@ -46,7 +53,7 @@ packages: description: name: async sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.13.0" audio_session: @@ -54,7 +61,7 @@ packages: description: name: audio_session sha256: "2b7fff16a552486d078bfc09a8cde19f426dc6d6329262b684182597bec5b1ac" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.1.25" bluez: @@ -62,7 +69,7 @@ packages: description: name: bluez sha256: "61a7204381925896a374301498f2f5399e59827c6498ae1e924aaa598751b545" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.8.3" boolean_selector: @@ -70,7 +77,7 @@ packages: description: name: boolean_selector sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.2" build: @@ -78,7 +85,7 @@ packages: description: name: build sha256: "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.0.4" build_config: @@ -86,7 +93,7 @@ packages: description: name: build_config sha256: "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.0" build_daemon: @@ -94,7 +101,7 @@ packages: description: name: build_daemon sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.1.1" build_runner: @@ -102,7 +109,7 @@ packages: description: name: build_runner sha256: ac78098de97893812b7aff1154f29008fa2464cad9e8e7044d39bc905dad4fbc - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.11.0" built_collection: @@ -110,7 +117,7 @@ packages: description: name: built_collection sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "5.1.1" built_value: @@ -118,7 +125,7 @@ packages: description: name: built_value sha256: "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "8.12.3" characters: @@ -126,7 +133,7 @@ packages: description: name: characters sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.4.0" checked_yaml: @@ -134,7 +141,7 @@ packages: description: name: checked_yaml sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.4" ci: @@ -142,7 +149,7 @@ packages: description: name: ci sha256: "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.1.0" cli_config: @@ -150,7 +157,7 @@ packages: description: name: cli_config sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.0" cli_util: @@ -158,7 +165,7 @@ packages: description: name: cli_util sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.4.2" clock: @@ -166,7 +173,7 @@ packages: description: name: clock sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.2" code_assets: @@ -174,7 +181,7 @@ packages: description: name: code_assets sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.0" code_builder: @@ -182,7 +189,7 @@ packages: description: name: code_builder sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.11.1" collection: @@ -190,7 +197,7 @@ packages: description: name: collection sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.19.1" convert: @@ -198,7 +205,7 @@ packages: description: name: convert sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.1.2" coverage: @@ -206,7 +213,7 @@ packages: description: name: coverage sha256: "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.15.0" cross_file: @@ -214,7 +221,7 @@ packages: description: name: cross_file sha256: "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.3.5+2" crypto: @@ -222,7 +229,7 @@ packages: description: name: crypto sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.7" custom_lint: @@ -230,7 +237,7 @@ packages: description: name: custom_lint sha256: "751ee9440920f808266c3ec2553420dea56d3c7837dd2d62af76b11be3fcece5" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.8.1" custom_lint_builder: @@ -238,7 +245,7 @@ packages: description: name: custom_lint_builder sha256: "1128db6f58e71d43842f3b9be7465c83f0c47f4dd8918f878dd6ad3b72a32072" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.8.1" custom_lint_core: @@ -246,7 +253,7 @@ packages: description: name: custom_lint_core sha256: "85b339346154d5646952d44d682965dfe9e12cae5febd706f0db3aa5010d6423" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.8.1" custom_lint_visitor: @@ -254,7 +261,7 @@ packages: description: name: custom_lint_visitor sha256: "91f2a81e9f0abb4b9f3bb529f78b6227ce6050300d1ae5b1e2c69c66c7a566d8" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.0+8.4.0" dart_style: @@ -262,7 +269,7 @@ packages: description: name: dart_style sha256: a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.1.3" dbus: @@ -270,15 +277,31 @@ packages: description: name: dbus sha256: d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.7.12" + dio: + dependency: "direct main" + description: + name: dio + sha256: b9d46faecab38fc8cc286f80bc4d61a3bb5d4ac49e51ed877b4d6706efe57b25 + url: "https://pub.dev" + source: hosted + version: "5.9.1" + dio_web_adapter: + dependency: transitive + description: + name: dio_web_adapter + sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78" + url: "https://pub.dev" + source: hosted + version: "2.1.1" fake_async: dependency: transitive description: name: fake_async sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.3.3" ffi: @@ -286,7 +309,7 @@ packages: description: name: ffi sha256: d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.5" file: @@ -294,7 +317,7 @@ packages: description: name: file sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "7.0.1" file_selector_linux: @@ -302,7 +325,7 @@ packages: description: name: file_selector_linux sha256: "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.9.4" file_selector_macos: @@ -310,7 +333,7 @@ packages: description: name: file_selector_macos sha256: "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.9.5" file_selector_platform_interface: @@ -318,7 +341,7 @@ packages: description: name: file_selector_platform_interface sha256: "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.7.0" file_selector_windows: @@ -326,7 +349,7 @@ packages: description: name: file_selector_windows sha256: "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.9.3+5" fixnum: @@ -334,7 +357,7 @@ packages: description: name: fixnum sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.1" flutter: @@ -347,7 +370,7 @@ packages: description: name: flutter_blue_plus sha256: "69a8c87c11fc792e8cf0f997d275484fbdb5143ac9f0ac4d424429700cb4e0ed" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.36.8" flutter_blue_plus_android: @@ -355,7 +378,7 @@ packages: description: name: flutter_blue_plus_android sha256: "6f7fe7e69659c30af164a53730707edc16aa4d959e4c208f547b893d940f853d" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "7.0.4" flutter_blue_plus_darwin: @@ -363,7 +386,7 @@ packages: description: name: flutter_blue_plus_darwin sha256: "682982862c1d964f4d54a3fb5fccc9e59a066422b93b7e22079aeecd9c0d38f8" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "7.0.3" flutter_blue_plus_linux: @@ -371,7 +394,7 @@ packages: description: name: flutter_blue_plus_linux sha256: "56b0c45edd0a2eec8f85bd97a26ac3cd09447e10d0094fed55587bf0592e3347" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "7.0.3" flutter_blue_plus_platform_interface: @@ -379,7 +402,7 @@ packages: description: name: flutter_blue_plus_platform_interface sha256: "84fbd180c50a40c92482f273a92069960805ce324e3673ad29c41d2faaa7c5c2" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "7.0.0" flutter_blue_plus_web: @@ -387,7 +410,7 @@ packages: description: name: flutter_blue_plus_web sha256: a1aceee753d171d24c0e0cdadb37895b5e9124862721f25f60bb758e20b72c99 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "7.0.2" flutter_lints: @@ -395,7 +418,7 @@ packages: description: name: flutter_lints sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.0.0" flutter_localizations: @@ -408,7 +431,7 @@ packages: description: name: flutter_plugin_android_lifecycle sha256: ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.33" flutter_riverpod: @@ -416,7 +439,7 @@ packages: description: name: flutter_riverpod sha256: "9e2d6907f12cc7d23a846847615941bddee8709bf2bfd274acdf5e80bcf22fde" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.3" flutter_svg: @@ -424,7 +447,7 @@ packages: description: name: flutter_svg sha256: "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.2.3" flutter_test: @@ -442,7 +465,7 @@ packages: description: name: fpdart sha256: f8e9d0989ba293946673e382c59ac513e30cb6746a9452df195f29e3357a73d4 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.0" freezed: @@ -450,7 +473,7 @@ packages: description: name: freezed sha256: "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.2.3" freezed_annotation: @@ -458,7 +481,7 @@ packages: description: name: freezed_annotation sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.1.0" frontend_server_client: @@ -466,7 +489,7 @@ packages: description: name: frontend_server_client sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.0.0" glob: @@ -474,7 +497,7 @@ packages: description: name: glob sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.3" go_router: @@ -482,7 +505,7 @@ packages: description: name: go_router sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "14.8.1" google_fonts: @@ -490,7 +513,7 @@ packages: description: name: google_fonts sha256: ba03d03bcaa2f6cb7bd920e3b5027181db75ab524f8891c8bc3aa603885b8055 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.3.3" graphs: @@ -498,7 +521,7 @@ packages: description: name: graphs sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.3.2" hooks: @@ -506,7 +529,7 @@ packages: description: name: hooks sha256: "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.1" hotreloader: @@ -514,7 +537,7 @@ packages: description: name: hotreloader sha256: bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.3.0" http: @@ -522,7 +545,7 @@ packages: description: name: http sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.6.0" http_multi_server: @@ -530,7 +553,7 @@ packages: description: name: http_multi_server sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.2.2" http_parser: @@ -538,7 +561,7 @@ packages: description: name: http_parser sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.1.2" image_picker: @@ -546,7 +569,7 @@ packages: description: name: image_picker sha256: "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.1" image_picker_android: @@ -554,7 +577,7 @@ packages: description: name: image_picker_android sha256: "518a16108529fc18657a3e6dde4a043dc465d16596d20ab2abd49a4cac2e703d" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.8.13+13" image_picker_for_web: @@ -562,7 +585,7 @@ packages: description: name: image_picker_for_web sha256: "66257a3191ab360d23a55c8241c91a6e329d31e94efa7be9cf7a212e65850214" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.1.1" image_picker_ios: @@ -570,7 +593,7 @@ packages: description: name: image_picker_ios sha256: b9c4a438a9ff4f60808c9cf0039b93a42bb6c2211ef6ebb647394b2b3fa84588 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.8.13+6" image_picker_linux: @@ -578,7 +601,7 @@ packages: description: name: image_picker_linux sha256: "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.2" image_picker_macos: @@ -586,7 +609,7 @@ packages: description: name: image_picker_macos sha256: "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.2+1" image_picker_platform_interface: @@ -594,7 +617,7 @@ packages: description: name: image_picker_platform_interface sha256: "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.11.1" image_picker_windows: @@ -602,7 +625,7 @@ packages: description: name: image_picker_windows sha256: d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.2" intl: @@ -610,7 +633,7 @@ packages: description: name: intl sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.20.2" io: @@ -618,7 +641,7 @@ packages: description: name: io sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.5" js: @@ -626,7 +649,7 @@ packages: description: name: js sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.7.2" json_annotation: @@ -634,7 +657,7 @@ packages: description: name: json_annotation sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.9.0" json_serializable: @@ -642,7 +665,7 @@ packages: description: name: json_serializable sha256: c5b2ee75210a0f263c6c7b9eeea80553dbae96ea1bf57f02484e806a3ffdffa3 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.11.2" just_audio: @@ -650,7 +673,7 @@ packages: description: name: just_audio sha256: f978d5b4ccea08f267dae0232ec5405c1b05d3f3cd63f82097ea46c015d5c09e - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.9.46" just_audio_platform_interface: @@ -658,7 +681,7 @@ packages: description: name: just_audio_platform_interface sha256: "2532c8d6702528824445921c5ff10548b518b13f808c2e34c2fd54793b999a6a" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.6.0" just_audio_web: @@ -666,7 +689,7 @@ packages: description: name: just_audio_web sha256: "6ba8a2a7e87d57d32f0f7b42856ade3d6a9fbe0f1a11fabae0a4f00bb73f0663" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.4.16" leak_tracker: @@ -674,7 +697,7 @@ packages: description: name: leak_tracker sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "11.0.2" leak_tracker_flutter_testing: @@ -682,7 +705,7 @@ packages: description: name: leak_tracker_flutter_testing sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.10" leak_tracker_testing: @@ -690,7 +713,7 @@ packages: description: name: leak_tracker_testing sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.2" lints: @@ -698,7 +721,7 @@ packages: description: name: lints sha256: "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.1.0" logging: @@ -706,7 +729,7 @@ packages: description: name: logging sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.3.0" matcher: @@ -714,7 +737,7 @@ packages: description: name: matcher sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.12.17" material_color_utilities: @@ -722,7 +745,7 @@ packages: description: name: material_color_utilities sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.11.1" meta: @@ -730,7 +753,7 @@ packages: description: name: meta sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.17.0" mime: @@ -738,7 +761,7 @@ packages: description: name: mime sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.0" mockito: @@ -746,7 +769,7 @@ packages: description: name: mockito sha256: a45d1aa065b796922db7b9e7e7e45f921aed17adf3a8318a1f47097e7e695566 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "5.6.3" native_toolchain_c: @@ -754,7 +777,7 @@ packages: description: name: native_toolchain_c sha256: "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.17.4" node_preamble: @@ -762,7 +785,7 @@ packages: description: name: node_preamble sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.2" objective_c: @@ -770,7 +793,7 @@ packages: description: name: objective_c sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "9.3.0" package_config: @@ -778,7 +801,7 @@ packages: description: name: package_config sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.2.0" path: @@ -786,7 +809,7 @@ packages: description: name: path sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.9.1" path_parsing: @@ -794,7 +817,7 @@ packages: description: name: path_parsing sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.0" path_provider: @@ -802,7 +825,7 @@ packages: description: name: path_provider sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.5" path_provider_android: @@ -810,7 +833,7 @@ packages: description: name: path_provider_android sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.2.22" path_provider_foundation: @@ -818,7 +841,7 @@ packages: description: name: path_provider_foundation sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.6.0" path_provider_linux: @@ -826,7 +849,7 @@ packages: description: name: path_provider_linux sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.2.1" path_provider_platform_interface: @@ -834,7 +857,7 @@ packages: description: name: path_provider_platform_interface sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.2" path_provider_windows: @@ -842,7 +865,7 @@ packages: description: name: path_provider_windows sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.3.0" permission_handler: @@ -850,7 +873,7 @@ packages: description: name: permission_handler sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "11.4.0" permission_handler_android: @@ -858,7 +881,7 @@ packages: description: name: permission_handler_android sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "12.1.0" permission_handler_apple: @@ -866,7 +889,7 @@ packages: description: name: permission_handler_apple sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "9.4.7" permission_handler_html: @@ -874,7 +897,7 @@ packages: description: name: permission_handler_html sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.1.3+5" permission_handler_platform_interface: @@ -882,7 +905,7 @@ packages: description: name: permission_handler_platform_interface sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.3.0" permission_handler_windows: @@ -890,7 +913,7 @@ packages: description: name: permission_handler_windows sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.1" petitparser: @@ -898,7 +921,7 @@ packages: description: name: petitparser sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "7.0.1" platform: @@ -906,7 +929,7 @@ packages: description: name: platform sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.1.6" plugin_platform_interface: @@ -914,7 +937,7 @@ packages: description: name: plugin_platform_interface sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.8" pool: @@ -922,7 +945,7 @@ packages: description: name: pool sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.5.2" pub_semver: @@ -930,7 +953,7 @@ packages: description: name: pub_semver sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.2.0" pubspec_parse: @@ -938,7 +961,7 @@ packages: description: name: pubspec_parse sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.5.0" riverpod: @@ -946,7 +969,7 @@ packages: description: name: riverpod sha256: c406de02bff19d920b832bddfb8283548bfa05ce41c59afba57ce643e116aa59 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.3" riverpod_analyzer_utils: @@ -954,7 +977,7 @@ packages: description: name: riverpod_analyzer_utils sha256: a0f68adb078b790faa3c655110a017f9a7b7b079a57bbd40f540e80dce5fcd29 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.0-dev.7" riverpod_annotation: @@ -962,7 +985,7 @@ packages: description: name: riverpod_annotation sha256: "7230014155777fc31ba3351bc2cb5a3b5717b11bfafe52b1553cb47d385f8897" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.3" riverpod_generator: @@ -970,7 +993,7 @@ packages: description: name: riverpod_generator sha256: "49894543a42cf7a9954fc4e7366b6d3cb2e6ec0fa07775f660afcdd92d097702" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.3" riverpod_lint: @@ -978,7 +1001,7 @@ packages: description: name: riverpod_lint sha256: "7ef9c43469e9b5ac4e4c3b24d7c30642e47ce1b12cd7dcdd643534db0a72ed13" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.3" rxdart: @@ -986,15 +1009,71 @@ packages: description: name: rxdart sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.28.0" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64" + url: "https://pub.dev" + source: hosted + version: "2.5.4" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f + url: "https://pub.dev" + source: hosted + version: "2.4.20" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f" + url: "https://pub.dev" + source: hosted + version: "2.5.6" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 + url: "https://pub.dev" + source: hosted + version: "2.4.3" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" shelf: dependency: transitive description: name: shelf sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.4.2" shelf_packages_handler: @@ -1002,7 +1081,7 @@ packages: description: name: shelf_packages_handler sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.2" shelf_static: @@ -1010,7 +1089,7 @@ packages: description: name: shelf_static sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.3" shelf_web_socket: @@ -1018,7 +1097,7 @@ packages: description: name: shelf_web_socket sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.0" sky_engine: @@ -1031,7 +1110,7 @@ packages: description: name: source_gen sha256: "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.2.0" source_helper: @@ -1039,7 +1118,7 @@ packages: description: name: source_helper sha256: "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.3.8" source_map_stack_trace: @@ -1047,7 +1126,7 @@ packages: description: name: source_map_stack_trace sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.2" source_maps: @@ -1055,7 +1134,7 @@ packages: description: name: source_maps sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.10.13" source_span: @@ -1063,7 +1142,7 @@ packages: description: name: source_span sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.10.2" stack_trace: @@ -1071,7 +1150,7 @@ packages: description: name: stack_trace sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.12.1" state_notifier: @@ -1079,7 +1158,7 @@ packages: description: name: state_notifier sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.0" stream_channel: @@ -1087,7 +1166,7 @@ packages: description: name: stream_channel sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.4" stream_transform: @@ -1095,7 +1174,7 @@ packages: description: name: stream_transform sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.1" string_scanner: @@ -1103,7 +1182,7 @@ packages: description: name: string_scanner sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.4.1" synchronized: @@ -1111,7 +1190,7 @@ packages: description: name: synchronized sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.4.0" term_glyph: @@ -1119,7 +1198,7 @@ packages: description: name: term_glyph sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.2" test: @@ -1127,7 +1206,7 @@ packages: description: name: test sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.26.3" test_api: @@ -1135,7 +1214,7 @@ packages: description: name: test_api sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.7.7" test_core: @@ -1143,7 +1222,7 @@ packages: description: name: test_core sha256: "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.6.12" typed_data: @@ -1151,7 +1230,7 @@ packages: description: name: typed_data sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.4.0" uuid: @@ -1159,7 +1238,7 @@ packages: description: name: uuid sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.5.2" vector_graphics: @@ -1167,7 +1246,7 @@ packages: description: name: vector_graphics sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.19" vector_graphics_codec: @@ -1175,7 +1254,7 @@ packages: description: name: vector_graphics_codec sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.13" vector_graphics_compiler: @@ -1183,7 +1262,7 @@ packages: description: name: vector_graphics_compiler sha256: "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.20" vector_math: @@ -1191,7 +1270,7 @@ packages: description: name: vector_math sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.2.0" vm_service: @@ -1199,7 +1278,7 @@ packages: description: name: vm_service sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "15.0.2" watcher: @@ -1207,7 +1286,7 @@ packages: description: name: watcher sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.1" web: @@ -1215,7 +1294,7 @@ packages: description: name: web sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.1" web_socket: @@ -1223,7 +1302,7 @@ packages: description: name: web_socket sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.1" web_socket_channel: @@ -1231,7 +1310,7 @@ packages: description: name: web_socket_channel sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.0.3" webkit_inspection_protocol: @@ -1239,7 +1318,7 @@ packages: description: name: webkit_inspection_protocol sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.1" webview_flutter: @@ -1247,7 +1326,7 @@ packages: description: name: webview_flutter sha256: a3da219916aba44947d3a5478b1927876a09781174b5a2b67fa5be0555154bf9 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.13.1" webview_flutter_android: @@ -1255,7 +1334,7 @@ packages: description: name: webview_flutter_android sha256: eeeb3fcd5f0ff9f8446c9f4bbc18a99b809e40297528a3395597d03aafb9f510 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "4.10.11" webview_flutter_platform_interface: @@ -1263,7 +1342,7 @@ packages: description: name: webview_flutter_platform_interface sha256: "63d26ee3aca7256a83ccb576a50272edd7cfc80573a4305caa98985feb493ee0" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.14.0" webview_flutter_wkwebview: @@ -1271,7 +1350,7 @@ packages: description: name: webview_flutter_wkwebview sha256: "0412b657a2828fb301e73509909e6ec02b77cd2b441ae9f77125d482b3ddf0e7" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.23.6" xdg_directories: @@ -1279,7 +1358,7 @@ packages: description: name: xdg_directories sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.0" xml: @@ -1287,7 +1366,7 @@ packages: description: name: xml sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "6.6.1" yaml: @@ -1295,7 +1374,7 @@ packages: description: name: yaml sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "3.1.3" sdks: diff --git a/airhub_app/pubspec.yaml b/airhub_app/pubspec.yaml index 1949647..e62c8c5 100644 --- a/airhub_app/pubspec.yaml +++ b/airhub_app/pubspec.yaml @@ -50,6 +50,13 @@ dependencies: json_annotation: ^4.9.0 fpdart: ^1.1.0 # Functional programming (Optional/Recommended) + # Network & Storage + dio: ^5.7.0 + shared_preferences: ^2.3.0 + + # Aliyun Phone Auth (一键登录) + ali_auth: ^1.3.7 + # Existing dependencies webview_flutter: ^4.4.2 permission_handler: ^11.0.0 @@ -59,6 +66,10 @@ dependencies: image_picker: ^1.2.1 just_audio: ^0.9.42 +dependency_overrides: + ali_auth: + path: packages/ali_auth + flutter: uses-material-design: true assets: From 0919ded628380ef41bb936eeb3a47d214db01b88 Mon Sep 17 00:00:00 2001 From: zyc <1439655764@qq.com> Date: Mon, 9 Feb 2026 18:24:35 +0800 Subject: [PATCH 3/5] add log center --- airhub_app/lib/core/network/api_client.dart | 51 ++++++- airhub_app/lib/core/network/api_client.g.dart | 2 +- .../lib/core/services/log_center_service.dart | 142 ++++++++++++++++++ .../core/services/log_center_service.g.dart | 56 +++++++ airhub_app/lib/main.dart | 32 +++- 5 files changed, 278 insertions(+), 5 deletions(-) create mode 100644 airhub_app/lib/core/services/log_center_service.dart create mode 100644 airhub_app/lib/core/services/log_center_service.g.dart diff --git a/airhub_app/lib/core/network/api_client.dart b/airhub_app/lib/core/network/api_client.dart index 8aebc65..5a8f961 100644 --- a/airhub_app/lib/core/network/api_client.dart +++ b/airhub_app/lib/core/network/api_client.dart @@ -2,6 +2,7 @@ import 'package:dio/dio.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../errors/exceptions.dart'; +import '../services/log_center_service.dart'; import 'api_config.dart'; import 'token_manager.dart'; @@ -10,14 +11,16 @@ part 'api_client.g.dart'; @Riverpod(keepAlive: true) ApiClient apiClient(Ref ref) { final tokenManager = ref.watch(tokenManagerProvider); - return ApiClient(tokenManager); + final logCenter = ref.watch(logCenterServiceProvider); + return ApiClient(tokenManager, logCenter); } class ApiClient { final TokenManager _tokenManager; + final LogCenterService _logCenter; late final Dio _dio; - ApiClient(this._tokenManager) { + ApiClient(this._tokenManager, this._logCenter) { _dio = Dio(BaseOptions( baseUrl: ApiConfig.fullBaseUrl, connectTimeout: ApiConfig.connectTimeout, @@ -26,6 +29,7 @@ class ApiClient { )); _dio.interceptors.add(_AuthInterceptor(_tokenManager, _dio)); + _dio.interceptors.add(_LogCenterInterceptor(_logCenter)); } /// GET 请求，返回 data 字段 @@ -176,3 +180,46 @@ class _AuthInterceptor extends Interceptor { handler.next(err); } } + +/// Log Center 拦截器：自动上报 API 错误 +class _LogCenterInterceptor extends Interceptor { + final LogCenterService _logCenter; + + _LogCenterInterceptor(this._logCenter); + + @override + void onError(DioException err, ErrorInterceptorHandler handler) { + final req = err.requestOptions; + final statusCode = err.response?.statusCode; + + // 跳过 401（token 过期是正常流程，不上报） + if (statusCode == 401) { + handler.next(err); + return; + } + + // 提取后端返回的业务错误信息 + String errorMessage = err.message ?? err.type.name; + String errorType = 'DioException.${err.type.name}'; + final body = err.response?.data; + if (body is Map) { + errorType = 'ApiError(${body['code'] ?? statusCode})'; + errorMessage = body['message'] as String? ?? errorMessage; + } + + _logCenter.reportError( + Exception(errorMessage), + context: { + 'type': 'api_error', + 'error_type': errorType, + 'url': '${req.method} ${req.path}', + 'status_code': statusCode, + 'query': req.queryParameters.isNotEmpty + ? req.queryParameters.toString() + : null, + }, + ); + + handler.next(err); + } +} diff --git a/airhub_app/lib/core/network/api_client.g.dart b/airhub_app/lib/core/network/api_client.g.dart index 2d28050..2e0dd3c 100644 --- a/airhub_app/lib/core/network/api_client.g.dart +++ b/airhub_app/lib/core/network/api_client.g.dart @@ -48,4 +48,4 @@ final class ApiClientProvider } } -String _$apiClientHash() => r'9d0cce119ded498b0bdf8ec8bb1ed5fc9fcfb8aa'; +String _$apiClientHash() => r'03fa482085a0f74d1526b1a511e1b3c555269918'; diff --git a/airhub_app/lib/core/services/log_center_service.dart b/airhub_app/lib/core/services/log_center_service.dart new file mode 100644 index 0000000..192cab2 --- /dev/null +++ b/airhub_app/lib/core/services/log_center_service.dart @@ -0,0 +1,142 @@ +import 'dart:isolate'; +import 'package:dio/dio.dart'; +import 'package:flutter/foundation.dart'; +import 'package:riverpod_annotation/riverpod_annotation.dart'; + +part 'log_center_service.g.dart'; + +@Riverpod(keepAlive: true) +LogCenterService logCenterService(Ref ref) { + return LogCenterService(); +} + +class LogCenterService { + static const String _url = + 'https://qiyuan-log-center-api.airlabs.art/api/v1/logs/report'; + static const String _projectId = 'airhub_app'; + + late final Dio _dio; + + LogCenterService() { + _dio = Dio(BaseOptions( + connectTimeout: const Duration(seconds: 3), + receiveTimeout: const Duration(seconds: 3), + headers: {'Content-Type': 'application/json'}, + )); + } + + /// 上报 Flutter 框架错误（FlutterError） + void reportFlutterError(FlutterErrorDetails details) { + _report( + errorType: 'FlutterError', + message: details.exceptionAsString(), + stackTrace: details.stack, + context: { + 'library': details.library ?? 'unknown', + 'context': details.context?.toString() ?? '', + }, + ); + } + + /// 上报未捕获的异步异常（Zone / PlatformDispatcher） + void reportUncaughtError(Object error, StackTrace? stack) { + _report( + errorType: error.runtimeType.toString(), + message: error.toString(), + stackTrace: stack, + ); + } + + /// 上报业务层手动捕获的异常 + void reportError( + Object error, { + StackTrace? stackTrace, + Map? context, + }) { + _report( + errorType: error.runtimeType.toString(), + message: error.toString(), + stackTrace: stackTrace, + context: context, + ); + } + + /// 核心上报逻辑 — 异步、静默、不阻塞 UI + void _report({ + required String errorType, + required String message, + StackTrace? stackTrace, + Map? context, + }) { + // 解析堆栈第一帧 + String filePath = 'unknown'; + int lineNumber = 0; + final frames = stackTrace?.toString().split('\n') ?? []; + if (frames.isNotEmpty) { + final match = + RegExp(r'(?:package:airhub_app/|lib/)(.+?):(\d+)').firstMatch( + frames.firstWhere( + (f) => f.contains('package:airhub_app/') || f.contains('lib/'), + orElse: () => frames.first, + ), + ); + if (match != null) { + filePath = 'lib/${match.group(1)}'; + lineNumber = int.tryParse(match.group(2) ?? '0') ?? 0; + } + } + + final payload = { + 'project_id': _projectId, + 'environment': kDebugMode ? 'development' : 'production', + 'level': 'ERROR', + 'error': { + 'type': errorType, + 'message': message.length > 2000 ? message.substring(0, 2000) : message, + 'file_path': filePath, + 'line_number': lineNumber, + 'stack_trace': frames.take(30).toList(), + }, + 'context': { + 'platform': defaultTargetPlatform.name, + 'is_web': kIsWeb, + ...?context, + }, + }; + + // 异步发送，不阻塞调用方 + _sendAsync(payload); + } + + void _sendAsync(Map payload) { + // Web 不支持 Isolate，用 compute / 直接 fire-and-forget + if (kIsWeb) { + _send(payload); + } else { + // 原生平台用 Isolate 完全不阻塞 UI 线程 + Isolate.run(() => _sendStatic(payload)); + } + } + + Future _send(Map payload) async { + try { + await _dio.post(_url, data: payload); + } catch (_) { + // 静默失败，不影响 App 运行 + } + } + + /// Isolate 内使用的静态方法（独立 Dio 实例） + static Future _sendStatic(Map payload) async { + try { + final dio = Dio(BaseOptions( + connectTimeout: const Duration(seconds: 3), + receiveTimeout: const Duration(seconds: 3), + headers: {'Content-Type': 'application/json'}, + )); + await dio.post(_url, data: payload); + } catch (_) { + // 静默失败 + } + } +} diff --git a/airhub_app/lib/core/services/log_center_service.g.dart b/airhub_app/lib/core/services/log_center_service.g.dart new file mode 100644 index 0000000..c74dd97 --- /dev/null +++ b/airhub_app/lib/core/services/log_center_service.g.dart @@ -0,0 +1,56 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'log_center_service.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning + +@ProviderFor(logCenterService) +const logCenterServiceProvider = LogCenterServiceProvider._(); + +final class LogCenterServiceProvider + extends + $FunctionalProvider< + LogCenterService, + LogCenterService, + LogCenterService + > + with $Provider { + const LogCenterServiceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'logCenterServiceProvider', + isAutoDispose: false, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$logCenterServiceHash(); + + @$internal + @override + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(pointer); + + @override + LogCenterService create(Ref ref) { + return logCenterService(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(LogCenterService value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$logCenterServiceHash() => r'd32eef012bfcebde414b77bfc69fa9ffda09eb5e'; diff --git a/airhub_app/lib/main.dart b/airhub_app/lib/main.dart index aaffd05..21a7dc8 100644 --- a/airhub_app/lib/main.dart +++ b/airhub_app/lib/main.dart @@ -1,13 +1,41 @@ +import 'dart:async'; +import 'dart:ui' show PlatformDispatcher; import 'package:flutter/foundation.dart' show kIsWeb; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'core/router/app_router.dart'; +import 'core/services/log_center_service.dart'; import 'theme/app_theme.dart'; void main() { - WidgetsFlutterBinding.ensureInitialized(); - runApp(const ProviderScope(child: AirhubApp())); + runZonedGuarded(() { + WidgetsFlutterBinding.ensureInitialized(); + + final container = ProviderContainer(); + final logCenter = container.read(logCenterServiceProvider); + + // 捕获 Flutter 框架错误（Widget build 异常等） + FlutterError.onError = (details) { + FlutterError.presentError(details); // 保留控制台输出 + logCenter.reportFlutterError(details); + }; + + // 捕获非 Flutter 框架的平台异常 + PlatformDispatcher.instance.onError = (error, stack) { + logCenter.reportUncaughtError(error, stack); + return true; + }; + + runApp(UncontrolledProviderScope( + container: container, + child: const AirhubApp(), + )); + }, (error, stack) { + // Zone 兜底：捕获 runZonedGuarded 区域内的未处理异步异常 + // 此处 container 不可用，直接静态发送 + LogCenterService().reportUncaughtError(error, stack); + }); } class AirhubApp extends ConsumerWidget { From 8ed21ca4a4edcd28d684fb079c8849a07f9a32f6 Mon Sep 17 00:00:00 2001 From: zyc <1439655764@qq.com> Date: Tue, 10 Feb 2026 09:41:40 +0800 Subject: [PATCH 4/5] fix router bug --- .../lib/core/network/token_manager.dart | 5 +++- airhub_app/lib/core/router/app_router.dart | 1 + airhub_app/lib/core/router/app_router.g.dart | 2 +- .../controllers/auth_controller.dart | 5 ++++ .../controllers/auth_controller.g.dart | 2 +- .../lib/pages/profile/profile_info_page.dart | 12 ++++---- airhub_app/test/widget_test.dart | 29 ++++--------------- 7 files changed, 23 insertions(+), 33 deletions(-) diff --git a/airhub_app/lib/core/network/token_manager.dart b/airhub_app/lib/core/network/token_manager.dart index b3e654f..19e7e41 100644 --- a/airhub_app/lib/core/network/token_manager.dart +++ b/airhub_app/lib/core/network/token_manager.dart @@ -1,3 +1,4 @@ +import 'package:flutter/foundation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -11,7 +12,7 @@ TokenManager tokenManager(Ref ref) { return TokenManager(); } -class TokenManager { +class TokenManager extends ChangeNotifier { SharedPreferences? _prefs; Future get _preferences async { @@ -26,6 +27,7 @@ class TokenManager { final prefs = await _preferences; await prefs.setString(_keyAccessToken, access); await prefs.setString(_keyRefreshToken, refresh); + notifyListeners(); } Future getAccessToken() async { @@ -47,5 +49,6 @@ class TokenManager { final prefs = await _preferences; await prefs.remove(_keyAccessToken); await prefs.remove(_keyRefreshToken); + notifyListeners(); } } diff --git a/airhub_app/lib/core/router/app_router.dart b/airhub_app/lib/core/router/app_router.dart index a2acb04..67faa4c 100644 --- a/airhub_app/lib/core/router/app_router.dart +++ b/airhub_app/lib/core/router/app_router.dart @@ -18,6 +18,7 @@ GoRouter goRouter(Ref ref) { return GoRouter( initialLocation: '/login', + refreshListenable: tokenManager, redirect: (context, state) async { final hasToken = await tokenManager.hasToken(); final isLoginRoute = state.matchedLocation == '/login'; diff --git a/airhub_app/lib/core/router/app_router.g.dart b/airhub_app/lib/core/router/app_router.g.dart index 631592a..c2f3d9a 100644 --- a/airhub_app/lib/core/router/app_router.g.dart +++ b/airhub_app/lib/core/router/app_router.g.dart @@ -48,4 +48,4 @@ final class GoRouterProvider } } -String _$goRouterHash() => r'b559a84bcf9ae1ffda1deba4cf213f31a4006782'; +String _$goRouterHash() => r'8e620e452bb81f2c6ed87b136283a9e508dca2e9'; diff --git a/airhub_app/lib/features/auth/presentation/controllers/auth_controller.dart b/airhub_app/lib/features/auth/presentation/controllers/auth_controller.dart index 618866b..b3a1b6e 100644 --- a/airhub_app/lib/features/auth/presentation/controllers/auth_controller.dart +++ b/airhub_app/lib/features/auth/presentation/controllers/auth_controller.dart @@ -14,6 +14,7 @@ class AuthController extends _$AuthController { state = const AsyncLoading(); final repository = ref.read(authRepositoryProvider); final result = await repository.sendCode(phone); + if (!ref.mounted) return; state = result.fold( (failure) => AsyncError(failure.message, StackTrace.current), (_) => const AsyncData(null), @@ -24,6 +25,7 @@ class AuthController extends _$AuthController { state = const AsyncLoading(); final repository = ref.read(authRepositoryProvider); final result = await repository.codeLogin(phone, code); + if (!ref.mounted) return false; return result.fold( (failure) { state = AsyncError(failure.message, StackTrace.current); @@ -40,6 +42,7 @@ class AuthController extends _$AuthController { state = const AsyncLoading(); final repository = ref.read(authRepositoryProvider); final result = await repository.tokenLogin(token); + if (!ref.mounted) return false; return result.fold( (failure) { state = AsyncError(failure.message, StackTrace.current); @@ -56,6 +59,7 @@ class AuthController extends _$AuthController { state = const AsyncLoading(); final repository = ref.read(authRepositoryProvider); final result = await repository.logout(); + if (!ref.mounted) return; state = result.fold( (failure) => AsyncError(failure.message, StackTrace.current), (_) => const AsyncData(null), @@ -66,6 +70,7 @@ class AuthController extends _$AuthController { state = const AsyncLoading(); final repository = ref.read(authRepositoryProvider); final result = await repository.deleteAccount(); + if (!ref.mounted) return false; return result.fold( (failure) { state = AsyncError(failure.message, StackTrace.current); diff --git a/airhub_app/lib/features/auth/presentation/controllers/auth_controller.g.dart b/airhub_app/lib/features/auth/presentation/controllers/auth_controller.g.dart index fba6b23..82a5a8a 100644 --- a/airhub_app/lib/features/auth/presentation/controllers/auth_controller.g.dart +++ b/airhub_app/lib/features/auth/presentation/controllers/auth_controller.g.dart @@ -33,7 +33,7 @@ final class AuthControllerProvider AuthController create() => AuthController(); } -String _$authControllerHash() => r'fac48518f4825055a266b5ea7e11163320342153'; +String _$authControllerHash() => r'3a290ddd5b4b091786d5020ecb57b7fb1d3a287a'; abstract class _$AuthController extends $AsyncNotifier { FutureOr build(); diff --git a/airhub_app/lib/pages/profile/profile_info_page.dart b/airhub_app/lib/pages/profile/profile_info_page.dart index 3741630..6facade 100644 --- a/airhub_app/lib/pages/profile/profile_info_page.dart +++ b/airhub_app/lib/pages/profile/profile_info_page.dart @@ -35,13 +35,16 @@ class _ProfileInfoPageState extends ConsumerState { super.dispose(); } + static const _genderToDisplay = {'male': '男', 'female': '女'}; + static const _displayToGender = {'男': 'male', '女': 'female'}; + void _initFromUser() { if (_initialized) return; final userAsync = ref.read(userControllerProvider); final user = userAsync.value; if (user != null) { _nicknameController.text = user.nickname ?? ''; - _gender = user.gender ?? ''; + _gender = _genderToDisplay[user.gender] ?? user.gender ?? ''; _birthday = user.birthday ?? ''; _avatarUrl = user.avatar; _initialized = true; @@ -153,12 +156,7 @@ class _ProfileInfoPageState extends ConsumerState { Future _saveProfile() async { // 转换性别为后端格式 - String? genderCode; - if (_gender == '男') { - genderCode = 'M'; - } else if (_gender == '女') { - genderCode = 'F'; - } + final genderCode = _displayToGender[_gender]; final success = await ref.read(userControllerProvider.notifier).updateProfile( nickname: _nicknameController.text.trim(), diff --git a/airhub_app/test/widget_test.dart b/airhub_app/test/widget_test.dart index 746d912..bd743ae 100644 --- a/airhub_app/test/widget_test.dart +++ b/airhub_app/test/widget_test.dart @@ -1,30 +1,13 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility in the flutter_test package. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:airhub_app/main.dart'; void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(const MyApp()); - - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); - - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); - - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); + testWidgets('App smoke test', (WidgetTester tester) async { + await tester.pumpWidget( + const ProviderScope(child: AirhubApp()), + ); + await tester.pumpAndSettle(); }); } From 4983553261d28f4b993789d993598867e23c66bb Mon Sep 17 00:00:00 2001 From: zyc <1439655764@qq.com> Date: Tue, 10 Feb 2026 18:21:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix=20wify=20=E9=85=8D=E7=BD=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/app/src/main/AndroidManifest.xml | 7 + airhub_app/ios/Podfile.lock | 39 ++ airhub_app/ios/Runner/Info.plist | 6 + airhub_app/lib/core/network/api_client.dart | 1 + airhub_app/lib/core/network/api_config.dart | 2 +- airhub_app/lib/core/router/app_router.dart | 4 +- .../services/ble_provisioning_service.dart | 282 +++++++++++++ .../lib/core/services/phone_auth_service.dart | 42 +- .../auth/presentation/pages/login_page.dart | 31 +- airhub_app/lib/pages/bluetooth_page.dart | 370 +++++++++++++--- .../lib/pages/profile/profile_info_page.dart | 7 +- airhub_app/lib/pages/wifi_config_page.dart | 398 ++++++++++++------ .../com/sean/rao/ali_auth/AliAuthPlugin.kt | 22 + .../ali_auth/ios/Classes/AliAuthPlugin.swift | 13 + .../packages/ali_auth/ios/ali_auth.podspec | 13 + airhub_app/pubspec.lock | 7 - airhub_app/pubspec.yaml | 8 +- 本地localhost运行.md | 130 ++++++ 18 files changed, 1159 insertions(+), 223 deletions(-) create mode 100644 airhub_app/lib/core/services/ble_provisioning_service.dart create mode 100644 airhub_app/packages/ali_auth/android/src/main/kotlin/com/sean/rao/ali_auth/AliAuthPlugin.kt create mode 100644 airhub_app/packages/ali_auth/ios/Classes/AliAuthPlugin.swift create mode 100644 airhub_app/packages/ali_auth/ios/ali_auth.podspec create mode 100644 本地localhost运行.md diff --git a/airhub_app/android/app/src/main/AndroidManifest.xml b/airhub_app/android/app/src/main/AndroidManifest.xml index 00b6227..1c33bdf 100644 --- a/airhub_app/android/app/src/main/AndroidManifest.xml +++ b/airhub_app/android/app/src/main/AndroidManifest.xml @@ -1,4 +1,11 @@ + + + + + + + UIApplicationSupportsIndirectInputEvents + NSBluetoothAlwaysUsageDescription + 需要蓝牙权限来搜索和连接您的设备 + NSBluetoothPeripheralUsageDescription + 需要蓝牙权限来搜索和连接您的设备 + NSLocationWhenInUseUsageDescription + 需要位置权限以扫描附近的蓝牙设备 UILaunchScreen UIColorName diff --git a/airhub_app/lib/core/network/api_client.dart b/airhub_app/lib/core/network/api_client.dart index 5a8f961..a37fafc 100644 --- a/airhub_app/lib/core/network/api_client.dart +++ b/airhub_app/lib/core/network/api_client.dart @@ -128,6 +128,7 @@ class _AuthInterceptor extends Interceptor { '/auth/phone-login/', '/auth/refresh/', '/version/check/', + '/devices/query-by-mac/', ]; final needsAuth = !noAuthPaths.any((p) => options.path.contains(p)); diff --git a/airhub_app/lib/core/network/api_config.dart b/airhub_app/lib/core/network/api_config.dart index 7abe3aa..89b6863 100644 --- a/airhub_app/lib/core/network/api_config.dart +++ b/airhub_app/lib/core/network/api_config.dart @@ -1,6 +1,6 @@ class ApiConfig { /// 后端服务器地址（开发环境请替换为实际 IP） - static const String baseUrl = 'http://127.0.0.1:8000'; + static const String baseUrl = 'http://192.168.124.24:8000'; /// App 端 API 前缀 static const String apiPrefix = '/api/v1'; diff --git a/airhub_app/lib/core/router/app_router.dart b/airhub_app/lib/core/router/app_router.dart index 67faa4c..fe4a7df 100644 --- a/airhub_app/lib/core/router/app_router.dart +++ b/airhub_app/lib/core/router/app_router.dart @@ -44,7 +44,9 @@ GoRouter goRouter(Ref ref) { ), GoRoute( path: '/wifi-config', - builder: (context, state) => const WifiConfigPage(), + builder: (context, state) => WifiConfigPage( + extra: state.extra as Map?, + ), ), GoRoute( path: '/device-control', diff --git a/airhub_app/lib/core/services/ble_provisioning_service.dart b/airhub_app/lib/core/services/ble_provisioning_service.dart new file mode 100644 index 0000000..dc28bef --- /dev/null +++ b/airhub_app/lib/core/services/ble_provisioning_service.dart @@ -0,0 +1,282 @@ +import 'dart:async'; +import 'dart:convert' show utf8; +import 'dart:typed_data'; +import 'package:flutter/foundation.dart' show debugPrint; +import 'package:flutter_blue_plus/flutter_blue_plus.dart'; + +/// 硬件 BLE 配网协议常量 +class _ProvCmd { + static const int setSsid = 0x01; + static const int setPassword = 0x02; + static const int connectAp = 0x04; + static const int getWifiList = 0x06; +} + +class _ProvResp { + static const int wifiStatus = 0x81; + static const int wifiList = 0x82; + static const int wifiListEnd = 0x83; + static const int customData = 0x84; +} + +/// 配网服务 UUID（与硬件一致） +class _ProvUuid { + static final service = Guid('0000abf0-0000-1000-8000-00805f9b34fb'); + static final writeChar = Guid('0000abf1-0000-1000-8000-00805f9b34fb'); + static final notifyChar = Guid('0000abf2-0000-1000-8000-00805f9b34fb'); +} + +/// 扫描到的 WiFi 网络 +class ScannedWifi { + final String ssid; + final int rssi; + + const ScannedWifi({required this.ssid, required this.rssi}); + + /// 信号强度等级 1-4 + int get level { + if (rssi >= -50) return 4; + if (rssi >= -65) return 3; + if (rssi >= -80) return 2; + return 1; + } +} + +/// WiFi 连接结果 +class WifiResult { + final bool success; + final int reasonCode; + final String? staMac; + + const WifiResult({required this.success, this.reasonCode = 0, this.staMac}); +} + +/// BLE WiFi 配网服务 +/// +/// 封装与硬件的 BLE 通信协议，提供： +/// - 连接 BLE 设备 +/// - 获取 WiFi 列表 +/// - 发送 WiFi 凭证 +/// - 监听连接状态 +class BleProvisioningService { + BluetoothDevice? _device; + BluetoothCharacteristic? _writeChar; + BluetoothCharacteristic? _notifyChar; + StreamSubscription? _notifySubscription; + StreamSubscription? _connectionSubscription; + + bool _connected = false; + bool get isConnected => _connected; + String? get deviceId => _device?.remoteId.str; + + /// 用于传递 WiFi 扫描结果 + final _wifiListController = StreamController>.broadcast(); + Stream> get onWifiList => _wifiListController.stream; + + /// 用于传递 WiFi 连接状态 + final _wifiStatusController = StreamController.broadcast(); + Stream get onWifiStatus => _wifiStatusController.stream; + + /// 用于传递连接断开事件 + final _disconnectController = StreamController.broadcast(); + Stream get onDisconnect => _disconnectController.stream; + + /// 临时存储 WiFi 列表条目 + List _pendingWifiList = []; + + /// 连接到 BLE 设备并发现配网服务 + Future connect(BluetoothDevice device) async { + try { + _device = device; + debugPrint('[BLE Prov] 连接设备: ${device.remoteId}'); + + await device.connect(timeout: const Duration(seconds: 15)); + _connected = true; + debugPrint('[BLE Prov] BLE 连接成功'); + + // 监听连接状态 + _connectionSubscription = device.connectionState.listen((state) { + debugPrint('[BLE Prov] 连接状态变化: $state'); + if (state == BluetoothConnectionState.disconnected) { + debugPrint('[BLE Prov] 设备已断开'); + _connected = false; + _disconnectController.add(null); + } + }); + + // 请求更大的 MTU（iOS 自动协商，可能不支持显式请求） + try { + final mtu = await device.requestMtu(512); + debugPrint('[BLE Prov] MTU 协商成功: $mtu'); + } catch (e) { + debugPrint('[BLE Prov] MTU 协商失败(可忽略): $e'); + } + + // 发现服务 + debugPrint('[BLE Prov] 开始发现服务...'); + final services = await device.discoverServices(); + debugPrint('[BLE Prov] 发现 ${services.length} 个服务'); + + BluetoothService? provService; + for (final s in services) { + debugPrint('[BLE Prov] 服务: ${s.uuid}'); + if (s.uuid == _ProvUuid.service) { + provService = s; + } + } + + if (provService == null) { + debugPrint('[BLE Prov] 未找到配网服务 ${_ProvUuid.service}'); + await disconnect(); + return false; + } + debugPrint('[BLE Prov] 找到配网服务 ABF0'); + + // 找到读写特征 + for (final c in provService.characteristics) { + debugPrint('[BLE Prov] 特征: ${c.uuid}, props: ${c.properties}'); + if (c.uuid == _ProvUuid.writeChar) _writeChar = c; + if (c.uuid == _ProvUuid.notifyChar) _notifyChar = c; + } + + if (_writeChar == null || _notifyChar == null) { + debugPrint('[BLE Prov] 未找到所需特征 writeChar=$_writeChar notifyChar=$_notifyChar'); + await disconnect(); + return false; + } + debugPrint('[BLE Prov] 找到 ABF1(write) + ABF2(notify)'); + + // 订阅 Notify + await _notifyChar!.setNotifyValue(true); + _notifySubscription = _notifyChar!.onValueReceived.listen(_handleNotify); + + debugPrint('[BLE Prov] 配网服务就绪'); + return true; + } catch (e, stack) { + debugPrint('[BLE Prov] 连接失败: $e'); + debugPrint('[BLE Prov] 堆栈: $stack'); + _connected = false; + return false; + } + } + + /// 请求设备扫描 WiFi 网络 + Future requestWifiScan() async { + _pendingWifiList = []; + await _write([_ProvCmd.getWifiList]); + debugPrint('[BLE Prov] 已发送 WiFi 扫描命令'); + } + + /// 发送 WiFi 凭证并触发连接 + Future sendWifiCredentials(String ssid, String password) async { + // 1. 发送 SSID + final ssidBytes = Uint8List.fromList([_ProvCmd.setSsid, ...ssid.codeUnits]); + await _write(ssidBytes); + debugPrint('[BLE Prov] 已发送 SSID: $ssid'); + + // 稍等确保硬件处理完成 + await Future.delayed(const Duration(milliseconds: 100)); + + // 2. 发送密码（硬件收到密码后自动开始连接） + final pwdBytes = Uint8List.fromList([_ProvCmd.setPassword, ...password.codeUnits]); + await _write(pwdBytes); + debugPrint('[BLE Prov] 已发送密码，等待硬件连接 WiFi...'); + } + + /// 断开连接 + Future disconnect() async { + _notifySubscription?.cancel(); + _connectionSubscription?.cancel(); + try { + await _device?.disconnect(); + } catch (_) {} + _connected = false; + debugPrint('[BLE Prov] 已断开'); + } + + /// 释放资源 + void dispose() { + disconnect(); + _wifiListController.close(); + _wifiStatusController.close(); + _disconnectController.close(); + } + + /// 写入数据到 Write 特征 + Future _write(List data) async { + if (_writeChar == null) { + debugPrint('[BLE Prov] writeChar 未就绪'); + return; + } + await _writeChar!.write(data, withoutResponse: false); + } + + /// 处理 Notify 数据 + void _handleNotify(List data) { + if (data.isEmpty) return; + final cmd = data[0]; + debugPrint('[BLE Prov] 收到通知: cmd=0x${cmd.toRadixString(16)}, len=${data.length}'); + + switch (cmd) { + case _ProvResp.wifiList: + _handleWifiListEntry(data); + break; + case _ProvResp.wifiListEnd: + _handleWifiListEnd(); + break; + case _ProvResp.wifiStatus: + _handleWifiStatus(data); + break; + case _ProvResp.customData: + _handleCustomData(data); + break; + } + } + + /// 解析单条 WiFi 列表: [0x82][RSSI][SSID_LEN][SSID...] + void _handleWifiListEntry(List data) { + if (data.length < 4) return; + final rssi = data[1].toSigned(8); // signed byte + final ssidLen = data[2]; + if (data.length < 3 + ssidLen) return; + final ssid = utf8.decode(data.sublist(3, 3 + ssidLen), allowMalformed: true); + if (ssid.isNotEmpty) { + _pendingWifiList.add(ScannedWifi(ssid: ssid, rssi: rssi)); + debugPrint('[BLE Prov] WiFi: $ssid (RSSI: $rssi)'); + } + } + + /// WiFi 列表结束 + void _handleWifiListEnd() { + debugPrint('[BLE Prov] WiFi 列表完成，共 ${_pendingWifiList.length} 个'); + // 按信号强度排序 + _pendingWifiList.sort((a, b) => b.rssi.compareTo(a.rssi)); + _wifiListController.add(List.unmodifiable(_pendingWifiList)); + } + + /// WiFi 连接状态: [0x81][success][reason] + void _handleWifiStatus(List data) { + if (data.length < 3) return; + final success = data[1] == 1; + final reason = data[2]; + debugPrint('[BLE Prov] WiFi 状态: success=$success, reason=$reason'); + _wifiStatusController.add(WifiResult( + success: success, + reasonCode: reason, + staMac: _lastStaMac, + )); + } + + String? _lastStaMac; + + /// 自定义数据: [0x84][payload...] 如 "STA_MAC:AA:BB:CC:DD:EE:FF" + void _handleCustomData(List data) { + if (data.length < 2) return; + final payload = String.fromCharCodes(data.sublist(1)); + debugPrint('[BLE Prov] 自定义数据: $payload'); + if (payload.startsWith('STA_MAC:')) { + _lastStaMac = payload.substring(8); + debugPrint('[BLE Prov] 设备 STA MAC: $_lastStaMac'); + } + } +} diff --git a/airhub_app/lib/core/services/phone_auth_service.dart b/airhub_app/lib/core/services/phone_auth_service.dart index cfd1177..30f44a8 100644 --- a/airhub_app/lib/core/services/phone_auth_service.dart +++ b/airhub_app/lib/core/services/phone_auth_service.dart @@ -1,10 +1,9 @@ import 'dart:async'; -import 'package:flutter/foundation.dart' show kIsWeb; +import 'package:flutter/foundation.dart' show debugPrint, kIsWeb; import 'package:riverpod_annotation/riverpod_annotation.dart'; -// 条件导入：Web 用 stub，原生用真实 ali_auth -import 'phone_auth_service_stub.dart' - if (dart.library.io) 'package:ali_auth/ali_auth.dart'; +// 本地 Web 调试：始终使用 stub（ali_auth 不兼容当前 Dart 版本） +import 'phone_auth_service_stub.dart'; part 'phone_auth_service.g.dart'; @@ -22,12 +21,19 @@ PhoneAuthService phoneAuthService(Ref ref) { class PhoneAuthService { bool _initialized = false; + String? _lastError; + + /// 最近一次错误信息（用于 UI 展示） + String? get lastError => _lastError; /// 初始化 SDK（只需调用一次） Future init() async { + debugPrint('[AliAuth] init() called, _initialized=$_initialized, kIsWeb=$kIsWeb'); if (_initialized) return; - // 真机才初始化，Web 跳过 - if (kIsWeb) return; + if (kIsWeb) { + _lastError = '不支持 Web 平台'; + return; + } try { await AliAuth.initSdk( @@ -40,37 +46,45 @@ class PhoneAuthService { ), ); _initialized = true; + _lastError = null; + debugPrint('[AliAuth] SDK 初始化成功'); } catch (e) { - // SDK 初始化失败不阻塞 App 启动 _initialized = false; + _lastError = 'SDK初始化失败: $e'; + debugPrint('[AliAuth] $_lastError'); } } /// 一键登录，返回阿里云 token（用于发给后端换手机号） /// 返回 null 表示用户取消或认证失败 Future getLoginToken() async { + debugPrint('[AliAuth] getLoginToken() called, _initialized=$_initialized'); if (!_initialized) { await init(); } - if (!_initialized) return null; + if (!_initialized) { + debugPrint('[AliAuth] SDK 未初始化，返回 null, error=$_lastError'); + return null; + } final completer = Completer(); AliAuth.loginListen(onEvent: (event) { + debugPrint('[AliAuth] loginListen event: $event'); final code = event['code'] as String?; if (code == '600000' && event['data'] != null) { - // 成功获取 token if (!completer.isCompleted) { completer.complete(event['data'] as String); } } else if (code == '700000' || code == '700001') { - // 用户取消 + _lastError = '用户取消'; if (!completer.isCompleted) { completer.complete(null); } } else if (code != null && code.startsWith('6') && code != '600000') { - // 其他 6xxxxx 错误码 + _lastError = '错误码$code: ${event['msg']}'; + debugPrint('[AliAuth] $_lastError'); if (!completer.isCompleted) { completer.complete(null); } @@ -79,7 +93,11 @@ class PhoneAuthService { return completer.future.timeout( const Duration(seconds: 30), - onTimeout: () => null, + onTimeout: () { + _lastError = '请求超时(30s)'; + debugPrint('[AliAuth] $_lastError'); + return null; + }, ); } } diff --git a/airhub_app/lib/features/auth/presentation/pages/login_page.dart b/airhub_app/lib/features/auth/presentation/pages/login_page.dart index ab1bda4..bf9e330 100644 --- a/airhub_app/lib/features/auth/presentation/pages/login_page.dart +++ b/airhub_app/lib/features/auth/presentation/pages/login_page.dart @@ -12,6 +12,7 @@ import '../../../../theme/app_colors.dart'; import '../../../../widgets/animated_gradient_background.dart'; import '../../../../widgets/gradient_button.dart'; import '../../../../widgets/ios_toast.dart'; +import '../../../device/presentation/controllers/device_controller.dart'; import '../controllers/auth_controller.dart'; import '../widgets/floating_mascot.dart'; @@ -205,21 +206,25 @@ class _LoginPageState extends ConsumerState { // Logic Methods Future _doOneClickLogin() async { - // 通过阿里云号码认证 SDK 获取 token + debugPrint('[Login] _doOneClickLogin() 开始'); final phoneAuthService = ref.read(phoneAuthServiceProvider); final token = await phoneAuthService.getLoginToken(); + debugPrint('[Login] getLoginToken 返回: $token'); if (token == null) { - if (mounted) _showToast('一键登录取消或失败，请使用验证码登录', isError: true); + final error = phoneAuthService.lastError ?? '未知错误'; + if (mounted) _showToast('一键登录失败: $error', isError: true); return; } if (!mounted) return; final success = await ref.read(authControllerProvider.notifier).tokenLogin(token); + debugPrint('[Login] tokenLogin 结果: $success'); if (success && mounted) { - context.go('/home'); + await _navigateAfterLogin(); } } void _handleOneClickLogin() { + debugPrint('[Login] _handleOneClickLogin() agreed=$_agreed'); if (!_agreed) { _showAgreementDialog(action: 'oneclick'); return; @@ -269,7 +274,25 @@ class _LoginPageState extends ConsumerState { .read(authControllerProvider.notifier) .codeLogin(_phoneController.text, _codeController.text); if (success && mounted) { - context.go('/home'); + await _navigateAfterLogin(); + } + } + + Future _navigateAfterLogin() async { + if (!mounted) return; + try { + final devices = await ref.read(deviceControllerProvider.future); + if (!mounted) return; + if (devices.isNotEmpty) { + debugPrint('[Login] User has ${devices.length} device(s), navigating to device control'); + context.go('/device-control'); + } else { + debugPrint('[Login] No devices, navigating to home'); + context.go('/home'); + } + } catch (e) { + debugPrint('[Login] Device check failed: $e'); + if (mounted) context.go('/home'); } } diff --git a/airhub_app/lib/pages/bluetooth_page.dart b/airhub_app/lib/pages/bluetooth_page.dart index df17fc8..cde01a0 100644 --- a/airhub_app/lib/pages/bluetooth_page.dart +++ b/airhub_app/lib/pages/bluetooth_page.dart @@ -1,13 +1,19 @@ import 'dart:async'; -import 'dart:math'; +import 'dart:io'; +import 'package:flutter/foundation.dart' show kIsWeb; import 'package:flutter/material.dart'; +import 'package:flutter_blue_plus/flutter_blue_plus.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import '../core/services/ble_provisioning_service.dart'; +import '../features/device/data/datasources/device_remote_data_source.dart'; +import '../features/device/presentation/controllers/device_controller.dart'; import '../widgets/animated_gradient_background.dart'; -import '../theme/app_colors.dart'; import '../widgets/gradient_button.dart'; +import '../widgets/glass_dialog.dart'; /// 设备类型 enum DeviceType { plush, badgeAi, badge } @@ -16,14 +22,20 @@ enum DeviceType { plush, badgeAi, badge } class MockDevice { final String sn; final String name; + final String macAddress; final DeviceType type; final bool hasAI; + final bool isNetworkRequired; + final BluetoothDevice? bleDevice; const MockDevice({ required this.sn, required this.name, + required this.macAddress, required this.type, required this.hasAI, + this.isNetworkRequired = true, + this.bleDevice, }); String get iconPath { @@ -50,53 +62,39 @@ class MockDevice { } /// 蓝牙搜索页面 -class BluetoothPage extends StatefulWidget { +class BluetoothPage extends ConsumerStatefulWidget { const BluetoothPage({super.key}); @override - State createState() => _BluetoothPageState(); + ConsumerState createState() => _BluetoothPageState(); } -class _BluetoothPageState extends State +class _BluetoothPageState extends ConsumerState with TickerProviderStateMixin { + /// Airhub 设备名前缀（硬件广播格式: Airhub_ + MAC） + static const _airhubPrefix = 'Airhub_'; + // 状态 bool _isSearching = true; + bool _isBluetoothOn = false; List _devices = []; int _currentIndex = 0; + // 已查询过的 MAC → 设备信息缓存（避免重复调 API） + final Map> _macInfoCache = {}; + // 动画控制器 late AnimationController _searchAnimController; // 滚轮控制器 late FixedExtentScrollController _wheelController; - // 模拟设备数据 - static const List _mockDevices = [ - MockDevice( - sn: 'PLUSH_01', - name: '卡皮巴拉-001', - type: DeviceType.plush, - hasAI: true, - ), - MockDevice( - sn: 'BADGE_01', - name: 'AI电子吧唧-001', - type: DeviceType.badgeAi, - hasAI: true, - ), - MockDevice( - sn: 'BADGE_02', - name: '电子吧唧-001', - type: DeviceType.badge, - hasAI: false, - ), - MockDevice( - sn: 'PLUSH_02', - name: '卡皮巴拉-002', - type: DeviceType.plush, - hasAI: true, - ), - ]; + // 蓝牙订阅 + StreamSubscription? _bluetoothSubscription; + StreamSubscription>? _scanSubscription; + + // 是否已弹过蓝牙关闭提示（避免重复弹窗） + bool _hasShownBluetoothDialog = false; @override void initState() { @@ -111,61 +109,315 @@ class _BluetoothPageState extends State // 滚轮控制器 _wheelController = FixedExtentScrollController(initialItem: _currentIndex); - // 模拟搜索延迟 - _startSearch(); + // 监听蓝牙适配器状态 + _listenBluetoothState(); } @override void dispose() { + _bluetoothSubscription?.cancel(); + _scanSubscription?.cancel(); + FlutterBluePlus.stopScan(); _searchAnimController.dispose(); _wheelController.dispose(); super.dispose(); } - /// 开始搜索 (模拟) + /// 监听蓝牙适配器状态 + void _listenBluetoothState() { + _bluetoothSubscription = FlutterBluePlus.adapterState.listen((state) { + if (!mounted) return; + + final isOn = state == BluetoothAdapterState.on; + setState(() => _isBluetoothOn = isOn); + + if (isOn) { + _startSearch(); + } else if (state == BluetoothAdapterState.off) { + FlutterBluePlus.stopScan(); + setState(() { + _isSearching = false; + _devices.clear(); + }); + if (!_hasShownBluetoothDialog) { + _hasShownBluetoothDialog = true; + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted) _showBluetoothOffDialog(); + }); + } + } + }); + } + + /// 从设备名中提取 MAC 地址（格式: Airhub_XXXXXXXXXXXX 或 Airhub_XX:XX:XX:XX:XX:XX） + /// 返回标准格式 XX:XX:XX:XX:XX:XX（大写，带冒号），或 null + String? _extractMacFromName(String bleName) { + if (!bleName.startsWith(_airhubPrefix)) return null; + final rawMac = bleName.substring(_airhubPrefix.length).trim(); + if (rawMac.isEmpty) return null; + + // 移除冒号/横杠，统一处理 + final hex = rawMac.replaceAll(RegExp(r'[:\-]'), '').toUpperCase(); + if (hex.length != 12 || !RegExp(r'^[0-9A-F]{12}$').hasMatch(hex)) { + debugPrint('[BLE Scan] MAC 格式异常: $rawMac'); + return null; + } + + // 转为 XX:XX:XX:XX:XX:XX + return '${hex.substring(0, 2)}:${hex.substring(2, 4)}:${hex.substring(4, 6)}:' + '${hex.substring(6, 8)}:${hex.substring(8, 10)}:${hex.substring(10, 12)}'; + } + + // 暂存扫描到但尚未完成 API 查询的 Airhub 设备 BLE 句柄 + final Map _pendingBleDevices = {}; + + /// 开始 BLE 扫描（持续扫描，直到找到设备并完成 API 查询） Future _startSearch() async { - // 请求蓝牙权限 + if (!_isBluetoothOn) { + _showBluetoothOffDialog(); + return; + } + await _requestPermissions(); - // 模拟 2 秒搜索延迟 - await Future.delayed(const Duration(seconds: 2)); + if (!mounted) return; + setState(() { + _isSearching = true; + _devices.clear(); + _currentIndex = 0; + }); + _pendingBleDevices.clear(); + + _scanSubscription?.cancel(); + _scanSubscription = FlutterBluePlus.onScanResults.listen((results) { + if (!mounted) return; + + for (final r in results) { + final name = r.device.platformName; + if (name.isEmpty) continue; + + final mac = _extractMacFromName(name); + if (mac == null) continue; + + // 记录 BLE 句柄 + _pendingBleDevices[mac] = r.device; + + // 如果没查过这个 MAC，发起 API 查询 + if (!_macInfoCache.containsKey(mac)) { + _macInfoCache[mac] = {}; // 占位，避免重复查询 + _queryDeviceByMac(mac); + } + } + }); + + // 持续扫描（不设超时），由 _queryDeviceByMac 成功后停止 + await FlutterBluePlus.startScan( + timeout: const Duration(seconds: 30), + androidUsesFineLocation: true, + ); + + // 30 秒兜底超时：如果始终没找到设备 + if (mounted && _isSearching) { + setState(() => _isSearching = false); + } + } + + /// 通过 MAC 调用后端 API 查询设备信息 + /// 查询成功后：添加设备到列表、停止扫描、结束搜索状态 + Future _queryDeviceByMac(String mac) async { + try { + final dataSource = ref.read(deviceRemoteDataSourceProvider); + debugPrint('[Bluetooth] queryByMac: $mac'); + final data = await dataSource.queryByMac(mac); + debugPrint('[Bluetooth] queryByMac 返回: $data'); + + if (!mounted) return; + + _macInfoCache[mac] = data; + + final deviceTypeName = data['device_type']?['name'] as String? ?? ''; + final sn = data['sn'] as String? ?? ''; + final isNetworkRequired = data['device_type']?['is_network_required'] as bool? ?? true; + final bleDevice = _pendingBleDevices[mac]; + + // API 返回了有效设备名 → 添加到列表 + final displayName = deviceTypeName.isNotEmpty ? deviceTypeName : 'Airhub 设备'; - if (mounted) { - // 随机选择 1-4 个设备 - final count = Random().nextInt(4) + 1; setState(() { - _devices = _mockDevices.take(count).toList(); + // 避免重复添加 + if (!_devices.any((d) => d.macAddress == mac)) { + _devices.add(MockDevice( + sn: sn, + name: displayName, + macAddress: mac, + type: _inferDeviceType(displayName), + hasAI: _inferHasAI(displayName), + isNetworkRequired: isNetworkRequired, + bleDevice: bleDevice, + )); + } + // 有设备了，结束搜索状态 _isSearching = false; }); + + // 停止扫描 + try { await FlutterBluePlus.stopScan(); } catch (_) {} + + debugPrint('[Bluetooth] 设备已就绪: $mac → $displayName'); + } catch (e) { + debugPrint('[Bluetooth] queryByMac 失败($mac): $e'); + // API 查询失败时，用 BLE 名作为 fallback 也显示出来 + if (!mounted) return; + final bleDevice = _pendingBleDevices[mac]; + setState(() { + if (!_devices.any((d) => d.macAddress == mac)) { + _devices.add(MockDevice( + sn: '', + name: '${_airhubPrefix}设备', + macAddress: mac, + type: DeviceType.plush, + hasAI: true, + bleDevice: bleDevice, + )); + } + _isSearching = false; + }); + try { await FlutterBluePlus.stopScan(); } catch (_) {} } } - /// 请求蓝牙权限（模拟器上可能失败，不影响 mock 搜索） + /// 根据设备名称推断设备类型 + DeviceType _inferDeviceType(String name) { + final lower = name.toLowerCase(); + if (lower.contains('plush') || lower.contains('卡皮巴拉') || lower.contains('机芯') || lower.contains('airhub')) { + return DeviceType.plush; + } + if (lower.contains('ai') || lower.contains('智能')) { + return DeviceType.badgeAi; + } + return DeviceType.badge; + } + + /// 根据设备名称推断是否支持 AI + bool _inferHasAI(String name) { + final lower = name.toLowerCase(); + return lower.contains('ai') || lower.contains('plush') || + lower.contains('卡皮巴拉') || lower.contains('机芯') || lower.contains('智能') || lower.contains('airhub'); + } + + /// 请求蓝牙权限 Future _requestPermissions() async { try { - await Permission.bluetooth.request(); - await Permission.bluetoothScan.request(); - await Permission.bluetoothConnect.request(); - await Permission.location.request(); - } catch (_) { - // 模拟器上蓝牙不可用，忽略权限错误，继续用 mock 数据 + if (Platform.isAndroid) { + // Android 需要位置权限才能扫描 BLE + await Permission.bluetoothScan.request(); + await Permission.bluetoothConnect.request(); + await Permission.location.request(); + } else { + // iOS 只需蓝牙权限，不需要位置 + await Permission.bluetooth.request(); + } + } catch (e) { + debugPrint('[Bluetooth] 权限请求异常: $e'); } } + /// 蓝牙未开启弹窗 + void _showBluetoothOffDialog() { + if (!mounted) return; + showGlassDialog( + context: context, + title: '蓝牙未开启', + description: '请开启蓝牙以搜索附近的设备', + cancelText: '取消', + confirmText: Platform.isAndroid ? '开启蓝牙' : '去设置', + onConfirm: () { + Navigator.of(context).pop(); + if (Platform.isAndroid) { + // Android 可直接请求开启蓝牙 + FlutterBluePlus.turnOn(); + } else { + // iOS 无法直接开启，引导到系统设置 + openAppSettings(); + } + }, + ); + } + + bool _isConnecting = false; + /// 连接设备 - void _handleConnect() { - if (_devices.isEmpty) return; + Future _handleConnect() async { + if (_devices.isEmpty || _isConnecting) return; + + // 检查蓝牙状态 + if (!_isBluetoothOn) { + _showBluetoothOffDialog(); + return; + } final device = _devices[_currentIndex]; - // TODO: 保存设备信息到本地存储 + debugPrint('[Bluetooth] 连接设备: sn=${device.sn}, mac=${device.macAddress}, needsNetwork=${device.isNetworkRequired}'); - if (device.type == DeviceType.badge) { - // 普通吧唧 -> 设备控制页 + if (!device.isNetworkRequired) { + // 不需要联网 -> 直接去设备控制页 context.go('/device-control'); - } else { - // 其他 -> WiFi 配网页 - context.go('/wifi-config'); + return; } + + // Web 环境：跳过 BLE 和 WiFi 配网，直接绑定设备 + if (kIsWeb) { + debugPrint('[Bluetooth] Web 环境，直接绑定 sn=${device.sn}'); + setState(() => _isConnecting = true); + if (device.sn.isNotEmpty) { + await ref.read(deviceControllerProvider.notifier).bindDevice(device.sn); + } + if (!mounted) return; + setState(() => _isConnecting = false); + context.go('/device-control'); + return; + } + + // 需要联网 -> BLE 连接后进入 WiFi 配网 + final bleDevice = device.bleDevice; + if (bleDevice == null) { + debugPrint('[Bluetooth] 无 BLE 句柄，无法连接'); + return; + } + + setState(() => _isConnecting = true); + + // 连接前先停止扫描（iOS 上扫描和连接并发会冲突） + try { + await FlutterBluePlus.stopScan(); + } catch (_) {} + await Future.delayed(const Duration(milliseconds: 300)); + + final provService = BleProvisioningService(); + final ok = await provService.connect(bleDevice); + + if (!mounted) return; + setState(() => _isConnecting = false); + + if (!ok) { + showGlassDialog( + context: context, + title: '连接失败', + description: '无法连接到设备，请确认设备已开机并靠近手机', + confirmText: '确定', + onConfirm: () => Navigator.of(context).pop(), + ); + return; + } + + // BLE 连接成功，跳转 WiFi 配网页并传递 service + context.go('/wifi-config', extra: { + 'provService': provService, + 'sn': device.sn, + 'name': device.name, + 'mac': device.macAddress, + 'type': device.type.name, + }); } @override @@ -564,10 +816,10 @@ class _BluetoothPageState extends State if (!_isSearching && _devices.isNotEmpty) ...[ const SizedBox(width: 16), // HTML: gap 16px GradientButton( - text: '连接设备', + text: _isConnecting ? '连接中...' : '连接设备', width: 180, height: 52, - onPressed: _handleConnect, + onPressed: _isConnecting ? null : _handleConnect, ), ], ], diff --git a/airhub_app/lib/pages/profile/profile_info_page.dart b/airhub_app/lib/pages/profile/profile_info_page.dart index 6facade..7c1a16f 100644 --- a/airhub_app/lib/pages/profile/profile_info_page.dart +++ b/airhub_app/lib/pages/profile/profile_info_page.dart @@ -35,7 +35,12 @@ class _ProfileInfoPageState extends ConsumerState { super.dispose(); } - static const _genderToDisplay = {'male': '男', 'female': '女'}; + static const _genderToDisplay = { + 'male': '男', + 'female': '女', + 'M': '男', + 'F': '女', + }; static const _displayToGender = {'男': 'male', '女': 'female'}; void _initFromUser() { diff --git a/airhub_app/lib/pages/wifi_config_page.dart b/airhub_app/lib/pages/wifi_config_page.dart index 6fc01d7..c4f4cc7 100644 --- a/airhub_app/lib/pages/wifi_config_page.dart +++ b/airhub_app/lib/pages/wifi_config_page.dart @@ -4,12 +4,15 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import '../core/services/ble_provisioning_service.dart'; +import '../features/device/presentation/controllers/device_controller.dart'; import '../widgets/animated_gradient_background.dart'; import '../widgets/gradient_button.dart'; -import '../features/device/presentation/controllers/device_controller.dart'; class WifiConfigPage extends ConsumerStatefulWidget { - const WifiConfigPage({super.key}); + final Map? extra; + + const WifiConfigPage({super.key, this.extra}); @override ConsumerState createState() => _WifiConfigPageState(); @@ -25,36 +28,112 @@ class _WifiConfigPageState extends ConsumerState // Progress State double _progress = 0.0; String _progressText = '正在连接WiFi...'; + bool _connectFailed = false; - // Device Info (Mock or from Route Args) - // We'll try to get it from arguments, default to a fallback + // Device Info Map _deviceInfo = {}; - // Mock WiFi List - final List> _wifiList = [ - {'ssid': 'Home_5G', 'level': 4}, - {'ssid': 'Office_WiFi', 'level': 3}, - {'ssid': 'Guest_Network', 'level': 2}, - ]; + // BLE Provisioning + BleProvisioningService? _provService; + List _wifiList = []; + bool _isScanning = false; + + // Subscriptions + StreamSubscription? _wifiListSub; + StreamSubscription? _wifiStatusSub; + StreamSubscription? _disconnectSub; @override - void didChangeDependencies() { - super.didChangeDependencies(); - // Retrieve device info from arguments - final args = ModalRoute.of(context)?.settings.arguments; - if (args is Map) { - _deviceInfo = args; + void initState() { + super.initState(); + _deviceInfo = widget.extra ?? {}; + _provService = _deviceInfo['provService'] as BleProvisioningService?; + + if (_provService != null) { + _setupBleListeners(); + // 自动开始 WiFi 扫描 + _requestWifiScan(); } } - void _handleNext() { + @override + void dispose() { + _wifiListSub?.cancel(); + _wifiStatusSub?.cancel(); + _disconnectSub?.cancel(); + _provService?.dispose(); + _passwordController.dispose(); + super.dispose(); + } + + void _setupBleListeners() { + // 监听 WiFi 列表 + _wifiListSub = _provService!.onWifiList.listen((list) { + if (!mounted) return; + debugPrint('[WiFi Config] 收到 WiFi 列表: ${list.length} 个'); + setState(() { + _wifiList = list; + _isScanning = false; + }); + }); + + // 监听 WiFi 连接状态 + _wifiStatusSub = _provService!.onWifiStatus.listen((result) { + if (!mounted) return; + debugPrint('[WiFi Config] WiFi 状态: success=${result.success}, reason=${result.reasonCode}'); + if (result.success) { + setState(() { + _progress = 1.0; + _progressText = '配网成功!'; + _currentStep = 4; + }); + } else { + setState(() { + _connectFailed = true; + _progressText = '连接失败 (错误码: ${result.reasonCode})'; + }); + } + }); + + // 监听 BLE 断开 + _disconnectSub = _provService!.onDisconnect.listen((_) { + if (!mounted) return; + debugPrint('[WiFi Config] BLE 连接已断开'); + // 如果在配网中断开，可能是成功后设备重启 + if (_currentStep == 3 && !_connectFailed) { + setState(() { + _progress = 1.0; + _progressText = '设备正在重启...'; + _currentStep = 4; + }); + } + }); + } + + Future _requestWifiScan() async { + if (_provService == null) return; + setState(() => _isScanning = true); + await _provService!.requestWifiScan(); + // WiFi 列表会通过 onWifiList stream 回调 + // 设置超时：10 秒后如果还没收到列表，停止加载 + Future.delayed(const Duration(seconds: 10), () { + if (mounted && _isScanning) { + setState(() => _isScanning = false); + } + }); + } + + Future _handleNext() async { if (_currentStep == 1 && _selectedWifiSsid.isEmpty) return; if (_currentStep == 2 && _passwordController.text.isEmpty) return; if (_currentStep == 4) { - // Navigate to Device Control - // Use pushNamedAndRemoveUntil to remove Bluetooth and WiFi pages from stack - // but keep Home page so back button goes to Home + final sn = _deviceInfo['sn'] as String? ?? ''; + if (sn.isNotEmpty) { + debugPrint('[WiFi Config] Binding device sn=$sn'); + await ref.read(deviceControllerProvider.notifier).bindDevice(sn); + } + if (!mounted) return; context.go('/device-control'); return; } @@ -72,13 +151,58 @@ class _WifiConfigPageState extends ConsumerState if (_currentStep > 1) { setState(() { _currentStep--; + if (_currentStep == 1) { + _connectFailed = false; + _progress = 0.0; + } }); } else { - context.go('/home'); + _provService?.disconnect(); + context.go('/bluetooth'); } } - void _startConnecting() { + Future _startConnecting() async { + setState(() { + _progress = 0.1; + _progressText = '正在发送WiFi信息...'; + _connectFailed = false; + }); + + if (_provService != null && _provService!.isConnected) { + // 通过 BLE 发送 WiFi 凭证 + setState(() { + _progress = 0.3; + _progressText = '正在发送WiFi凭证...'; + }); + + await _provService!.sendWifiCredentials( + _selectedWifiSsid, + _passwordController.text, + ); + + setState(() { + _progress = 0.5; + _progressText = '等待设备连接WiFi...'; + }); + + // WiFi 状态会通过 onWifiStatus stream 回调 + // 设置超时：60 秒后如果还没收到结果 + Future.delayed(const Duration(seconds: 60), () { + if (mounted && _currentStep == 3 && !_connectFailed) { + setState(() { + _connectFailed = true; + _progressText = '连接超时，请重试'; + }); + } + }); + } else { + // 无 BLE 连接（模拟模式），使用 mock 流程 + _startMockConnecting(); + } + } + + void _startMockConnecting() { const steps = [ {'progress': 0.3, 'text': '正在连接WiFi...'}, {'progress': 0.6, 'text': '正在验证密码...'}, @@ -98,27 +222,13 @@ class _WifiConfigPageState extends ConsumerState stepIndex++; } else { timer.cancel(); - // Record WiFi config on server - _recordWifiConfig(); if (mounted) { - setState(() { - _currentStep = 4; - }); + setState(() => _currentStep = 4); } } }); } - Future _recordWifiConfig() async { - final userDeviceId = _deviceInfo['userDeviceId'] as int?; - if (userDeviceId != null && _selectedWifiSsid.isNotEmpty) { - final controller = ref.read( - deviceDetailControllerProvider(userDeviceId).notifier, - ); - await controller.configWifi(_selectedWifiSsid); - } - } - @override Widget build(BuildContext context) { return Scaffold( @@ -126,34 +236,24 @@ class _WifiConfigPageState extends ConsumerState resizeToAvoidBottomInset: true, body: Stack( children: [ - // Background - _buildGradientBackground(), - + const AnimatedGradientBackground(), Positioned.fill( child: SafeArea( child: Column( children: [ - // Header _buildHeader(), - - // Content Expanded( child: SingleChildScrollView( padding: const EdgeInsets.symmetric(horizontal: 32), child: Column( children: [ - // Steps Indicator _buildStepIndicator(), const SizedBox(height: 32), - - // Dynamic Step Content _buildCurrentStepContent(), ], ), ), ), - - // Footer _buildFooter(), ], ), @@ -164,17 +264,11 @@ class _WifiConfigPageState extends ConsumerState ); } - // Common Gradient Background - Widget _buildGradientBackground() { - return const AnimatedGradientBackground(); - } - Widget _buildHeader() { return Container( padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16), child: Row( children: [ - // Back button - HTML: bg rgba(255,255,255,0.6), border-radius: 12px, color #4B5563 GestureDetector( onTap: _handleBack, child: Container( @@ -187,7 +281,7 @@ class _WifiConfigPageState extends ConsumerState child: const Icon( Icons.arrow_back_ios_new, size: 18, - color: Color(0xFF4B5563), // Gray per HTML, not purple + color: Color(0xFF4B5563), ), ), ), @@ -202,7 +296,7 @@ class _WifiConfigPageState extends ConsumerState ), ), ), - const SizedBox(width: 48), // Balance back button + const SizedBox(width: 48), ], ), ); @@ -223,10 +317,10 @@ class _WifiConfigPageState extends ConsumerState margin: const EdgeInsets.symmetric(horizontal: 4), decoration: BoxDecoration( color: isCompleted - ? const Color(0xFF22C55E) // Green for completed + ? const Color(0xFF22C55E) : isActive - ? const Color(0xFF8B5CF6) // Purple for active - : const Color(0xFF8B5CF6).withOpacity(0.3), // Faded purple + ? const Color(0xFF8B5CF6) + : const Color(0xFF8B5CF6).withOpacity(0.3), borderRadius: BorderRadius.circular(4), ), ); @@ -249,11 +343,10 @@ class _WifiConfigPageState extends ConsumerState } } - // Step 1: Select Network + // Step 1: 选择 WiFi 网络 Widget _buildStep1() { return Column( children: [ - // Icon Container( margin: const EdgeInsets.only(bottom: 24), child: const Icon(Icons.wifi, size: 80, color: Color(0xFF8B5CF6)), @@ -269,27 +362,74 @@ class _WifiConfigPageState extends ConsumerState const SizedBox(height: 8), const Text( '设备需要连接WiFi以使用AI功能', - style: TextStyle( - - fontSize: 14, - color: Color(0xFF6B7280), - ), + style: TextStyle(fontSize: 14, color: Color(0xFF6B7280)), ), const SizedBox(height: 24), - // List - Column( - children: _wifiList.map((wifi) => _buildWifiItem(wifi)).toList(), - ), + if (_isScanning) + const Padding( + padding: EdgeInsets.symmetric(vertical: 40), + child: Column( + children: [ + CircularProgressIndicator(color: Color(0xFF8B5CF6)), + SizedBox(height: 16), + Text( + '正在通过设备扫描WiFi...', + style: TextStyle(fontSize: 14, color: Color(0xFF6B7280)), + ), + ], + ), + ) + else if (_wifiList.isEmpty) + Column( + children: [ + const Padding( + padding: EdgeInsets.symmetric(vertical: 40), + child: Text( + '未扫描到WiFi网络', + style: TextStyle(fontSize: 14, color: Color(0xFF9CA3AF)), + ), + ), + GestureDetector( + onTap: _requestWifiScan, + child: const Text( + '重新扫描', + style: TextStyle( + fontSize: 14, + color: Color(0xFF8B5CF6), + decoration: TextDecoration.underline, + ), + ), + ), + ], + ) + else + Column( + children: [ + ..._wifiList.map((wifi) => _buildWifiItem(wifi)), + const SizedBox(height: 8), + GestureDetector( + onTap: _requestWifiScan, + child: const Text( + '重新扫描', + style: TextStyle( + fontSize: 14, + color: Color(0xFF8B5CF6), + decoration: TextDecoration.underline, + ), + ), + ), + ], + ), ], ); } - Widget _buildWifiItem(Map wifi) { - bool isSelected = _selectedWifiSsid == wifi['ssid']; + Widget _buildWifiItem(ScannedWifi wifi) { + bool isSelected = _selectedWifiSsid == wifi.ssid; return GestureDetector( onTap: () { - setState(() => _selectedWifiSsid = wifi['ssid']); + setState(() => _selectedWifiSsid = wifi.ssid); }, child: Container( padding: const EdgeInsets.all(16), @@ -317,27 +457,23 @@ class _WifiConfigPageState extends ConsumerState children: [ Expanded( child: Text( - wifi['ssid'], + wifi.ssid, style: const TextStyle( - fontSize: 16, fontWeight: FontWeight.w500, color: Color(0xFF1F2937), ), ), ), - // HTML uses per-level SVG icons: wifi-1.svg to wifi-4.svg - Opacity( - opacity: 0.8, - child: SvgPicture.asset( - 'assets/www/icons/wifi-${wifi['level']}.svg', - width: 24, - height: 24, - colorFilter: const ColorFilter.mode( - Color(0xFF6B7280), - BlendMode.srcIn, - ), - ), + // WiFi 信号图标 + Icon( + wifi.level >= 3 + ? Icons.wifi + : wifi.level == 2 + ? Icons.wifi_2_bar + : Icons.wifi_1_bar, + size: 24, + color: const Color(0xFF6B7280), ), ], ), @@ -345,7 +481,7 @@ class _WifiConfigPageState extends ConsumerState ); } - // Step 2: Enter Password + // Step 2: 输入密码 Widget _buildStep2() { return Column( children: [ @@ -366,16 +502,11 @@ class _WifiConfigPageState extends ConsumerState ), ), const SizedBox(height: 8), - Text( + const Text( '请输入WiFi密码', - style: TextStyle( - - fontSize: 14, - color: const Color(0xFF6B7280), - ), + style: TextStyle(fontSize: 14, color: Color(0xFF6B7280)), ), const SizedBox(height: 24), - TextField( controller: _passwordController, obscureText: _obscurePassword, @@ -398,9 +529,7 @@ class _WifiConfigPageState extends ConsumerState size: 22, ), onPressed: () { - setState(() { - _obscurePassword = !_obscurePassword; - }); + setState(() => _obscurePassword = !_obscurePassword); }, ), ), @@ -411,11 +540,10 @@ class _WifiConfigPageState extends ConsumerState ); } - // Step 3: Connecting + // Step 3: 正在连接 Widget _buildStep3() { return Column( children: [ - // Animation placeholder (using Icon for now, can be upgraded to Wave animation) SizedBox( height: 120, child: Center( @@ -429,8 +557,7 @@ class _WifiConfigPageState extends ConsumerState color: const Color(0xFF8B5CF6).withOpacity(1 - value * 0.5), ); }, - onEnd: - () {}, // Repeat logic usually handled by AnimationController + onEnd: () {}, ), ), ), @@ -443,8 +570,6 @@ class _WifiConfigPageState extends ConsumerState ), ), const SizedBox(height: 32), - - // Progress Bar ClipRRect( borderRadius: BorderRadius.circular(3), child: SizedBox( @@ -452,7 +577,9 @@ class _WifiConfigPageState extends ConsumerState child: LinearProgressIndicator( value: _progress, backgroundColor: const Color(0xFF8B5CF6).withOpacity(0.2), - valueColor: const AlwaysStoppedAnimation(Color(0xFF8B5CF6)), + valueColor: AlwaysStoppedAnimation( + _connectFailed ? const Color(0xFFEF4444) : const Color(0xFF8B5CF6), + ), ), ), ), @@ -460,25 +587,42 @@ class _WifiConfigPageState extends ConsumerState Text( _progressText, style: TextStyle( - fontSize: 14, - color: const Color(0xFF6B7280), + color: _connectFailed ? const Color(0xFFEF4444) : const Color(0xFF6B7280), ), ), + if (_connectFailed) ...[ + const SizedBox(height: 24), + GestureDetector( + onTap: () { + setState(() { + _currentStep = 1; + _connectFailed = false; + _progress = 0.0; + }); + }, + child: const Text( + '返回重新选择', + style: TextStyle( + fontSize: 14, + color: Color(0xFF8B5CF6), + decoration: TextDecoration.underline, + ), + ), + ), + ], ], ); } - // Get device icon path based on device type String _getDeviceIconPath() { final type = _deviceInfo['type'] as String? ?? 'plush'; switch (type) { case 'plush_core': case 'plush': return 'assets/www/icons/pixel-capybara.svg'; - case 'badge_ai': + case 'badgeAi': return 'assets/www/icons/pixel-badge-ai.svg'; - case 'badge_basic': case 'badge': return 'assets/www/icons/pixel-badge-basic.svg'; default: @@ -486,17 +630,15 @@ class _WifiConfigPageState extends ConsumerState } } - // Step 4: Result (Success) - centered vertically + // Step 4: 配网成功 Widget _buildStep4() { return Column( children: [ const SizedBox(height: 80), - // Success Icon Stack - HTML: no white background Stack( clipBehavior: Clip.none, alignment: Alignment.center, children: [ - // Device icon container - 120x120 per HTML SizedBox( width: 120, height: 120, @@ -511,7 +653,6 @@ class _WifiConfigPageState extends ConsumerState ), ), ), - // Check badge Positioned( bottom: -5, right: -5, @@ -545,13 +686,9 @@ class _WifiConfigPageState extends ConsumerState ), ), const SizedBox(height: 8), - Text( + const Text( '设备已成功连接到网络', - style: TextStyle( - - fontSize: 14, - color: const Color(0xFF6B7280), - ), + style: TextStyle(fontSize: 14, color: Color(0xFF6B7280)), ), ], ); @@ -572,24 +709,24 @@ class _WifiConfigPageState extends ConsumerState } if (!showNext && _currentStep != 3) { - // Show cancel only? return Padding( padding: const EdgeInsets.all(32), child: TextButton( - onPressed: () => context.go('/bluetooth'), - child: Text( + onPressed: () { + _provService?.disconnect(); + context.go('/bluetooth'); + }, + child: const Text( '取消', - style: TextStyle( - - color: const Color(0xFF6B7280), - ), + style: TextStyle(color: Color(0xFF6B7280)), ), ), ); } - if (_currentStep == 3) - return const SizedBox(height: 100); // Hide buttons during connection + if (_currentStep == 3) { + return const SizedBox(height: 100); + } return Container( padding: EdgeInsets.fromLTRB( @@ -601,7 +738,6 @@ class _WifiConfigPageState extends ConsumerState child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - // Cancel button - frosted glass style if (_currentStep < 4) GestureDetector( onTap: _handleBack, @@ -626,8 +762,6 @@ class _WifiConfigPageState extends ConsumerState ), ), if (_currentStep < 4) const SizedBox(width: 16), - - // Constrained button (not full-width) GradientButton( text: nextText, onPressed: _handleNext, diff --git a/airhub_app/packages/ali_auth/android/src/main/kotlin/com/sean/rao/ali_auth/AliAuthPlugin.kt b/airhub_app/packages/ali_auth/android/src/main/kotlin/com/sean/rao/ali_auth/AliAuthPlugin.kt new file mode 100644 index 0000000..5db34de --- /dev/null +++ b/airhub_app/packages/ali_auth/android/src/main/kotlin/com/sean/rao/ali_auth/AliAuthPlugin.kt @@ -0,0 +1,22 @@ +package com.sean.rao.ali_auth + +import io.flutter.embedding.engine.plugins.FlutterPlugin +import io.flutter.plugin.common.MethodCall +import io.flutter.plugin.common.MethodChannel + +class AliAuthPlugin : FlutterPlugin, MethodChannel.MethodCallHandler { + private lateinit var channel: MethodChannel + + override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) { + channel = MethodChannel(binding.binaryMessenger, "ali_auth") + channel.setMethodCallHandler(this) + } + + override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) { + result.notImplemented() + } + + override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) { + channel.setMethodCallHandler(null) + } +} diff --git a/airhub_app/packages/ali_auth/ios/Classes/AliAuthPlugin.swift b/airhub_app/packages/ali_auth/ios/Classes/AliAuthPlugin.swift new file mode 100644 index 0000000..fb965bd --- /dev/null +++ b/airhub_app/packages/ali_auth/ios/Classes/AliAuthPlugin.swift @@ -0,0 +1,13 @@ +import Flutter + +public class AliAuthPlugin: NSObject, FlutterPlugin { + public static func register(with registrar: FlutterPluginRegistrar) { + let channel = FlutterMethodChannel(name: "ali_auth", binaryMessenger: registrar.messenger()) + let instance = AliAuthPlugin() + registrar.addMethodCallDelegate(instance, channel: channel) + } + + public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { + result(FlutterMethodNotImplemented) + } +} diff --git a/airhub_app/packages/ali_auth/ios/ali_auth.podspec b/airhub_app/packages/ali_auth/ios/ali_auth.podspec new file mode 100644 index 0000000..537f534 --- /dev/null +++ b/airhub_app/packages/ali_auth/ios/ali_auth.podspec @@ -0,0 +1,13 @@ +Pod::Spec.new do |s| + s.name = 'ali_auth' + s.version = '1.3.7' + s.summary = 'Alibaba Cloud phone auth plugin for Flutter.' + s.homepage = 'https://github.com/CodeGather/flutter_ali_auth' + s.license = { :type => 'MIT' } + s.author = { 'sean' => 'author@example.com' } + s.source = { :http => 'https://github.com/CodeGather/flutter_ali_auth' } + s.source_files = 'Classes/**/*' + s.dependency 'Flutter' + s.platform = :ios, '13.0' + s.swift_version = '5.0' +end diff --git a/airhub_app/pubspec.lock b/airhub_app/pubspec.lock index 72b06ee..ced9ab7 100644 --- a/airhub_app/pubspec.lock +++ b/airhub_app/pubspec.lock @@ -9,13 +9,6 @@ packages: url: "https://pub.dev" source: hosted version: "91.0.0" - ali_auth: - dependency: "direct main" - description: - path: "packages/ali_auth" - relative: true - source: path - version: "1.3.7" analyzer: dependency: transitive description: diff --git a/airhub_app/pubspec.yaml b/airhub_app/pubspec.yaml index e62c8c5..8ddadd7 100644 --- a/airhub_app/pubspec.yaml +++ b/airhub_app/pubspec.yaml @@ -54,8 +54,8 @@ dependencies: dio: ^5.7.0 shared_preferences: ^2.3.0 - # Aliyun Phone Auth (一键登录) - ali_auth: ^1.3.7 + # Aliyun Phone Auth (一键登录) — 本地 Web 调试时禁用 + # ali_auth: ^1.3.7 # Existing dependencies webview_flutter: ^4.4.2 @@ -66,10 +66,6 @@ dependencies: image_picker: ^1.2.1 just_audio: ^0.9.42 -dependency_overrides: - ali_auth: - path: packages/ali_auth - flutter: uses-material-design: true assets: diff --git a/本地localhost运行.md b/本地localhost运行.md new file mode 100644 index 0000000..ff854a9 --- /dev/null +++ b/本地localhost运行.md @@ -0,0 +1,130 @@ +# Flutter Web 本地调试启动指南 + +> 本文档供 AI 编码助手阅读，用于在本项目中正确启动 Flutter Web 调试环境。 + +## 项目结构 + +- Flutter 应用目录：`airhub_app/` +- 后端服务入口：`server.py`（根目录，FastAPI + Uvicorn，端口 3000） +- 前端端口：`8080` + +## 环境要求 + +- Flutter SDK（3.x） +- Python 3.x（后端服务） +- PowerShell（Windows 环境） + +## 操作系统 + +Windows（所有命令均为 PowerShell 语法） + +--- + +## 启动流程（严格按顺序执行） + +### 1. 杀掉旧进程并确认端口空闲 + +```powershell +# 杀掉占用 8080 和 3000 的旧进程 +Get-NetTCPConnection -LocalPort 8080 -ErrorAction SilentlyContinue | ForEach-Object { taskkill /F /PID $_.OwningProcess 2>$null } +Get-NetTCPConnection -LocalPort 3000 -ErrorAction SilentlyContinue | ForEach-Object { taskkill /F /PID $_.OwningProcess 2>$null } + +# 等待端口释放 +Start-Sleep -Seconds 3 + +# 确认端口已空闲（无输出 = 空闲） +Get-NetTCPConnection -LocalPort 8080 -ErrorAction SilentlyContinue +Get-NetTCPConnection -LocalPort 3000 -ErrorAction SilentlyContinue +``` + +### 2. 启动后端服务器（音乐生成功能依赖此服务） + +```powershell +# 工作目录：项目根目录 +cd d:\Airhub +python server.py +``` + +成功标志： +``` +INFO: Uvicorn running on http://0.0.0.0:3000 (Press CTRL+C to quit) +[Server] Music Server running on http://localhost:3000 +``` + +### 3. 设置国内镜像源 + 启动 Flutter Web Server + +```powershell +# 工作目录：airhub_app 子目录 +cd d:\Airhub\airhub_app + +# 设置镜像源（必须，否则网络超时） +$env:PUB_HOSTED_URL = "https://pub.flutter-io.cn" +$env:FLUTTER_STORAGE_BASE_URL = "https://storage.flutter-io.cn" + +# 启动 web-server 模式 +flutter run -d web-server --web-port=8080 --no-pub +``` + +成功标志： +``` +lib\main.dart is being served at http://localhost:8080 +``` + +### 4. 访问应用 + +浏览器打开：`http://localhost:8080` + +--- + +## 关键规则 + +### 必须使用 `web-server` 模式 +- **禁止**使用 `flutter run -d chrome`（会弹出系统 Chrome 窗口，不可控） +- **必须**使用 `flutter run -d web-server`（只启动 HTTP 服务，手动用浏览器访问） + +### `--no-pub` 的使用条件 +- 仅修改 Dart 代码（无新依赖、无新 asset）→ 加 `--no-pub`，编译更快 +- 新增了 `pubspec.yaml` 依赖或 `assets/` 资源文件 → **不能**加 `--no-pub` + +### 端口管理 +- 固定使用 8080（Flutter）和 3000（后端），不要换端口绕过占用 +- 每次启动前必须先确认端口空闲 +- 停止服务后等 3 秒再重新启动 + +### 热重载 +- 在 Flutter 终端按 `r` = 热重载（保留页面状态） +- 按 `R` = 热重启（重置页面状态） +- 浏览器 `Ctrl+Shift+R` = 强制刷新 + +--- + +## 停止服务 + +```powershell +# 方法1：在 Flutter 终端按 q 退出 + +# 方法2：强制杀进程 +Get-NetTCPConnection -LocalPort 8080 | ForEach-Object { taskkill /F /PID $_.OwningProcess } +Get-NetTCPConnection -LocalPort 3000 | ForEach-Object { taskkill /F /PID $_.OwningProcess } +``` + +--- + +## 常见问题排查 + +| 问题 | 原因 | 解决方案 | +|------|------|---------| +| 端口被占用 | 旧进程未退出 | 执行第1步杀进程，等3秒 | +| 编译报错找不到包 | 使用了 `--no-pub` 但有新依赖 | 去掉 `--no-pub` 重新编译 | +| 网络超时 | 未设置镜像源 | 设置 `PUB_HOSTED_URL` 和 `FLUTTER_STORAGE_BASE_URL` | +| 页面白屏 | 缓存问题 | 浏览器 `Ctrl+Shift+R` 强刷 | +| 音乐功能不工作 | 后端未启动 | 先启动 `python server.py` | + +--- + +## 编译耗时参考 + +- 首次完整编译（含 pub get）：90-120 秒 +- 增量编译（`--no-pub`）：60-90 秒 +- 热重载（按 r）：3-5 秒 +- 热重启（按 R）：10-20 秒