diff --git a/dimensionhub/Core/API.swift b/dimensionhub/Core/API.swift index 6dc9b04..2d8f793 100644 --- a/dimensionhub/Core/API.swift +++ b/dimensionhub/Core/API.swift @@ -38,14 +38,14 @@ struct API { // 服务器地址 static let baseUrl = "http://39.98.184.67:8500" - static func getIndexData(userId: Int, as: T.Type) async -> APIResponse { + static func getIndexData(userId: String, as: T.Type) async -> APIResponse { let request = URLRequest(url: URL(string: baseUrl + "/api/index?user_id=\(userId)")!) return await doRequest(request: request, as: T.self) } // 前后刷新获取数据 - static func loadMoreUpdateDramas(userId: Int, mode: LoadMode, id: Int, as: T.Type) async -> APIResponse { + static func loadMoreUpdateDramas(userId: String, mode: LoadMode, id: Int, as: T.Type) async -> APIResponse { // TODO let request = URLRequest(url: URL(string: baseUrl + "/api/load_more_dramas?user_id=\(userId)&mode=\(mode.rawValue)&id=8030")!) print(request) @@ -54,25 +54,25 @@ struct API { } // 指定时间索引 - static func loadDateUpdateDramas(userId: Int, date: String, as: T.Type) async -> APIResponse { + static func loadDateUpdateDramas(userId: String, date: String, as: T.Type) async -> APIResponse { let request = URLRequest(url: URL(string: baseUrl + "/api/load_date_dramas?user_id=\(userId)&date=\(date)")!) return await doRequest(request: request, as: T.self) } - static func getDateIndex(as: T.Type) async -> APIResponse { - let request = URLRequest(url: URL(string: baseUrl + "date_index")!) + static func getDateIndex(userId: String, as: T.Type) async -> APIResponse { + let request = URLRequest(url: URL(string: baseUrl + "/api/date_index?user_id=\(userId)")!) return await doRequest(request: request, as: T.self) } - static func getDramaDetail(userId: Int, id: Int, as: T.Type) async -> APIResponse { + static func getDramaDetail(userId: String, id: Int, as: T.Type) async -> APIResponse { let request = URLRequest(url: URL(string: baseUrl + "/api/detail?user_id=\(userId)&id=\(id)")!) return await doRequest(request: request, as: T.self) } - static func followDrama(userId: Int, id: Int, status: String, as: T.Type) async -> APIResponse { + static func followDrama(userId: String, id: Int, status: String, as: T.Type) async -> APIResponse { let request = URLRequest(url: URL(string: baseUrl + "/api/follow?user_id=\(userId)&id=\(id)&status=\(status)")!) return await doRequest(request: request, as: T.self) @@ -88,6 +88,7 @@ struct API { return .error(-1, "http status error") } + print("request url: \(request.url!.absoluteString)") // let x = String(data: data, encoding: .utf8)! // print("url: \(request.url!.path()), data is: \(x)") do { diff --git a/dimensionhub/Core/Uitls.swift b/dimensionhub/Core/Uitls.swift index 3e718a7..26f4e6f 100644 --- a/dimensionhub/Core/Uitls.swift +++ b/dimensionhub/Core/Uitls.swift @@ -5,6 +5,7 @@ // Created by 安礼成 on 2025/2/25. // import Foundation +import UIKit struct Utils { @@ -25,4 +26,12 @@ struct Utils { return attributedString.string } + static func defaultUserId() -> String { + if let uuid = UIDevice.current.identifierForVendor?.uuidString { + return uuid.lowercased() + } else { + return UUID().uuidString.lowercased() + } + } + } diff --git a/dimensionhub/Core/UserModel.swift b/dimensionhub/Core/UserModel.swift deleted file mode 100644 index 45a7d76..0000000 --- a/dimensionhub/Core/UserModel.swift +++ /dev/null @@ -1,35 +0,0 @@ -// -// UserModel.swift -// dimensionhub -// -// Created by 安礼成 on 2025/2/24. -// - -import Foundation -import SwiftData -import UIKit - -@Model -final class UserModel { - var userId: String - var username: String - - init(userId: String, username: String) { - self.userId = userId - self.username = username - } - - static func defaultUser() -> UserModel { - return UserModel(userId: getUserId(), username: "") - } - - // 获取设备的唯一标识 - private static func getUserId() -> String { - if let uuid = UIDevice.current.identifierForVendor?.uuidString { - return uuid.lowercased() - } else { - return UUID().uuidString.lowercased() - } - } - -} diff --git a/dimensionhub/Views/DateNavView.swift b/dimensionhub/Views/DateNavView.swift index f9e0b5c..71ef558 100644 --- a/dimensionhub/Views/DateNavView.swift +++ b/dimensionhub/Views/DateNavView.swift @@ -9,7 +9,62 @@ import Foundation import SwiftUI import Observation +@Observable +final class DateNavModel { + + struct DateModel: Codable, Identifiable { + struct Month: Codable { + let id: String + let name: String + let disabled: Bool + } + + let id = UUID().uuidString + let year: String + let months: [Month] + + enum CodingKeys: String, CodingKey { + case year + case months + } + } + + var dateModels: [DateModel] + + init() { + self.dateModels = [] + } + + @MainActor + func loadDateCells(userId: String) async { + self.dateModels = await getDateModelData(userId: userId) + } + + private func getDateModelData(userId: String) async -> [DateModel] { + let models = await DataCache.shared.getDateModelCache() + if models.count > 0 { + return models + } else { + let response = await API.getDateIndex(userId: userId, as: [DateModel].self) + print(response) + switch response { + case .error(let code, let message): + print(code) + print(message) + return [] + case .result(let models): + print(models) + await DataCache.shared.setDateModelCache(models) + return models + } + } + } + +} + struct DateNavView: View { + @AppStorage("userId") private var userId: String = Utils.defaultUserId() + @State var navModel = DateNavModel() @Binding var selectGroupId: String @@ -18,20 +73,22 @@ struct DateNavView: View { var onSelected: (String) -> Void var body: some View { - VStack(alignment: .center) { - ForEach(navModel.dateModels) { model in - VStack(alignment: .leading, spacing: 10) { - Text(model.year) - HStack { - ForEach(model.months, id: \.id) { month in - if month.disabled { - DateDisabledItemView(datetime: month.name) - } else { - DateItemView(id: month.id, - datetime: month.name, - selected: month.id == selectGroupId, - showDateNavPopover: $showDateNavPopover, - onSelected: onSelected) + ScrollView(.vertical, showsIndicators: false) { + VStack(alignment: .center) { + ForEach(navModel.dateModels) { model in + VStack(alignment: .leading, spacing: 10) { + Text(model.year) + HStack { + ForEach(model.months, id: \.id) { month in + if month.disabled { + DateDisabledItemView(datetime: month.name) + } else { + DateItemView(id: month.id, + datetime: month.name, + selected: month.id == selectGroupId, + showDateNavPopover: $showDateNavPopover, + onSelected: onSelected) + } } } } @@ -39,7 +96,7 @@ struct DateNavView: View { } } .task { - await self.navModel.loadDateCells() + await self.navModel.loadDateCells(userId: self.userId) } .onAppear { print("group_id is: \(selectGroupId)") @@ -104,58 +161,6 @@ extension DateNavView { } -@Observable -final class DateNavModel { - - struct DateModel: Codable, Identifiable { - struct Month: Codable { - let id: String - let name: String - let disabled: Bool - } - - let id = UUID().uuidString - let year: String - let months: [Month] - - enum CodingKeys: String, CodingKey { - case year - case months - } - } - - var dateModels: [DateModel] - - init() { - self.dateModels = [] - } - - @MainActor - func loadDateCells() async { - self.dateModels = await getDateModelData() - } - - private func getDateModelData() async -> [DateModel] { - let models = await DataCache.shared.getDateModelCache() - if models.count > 0 { - return models - } else { - let response = await API.getDateIndex(as: [DateModel].self) - print(response) - switch response { - case .error(let code, let message): - print(code) - print(message) - return [] - case .result(let models): - print(models) - await DataCache.shared.setDateModelCache(models) - return models - } - } - } - -} //#Preview { // DateNavView() diff --git a/dimensionhub/Views/DetailView.swift b/dimensionhub/Views/DetailView.swift index e655141..dfc0b34 100644 --- a/dimensionhub/Views/DetailView.swift +++ b/dimensionhub/Views/DetailView.swift @@ -87,7 +87,7 @@ final class DetailModel { var selectedEpisodes: [Episode] = [] @MainActor - func loadData(userId: Int, id: Int) async { + func loadData(userId: String, id: Int) async { let response = await API.getDramaDetail(userId: userId, id: id, as: DramaDetailResponse.self) switch response { case .error(let code, let message): @@ -118,10 +118,10 @@ final class DetailModel { } @MainActor - func onTapFollowButton(userId: Int, id: Int, status: String) async -> FollowResult { + func onTapFollowButton(userId: String, id: Int, status: String) async -> FollowResult { let response = await API.followDrama(userId: userId, id: id, status: status, as: [String].self) switch response { - case .error(let code, let message): + case .error(_, let message): return .error("错误", message) case .result(let newStatuses): self.statuses = newStatuses.flatMap({ s in @@ -138,6 +138,8 @@ final class DetailModel { } struct DetailView: View { + @AppStorage("userId") private var userId: String = Utils.defaultUserId() + @State var detailModel = DetailModel() @State var showAllSummary: Bool = false @@ -185,7 +187,7 @@ struct DetailView: View { ForEach(detailModel.statuses, id: \.status) { status in FollowButtonView(dramaStatus: status) { followStatus in Task { - let result = await detailModel.onTapFollowButton(userId: 1, id: id, status: followStatus) + let result = await detailModel.onTapFollowButton(userId: self.userId, id: id, status: followStatus) switch result { case .success: () @@ -267,7 +269,7 @@ struct DetailView: View { Alert(title: Text(self.errorInfo.0), message: Text(self.errorInfo.1), dismissButton: .default(Text("OK"))) } .task { - await detailModel.loadData(userId: 1, id: self.id) + await detailModel.loadData(userId: self.userId, id: self.id) print(detailModel.summary) } } diff --git a/dimensionhub/Views/IndexView.swift b/dimensionhub/Views/IndexView.swift index c37db30..916bf46 100644 --- a/dimensionhub/Views/IndexView.swift +++ b/dimensionhub/Views/IndexView.swift @@ -78,8 +78,8 @@ final class IndexModel { } @MainActor - func loadData() async { - let response = await API.getIndexData(userId: 1, as: IndexResponse.self) + func loadData(userId: String) async { + let response = await API.getIndexData(userId: userId, as: IndexResponse.self) switch response { case .error(let code, let message): print(code) @@ -92,7 +92,7 @@ final class IndexModel { } @MainActor - func loadMoreUpdateDramas(userId: Int, mode: API.LoadMode) async { + func loadMoreUpdateDramas(userId: String, mode: API.LoadMode) async { let id: Int = 8030 // TODO 按照id来判断不一定正确，需要借助其他值 switch mode { @@ -114,7 +114,7 @@ final class IndexModel { // 指定日期，并更新日期下对应的数据 @MainActor - func loadDateUpdateDramas(userId: Int, date: String) async { + func loadDateUpdateDramas(userId: String, date: String) async { self.showUpdateDramas.removeAll() let response = await API.loadDateUpdateDramas(userId: userId, date: date, as: [UpdateDramaGroup].self) if case let .result(groups) = response { @@ -174,6 +174,8 @@ final class IndexModel { struct IndexView: View { @Environment(\.modelContext) private var modelContext + @AppStorage("userId") private var userId: String = Utils.defaultUserId() + //@Query private var items: [Item] //@Query private var userModel: [UserModel] = [] @@ -273,7 +275,7 @@ struct IndexView: View { if screenBounds.height - frame.minY > 50 && contextFrame.minY > 0 && !isMoreLoading { Task { self.isMoreLoading = true - await self.indexModel.loadMoreUpdateDramas(userId: 1, mode: .next) + await self.indexModel.loadMoreUpdateDramas(userId: self.userId, mode: .next) self.isMoreLoading = false } } @@ -289,7 +291,7 @@ struct IndexView: View { DateNavView(selectGroupId: self.$selectGroupId, showDateNavPopover: $showDateNavPopover) { selectedDate in print("new selected date: " + selectedDate) Task { - await indexModel.loadDateUpdateDramas(userId: 1, date: selectedDate) + await indexModel.loadDateUpdateDramas(userId: self.userId, date: selectedDate) } } } @@ -300,7 +302,7 @@ struct IndexView: View { // 上拉刷新功能 self.isPrevLoading = true - await self.indexModel.loadMoreUpdateDramas(userId: 1, mode: .prev) + await self.indexModel.loadMoreUpdateDramas(userId: self.userId, mode: .prev) self.isPrevLoading = false } @@ -308,7 +310,7 @@ struct IndexView: View { .frame(width: 370) .ignoresSafeArea(edges: .bottom) .task { - await self.indexModel.loadData() + await self.indexModel.loadData(userId: self.userId) //print(userModel) } } diff --git a/dimensionhub/Views/ListView.swift b/dimensionhub/Views/ListView.swift index f11695b..6d3b1da 100644 --- a/dimensionhub/Views/ListView.swift +++ b/dimensionhub/Views/ListView.swift @@ -46,7 +46,7 @@ final class ListModel { var selectedEpisodes: [Episode] = [] @MainActor - func loadData(userId: Int, id: Int) async { + func loadData(userId: String, id: Int) async { let response = await API.getDramaDetail(userId: userId, id: id, as: DramaDetailResponse.self) switch response { case .error(let code, let message): @@ -72,6 +72,8 @@ final class ListModel { struct ListView: View { @Environment(\.presentationMode) var presentationMode + @AppStorage("userId") private var userId: String = Utils.defaultUserId() + @State var detailModel = ListModel() let id: Int @@ -160,7 +162,7 @@ struct ListView: View { } .frame(width: 370, alignment: .center) .task { - await detailModel.loadData(userId: 1, id: self.id) + await detailModel.loadData(userId: self.userId, id: self.id) } } diff --git a/dimensionhub/dimensionhubApp.swift b/dimensionhub/dimensionhubApp.swift index a7823a7..765d6ea 100644 --- a/dimensionhub/dimensionhubApp.swift +++ b/dimensionhub/dimensionhubApp.swift @@ -12,7 +12,7 @@ import SwiftData struct dimensionhubApp: App { var sharedModelContainer: ModelContainer = { let schema = Schema([ - UserModel.self + Item.self ]) let modelConfiguration = ModelConfiguration( schema: schema, @@ -21,22 +21,19 @@ struct dimensionhubApp: App { ) do { - let container = try ModelContainer(for: schema, configurations: [modelConfiguration]) - - // 如何用户不存在，则初始化一个用户 - var descriptor = FetchDescriptor(sortBy: []) - descriptor.fetchLimit = 1 - let users = try container.mainContext.fetch(descriptor) - if users.isEmpty { - print("user is empty create user") - container.mainContext.insert(UserModel.defaultUser()) - } - - return container + return try ModelContainer(for: schema, configurations: [modelConfiguration]) } catch { fatalError("Could not create ModelContainer: \(error)") } }() + + init() { + if let userId = UserDefaults.standard.string(forKey: "userId") { + print("user_id is: \(userId)") + } else { + UserDefaults.standard.set(Utils.defaultUserId(), forKey: "userId") + } + } var body: some Scene { WindowGroup {