+				FRAMEWORK_SEARCH_PATHS = (

+					"$(inherited)",

+					"$(PROJECT_DIR)/Carthage/Build/iOS",

+				);

 				GCC_C_LANGUAGE_STANDARD = gnu11;

 				INFOPLIST_FILE = PaiaiUIKit/Info.plist;

 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

@@ -1952,7 +1930,12 @@

 				DYLIB_COMPATIBILITY_VERSION = 1;

 				DYLIB_CURRENT_VERSION = 1;

 				DYLIB_INSTALL_NAME_BASE = "@rpath";

+				FRAMEWORK_SEARCH_PATHS = (

+					"$(inherited)",

+					"$(PROJECT_DIR)/Carthage/Build/iOS",

+				);

 				GCC_C_LANGUAGE_STANDARD = gnu11;

+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;

 				INFOPLIST_FILE = PaiaiUIKit/Info.plist;

 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

@@ -1967,6 +1950,7 @@

 				SKIP_INSTALL = YES;

 				SWIFT_VERSION = 5.0;

 				TARGETED_DEVICE_FAMILY = 1;

+				VALID_ARCHS = "arm64 arm64e armv7s";

 				VERSIONING_SYSTEM = "apple-generic";

 				VERSION_INFO_PREFIX = "";

 			};

@@ -1994,12 +1978,14 @@

 				FRAMEWORK_SEARCH_PATHS = (

 					"$(inherited)",

 					"$(PROJECT_DIR)/Carthage/Build/iOS",

+					"$(PROJECT_DIR)",

 				);

 				GCC_C_LANGUAGE_STANDARD = gnu11;

 				HEADER_SEARCH_PATHS = "";

 				INFOPLIST_FILE = PaiaiDataKit/Info.plist;

 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

+				LD_GENERATE_MAP_FILE = YES;

 				LD_RUNPATH_SEARCH_PATHS = (

 					"$(inherited)",

 					"@executable_path/Frameworks",

@@ -2047,12 +2033,15 @@

 				FRAMEWORK_SEARCH_PATHS = (

 					"$(inherited)",

 					"$(PROJECT_DIR)/Carthage/Build/iOS",

+					"$(PROJECT_DIR)",

 				);

 				GCC_C_LANGUAGE_STANDARD = gnu11;

+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;

 				HEADER_SEARCH_PATHS = "";

 				INFOPLIST_FILE = PaiaiDataKit/Info.plist;

 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

+				LD_GENERATE_MAP_FILE = YES;

 				LD_RUNPATH_SEARCH_PATHS = (

 					"$(inherited)",

 					"@executable_path/Frameworks",

@@ -2069,6 +2058,7 @@

 				SWIFT_OBJC_BRIDGING_HEADER = "";

 				SWIFT_VERSION = 5.0;

 				TARGETED_DEVICE_FAMILY = "1,2";

+				VALID_ARCHS = "arm64 arm64e armv7s";

 				VERSIONING_SYSTEM = "apple-generic";

 				VERSION_INFO_PREFIX = "";

 			};

@@ -2094,6 +2084,7 @@

 				FRAMEWORK_SEARCH_PATHS = (

 					"$(inherited)",

 					"$(PROJECT_DIR)/Carthage/Build/iOS",

+					"$(PROJECT_DIR)",

 				);

 				GCC_C_LANGUAGE_STANDARD = gnu11;

 				INFOPLIST_FILE = Paiai_iOS/Info.plist;

@@ -2112,6 +2103,7 @@

 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;

 				SWIFT_VERSION = 5.0;

 				TARGETED_DEVICE_FAMILY = 1;

+				VALID_ARCHS = "arm64 arm64e armv7s";

 				VERSIONING_SYSTEM = "apple-generic";

 				VERSION_INFO_PREFIX = "";

 			};

