Merge branch 'release/1.0.0'

RainbowPlanet/Podfile

@@ -43,6 +43,7 @@ target 'RainbowPlanet' do
   pod 'FSPagerView'
   # 小红点
   pod 'PPBadgeViewSwift'
+  # bug统计
   pod 'Bugly'
   # 动画效果
 #  pod 'pop'
@@ -56,14 +57,19 @@ target 'RainbowPlanet' do
   pod 'SwiftyMediator/Routable'
   # 上下滚动的Label
   pod 'DPScrollNumberLabel'
-  # 左右Label
-  pod 'FlickerNumber'
+  
+  pod 'ESTabBarController-swift'
+  
   # Label扩展
   pod 'YYText'
+  
+  pod 'AFNetworking', '~> 3.0'
+  pod 'JSONModel','~> 1.7.0'
+  pod 'ZipArchive','1.4.0'
+  # 左右Label
+#  pod 'FlickerNumber'
   # 生成二维码
 #  pod 'EFQRCode'
-
-  pod 'ESTabBarController-swift'
   # 内存泄露
   pod 'MLeaksFinder'
 #  pod 'FBMemoryProfiler'
@@ -107,9 +113,5 @@ target 'RainbowPlanet' do
 #  pod 'VODUpload'
 #  # 播放器
 #  pod 'AliPlayerSDK_iOS'
-
-  pod 'AFNetworking', '~> 3.0'
-  pod 'JSONModel','~> 1.7.0'
-  pod 'ZipArchive','1.4.0'
   
 end

RainbowPlanet/Podfile.lock

@@ -28,7 +28,6 @@ PODS:
   - DPScrollNumberLabel (0.0.2)
   - ESTabBarController-swift (2.7)
   - FBRetainCycleDetector (0.1.4)
-  - FlickerNumber (1.1)
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
@@ -107,7 +106,6 @@ DEPENDENCIES:
   - DeviceKit
   - DPScrollNumberLabel
   - ESTabBarController-swift
-  - FlickerNumber
   - FMDB
   - FSPagerView
   - FWPopupView
@@ -160,7 +158,6 @@ SPEC REPOS:
     - DPScrollNumberLabel
     - ESTabBarController-swift
     - FBRetainCycleDetector
-    - FlickerNumber
     - FMDB
     - FSPagerView
     - FWPopupView
@@ -210,7 +207,6 @@ SPEC CHECKSUMS:
   DPScrollNumberLabel: 5124eaccf3029bb84116de391e1273cba676f4f5
   ESTabBarController-swift: 4fb52ad03d94d0717ef97bc9eb09a5abfdded0a2
   FBRetainCycleDetector: 46f8179bbb1c587deee3ea838a1a3ee02acf5015
-  FlickerNumber: bce41da51904d533393d69e9734df6281ab1c646
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   FSPagerView: 816a18842306973cc7cc6df8a5332272f7815c30
   FWPopupView: c1dbb33fbe4d223f619f28a7e5e5a00f08c10342
@@ -246,6 +242,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
 
