--- a/PaiAi/Paiai.xcodeproj/project.xcworkspace/xcuserdata/FFIB.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/PaiAi/Paiai.xcodeproj/project.xcworkspace/xcuserdata/FFIB.xcuserdatad/UserInterfaceState.xcuserstate
--- a/PaiAi/Paiai.xcodeproj/xcuserdata/FFIB.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/PaiAi/Paiai.xcodeproj/xcuserdata/FFIB.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -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>
              
--- a/PaiAi/Paiai.xcodeproj/xcuserdata/FFIB.xcuserdatad/xcschemes/PaiAi.xcscheme
+++ b/PaiAi/Paiai.xcodeproj/xcuserdata/FFIB.xcuserdatad/xcschemes/PaiAi.xcscheme
@@ -104,10 +104,10 @@
 
                       </BuildableProductRunnable>
              
 
                    </ProfileAction>
              
 
                    <AnalyzeAction
              
 
                -      buildConfiguration = "Debug">
              
 
                +      buildConfiguration = "Release">
              
 
                    </AnalyzeAction>
              
 
                    <ArchiveAction
              
 
                -      buildConfiguration = "Debug"
              
 
                +      buildConfiguration = "Release"
              
 
                       revealArchiveInOrganizer = "YES">
              
 
                    </ArchiveAction>
              
 
                 </Scheme>
              
--- a/PaiAi/Paiai/Assets.xcassets/.DS_Store
+++ b/PaiAi/Paiai/Assets.xcassets/.DS_Store
--- a/PaiAi/Paiai/Assets.xcassets/module/login/guide1.imageset/8778FB9773576108C6D5109F23D69C69.png
+++ b/PaiAi/Paiai/Assets.xcassets/module/login/guide1.imageset/8778FB9773576108C6D5109F23D69C69.png
--- a/PaiAi/Paiai/Assets.xcassets/module/login/guide2.imageset/A4494A157AB20FA47B8B96993319B3E9.png
+++ b/PaiAi/Paiai/Assets.xcassets/module/login/guide2.imageset/A4494A157AB20FA47B8B96993319B3E9.png
--- a/PaiAi/Paiai/Assets.xcassets/module/login/guide3.imageset/862B9012863929D278CBEF1E3A118E6D.png
+++ b/PaiAi/Paiai/Assets.xcassets/module/login/guide3.imageset/862B9012863929D278CBEF1E3A118E6D.png
--- a/PaiAi/Paiai/Info.plist
+++ b/PaiAi/Paiai/Info.plist
@@ -62,7 +62,7 @@
 
                 		</dict>
              
 
                 	</array>
              
 
                 	<key>CFBundleVersion</key>
              
 
                -	<string>1</string>
              
 
                +	<string>3</string>
              
 
                 	<key>LSApplicationCategoryType</key>
              
 
                 	<string></string>
              
 
                 	<key>LSApplicationQueriesSchemes</key>
              
--- a/PaiAi/Paiai/Paiai.entitlements
+++ b/PaiAi/Paiai/Paiai.entitlements
@@ -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>
              
--- a/PaiAi/PaiaiDataKit/DataLayer/Repositories/Remote/Reusable/NetWork/NetworkApi.swift
+++ b/PaiAi/PaiaiDataKit/DataLayer/Repositories/Remote/Reusable/NetWork/NetworkApi.swift
@@ -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: "网络出现未知错误")
              
--- a/PaiAi/PaiaiDataKit/DataLayer/Repositories/Remote/WXUserInfoRemoteAPI.swift
+++ b/PaiAi/PaiaiDataKit/DataLayer/Repositories/Remote/WXUserInfoRemoteAPI.swift
@@ -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)
              
 
                     }
              
 
                 
              
--- a/PaiAi/PaiaiDataKit/PaiaiDataKit.h
+++ b/PaiAi/PaiaiDataKit/PaiaiDataKit.h
@@ -18,3 +18,4 @@ FOUNDATION_EXPORT const unsigned char PaiaiDataKitVersionString[];
 
                 
              
 
                 //微信SDK头文件
              
 
                 #import "WXApi.h"
              
 
                +#import "WechatAuthSDK.h"
              
--- a/PaiAi/PaiaiDataKit/PresentLayer/PhotoDetail/PhotoDetailItemViewModel.swift
+++ b/PaiAi/PaiaiDataKit/PresentLayer/PhotoDetail/PhotoDetailItemViewModel.swift
@@ -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)
              
 
                     }
              
 
                +    
              
 
                +    
              
 
                 }
              
--- a/PaiAi/PaiaiDataKit/PresentLayer/PhotoDetail/PhotoDetailViewModel.swift
+++ b/PaiAi/PaiaiDataKit/PresentLayer/PhotoDetail/PhotoDetailViewModel.swift
@@ -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])
              
--- a/PaiAi/PaiaiUIKit/Reusable/UIKit/WaterfallFlowLayout/WaterfallFlowLayout.swift
+++ b/PaiAi/PaiaiUIKit/Reusable/UIKit/WaterfallFlowLayout/WaterfallFlowLayout.swift
@@ -125,7 +125,7 @@ public final class WaterfallFlowLayout: UICollectionViewLayout {
 
                     }
              
 
                     
              
 
                     /// called at collectionView reload
              
 
                -    func setNeedsLayout() {
              
 
                +    public func setNeedsLayout() {
              
 
                         isNeedLayout = true
              
 
                     }
              
 
                 }
              
