diff --git a/QuickLocation.xcworkspace/xcuserdata/yanghong.xcuserdatad/UserInterfaceState.xcuserstate b/QuickLocation.xcworkspace/xcuserdata/yanghong.xcuserdatad/UserInterfaceState.xcuserstate index 604eb0f..3d4fc73 100644 Binary files a/QuickLocation.xcworkspace/xcuserdata/yanghong.xcuserdatad/UserInterfaceState.xcuserstate and b/QuickLocation.xcworkspace/xcuserdata/yanghong.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/QuickLocation/API/UserAPI.swift b/QuickLocation/API/UserAPI.swift index 788350a..d69f25d 100644 --- a/QuickLocation/API/UserAPI.swift +++ b/QuickLocation/API/UserAPI.swift @@ -19,6 +19,9 @@ enum UserAPI { bind: String, data: [String: Any]) + /// 用户信息 + case userInfo + /// 退出登录 case logout } @@ -29,19 +32,20 @@ extension UserAPI: MultiTargetProtocol { switch self { case .login: return "api/user/login" + case .userInfo: + return "api/user" case .logout: return "api/user/logout" } } var method: Moya.Method { - .post -// switch self { -// case .: -// return .get -// case .login: -// return .post -// } + switch self { + case .userInfo: + return .get + default: + return .post + } } var task: Moya.Task { @@ -53,6 +57,9 @@ extension UserAPI: MultiTargetProtocol { params["data"] = data return .requestParameters(parameters: params, encoding: JSONEncoding()) + case .userInfo: + return .requestParameters(parameters: Parameters(), encoding: JSONEncoding()) + case .logout: return .requestParameters(parameters: Parameters(), encoding: JSONEncoding()) } diff --git a/QuickLocation/Main/Tabbar/MainTabBarController.swift b/QuickLocation/Main/Tabbar/MainTabBarController.swift index 190b70f..64d2c67 100644 --- a/QuickLocation/Main/Tabbar/MainTabBarController.swift +++ b/QuickLocation/Main/Tabbar/MainTabBarController.swift @@ -63,7 +63,7 @@ final class MainTabBarController: UITabBarController { NSLayoutConstraint.activate([ customTabBar.leadingAnchor.constraint(equalTo: view.leadingAnchor), customTabBar.trailingAnchor.constraint(equalTo: view.trailingAnchor), - customTabBar.bottomAnchor.constraint(equalTo: view.bottomAnchor), + customTabBar.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: -41), customTabBar.heightAnchor.constraint(equalToConstant: tabBarHeight) ]) } diff --git a/QuickLocation/Section/Home/HomeViewController.swift b/QuickLocation/Section/Home/HomeViewController.swift index 93ce1fa..8c7a8f6 100644 --- a/QuickLocation/Section/Home/HomeViewController.swift +++ b/QuickLocation/Section/Home/HomeViewController.swift @@ -39,6 +39,8 @@ class HomeViewController: BaseViewController { setupMap() setupLocation() loadMembers() + + requestUserInfo() } // MARK: - Map Setup @@ -114,6 +116,13 @@ class HomeViewController: BaseViewController { } #endif } + + // MARK: - API + private func requestUserInfo() { + UserService.userInfo().subscribe { response in + + }.disposed(by: disposeBag) + } } #if !targetEnvironment(simulator) diff --git a/QuickLocation/Service/UserService.swift b/QuickLocation/Service/UserService.swift index f837bf0..0a1d43d 100644 --- a/QuickLocation/Service/UserService.swift +++ b/QuickLocation/Service/UserService.swift @@ -26,6 +26,14 @@ struct UserService { .asObservable() } + /// 用户信息 + static func userInfo() -> Observable { + let api = UserAPI.userInfo.multiTarget + return APIProvider.request(token: api) + .map(ResponseModel.self) + .asObservable() + } + /// 退出登录 static func logout() -> Observable { let api = UserAPI.logout.multiTarget