@@ -2138,8 +2130,10 @@

 				FRAMEWORK_SEARCH_PATHS = (

 					"$(inherited)",

 					"$(PROJECT_DIR)/Carthage/Build/iOS",

+					"$(PROJECT_DIR)",

 				);

 				GCC_C_LANGUAGE_STANDARD = gnu11;

+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;

 				INFOPLIST_FILE = Paiai_iOS/Info.plist;

 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

@@ -2154,6 +2148,7 @@

 				SKIP_INSTALL = YES;

 				SWIFT_VERSION = 5.0;

 				TARGETED_DEVICE_FAMILY = 1;

+				VALID_ARCHS = "arm64 arm64e armv7s";

 				VERSIONING_SYSTEM = "apple-generic";

 				VERSION_INFO_PREFIX = "";

 			};

@@ -2209,6 +2204,7 @@

 				GCC_WARN_UNUSED_FUNCTION = YES;

 				GCC_WARN_UNUSED_VARIABLE = YES;

 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

+				LD_GENERATE_MAP_FILE = YES;

 				MTL_ENABLE_DEBUG_INFO = YES;

 				ONLY_ACTIVE_ARCH = YES;

 				OTHER_LDFLAGS = (

@@ -2264,6 +2260,7 @@

 				GCC_WARN_UNUSED_FUNCTION = YES;

 				GCC_WARN_UNUSED_VARIABLE = YES;

 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

+				LD_GENERATE_MAP_FILE = YES;

 				MTL_ENABLE_DEBUG_INFO = NO;

 				OTHER_LDFLAGS = (

 					"-Objc",

@@ -2284,17 +2281,17 @@

 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;

 				CLANG_ENABLE_MODULES = NO;

-				CODE_SIGN_ENTITLEMENTS = PaiAi/PaiAi.entitlements;

 				CODE_SIGN_IDENTITY = "iPhone Developer";

 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";

 				CODE_SIGN_STYLE = Automatic;

 				DEFINES_MODULE = YES;

-				DEVELOPMENT_TEAM = RSJ4N8U2LM;

+				DEVELOPMENT_TEAM = Q38447SL4M;

 				ENABLE_BITCODE = NO;

 				FRAMEWORK_SEARCH_PATHS = (

 					"$(inherited)",

 					"$(PROJECT_DIR)/Paiai",

 					"$(PROJECT_DIR)/Carthage/Build/iOS",

+					"$(PROJECT_DIR)",

 				);

 				GCC_PREFIX_HEADER = "";

 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";

@@ -2305,6 +2302,7 @@

 				);

 				INFOPLIST_FILE = PaiAi/Info.plist;

 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

+				LD_GENERATE_MAP_FILE = YES;

 				LD_RUNPATH_SEARCH_PATHS = (

 					"$(inherited)",

 					"@executable_path/Frameworks",

@@ -2315,6 +2313,7 @@

 				);

 				MACH_O_TYPE = mh_execute;

 				ONLY_ACTIVE_ARCH = YES;

+				OTHER_CODE_SIGN_FLAGS = "--deep";

 				OTHER_LDFLAGS = "-all_load";

 				OTHER_SWIFT_FLAGS = "-DDEBUG";

 				PRODUCT_BUNDLE_IDENTIFIER = com.PaiAi.PaiAi;

@@ -2335,18 +2334,19 @@

 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;

 				CLANG_ENABLE_MODULES = NO;

-				CODE_SIGN_ENTITLEMENTS = PaiAi/PaiAi.entitlements;

 				CODE_SIGN_IDENTITY = "iPhone Developer";

 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";

 				CODE_SIGN_STYLE = Automatic;

 				DEBUG_INFORMATION_FORMAT = dwarf;

 				DEFINES_MODULE = YES;

-				DEVELOPMENT_TEAM = RSJ4N8U2LM;

+				DEVELOPMENT_TEAM = Q38447SL4M;

 				FRAMEWORK_SEARCH_PATHS = (

 					"$(inherited)",

 					"$(PROJECT_DIR)/Paiai",

 					"$(PROJECT_DIR)/Carthage/Build/iOS",

+					"$(PROJECT_DIR)",

 				);

+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;

 				GCC_PREFIX_HEADER = "";

 				HEADER_SEARCH_PATHS = (

 					"$(PROJECT_DIR)/Paiai/wxSDK/WXApi.h",

@@ -2355,6 +2355,7 @@

 				);

 				INFOPLIST_FILE = PaiAi/Info.plist;

 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

+				LD_GENERATE_MAP_FILE = YES;

 				LD_RUNPATH_SEARCH_PATHS = (

 					"$(inherited)",

 					"@executable_path/Frameworks",

@@ -2365,6 +2366,7 @@

 				);

 				MACH_O_TYPE = mh_execute;

 				ONLY_ACTIVE_ARCH = YES;

+				OTHER_CODE_SIGN_FLAGS = "--deep";

 				OTHER_LDFLAGS = "-all_load";

 				OTHER_SWIFT_FLAGS = "";

 				PRODUCT_BUNDLE_IDENTIFIER = com.PaiAi.PaiAi;

@@ -2374,6 +2376,7 @@

 				SWIFT_OBJC_BRIDGING_HEADER = "Swift-bridge.h";

 				SWIFT_VERSION = 5.0;

 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";

+				VALID_ARCHS = "arm64 arm64e armv7s";

 			};

 			name = Release;

 		};