--- a/PaiAi/Paiai_iOS/App/Home/HomeViewController.swift
+++ b/PaiAi/Paiai_iOS/App/Home/HomeViewController.swift
@@ -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 {

..
0001_initial.py	4defb80fdc	gogs first init	9 年之前
0002_auto_20151202_2251.py	434468279f	add api of lesman login & update other api	9 年之前
0003_auto_20151202_2313.py	434468279f	add api of lesman login & update other api	9 年之前
0004_auto_20151207_1811.py	4a8b4f8819	add watermark	9 年之前
0005_auto_20151209_1638.py	3454610bb7	add api of user signup/login	9 年之前
0006_auto_20151223_1533.py	5ef425fee7	add api wx_authorize_api	9 年之前
0007_auto_20160120_1830.py	a121b75ff2	add db_index=True for status field	9 年之前
0008_userinfo_unionid.py	8aeca53563	record unionid for wx_authorize user	9 年之前
0009_auto_20160428_1410.py	269576f8b9	add guest user	9 年之前
0010_userinfo_uuid.py	63eaee0951	modify guest_login_api	9 年之前
0011_auto_20160627_1411.py	6d6c8485ce	bind LensmanInfo and UserInfo	9 年之前
0012_auto_20160627_1419.py	6d6c8485ce	bind LensmanInfo and UserInfo	9 年之前
0013_auto_20160711_1436.py	d0affd4b01	add lensman_oauth page	9 年之前
0014_lensmaninfo_refused_reason.py	30d24179d9	add refused relative	9 年之前
0015_auto_20160713_1646.py	30d24179d9	add refused relative	9 年之前
0016_auto_20160718_1258.py	c7071ae7f1	wx_uid to openid	9 年之前
0017_auto_20160908_1053.py	4fdd237863	add api price_fix	9 年之前
0018_auto_20161020_1844.py	e249360c0c	Add freeze_balance for lensman/user	8 年之前
0019_auto_20161024_1235.py	c7abce172a	Rename field name	8 年之前
0020_tourguideinfo.py	8a213207ea	Add tour guide oauth	8 年之前
0021_auto_20161213_1639.py	8a213207ea	Add tour guide oauth	8 年之前
0022_auto_20170212_2153.py	c3e3681541	Create user in api get_userinfo_api for weapp	8 年之前
0023_auto_20170709_1923.py	d38cc6ceb2	Add multi openid for UserInfo & Change create order support miniapp	8 年之前
0024_auto_20170917_1825.py	a6195fa70d	Add outtake lensman	7 年之前
0025_auto_20180101_2220.py	9bb56c50cc	Makemigrations	7 年之前
0026_auto_20180103_0446.py	a7cbbf15a7	Update max_length for CharField	7 年之前
0027_franchiserinfo_saleclerkinfo.py	627187a7d7	Update Kodo	7 年之前
0028_saleclerkinfo_total_integral.py	2bac598d19	Clerk Sale Submit	7 年之前
0029_userinfo_has_membercard.py	852e8b89b5	Has Member Card Flag	7 年之前
0030_userinfo_membercardid.py	4bfdba3718	MemberCardID	7 年之前
0031_auto_20180417_1031.py	e47aa7f8c4	Add field test_user	7 年之前
0032_delete_saleclerkinfo.py	e7dcf47e22	SaleclerkInfo	7 年之前
0033_delete_franchiserinfo.py	619711142e	Makemigrations	7 年之前
0034_auto_20180930_1159.py	66a598b30c	Makemigrations	6 年之前
0035_auto_20181006_1142.py	69f5e16982	Makemigrations	6 年之前
0036_auto_20190826_1537.py	8d998319f7	Makemigrations	6 年之前
0037_auto_20191119_1348.py	3d0d214667	:sparkles: Member Infos	5 年之前
0038_userinfo_subscribe.py	b570a71ac8	:art: Add subscribe field for UserInfo	5 年之前
0039_auto_20200117_1203.py	5d326f3037	:art: Change subscribe default 0	5 年之前
0040_userinfo_province_code.py	3a0fde0866	:art: Makemigrations	5 年之前
0041_auto_20200206_2250.py	3a0fde0866	:art: Makemigrations	5 年之前
0042_userinfo_province_name.py	3a0fde0866	:art: Makemigrations	5 年之前
0043_userinfo_appid.py	26fba3f632	:art: Add appid for UserInfo	5 年之前
0044_userinfo_code_version.py	e3e796fb87	django makemigrations	5 年之前
0045_userinfo_new_subscribe.py	02698925b3	add new_subscribe	5 年之前
0046_auto_20200601_0237.py	42164961e3	:sparkles: Support qy_login_api	5 年之前
0047_auto_20200601_0242.py	fcf9b28df2	:art: user_from	5 年之前
0048_auto_20201130_0131.py	96c4bec605	:art: Add api activity_group_share	4 年之前
0049_auto_20201202_1203.py	6a9e324f6f	:art: Re Makemigrations	4 年之前
0050_auto_20201208_1607.py	9ef019cfea	移除拍爱项目相关	4 年之前
0051_userintegralincomeexpensesinfo.py	f9d21d534b	记录积分获得记录	4 年之前
0052_auto_20201209_1857.py	b166113653	alter field	4 年之前
0053_userinfo_resgister_at.py	76685e12e9	增加注册镜头时间，	4 年之前
0054_userinfo_coupon_expire_at.py	c01f5a3b5b	:art: Add coupon_expire_at	3 年之前
__init__.py	4defb80fdc	gogs first init	9 年之前