let file = FileModel(fileName: name, fileData: data)
let uploadResource = UploadResource<[PhotoItem]>(path: .photoUpload,
parameter: ["user_id": ShareUserId,
@@ -11,28 +11,24 @@ import RxSwift |
||
| 11 | 11 |
|
| 12 | 12 |
struct GuestUserInfoRemoteAPI: UserInfoRemoteAPI {
|
| 13 | 13 |
|
| 14 |
- typealias Model = UserInfo |
|
| 15 |
- |
|
| 16 |
- var path: Interfaces { return .guestLogin }
|
|
| 17 |
- var parameter: Parameter = [:] |
|
| 18 |
- |
|
| 19 |
- init() {
|
|
| 20 |
- parameter = ["uuid": getUUID()] |
|
| 14 |
+ private func parse(_ json: JSON) -> UserInfo? {
|
|
| 15 |
+ guard let data = json["data"] as? [String: AnyObject] else { return nil }
|
|
| 16 |
+ return UserInfo(json: data) |
|
| 21 | 17 |
} |
| 22 | 18 |
|
| 23 | 19 |
func login() -> Single<UserInfo> {
|
| 24 |
- return Single.create(subscribe: { (observer) in
|
|
| 25 |
- observer(.success(UserInfo(json: ["user_id": "fiDz2Ms" as AnyObject, "userName": "郑剑飞" as AnyObject, "photoPath": "https://wx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTJibSYLgvXpMakvD9FaCqfiaWqcMiaiaz905YxWPuO4hy8F2lGheV7kVr9vKKXFgmL1S5s4QJgxwuwtVw/132" as AnyObject]))) |
|
| 26 |
- return Disposables.create() |
|
| 27 |
- }) |
|
| 20 |
+ let contentResource = ContentResource(path: .guestLogin, |
|
| 21 |
+ parameter: ["uuid": getUUID()], |
|
| 22 |
+ parseJSON: parse) |
|
| 23 |
+ return contentResource.loadContent() |
|
| 28 | 24 |
} |
| 29 | 25 |
|
| 30 | 26 |
func getUUID() -> String {
|
| 31 | 27 |
let keyChainDic = NSMutableDictionary() |
| 32 | 28 |
keyChainDic.setObject(String(kSecClassGenericPassword), forKey: kSecClass as! NSCopying) |
| 33 | 29 |
keyChainDic.setObject("uuid", forKey: kSecAttrAccount as! NSCopying)
|
| 34 |
- keyChainDic.setObject(kCFBooleanTrue, forKey: kSecReturnAttributes as! NSCopying) |
|
| 35 |
- keyChainDic.setObject(kCFBooleanTrue, forKey: kSecReturnData as! NSCopying) |
|
| 30 |
+ keyChainDic.setObject(kCFBooleanTrue as Any, forKey: kSecReturnAttributes as! NSCopying) |
|
| 31 |
+ keyChainDic.setObject(kCFBooleanTrue as Any, forKey: kSecReturnData as! NSCopying) |
|
| 36 | 32 |
|
| 37 | 33 |
var result: AnyObject? |
| 38 | 34 |
var uuid: String? = nil |
@@ -51,11 +47,3 @@ struct GuestUserInfoRemoteAPI: UserInfoRemoteAPI {
|
||
| 51 | 47 |
return uuidStr |
| 52 | 48 |
} |
| 53 | 49 |
} |
| 54 |
- |
|
| 55 |
-//extension GuestUserInfoRemoteAPI {
|
|
| 56 |
-// func parse(_ json: JSON) -> UserInfo? {
|
|
| 57 |
-// guard let result = json["data"] as? [String: AnyObject] else { return nil }
|
|
| 58 |
-// return UserInfo(json: result) |
|
| 59 |
-// } |
|
| 60 |
-// |
|
| 61 |
-//} |
@@ -45,6 +45,10 @@ class WXUserInfoRemoteAPI: UserInfoRemoteAPI {
|
||
| 45 | 45 |
} |
| 46 | 46 |
|
| 47 | 47 |
func login() -> Single<UserInfo> {
|
| 48 |
+ return Single.create(subscribe: { (observer) in
|
|
| 49 |
+ observer(.success(UserInfo(json: ["user_id": "fiDz2Ms" as AnyObject, "userName": "郑剑飞" as AnyObject, "photoPath": "https://wx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTJibSYLgvXpMakvD9FaCqfiaWqcMiaiaz905YxWPuO4hy8F2lGheV7kVr9vKKXFgmL1S5s4QJgxwuwtVw/132" as AnyObject]))) |
|
| 50 |
+ return Disposables.create() |
|
| 51 |
+ }) |
|
| 48 | 52 |
return Single.create(subscribe: { (observer) -> Disposable in
|
| 49 | 53 |
|
| 50 | 54 |
// let wxLoginObserver = self.addWXLoginDidFinish() |
@@ -177,7 +177,7 @@ fileprivate extension PageViewController {
|
||
| 177 | 177 |
setSliderViewDetail() |
| 178 | 178 |
} |
| 179 | 179 |
|
| 180 |
- fileprivate func setSliderViewDetail() {
|
|
| 180 |
+ func setSliderViewDetail() {
|
|
| 181 | 181 |
guard let label = menuView.viewWithTag(baseTag) else { return }
|
| 182 | 182 |
sliderConstraint = sliderView.centerXAnchor |
| 183 | 183 |
.constraint(equalTo: label.centerXAnchor) |