@@ -2,16 +2,4 @@

 <Bucket

    type = "1"

    version = "2.0">

-   <Breakpoints>

-      <BreakpointProxy

-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">

-         <BreakpointContent

-            shouldBeEnabled = "Yes"

-            ignoreCount = "0"

-            continueAfterRunningActions = "No"

-            scope = "0"

-            stopOnStyle = "0">

-         </BreakpointContent>

-      </BreakpointProxy>

-   </Breakpoints>

 </Bucket>

@@ -104,10 +104,10 @@

       </BuildableProductRunnable>

    </ProfileAction>

    <AnalyzeAction

-      buildConfiguration = "Debug">

+      buildConfiguration = "Release">

    </AnalyzeAction>

    <ArchiveAction

-      buildConfiguration = "Debug"

+      buildConfiguration = "Release"

       revealArchiveInOrganizer = "YES">

    </ArchiveAction>

 </Scheme>

二进制

PaiAi/Paiai/Assets.xcassets/module/login/guide1.imageset/8778FB9773576108C6D5109F23D69C69.png

查看文件

二进制

PaiAi/Paiai/Assets.xcassets/module/login/guide2.imageset/A4494A157AB20FA47B8B96993319B3E9.png

查看文件

二进制

PaiAi/Paiai/Assets.xcassets/module/login/guide3.imageset/862B9012863929D278CBEF1E3A118E6D.png

查看文件

@@ -62,7 +62,7 @@

 		</dict>

 	</array>

 	<key>CFBundleVersion</key>

-	<string>1</string>

+	<string>3</string>

 	<key>LSApplicationCategoryType</key>

 	<string></string>

 	<key>LSApplicationQueriesSchemes</key>

@@ -1,10 +0,0 @@

-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

-<plist version="1.0">

-<dict>

-	<key>keychain-access-groups</key>

-	<array>

-		<string>$(AppIdentifierPrefix)com.Paiai.Paiai</string>

-	</array>

-</dict>

-</plist>

@@ -31,10 +31,7 @@ class NetworkApi {

             return

         }

-        if err.isSessionDeinitializedError

-            || err.isSessionInvalidatedError

-            || err.isInvalidURLError