-PODFILE CHECKSUM: fb8d10d0b68567b1425cddc55970c1cb93733003
+PODFILE CHECKSUM: 157702051212486747c9c4b46e9727f2888bace5
 
 COCOAPODS: 1.7.4

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -6901,7 +6901,7 @@
 					"$(PROJECT_DIR)/RainbowPlanet/Lib/ATAuthSDK",
 				);
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_ROOT}/Headers/Public\"",
@@ -7151,7 +7151,7 @@
 					"$(PROJECT_DIR)/RainbowPlanet/Lib/ATAuthSDK",
 				);
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -33,7 +33,7 @@ extension AppDelegate {
             /// 设置全局的TableView
             self?.setTableViewAppearance()
             /// 城市转换
-//            self?.setBaiduToCityFactory()
+            self?.setBaiduToCityFactory()
             /// 设置默认为快递
             let deliveryMethodTypeModel = DeliveryMethodTypeModel.shared()
             deliveryMethodTypeModel.deliveryMethodType = "2"
@@ -47,61 +47,65 @@ extension AppDelegate {
     
     /// 设置Tabbar
     func setTabbarController() {
-
-        setTabbarViewBarNil()
         /// 判断初始化页面
         if (UserModel.shared().getModel()?.token) != nil { //是否已经登录
             SwiftMoyaNetWorkServiceUser.shared().userRefreshApi {
                 [weak self] _ in
 
                 if(UserModel.shared().getModel()?.isFollowSuggestTopic == 0 || UserModel.shared().getModel()?.isFollowSuggestTopic == nil ) {//设置性别话题
-                    self?.setLoginOut()
+                    self?.setNoLoginOut()
                 }else {
                     self?.window?.rootViewController = BaseTabbarViewController.shared.tabBarViewController()
-                    //U米
-                    UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApiInterval()
-                    //获取消息的小红点
-                    MessageModuleManager.shared.userMemberMessageIndexApi()
+                    self?.setData()
                 }
             }
         }else {// 进入首页
-            self.window?.rootViewController = BaseTabbarViewController.shared.tabBarViewController()
-            //添加登录view
-            LoginNowView.initLoginNowView()
+            setNoLoginOut()
         }
     }
     
-    func setTabbarViewBarNil() {
-        BaseTabbarViewController.shared.v1 = nil
-        BaseTabbarViewController.shared.v2 = nil
-        BaseTabbarViewController.shared.v3 = nil
-        BaseTabbarViewController.shared.v4 = nil
-        BaseTabbarViewController.shared.v5 = nil
-        BaseTabbarViewController.shared.lottieAnimateContentView1 = nil
-        BaseTabbarViewController.shared.lottieAnimateContentView2 = nil
-        BaseTabbarViewController.shared.lottieAnimateContentView4 = nil
-        BaseTabbarViewController.shared.lottieAnimateContentView5 = nil
-        BaseTabbarViewController.shared.esTabBarController = nil
-        KingfisherManager.shared.cache.clearMemoryCache()
-        KingfisherManager.shared.cache.clearDiskCache()
+    
+    /// 设置登录时用的数据
+    func setData() {
+        //U米
+        UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApiInterval()
+        //获取消息的小红点
+        MessageModuleManager.shared.userMemberMessageIndexApi()
     }
     
-
-    /// 登录
-    func setLogin() {
-        Mediator.present(RegisterLoginRouterModuleType.presentRegisterLogin)
+    /// 未登录
+    func setNoLoginOut() {
+        // 移除本地用户信息
+        UserModel.shared().removeLoginModel()
+        // 移除快递信息
+        DeliveryMethodTypeModel.shared().removeLoginModel()
+        // 设置tabBar
+        self.window?.rootViewController = BaseTabbarViewController.shared.tabBarViewController()
+        //添加登录view
+        LoginNowView.initLoginNowView()
     }
     
     /// 退出登录
     func setLoginOut() {
-        //移除本地用户信息
+        // 移除本地用户信息
         UserModel.shared().removeLoginModel()
-        //移除快递信息
+        // 移除快递信息
         DeliveryMethodTypeModel.shared().removeLoginModel()
-        //置空
-        setTabbarViewBarNil()
-        //进入到首页
-        setTabbarController()
+        // 选择中index
+        BaseTabbarViewController.shared.setBadge()
+        //添加登录view
+        LoginNowView.initLoginNowView()
+        
+
+
+        // 退出登录
+        NotificationCenter.default.post(name: NSNotification.Name("loginOut"), object: nil)
+        BaseTabbarViewController.shared.setLoginOutTabBarItem()
+    }
+    
+    /// 登录
+    func setLogin() {
+        Mediator.present(RegisterLoginRouterModuleType.presentRegisterLogin)
     }
 
      /// 设置全局的navigation

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -115,15 +115,10 @@ class BaseTabbarViewController: NSObject {
         v3.tabBarItem.imageInsets =  UIEdgeInsets(top: 4, left: 0, bottom: -4, right: 0);
         
         if UserModel.isTokenNil() {
-
-            v4.tabBarItem = ESTabBarItem.init(BaseTabBarItemContentView(), title: "消息", image: UIImage(named: "tabbar_massage")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
-            v5.tabBarItem = ESTabBarItem.init(BaseTabBarItemContentView(), title: "我的", image: UIImage(named: "tabbar_my")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
-
+            setLoginOutTabBarItem()
         }else {
-            v4.tabBarItem = ESTabBarItem.init(lottieAnimateContentView4, title: "消息", image: UIImage(named: "tabbar_massage")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
-            v5.tabBarItem = ESTabBarItem.init(lottieAnimateContentView5, title: "我的", image: UIImage(named: "tabbar_my")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
+            setLoginTabBarItem()
         }
-        
 
         let n1 = BaseNavigationViewController.init(rootViewController: v1)
         let n2 = BaseNavigationViewController.init(rootViewController: v2)
@@ -151,6 +146,16 @@ class BaseTabbarViewController: NSObject {
         return esTabBarController
     }
     
+    func setLoginTabBarItem() {
+        v4.tabBarItem = ESTabBarItem.init(lottieAnimateContentView4, title: "消息", image: UIImage(named: "tabbar_massage")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
+        v5.tabBarItem = ESTabBarItem.init(lottieAnimateContentView5, title: "我的", image: UIImage(named: "tabbar_my")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
+    }
+    
+    func setLoginOutTabBarItem() {
+        v4.tabBarItem = ESTabBarItem.init(BaseTabBarItemContentView(), title: "消息", image: UIImage(named: "tabbar_massage")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage:nil)
+        v5.tabBarItem = ESTabBarItem.init(BaseTabBarItemContentView(), title: "我的", image: UIImage(named: "tabbar_my")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage:nil)
+    }
+    
     /// 跳转到VC
     func pushPublishVC() {
         if BaseTabbarViewController.shared.v1.navigationBarbgView.isHidden {

RainbowPlanet/RainbowPlanet/Manager/ATAuthSDKManager/ATAuthSDKManager.swift

@@ -50,7 +50,7 @@ class ATAuthSDKManager: NSObject {
                 modelNew.privacyOne = ["由你用户协议",kH5ContentId6Url];
                 modelNew.privacyTwo = ["隐私条款",kH5ContentId11Url];
                 modelNew.checkBoxIsChecked = true
-                modelNew.privacyBottomOffetY = 46.5 - kSafeTabBarHeight
+                modelNew.privacyBottomOffetY = 46.5
                 modelNew.privacyColors = [kbbbbbbColor,k333333Color];
                 
                 

RainbowPlanet/RainbowPlanet/Manager/AliyunVodManager/AliyunVodUpToyoPublishManager/AliyunVodupToyoPublishManager.swift

@@ -59,11 +59,10 @@ class AliyunVodUpToyoPublishManager: NSObject {
     }
     
     func destroy() {
-        self.aliyunVodUpToYoPublishModel = nil
         self.isUploadingVideo = true
         self.curTimes = 0
         self.imagesProgressValue = 0.0
-        self.aliyunVodPublishManager = nil
+        self.progressView?.curUploadStatus = nil
     }
 
 }

RainbowPlanet/RainbowPlanet/Manager/RegisterLoginManager/RegisterLoginManager.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import ESTabBarController_swift
 
 class RegisterLoginManager: NSObject {
 
@@ -17,8 +18,31 @@ class RegisterLoginManager: NSObject {
         if UserModel.shared().getModel()?.isFollowSuggestTopic == 0 || UserModel.shared().getModel()?.isFollowSuggestTopic == nil  { //设置性别
             vc?.navigationController?.pushViewController(GenderSelectionViewController(), animated: true)
         }else {// 设置首页
-            vc?.navigationController?.dismiss(animated: false, completion: {})
-            kAppDelegate.setTabbarController()
+            if vc?.presentingViewController != nil {
+                if vc?.navigationController?.presentationController != nil {
+                        vc?.navigationController?.dismiss(animated: false, completion: {
+                            NotificationCenter.default.post(name: NSNotification.Name("login"), object: nil)
+                            LoginNowView.removeLoginNowView()
+                            kAppDelegate.setData()
+                            BaseTabbarViewController.shared.setLoginTabBarItem()
+                        })
+                }else {
+                    vc?.dismiss(animated: false, completion: {
+                        NotificationCenter.default.post(name: NSNotification.Name("login"), object: nil)
+                        LoginNowView.removeLoginNowView()
+                        kAppDelegate.setData()
+                        BaseTabbarViewController.shared.setLoginTabBarItem()
+                    })
+                }
+                
+            } else {
+                vc?.navigationController?.popToRootViewController(animated: false)
+                NotificationCenter.default.post(name: NSNotification.Name("login"), object: nil)
+                LoginNowView.removeLoginNowView()
+                kAppDelegate.setData()
+                BaseTabbarViewController.shared.setLoginTabBarItem()
+
+            }
         }
     }
 }

RainbowPlanet/RainbowPlanet/Manager/UMManager/UMManager.swift

@@ -396,26 +396,29 @@ extension UMManager {
     /// 第三方登录
     ///
     /// - Parameter platformType: 平台
-    func loginGetUserInfo(platformType: UMSocialPlatformType,callBack: @escaping (UMLoginModel) -> (Void)) {
+    func loginGetUserInfo(platformType: UMSocialPlatformType,currentViewController:UIViewController,callBack: @escaping (UMLoginModel) -> (Void)) {
         
         if !AlamofireReachabilityManager.shared.isNetworkConnect() {
             return
         }
-        let isInstall = UMSocialManager.default()?.isInstall(platformType)
-        if isInstall!  { //验证
-            getUserInfo(platformType: platformType, callBack: callBack)
-        }else {
-            if platformType == .wechatSession {
-                SwiftProgressHUD.shared().showText("微信未安装\n请您安装微信程序")
-            }else{
-                getUserInfo(platformType: platformType, callBack: callBack)
-            }
-        }
+//        let isInstall = UMSocialManager.default()?.isInstall(platformType)
+//        if isInstall!  { //验证
+//            getUserInfo(platformType: platformType, callBack: callBack)
+//        }else {
+//            if platformType == .wechatSession {
+//                SwiftProgressHUD.shared().showText("微信未安装\n请您安装微信程序")
+//            }else{
+//                getUserInfo(platformType: platformType, callBack: callBack)
+//            }
+//        }
+        getUserInfo(platformType: platformType,currentViewController:currentViewController, callBack: callBack)
+
     }
 }
 
-func getUserInfo(platformType: UMSocialPlatformType,callBack: @escaping (UMLoginModel) -> (Void)) {
-    UMSocialManager.default().getUserInfo(with: platformType, currentViewController: nil) { result, error in
+func getUserInfo(platformType: UMSocialPlatformType,currentViewController:UIViewController,callBack: @escaping (UMLoginModel) -> (Void)) {
+    
+    UMSocialManager.default().getUserInfo(with: platformType, currentViewController: currentViewController) { result, error in
         
         if error != nil {
             SwiftProgressHUD.shared().showText("授权失败,请重新登录")
@@ -435,6 +438,11 @@ func getUserInfo(platformType: UMSocialPlatformType,callBack: @escaping (UMLogin
                 UserModel.open_id = anOpenid
             }
             
+            if let anUnionId = resp?.unionId {
+                NXLLog(" unionId: \(anUnionId)")
+                UserModel.union_id = anUnionId
+            }
+            
             // 用户数据
             if let aName = resp?.name {
                 NXLLog(" name: \(aName)")

RainbowPlanet/RainbowPlanet/Model/UserModel/MessageIndexModel.swift

@@ -44,6 +44,10 @@ class MessageIndexModel : NSObject, Mappable{
         let json = try? JSON(data: cacheModel?.data ?? Data())
         return MessageIndexModel(JSONString: json?.description ?? "")
     }
+    
+    func removeObject()  {
+        CacheManager.default.removeObjectCacheSync("MessageIndexModel")
+    }
 
 }
 

RainbowPlanet/RainbowPlanet/Model/UserModel/UserModel.swift

@@ -4,6 +4,7 @@
 
 import Foundation 
 import ObjectMapper
+import Kingfisher
 
 
 public class UserModel : NSObject, NSCoding, Mappable{
@@ -167,6 +168,10 @@ public class UserModel : NSObject, NSCoding, Mappable{
         //移除友盟别名
         UMManager.shared.removeAlias()
         UserDefaults.standard.removeObject(forKey: "UserModel")
+        MessageIndexModel.shared.removeObject()
+        //清除缓存
+        KingfisherManager.shared.cache.clearMemoryCache()
+        KingfisherManager.shared.cache.clearDiskCache()
     }
     
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Comment/CardContentCommnetTableViewCell.swift

@@ -60,7 +60,7 @@ class CardContentCommnetTableViewCell: UITableViewCell {
     
     private lazy var avatarButton: UIButton = {
         let avatarButton = UIButton()
-        avatarButton.kf.setImage(with: kURLThumbnailsImage(name: UserModel.shared().getModel()?.avatarurl ?? "",size:kSize28x28Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+        avatarButton.kf.setImage(with: kURLImage(name: UserModel.shared().getModel()?.avatarurl ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
         KingfisherManager.shared.cache.clearMemoryCache()
 
         avatarButton.cornerRadius = 14

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/User/CardContentUserTableViewCell.swift

@@ -158,7 +158,7 @@ class CardContentUserTableViewCell: UITableViewCell {
     
     var communityRecommendDataModel: CommunityRecommendDataModel? {
         didSet {
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendDataModel?.avatar ?? "", size: kSize40x40Image), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityRecommendDataModel?.avatar ?? ""), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             titleButton.setTitle(communityRecommendDataModel?.username, for: UIControl.State.normal)
             timeLabel.text = communityRecommendDataModel?.createdAt
@@ -174,7 +174,7 @@ class CardContentUserTableViewCell: UITableViewCell {
     
     var communityFollowDataModel : CommunityFollowDataModel? {
         didSet {
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityFollowDataModel?.relateData?.avatar ?? "",size: kSize40x40Image), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityFollowDataModel?.relateData?.avatar ?? ""), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
             
             KingfisherManager.shared.cache.clearMemoryCache()
             titleButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FollowStatus/CommunityFollowStatusTableViewCell.swift

@@ -299,7 +299,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
     
     var communityFollowDataModel : CommunityFollowDataModel? {
         didSet {
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityFollowDataModel?.followAvatar ?? "",size: kSize28x28Image), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityFollowDataModel?.followAvatar ?? ""), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             titleButton.setTitle(communityFollowDataModel?.followUsername, for: UIControl.State.normal)
@@ -316,7 +316,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
             switch communityFollowType {
             case .follow?:
                 timeStatusLabel.text = "\(communityFollowDataModel?.createdAt ?? "") 关注了"
-                avatarOtherButton.kf.setImage(with: kURLThumbnailsImage(name: communityFollowDataModel?.relateData?.avatar ?? "",size: kSize40x40Image), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
+                avatarOtherButton.kf.setImage(with: kURLImage(name: communityFollowDataModel?.relateData?.avatar ?? ""), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
                 KingfisherManager.shared.cache.clearMemoryCache()
 
                 titleOtherButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/PopularVideo/PopularVideoCollectionViewCell.swift

@@ -85,7 +85,7 @@ class PopularVideoCollectionViewCell: UICollectionViewCell {
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         didSet {
             picImageView.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendTypeDataModel?.img ?? "",size: self.size), placeholder: kImage(name: "default_pic"))
-            avatarImageView.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendTypeDataModel?.avatar ?? "",size: kSize54x54Image), placeholder: kImage(name: "default_avatar"))
+            avatarImageView.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.avatar ?? ""), placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             nameLabel.text = communityRecommendTypeDataModel?.userName

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/RecommendFollow/CommunityRecommendFollowCollectionViewCell.swift

@@ -126,7 +126,7 @@ class CommunityRecommendFollowCollectionViewCell: UICollectionViewCell {
     
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         didSet {
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendTypeDataModel?.avatar ?? "",size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
            
@@ -150,7 +150,7 @@ class CommunityRecommendFollowCollectionViewCell: UICollectionViewCell {
     
     var cmsMemberModel : CMSMemberModel? {
         didSet {
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: cmsMemberModel?.avatar ?? "",size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: cmsMemberModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
 

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/CommunityNavigationBarView.swift

@@ -25,6 +25,33 @@ class CommunityNavigationBarView: BaseView {
     var searchClosure:SearchClosure?
     var scrollNumberLabel : DPScrollNumberLabel?
     
+    func isTokenNil() {
+        UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApi()
+        if UserModel.isTokenNil() {
+            self.scrollNumberLabel?.isHidden  = true
+            self.rightButton.snp.remakeConstraints { (make) in
+                make.centerY.equalToSuperview()
+                make.right.equalTo(-14)
+                make.size.equalTo(25)
+                
+            }
+            self.scrollNumberLabel?.isHidden  = true
+        }else {
+            self.scrollNumberLabel?.isHidden  = false
+            self.scrollNumberLabel!.snp_remakeConstraints {[weak self] (make) in
+                make.centerY.equalToSuperview()
+                make.size.equalTo((self?.scrollNumberLabel?.frame.size)!)
+                make.right.equalToSuperview().offset(-14)
+            }
+            self.rightButton.snp.remakeConstraints {[weak self] (make) in
+                make.centerY.equalToSuperview()
+                make.right.equalTo((self?.scrollNumberLabel?.snp_left)!).offset(-2)
+                make.size.equalTo(25)
+                
+            }
+        }
+    }
+    
     override func setupViews() {
         scrollNumberLabel = DPScrollNumberLabel.init(number: 0, fontSize: 16, textColor: kFFA42FColor, signSetting: SignSetting.unsigned)
         scrollNumberLabel?.addTapGesture(1, target: self, action: #selector(skittles))
@@ -34,20 +61,31 @@ class CommunityNavigationBarView: BaseView {
         addSubview(searchBgView)
         searchBgView.addSubview(searchIconImageView)
         searchBgView.addSubview(searchTextField)
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("login"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.isTokenNil()
+        })
+        
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("loginOut"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.isTokenNil()
+        })
+        
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("userMemberGetTotalBean"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
             let totalBeanModel = notification.object as? TotalBeanModel
+            
 //            self?.rightButton.play()
             self?.scrollNumberLabel!.change(to: NSNumber(value: totalBeanModel?.todayBean ?? 0) , animated: true)
             
             if totalBeanModel?.todayBean == 0 {
                 self?.scrollNumberLabel?.isHidden  = true
-                self?.rightButton.snp.makeConstraints { (make) in
+                self?.rightButton.snp.remakeConstraints { (make) in
                     make.centerY.equalToSuperview()
                     make.right.equalTo(-14)
                     make.size.equalTo(25)
-
                 }
             }else {
+                self?.scrollNumberLabel?.isHidden  = false
                 self?.scrollNumberLabel!.snp_remakeConstraints { (make) in
                     make.centerY.equalToSuperview()
                     make.size.equalTo((self?.scrollNumberLabel!.frame.size)!)
@@ -61,12 +99,7 @@ class CommunityNavigationBarView: BaseView {
                 }
             }
         }
-        UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApi()
-        if UserModel.isTokenNil() {
-            scrollNumberLabel?.isHidden  = true
-        }else {
-            scrollNumberLabel?.isHidden  = false
-        }
+        isTokenNil()
     }
     
     override func setupLayouts() {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -39,6 +39,7 @@ class CommunityFollowViewController: BaseViewController {
     }
     
     override func setupViews() {
+        navigationBar.isHidden = true
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
     }
@@ -80,6 +81,16 @@ class CommunityFollowViewController: BaseViewController {
             self?.communityFollowFeedApi(page: page)
         })
         
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("login"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.tableView.mj_header.beginRefreshing()
+        })
+        
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("loginOut"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.tableView.mj_header.beginRefreshing()
+        })
+        
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("followApi"), object: nil, queue: OperationQueue.main) { [weak self] (notification) in
             let followStatusModel = notification.object as? FollowStatusModel
             

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -36,6 +36,17 @@ class CommunityViewController: BaseViewController {
         }
     }
     weak var observe : NSObjectProtocol?
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.view.frame = CGRect(x: 0, y: 0, width: kScreenWidth, height: kScreenHeight-kTabBarTotalHeight)
+        self.view.layoutIfNeeded()
+    }
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        self.view.frame = CGRect(x: 0, y: 0, width: kScreenWidth, height: kScreenHeight-kTabBarTotalHeight)
+        self.view.layoutIfNeeded()
+    }
+
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -108,6 +119,19 @@ class CommunityViewController: BaseViewController {
             }
         }
         
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("login"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.tabBarController?.selectedIndex = 0
+            self?.reloadSegmentedView()
+        })
+        
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("loginOut"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.tabBarController?.selectedIndex = 0
+            self?.reloadSegmentedView()
+            
+        })
+        
         // 找朋友 查看全部推荐关注
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityFindFriends"), object: nil, queue: OperationQueue.main) { [weak self] (notification) in
             let vc = CommunityFindFriendsViewController()

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Planet/CommunityPlanet/CommunityPlanetViewController.swift

@@ -26,6 +26,7 @@ class CommunityPlanetViewController: BaseJSWebViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.URLString = kH5PlanetUrl
+        navigationBar.isHidden = true
         setupViews()
         setupData()
         
@@ -54,6 +55,18 @@ class CommunityPlanetViewController: BaseJSWebViewController {
                 WebViewJavascriptBridgeManager.shared.callHandlerH5(bridge: self?.bridge)
             }
         }
+        
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("login"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            WebViewJavascriptBridgeManager.shared.callHandlerH5(bridge: self?.bridge)
+
+        })
+        
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("loginOut"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            WebViewJavascriptBridgeManager.shared.callHandlerH5(bridge: self?.bridge)
+
+        })
 
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityModulePlanetTop"), object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

@@ -56,6 +56,16 @@ class CommunityRecommnendViewController: UIViewController {
             [weak self] (page) in
             self?.communityPostSuggestApi(page:page)
         })
+        
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("login"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.tableView.mj_header.beginRefreshing()
+        })
+        
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("loginOut"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.tableView.mj_header.beginRefreshing()
+        })
 
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("followApi"), object: nil, queue: OperationQueue.main) { [weak self] (notification) in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFeaturedTopics/ViewController/CommunityFeaturedTopicsViewController.swift

@@ -305,7 +305,7 @@ extension CommunityFeaturedTopicsViewController {
             self?.communityTopicDetailModel = communityTopicDetailModel as? CommunityTopicDetailModel
             self?.topicLable.text = self?.communityTopicDetailModel?.name
             CommunityFollowTopicViewModel.shared.followTopicButton(communityTopicDetailModel: self?.communityTopicDetailModel, button: (self?.focusButton)!)
-            self?.bgImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.communityTopicDetailModel?.img ?? "", size: CGSize(width: (self?.view.width)!, height: (self?.view.width)!)), placeholder: kImage(name: "default_pic"))
+            self?.bgImageView.kf.setImage(with: kURLImage(name: self?.communityTopicDetailModel?.img ?? ""), placeholder: kImage(name: "default_pic"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             self?.navigationBar.barBackgroundImage = self?.bgImageView.image

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift

@@ -357,7 +357,7 @@ extension CommunityRecommendController {
             self?.communityPostDetailModel = communityPostDetailModel as? CommunityPostDetailModel
 
             self?.communityPostsApi(page:1)
-            self?.avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self?.communityPostDetailModel?.avatar ?? "", size: kSize30x30Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            self?.avatarButton.kf.setImage(with: kURLImage(name: self?.communityPostDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             self?.nameButton.setTitle(self?.communityPostDetailModel?.username, for: UIControl.State.normal)
             if self?.communityPostDetailModel?.uid == UserModel.shared().getModel()?.uid {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/AllCommentCell/RecommendMajorCommentCell.swift

@@ -166,7 +166,7 @@ class RecommendMajorCommentCell: UITableViewCell {
     
     var communityPostCommentModel : CommunityPostCommentModel? {
         didSet {
-            iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostCommentModel?.avatar ?? "",size: kSize24x24Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            iconButton.kf.setImage(with: kURLImage(name: communityPostCommentModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/AllCommentCell/RecommendSubCommentTableViewCell.swift

@@ -122,7 +122,7 @@ class RecommendSubCommentTableViewCell: UITableViewCell {
     
     var communityPostReplyModel: CommunityPostReplyModel? {
         didSet {
-            iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostReplyModel?.avatar ?? "", size: kSize24x24Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            iconButton.kf.setImage(with: kURLImage(name: communityPostReplyModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/HTMLCell/CommunityRecommendDetailHTMLTableViewCell.swift

@@ -273,7 +273,7 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
     var communityPostDetailModel : CommunityPostDetailModel? {
         didSet {
             
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostDetailModel?.avatar ?? "",size: kSize30x30Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityPostDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             nameButton.setTitle(communityPostDetailModel?.username, for: UIControl.State.normal)
             CommunityFollowUserViewModel.setFollowListType(followButton: followButton, followType: FollowType(rawValue: communityPostDetailModel?.isFollow ?? 0) ?? .futureFollow)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendNoneCommentCell.swift

@@ -157,7 +157,7 @@ class RecommendNoneCommentCell: UITableViewCell {
     
     var communityPostDetailModel : CommunityPostDetailModel? {
         didSet {
-            iconButton.kf.setImage(with: kURLThumbnailsImage(name: UserModel.shared().getModel()?.avatarurl ?? "", size: kSize30x30Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            iconButton.kf.setImage(with: kURLImage(name: UserModel.shared().getModel()?.avatarurl ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityShareContent/CommunityShareContentViewController.swift

@@ -139,7 +139,7 @@ class CommunityShareContentViewController: BaseViewController {
         QRCodeImageView.image = QRCode.createQRForString(qrString: H5UrlStr, qrImageName: "")
         scanLabel.text = "扫码查看内容 领取\(bean ?? 0)U米"
         
-        avatarImageView.kf.setImage(with: kURLThumbnailsImage(name: avatarStr ?? "",size: CGSize(width: 20*kScaleWidth, height: 20*kScaleWidth)), placeholder: kImage(name: "default_pic"),completionHandler:{ [weak self] (image, error, cacheType, url) in
+        avatarImageView.kf.setImage(with: kURLImage(name: avatarStr ?? ""), placeholder: kImage(name: "default_pic"),completionHandler:{ [weak self] (image, error, cacheType, url) in
             self?.bgImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.imgUrl ?? "",size: CGSize(width: kScreenWidth, height: 481*kScaleWidth)), placeholder: kImage(name: "default_pic"),completionHandler: { [weak self] (image, error, cacheType, url) in
                 self?.scrollView.swContentCapture {
                     [weak self] (image) in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/View/CommunityMajorCommentCell.swift

@@ -111,7 +111,7 @@ class CommunityMajorCommentCell: UITableViewCell {
     
     var communityPostCommentModel : CommunityPostCommentModel? {
         didSet {
-            iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostCommentModel?.avatar ?? "",size: kSize24x24Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            iconButton.kf.setImage(with: kURLImage(name: communityPostCommentModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/View/CommunityReplyCommentCell.swift

@@ -117,7 +117,7 @@ class CommunityReplyCommentCell: UITableViewCell {
     
     var communityPostReplyModel: CommunityPostReplyModel? {
         didSet {
-            iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostReplyModel?.avatar ?? "",size: kSize24x24Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            iconButton.kf.setImage(with: kURLImage(name: communityPostReplyModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             
             titleLabel.text = communityPostReplyModel?.username

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift

@@ -855,7 +855,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             
             beanLabel.text = "\(self.videoItemMdl?.willCollectBean ?? 0) U米待收获"
             
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self.videoItemMdl?.avatar ?? "", size: kSize30x30Image), for: .normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: self.videoItemMdl?.avatar ?? ""), for: .normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             if self.videoItemMdl?.username?.count ?? 0 <= 12 {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoMajorCommentCell.swift

@@ -166,7 +166,7 @@ class CommunityVideoMajorCommentCell: UITableViewCell {
     
     var communityPostCommentModel : CommunityPostCommentModel? {
         didSet {
-            iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostCommentModel?.avatar ?? "", size: kSize24x24Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            iconButton.kf.setImage(with: kURLImage(name: communityPostCommentModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content

RainbowPlanet/RainbowPlanet/Modules/MineModule/AccountSecurity/ViewController/AccountSecurityViewController.swift

@@ -103,7 +103,7 @@ class AccountSecurityViewController: BaseViewController {
         
         if loginType == .weixin {
             if userModel?.bindWeixinUserModel?.unionId == nil ||  userModel?.bindWeixinUserModel?.unionId == "" { //绑定微信
-                UMManager.shared.loginGetUserInfo(platformType: UMSocialPlatformType.wechatSession) {
+                UMManager.shared.loginGetUserInfo(platformType: UMSocialPlatformType.wechatSession, currentViewController: self) {
                     [weak self] (wxLoginModel) -> (Void) in
                     SwiftMoyaNetWorkServiceUser.shared().userIsBindTripartiteBindApi(loginType:loginType,umLoginModel: wxLoginModel, completion: { [weak self] (data) -> (Void) in
                         NotificationCenter.default.post(name: NSNotification.Name(rawValue: "WVJBRefresh"), object: WVJBRefreshModelType.task)
@@ -120,7 +120,7 @@ class AccountSecurityViewController: BaseViewController {
             }
         }else if loginType == .qq {
             if userModel?.bindQQUserModel?.unionId == nil ||  userModel?.bindQQUserModel?.unionId == "" { //绑定QQ
-                UMManager.shared.loginGetUserInfo(platformType: UMSocialPlatformType.QQ) { [weak self] (wxLoginModel) -> (Void) in
+                UMManager.shared.loginGetUserInfo(platformType: UMSocialPlatformType.QQ, currentViewController: self) { [weak self] (wxLoginModel) -> (Void) in
                     SwiftMoyaNetWorkServiceUser.shared().userIsBindTripartiteBindApi(loginType:loginType,umLoginModel: wxLoginModel, completion: { [weak self] (data) -> (Void) in
                         NotificationCenter.default.post(name: NSNotification.Name(rawValue: "WVJBRefresh"), object: WVJBRefreshModelType.task)
 

RainbowPlanet/RainbowPlanet/Modules/MineModule/ModifyData/View/ModifyDataAvatarView.swift

@@ -78,7 +78,7 @@ class ModifyDataAvatarView: BaseView {
     
     var userDetailModel: UserDetailModel? {
         didSet {
-            avatarButton.kf.setBackgroundImage(with: kURLThumbnailsImage(name: userDetailModel?.avatar ?? "",size: kSize80x80Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setBackgroundImage(with: kURLImage(name: userDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             
 
         }

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/OtherPersonalCenter/ViewController/OtherPersonalCenterViewController.swift

@@ -185,8 +185,8 @@ extension OtherPersonalCenterViewController {
             [weak self] (userDetailModel) -> (Void) in
             self?.userDetailModel = userDetailModel as? UserDetailModel
             self?.otherHeaderView.userDetailModel = self?.userDetailModel
-            self?.navigationBar.backgroundImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.backgroundImg ?? "default_pic", size: (self?.navigationBar.backgroundImageView.size)!), placeholder: kImage(name: "default_pic"))
-            self?.avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.avatar ?? "", size: kSize20x20Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            self?.navigationBar.backgroundImageView.kf.setImage(with: kURLImage(name: self?.userDetailModel?.backgroundImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            self?.avatarButton.kf.setImage(with: kURLImage(name: self?.userDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             self?.nameButton.setTitle(self?.userDetailModel?.username, for: UIControl.State.normal)

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherHeaderView.swift

@@ -242,7 +242,7 @@ class PersonViewUserAndOtherHeaderView: BaseView {
             }
             followNumberButton.setTitle("\(userDetailModel?.followCount ?? "0") 关注", for: UIControl.State.normal)
             fanNumberButton.setTitle("\(userDetailModel?.fansCount ?? "0") 粉丝", for: UIControl.State.normal)
-            avatarButton.kf.setBackgroundImage(with: kURLThumbnailsImage(name: userDetailModel?.avatar ?? "", size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setBackgroundImage(with: kURLImage(name: userDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
 

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/ViewController/UserPersonalCenterViewController.swift

@@ -309,7 +309,7 @@ extension UserPersonalCenterViewController {
             self?.userDetailModel = userDetailModel as? UserDetailModel
             self?.userHeaderView.userDetailModel = self?.userDetailModel
             self?.navigationBar.backgroundImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.backgroundImg ?? "default_pic", size: (self?.navigationBar.backgroundImageView.size)!), placeholder: kImage(name: "default_pic"))
-            self?.avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.avatar ?? "", size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            self?.avatarButton.kf.setImage(with: kURLImage(name: self?.userDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             self?.nameButton.setTitle(self?.userDetailModel?.username, for: UIControl.State.normal)
             self?.cmsTemplateTitles = ["发布 \(self?.userDetailModel?.postCount ?? "0")","收藏 \(self?.userDetailModel?.collectCount ?? "0")","分享 \(self?.userDetailModel?.shareCount ?? "0")"]
@@ -324,7 +324,7 @@ extension UserPersonalCenterViewController {
             self?.userDetailModel = userDetailModel as? UserDetailModel
             self?.userHeaderView.userDetailModel = self?.userDetailModel
             self?.navigationBar.backgroundImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.backgroundImg ?? "default_pic", size: (self?.navigationBar.backgroundImageView.size)!), placeholder: kImage(name: "default_pic"))
-            self?.avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.avatar ?? "", size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            self?.avatarButton.kf.setImage(with: kURLImage(name: self?.userDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             
         }
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/Config/AlivcUIConfig.m

@@ -24,7 +24,7 @@ static AlivcUIConfig *sharedIns = nil;
 }
 
 - (instancetype)init{
-    @throw [NSException exceptionWithName:@"AlivcUIConfig init error" reason:@"'shared' to get instance." userInfo:nil];
+//    @throw [NSException exceptionWithName:@"AlivcUIConfig init error" reason:@"'shared' to get instance." userInfo:nil];
     return [super init];
 }
 

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/Controller/PublishEditController.swift

@@ -305,10 +305,11 @@ extension PublishEditController {
             aliyunVodUpToYoPublishModel.publishType = .image
             aliyunVodUpToYoPublishModel.images = self.imageArr
         }
-        
-        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "DismissFromPublishEditVc"), object: aliyunVodUpToYoPublishModel)
-        BaseTabbarViewController.shared.esTabBarController.selectedIndex = 0
-        self.dismissToWindowRootViewController(animated: false, completion: nil)
+        self.dismissToRootViewController(animated: false) {
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "DismissFromPublishEditVc"), object: aliyunVodUpToYoPublishModel)
+            BaseTabbarViewController.shared.esTabBarController.selectedIndex = 0
+        }
+//        self.dismissToWindowRootViewController(animated: false) {}
 
 
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditDescribeCell.swift

@@ -65,6 +65,7 @@ class PublishEditDescribeCell: UITableViewCell {
         cmtTextView.placeholderTextColor = kDDDDDDColor
         cmtTextView.delegate = self
         cmtTextView.tintColor = kThemeColor
+        cmtTextView.textContainerInset = UIEdgeInsets.zero
         return cmtTextView
     }()
     

RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaBannerTableViewCell.swift

@@ -9,7 +9,6 @@
 import UIKit
 import FSPagerView
 import SwiftyMediator
-import FlickerNumber
 
 class RedemptionAreaBannerTableViewCell: UITableViewCell {
     

RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/ViewController/RedemptionAreaViewController.swift

@@ -50,6 +50,8 @@ class RedemptionAreaViewController: BaseViewController {
         return tableView
     }()
     
+    
+    
     override func setupData() {
         tableView.addHeader(withBeginRefresh: true, animation: true) {
             [weak self] (page) in
@@ -68,6 +70,16 @@ class RedemptionAreaViewController: BaseViewController {
             }
         })
         
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("login"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.tableView.mj_header.beginRefreshing()
+        })
+        
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("loginOut"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.tableView.mj_header.beginRefreshing()
+        })
+        
     }
     
 }

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/LoginNow/LoginNowView.swift

@@ -11,6 +11,8 @@ import ESTabBarController_swift
 
 class LoginNowView: UIView {
     
+    static let shared : LoginNowView = LoginNowView()
+    
     deinit {
         NXLLog("deinit")
     }
@@ -101,9 +103,18 @@ class LoginNowView: UIView {
         return loginNowButton
     }()
     
+    var loginNowView : LoginNowView?
+    
     class func initLoginNowView() {
         let loginNowView = LoginNowView(frame:CGRect(x: 0, y: -50, width: kScreenWidth, height: 50))
         let tabbar = BaseTabbarViewController.shared.esTabBarController.tabBar as? ESTabBar
         tabbar?.addSubview(loginNowView)
+        LoginNowView.shared.loginNowView = loginNowView
+    }
+    
+    
+    class func removeLoginNowView() {
+        guard let loginNowView = LoginNowView.shared.loginNowView else { return }
+        loginNowView.removeFromSuperview()
     }
 }

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/RegisterLogin/ViewController/RegisterLoginViewController.swift

@@ -40,6 +40,7 @@ class RegisterLoginViewController: BaseViewController {
         view.addSubview(mobileLoginButton)
         view.addSubview(weixinLoginButton)
         view.addSubview(QQLoginButton)
+        view.addSubview(agreementLabel)
         view.insertSubview(navigationBar, aboveSubview: playerView)
         view.insertSubview(navigationBar, aboveSubview: bgView)
 
@@ -66,7 +67,7 @@ class RegisterLoginViewController: BaseViewController {
 
         
         mobileLoginButton.snp.makeConstraints { (make) in
-            make.bottom.equalTo(weixinLoginButton.snp.top).offset(-20)
+            make.bottom.equalTo(QQLoginButton.snp.top).offset(-20)
             make.left.equalTo(30)
             make.right.equalTo(-30)
             make.height.equalTo(48)
@@ -74,19 +75,50 @@ class RegisterLoginViewController: BaseViewController {
         mobileLoginButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
         
         weixinLoginButton.snp.makeConstraints { (make) in
-            make.bottom.equalTo(-40)
+            make.bottom.equalTo(agreementLabel.snp.top).offset(-15)
+
             make.centerX.equalToSuperview().offset(-30)
         }
         QQLoginButton.snp.makeConstraints { (make) in
-            make.bottom.equalTo(-40)
+            make.bottom.equalTo(agreementLabel.snp.top).offset(-15)
             make.centerX.equalToSuperview().offset(30)
         }
         
+        agreementLabel.snp.makeConstraints { (make) in
+            make.bottom.equalTo(-(kSafeTabBarHeight+20))
+            make.centerX.equalToSuperview()
+        }
+        
         
     }
     
     override func setupData() {
         player.play()
+        
+        if (UMSocialManager.default()?.isInstall(.wechatSession) ?? true)  { //验证
+            weixinLoginButton.isHidden = false
+            weixinLoginButton.snp.updateConstraints { (make) in
+                make.centerX.equalToSuperview().offset(-30)
+            }
+            QQLoginButton.snp.updateConstraints { (make) in
+                make.centerX.equalToSuperview().offset(30)
+            }
+        }else {
+            weixinLoginButton.isHidden = true
+            QQLoginButton.snp.updateConstraints { (make) in
+                make.centerX.equalToSuperview()
+            }
+        }
+        
+        agreementLabel.addClickText("由你用户协议", attributeds: [NSAttributedString.Key.font:kRegularFont13 as Any,NSAttributedString.Key.foregroundColor:kffffffColor,NSAttributedString.Key.underlineStyle:NSUnderlineStyle.single.rawValue,NSAttributedString.Key.underlineColor:kffffffColor], transmitBody: nil) {
+            (data) in
+            Mediator.push(H5RouterModuleType.pushContentId6)
+        }
+        agreementLabel.addClickText("隐私条款", attributeds: [NSAttributedString.Key.font:kRegularFont13 as Any,NSAttributedString.Key.foregroundColor:kffffffColor,NSAttributedString.Key.underlineStyle:NSUnderlineStyle.single.rawValue,NSAttributedString.Key.underlineColor:kffffffColor], transmitBody: nil) {
+            (data) in
+            Mediator.push(H5RouterModuleType.pushContentId11)
+        }
+        
         navigationBar.onClickLeftButton = {
             [weak self] in
             //移除本地用户信息
@@ -165,6 +197,17 @@ class RegisterLoginViewController: BaseViewController {
         return QQLoginButton
     }()
     
+    private lazy var agreementLabel: FMLinkLabel = {
+        let agreementLabel = FMLinkLabel()
+        agreementLabel.numberOfLines = 0
+        agreementLabel.textColor = kbbbbbbColor
+        agreementLabel.font = kRegularFont12
+        agreementLabel.isUserInteractionEnabled = true
+        agreementLabel.text =  "登录即表示你已阅读并同意 由你用户协议 和 隐私条款"
+        agreementLabel.textAlignment = .center
+        return agreementLabel
+    }()
+    
     private lazy var playerView: UIView = {
         let playerView = UIView()
         return playerView
@@ -176,10 +219,10 @@ class RegisterLoginViewController: BaseViewController {
         let videoURL = URL(fileURLWithPath: filePath!)
         //定义一个playerItem，并监听相关的通知
         let playerItem = AVPlayerItem(url: videoURL)
-//        NotificationCenter.default.addObserver(self,
-//                                               selector: #selector(playerDidFinishPlaying),
-//                                               name: NSNotification.Name.AVPlayerItemDidPlayToEndTime,
-//                                               object: playerItem)
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(playerDidFinishPlaying),
+                                               name: NSNotification.Name.AVPlayerItemDidPlayToEndTime,
+                                               object: playerItem)
         let player = AVPlayer(playerItem: playerItem)
         //设置大小和位置（全屏）
         let playerLayer = AVPlayerLayer(player: player)
@@ -190,17 +233,17 @@ class RegisterLoginViewController: BaseViewController {
         return player
     }()
     
-//    @objc func playerDidFinishPlaying(notification:Notification) {
-//
-//        player.seek(to: .zero, toleranceBefore: .zero, toleranceAfter: .zero) {[weak self] (finished) in
-//            self?.player.play()
-//        }
-//    }
+    @objc func playerDidFinishPlaying(notification:Notification) {
+
+        player.seek(to: .zero, toleranceBefore: .zero, toleranceAfter: .zero) {[weak self] (finished) in
+            self?.player.play()
+        }
+    }
     
     //第三方登录
     func tripartiteLogin(platformType:UMSocialPlatformType,loginType:LoginType) {
         
-        UMManager.shared.loginGetUserInfo(platformType: platformType) {
+        UMManager.shared.loginGetUserInfo(platformType: platformType, currentViewController: self) {
             [weak self] (userModel) -> (Void) in
             let wxLoginModel = userModel
             SwiftMoyaNetWorkServiceUser.shared().userTripartiteRegisterTLoginApi(loginType:loginType,open_id: wxLoginModel.open_id, union_id: wxLoginModel.union_id, avatar: wxLoginModel.avatar, username: wxLoginModel.username, gender: wxLoginModel.gender, completion: {

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchContentList/View/SearchContentListCollectionCell.swift

@@ -232,7 +232,7 @@ class SearchContentListCollectionCell: UICollectionViewCell {
             }else {
                 titleLabel.text = "\(communityPostDataModel?.title?.replacingOccurrences(of: "\n", with: "").replacingOccurrences(of: "\r", with: "").prefix(20) ?? "")"
             }
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostDataModel?.avatar ?? "", size: kSize18x18Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityPostDataModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             nameButton.text = communityPostDataModel?.username
 

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchUser/View/SearchUserLitTableViewCell.swift

@@ -145,7 +145,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
             
             CommunityFollowUserViewModel.setFollowListType(followButton: followButton, followType: FollowType(rawValue: userFollowModel?.isFollowStatus ?? 0))
 
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: userFollowModel?.followAvatar ?? "",size: kSize44x44Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: userFollowModel?.followAvatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             titleButton.setTitle(userFollowModel?.followUsername, for: UIControl.State.normal)
             var followTopic = Array<String>()
@@ -168,7 +168,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
         didSet {
             CommunityFollowUserViewModel.setFollowListType(followButton: followButton, followType: FollowType(rawValue: userFanModel?.isFollowStatus ?? 0))
 
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: userFanModel?.fanAvatar ?? "",size: kSize44x44Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: userFanModel?.fanAvatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             titleButton.setTitle(userFanModel?.fanUsername, for: UIControl.State.normal)
             var followTopic = Array<String>()
@@ -191,7 +191,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
         didSet {
             CommunityFollowUserViewModel.setFollowListType(followButton: followButton, followType: FollowType(rawValue: cmsMemberModel?.followStatus ?? 0))
 
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: cmsMemberModel?.avatar ?? "",size: kSize44x44Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: cmsMemberModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             titleButton.setTitle(cmsMemberModel?.username, for: UIControl.State.normal)
             var followTopic = Array<String>()
@@ -215,7 +215,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
         didSet {
             CommunityFollowUserViewModel.setFollowListType(followButton: followButton, followType: FollowType(rawValue: searchMemberModel?.followStatus ?? 0))
 
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: searchMemberModel?.avatar ?? "",size: kSize40x40Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: searchMemberModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             titleButton.setTitle(searchMemberModel?.username, for: UIControl.State.normal)

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -280,7 +280,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         var parameters = Dictionary<String,Any>()
         let userModel = UserModel.shared().getModel()
         parameters.updateValue(userModel?.bindWeixinUserModel?.unionId as Any, forKey: "union_id")
-        parameters.updateValue(userModel?.bindWeixinUserModel?.unionId as Any, forKey: "open_id")
+        parameters.updateValue(userModel?.bindWeixinUserModel?.openId as Any, forKey: "open_id")
         if userModel?.mobile == nil ||  userModel?.mobile == "" {
             SwiftProgressHUD.shared().showText("暂时不可以解绑,请先绑定手机号")
         }else {

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

@@ -14,11 +14,6 @@ let kDevelopSever = false
 let kBetaSever = false
 let kProductSever = true
 
-/// h5Service
-let kH5PersonalService = false
-let kH5DevelopSever = false
-let kH5BetaSever = false
-let kH5ProductSever = true
 
 // MARK: - 数据服务器
 public func kApiDataPrefix() -> String {
@@ -56,13 +51,13 @@ public func kApiVirusPrefix() -> String {
 
 // MARK: - H5
 public func kApiH5Prefix() -> String {
-    if kH5PersonalService /** 接口前缀-个人服务器*/ {
+    if kPersonalService /** 接口前缀-个人服务器*/ {
         return "http://192.168.23.238:8820"
-    }else if kH5DevelopSever /** 接口前缀-开发服务器*/ {
+    }else if kDevelopSever /** 接口前缀-开发服务器*/ {
         return "http://h5.dev.caihongxingqiu.com"
-    } else if kH5BetaSever /** 接口前缀-测试服务器*/{
+    } else if kBetaSever /** 接口前缀-测试服务器*/{
         return "http://h5.beta.caihongxingqiu.com"
-    }else if kH5ProductSever /** 接口前缀-生产服务器*/ {
+    }else if kProductSever /** 接口前缀-生产服务器*/ {
         return "http://h5.uptoyo.com"
     }else {
         return ""

RainbowPlanet/RainbowPlanet/Supporting Files/Info.plist

@@ -87,7 +87,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>3</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>
@@ -207,18 +207,12 @@
 	</dict>
 	<key>NSAppleMusicUsageDescription</key>
 	<string>App需要您的同意,才能访问媒体资料库</string>
-	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>App需要您的同意,才能访问蓝牙</string>
 	<key>NSCalendarsUsageDescription</key>
 	<string>App需要您的同意,才能访问日历</string>
 	<key>NSCameraUsageDescription</key>
 	<string>App需要您的同意,才能访问相册</string>
 	<key>NSContactsUsageDescription</key>
 	<string>App需要您的同意,才能访问通信录</string>
-	<key>NSHealthShareUsageDescription</key>
-	<string>App需要您的同意,才能访问健康分享</string>
-	<key>NSHealthUpdateUsageDescription</key>
-	<string>App需要您的同意,才能访问健康更新 </string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>你的位置信息将帮助彩虹星球展示离你最近的门店</string>
 	<key>NSLocationAlwaysUsageDescription</key>
@@ -229,14 +223,10 @@
 	<string>你的位置信息将帮助彩虹星球展示离你最近的门店</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>App需要您的同意,才能访问麦克风</string>
-	<key>NSMotionUsageDescription</key>
-	<string>App需要您的同意,才能访问运动与健身</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
 	<string>App需要您的同意,才能保存图像和视频到您的相册</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>App需要您的同意,才能访问相机</string>
-	<key>NSRemindersUsageDescription</key>
-	<string>App需要您的同意,才能访问提醒事项</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>