-            || err.isRequestAdaptationError {

+        if err.isInvalidURLError {

             Toast.show(message: "客户端网络请求出错")

         } else if err.isParameterEncoderError || err.isParameterEncodingError {

             Toast.show(message: "客户端参数编码出错")

@@ -46,9 +43,11 @@ class NetworkApi {

             Toast.show(message: "服务器返回数据出错")

         } else if err.isServerTrustEvaluationError {

             Toast.show(message: "服务器验证错误")

-        } else if err.isRequestRetryError {

-            Toast.show(message: "客户端重试出错")

-        } else if err.isExplicitlyCancelledError {

+        }

+//        else if err.isRequestRetryError {

+//            Toast.show(message: "客户端重试出错")

+//        }

+        else if err.isExplicitlyCancelledError {

             return

         } else {

             Toast.show(message: "网络出现未知错误")

@@ -60,8 +60,8 @@ struct WXUserInfoRemoteAPI: UserInfoRemoteAPI {

                 }

                 switch errcode {

                 case 0:

-                    observer(.success(["appid": WXAppid, "secret": WXSecret,

-                                       "code": code, "grant_type": "authorization_code"]))

+                    return observer(.success(["appid": WXAppid, "secret": WXSecret,

+                                              "code": code, "grant_type": "authorization_code"]))

                 case -4:

                     Toast.show(message: "您拒绝授权，登录失败")

                 case -2:

@@ -89,12 +89,18 @@ struct WXUserInfoRemoteAPI: UserInfoRemoteAPI {

         return NetworkApi.share.get(resource: resource)

     }

+    

+    fileprivate func pareseWXUserInfo(json: JSON) -> [String: Any]? {

+        var data = json

+        data.removeValue(forKey: "privilege")

+        return data

+    }

     fileprivate func getWXUserInfo(param: [String: String]) -> Single<[String: Any]> {

         let resource = ContentResource<[String: Any]>(host: "https://api.weixin.qq.com",

                                                       path: .wxUserInfo,

                                                       parameter: param,

-                                                      parseJSON: { $0 })

+                                                      parseJSON: pareseWXUserInfo)

         return NetworkApi.share.get(resource: resource)

     }

@@ -18,3 +18,4 @@ FOUNDATION_EXPORT const unsigned char PaiaiDataKitVersionString[];

 //微信SDK头文件

 #import "WXApi.h"

+#import "WechatAuthSDK.h"

@@ -27,41 +27,65 @@ public final class PhotoDetailItemViewModel {

         self.item.subscribe(onNext: {[unowned self] (photoItem) in

             self.repository = PhotoDetailRepository(photoId: photoItem.photo_id, groupId: photoItem.group_id)

-            self.loadCommentItems().concat(self.loadThumbupUserItems()).subscribe(onCompleted: {

-                var val = self.item.value

-                val.comment_num = self.commentItems.value.count

-                val.thumbup_num = self.thumbupItems.value.count

-                self.item.accept(val)

-

-                let userInfo = [PhotoItemsOperator.key: PhotoItemsOperator.update(val.photo_id, val)]

-                NotificationCenter.default.post(name: .PhotoItemsChanged,

-                                                object: nil,

-                                                userInfo: userInfo)

-            }).disposed(by: self.disposeBag)

+            self.loadThumbupAndComment()

+//            Observable.zip(self.loadCommentItems(), self.loadThumbupUserItems()).subscribe(onNext: { _ in

+//                <#code#>

+//            }, onError: <#T##((Error) -> Void)?##((Error) -> Void)?##(Error) -> Void#>, onCompleted: <#T##(() -> Void)?##(() -> Void)?##() -> Void#>, onDisposed: <#T##(() -> Void)?##(() -> Void)?##() -> Void#>)

+//                .subscribe(onCompleted: {

+//

+//                var val = self.item.value

+//                val.comment_num = self.commentItems.value.count

+//                val.thumbup_num = self.thumbupItems.value.count

+//                self.item.accept(val)

+//

+//                let userInfo = [PhotoItemsOperator.key: PhotoItemsOperator.update(val.photo_id, val)]

+//                NotificationCenter.default.post(name: .PhotoItemsChanged,

+//                                                object: nil,

+//                                                userInfo: userInfo)

+//            }).disposed(by: self.disposeBag)

         }).disposed(by: disposeBag)

     }

-

-    private func loadThumbupUserItems() -> Completable {

-        return repository.loadThumbups().do(onSuccess: { (items) in

-            self.thumbupItems.accept(items)

-        }).asCompletable()

+    

+    private func loadThumbupAndComment() {

+        print(#function)

+        Single.zip(repository.loadComments(), repository.loadThumbups()).subscribe(onSuccess: {[unowned self] (commentItems, thumbupItems) in

+            self.commentItems.accept(commentItems)

+            self.thumbupItems.accept(thumbupItems)

+            self.update()

+        }).disposed(by: disposeBag)

+    }

+    

+    private func loadThumbupUserItems() -> Single<[PhotoThumbupUserItem]>  {

+        return repository.loadThumbups()

     }

-    private func loadCommentItems() -> Completable {

-        return repository.loadComments().do(onSuccess: { (items) in

-            self.commentItems.accept(items)

-        }).asCompletable()

+    private func loadCommentItems() -> Single<[PhotoCommentItem]>  {

+        return repository.loadComments()

+    }

+    

+    private func update() {

+        var val = self.item.value

+        val.comment_num = self.commentItems.value.count

+        val.thumbup_num = self.thumbupItems.value.count

+        let userInfo = [PhotoItemsOperator.key: PhotoItemsOperator.update(val.photo_id, val)]

+        NotificationCenter.default.post(name: .PhotoItemsChanged,

+                                        object: nil,

+                                        userInfo: userInfo)

     }

     public func submitThumbup() {

         repository.submitThumbup().subscribe(onSuccess: { items in

             self.thumbupItems.accept(items)

+            self.update()

         }).disposed(by: disposeBag)

     }

     public func submitComment(text: String) {

         repository.submitComment(text: text).subscribe(onSuccess: { (items) in

             self.commentItems.accept(items)

+            self.update()

         }).disposed(by: disposeBag)

     }

+    

+    

 }

@@ -127,6 +127,7 @@ public final class PhotoDetailViewModel {

     }

     public func willShow(index: Int) {

+        print(index)

         currIndex = index

         _hasGetPrice.accept(false)

         itemViewModel.item.accept(_items.value[index])

@@ -125,7 +125,7 @@ public final class WaterfallFlowLayout: UICollectionViewLayout {

     }

     /// called at collectionView reload

-    func setNeedsLayout() {

+    public func setNeedsLayout() {

         isNeedLayout = true

     }

 }

@@ -31,6 +31,10 @@ final class HomeViewController: UIViewController {

     override func viewDidAppear(_ animated: Bool) {

         super.viewDidAppear(animated)

     }

+    

+    override func viewDidDisappear(_ animated: Bool) {

+        super.viewDidDisappear(animated)

+    }

     func initalize() {

         collectionView.register(UINib(nibName: "PhotoCell",

@@ -95,7 +99,8 @@ fileprivate extension HomeViewController {

     func bindViewModelToRefreshing() {

         viewModel.isLoading

-            .subscribe(onNext: {[unowned self] flag in

+            .asDriver(onErrorJustReturn: true)

+            .drive(onNext: {[unowned self] flag in

                 if flag {

                     self.collectionView.endRefreshing(at: .top)

                 } else {

Главная Обзор Помощь

Зарегистрироваться Войти

tonglan

/

adminSystem

Следить 1

В избранное 0

Ответвить 0

Обсуждения 0 Пулл реквесты 0 Коммиты 3 Релизы 0

1 Коммиты (e5cdf3254b2e2b3bbece92a66994aef7f62f7a51)

Автор	SHA1	Сообщение	Дата
FFIB	11e3a9652a	first	лет %!s(int64=7): %!d(string=назад)