移除了无用的图,压缩图片

RainbowPlanet/Podfile

@@ -21,7 +21,7 @@ target 'RainbowPlanet' do
   # 图片加载
   pod 'Kingfisher'
   # gif动画
-  pod 'Gifu'
+#  pod 'Gifu'
   # josn动画
   pod 'lottie-ios'
   # 自动布局
@@ -65,7 +65,7 @@ target 'RainbowPlanet' do
   pod 'ESTabBarController-swift'
   # 内存泄露
   pod 'MLeaksFinder'
-  pod 'FBMemoryProfiler'
+#  pod 'FBMemoryProfiler'
 
 
 #======================第三方平台===========

RainbowPlanet/Podfile.lock

@@ -28,10 +28,6 @@ PODS:
   - EFQRCode (5.0.0):
     - swift_qrcodejs (~> 1.1.1)
   - ESTabBarController-swift (2.7)
-  - FBAllocationTracker (0.1.5)
-  - FBMemoryProfiler (0.1.3):
-    - FBAllocationTracker (~> 0.1)
-    - FBRetainCycleDetector (~> 0.1)
   - FBRetainCycleDetector (0.1.4)
   - FlickerNumber (1.1)
   - FMDB (2.7.5):
@@ -40,7 +36,6 @@ PODS:
   - FSPagerView (0.8.2)
   - FWPopupView (4.0.7):
     - SnapKit
-  - Gifu (3.2.0)
   - InputBarAccessoryView (4.3.1):
     - InputBarAccessoryView/Core (= 4.3.1)
   - InputBarAccessoryView/Core (4.3.1)
@@ -114,12 +109,10 @@ DEPENDENCIES:
   - DPScrollNumberLabel
   - EFQRCode
   - ESTabBarController-swift
-  - FBMemoryProfiler
   - FlickerNumber
   - FMDB
   - FSPagerView
   - FWPopupView
-  - Gifu
   - InputBarAccessoryView
   - IQKeyboardManagerSwift
   - JSONModel (~> 1.7.0)
@@ -168,14 +161,11 @@ SPEC REPOS:
     - DPScrollNumberLabel
     - EFQRCode
     - ESTabBarController-swift
-    - FBAllocationTracker
-    - FBMemoryProfiler
     - FBRetainCycleDetector
     - FlickerNumber
     - FMDB
     - FSPagerView
     - FWPopupView
-    - Gifu
     - InputBarAccessoryView
     - IQKeyboardManagerSwift
     - JSONModel
@@ -222,14 +212,11 @@ SPEC CHECKSUMS:
   DPScrollNumberLabel: 5124eaccf3029bb84116de391e1273cba676f4f5
   EFQRCode: 07437cfbce3a1e497397a4f3d766c980d8972608
   ESTabBarController-swift: 4fb52ad03d94d0717ef97bc9eb09a5abfdded0a2
-  FBAllocationTracker: dfdca3f71aceca6a85e95e3c6ec76a9785eba0f1
-  FBMemoryProfiler: 623fc5f8a61f7d02ec75c87e3b97c90f621d8b02
   FBRetainCycleDetector: 46f8179bbb1c587deee3ea838a1a3ee02acf5015
   FlickerNumber: bce41da51904d533393d69e9734df6281ab1c646
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   FSPagerView: 816a18842306973cc7cc6df8a5332272f7815c30
   FWPopupView: c1dbb33fbe4d223f619f28a7e5e5a00f08c10342
-  Gifu: 7bcb6427457d85e0b4dff5a84ec5947ac19a93ea
   InputBarAccessoryView: 58a348be7ea2736c7eec60e5c315511c2dbb39fd
   IQKeyboardManagerSwift: d2df660d0b8d64a15cb2537c9ff303213fa515b2
   JSONModel: 840bc0fcffb24b8454d2c026bf26fea454b8e98d
@@ -263,6 +250,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
 
-PODFILE CHECKSUM: df2e02ff5d93584b4d9c77c567dc6fc7b6a58532
+PODFILE CHECKSUM: 810a7117534d7cc86fe6e12f6388571ac3b400f2
 
 COCOAPODS: 1.7.4

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -464,7 +464,6 @@
 		A7F3069922E1C72D00DC7917 /* json_Image_1.png in Resources */ = {isa = PBXBuildFile; fileRef = A7F3069822E1C72D00DC7917 /* json_Image_1.png */; };
 		A7F577C322FD894F00E2D757 /* ATAuthSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7F577C022FD894F00E2D757 /* ATAuthSDK.framework */; };
 		A7F577C422FD894F00E2D757 /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A7F577C122FD894F00E2D757 /* ATAuthSDK.bundle */; };
-		A7F577C522FD894F00E2D757 /* TYRZResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A7F577C222FD894F00E2D757 /* TYRZResource.bundle */; };
 		A7F577CD22FECD7C00E2D757 /* AliyunVodupToyoPublishManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F577CC22FECD7C00E2D757 /* AliyunVodupToyoPublishManager.swift */; };
 		A7F577D122FECE8700E2D757 /* AliyunVodUpToYoPublishModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F577D022FECE8700E2D757 /* AliyunVodUpToYoPublishModel.swift */; };
 		A7F577D722FED3A100E2D757 /* PathManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F577D622FED3A100E2D757 /* PathManager.swift */; };
@@ -1199,7 +1198,6 @@
 		A7F577BB22FD7A9B00E2D757 /* RainbowPlanet.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RainbowPlanet.entitlements; sourceTree = "<group>"; };
 		A7F577C022FD894F00E2D757 /* ATAuthSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ATAuthSDK.framework; path = "../../../../../../../Downloads/号码认证及一键登录iOS SDK v2.6.5_demo工程代码/Release/ATAuthSDK.framework"; sourceTree = "<group>"; };
 		A7F577C122FD894F00E2D757 /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ATAuthSDK.bundle; sourceTree = "<group>"; };
-		A7F577C222FD894F00E2D757 /* TYRZResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TYRZResource.bundle; sourceTree = "<group>"; };
 		A7F577CC22FECD7C00E2D757 /* AliyunVodupToyoPublishManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AliyunVodupToyoPublishManager.swift; sourceTree = "<group>"; };
 		A7F577D022FECE8700E2D757 /* AliyunVodUpToYoPublishModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AliyunVodUpToYoPublishModel.swift; sourceTree = "<group>"; };
 		A7F577D622FED3A100E2D757 /* PathManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PathManager.swift; sourceTree = "<group>"; };
@@ -2862,7 +2860,6 @@
 			children = (
 				A7F577C022FD894F00E2D757 /* ATAuthSDK.framework */,
 				A7F577C122FD894F00E2D757 /* ATAuthSDK.bundle */,
-				A7F577C222FD894F00E2D757 /* TYRZResource.bundle */,
 			);
 			path = ATAuthSDK;
 			sourceTree = "<group>";
@@ -5979,7 +5976,6 @@
 				BDD54A2B22C31D78005BBE19 /* filter in Resources */,
 				BD108C9A22A60C3300837DAB /* HGImage.xcassets in Resources */,
 				A7F3069922E1C72D00DC7917 /* json_Image_1.png in Resources */,
-				A7F577C522FD894F00E2D757 /* TYRZResource.bundle in Resources */,
 				A76068ED22E4A2B4008DF18F /* verywell.json in Resources */,
 				BD24FABB22B509CF00C7AA3B /* PublishModule.xcassets in Resources */,
 			);

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -20,6 +20,10 @@ extension AppDelegate {
         window?.rootViewController = vc
         window?.makeKeyAndVisible()
 //        MemoryManager.shared.initMemoryManager()
+        //基础配置
+        SwiftMoyaNetWorkServiceConfig.shared().configApi {(data) -> (Void) in}
+        //版本更新
+        _ = UpdateVersionManager.shared
         DispatchQueue.global(qos: .default).async {
             [weak self] in
             /// 设置全局的tabbar
@@ -34,10 +38,6 @@ extension AppDelegate {
             let deliveryMethodTypeModel = DeliveryMethodTypeModel.shared()
             deliveryMethodTypeModel.deliveryMethodType = "2"
             DeliveryMethodTypeModel.shared().setModel(model: deliveryMethodTypeModel)
-            //基础配置
-            SwiftMoyaNetWorkServiceConfig.shared().configApi {(data) -> (Void) in}
-            //版本更新
-            _ = UpdateVersionManager.shared
             //网络监听
             //        AlamofireReachabilityManager.shared.reachability()
             //初始化百度地图

RainbowPlanet/RainbowPlanet/Lib/WeChatSDK/WXApi.h

@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * 收到一个来自微信的处理结果。调用一次sendReq后会收到onResp。
  * 可能收到的处理结果有SendMessageToWXResp、SendAuthResp等。
- * @param resp具体的回应内容，是自动释放的
+ * @param resp fjsa;
  */
 - (void)onResp:(BaseResp*)resp;
 
@@ -62,7 +62,6 @@ NS_ASSUME_NONNULL_BEGIN
  * iOS7及以上系统需要调起一次微信才会出现在微信的可用应用列表中。
  * @attention 请保证在主线程中调用此函数
  * @param appid 微信开发者ID
- * @param typeFlag 应用支持打开的文件类型
  * @return 成功返回YES，失败返回NO。
  */
 + (BOOL)registerApp:(NSString *)appid;
@@ -188,7 +187,6 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)startLogByLevel:(WXLogLevel)level logDelegate:(id<WXApiLogDelegate>)logDelegate;
 
 /*! @brief 停止打印log，会清理block或者delegate为空，释放block
- *  @param 
  */
 + (void)stopLog;
 @end

RainbowPlanet/RainbowPlanet/Macro/Common.swift

@@ -92,6 +92,16 @@ func kURLImage(name :String) -> URL? {
     return URL(string: name)
 }
 
+/// 返回缩略图url图片
+///
+/// - Parameters:
+///   - name: 图片Str
+///   - size: 图片尺寸
+/// - Returns: 图片url
+func kURLThumbnailsImage(name:String,size: CGSize) -> URL? {
+    return URL(string: ThumbnailsManager.thumbnails(imgStr: name, size: size))
+}
+
 //MARK: - 返回一个颜色
 /// 返回一个颜色
 ///

RainbowPlanet/RainbowPlanet/Manager/AppStoreManager/AppStoreManager.swift

@@ -9,13 +9,14 @@
 import UIKit
 import StoreKit
 
+let kAppStoreAppId = "1476038871"
+
 class AppStoreManager: NSObject {
     static let shared : AppStoreManager = AppStoreManager()
-    let kAppStoreAppId = "1166892045"
     /// 跳转到appStoreUrl
-    let kAppStore = String(describing: "https://itunes.apple.com/cn/app/1166892045")
+    let kAppStore = String(describing: "https://itunes.apple.com/cn/app/\(kAppStoreAppId)")
     ///跳转到appStore评论
-    let kAppStoreReview = String(describing: "https://itunes.apple.com/cn/app/1166892045?action=write-review")
+    let kAppStoreReview = String(describing: "https://itunes.apple.com/cn/app/\(kAppStoreAppId)?action=write-review")
     var viewController:UIViewController?
     
     /// 跳转到AppStore

RainbowPlanet/RainbowPlanet/Manager/MapManager/BaiduMapManager/BaiduMapManager.swift

@@ -55,7 +55,7 @@ public class BaiduMapManager: NSObject {
         //设置是否自动停止位置更新
         locationManager.pausesLocationUpdatesAutomatically = false
         //设置是否允许后台定位
-        locationManager.allowsBackgroundLocationUpdates = true
+        locationManager.allowsBackgroundLocationUpdates = false
         //设置位置获取超时时间
         locationManager.locationTimeout = 10
         //设置获取地址信息超时时间

RainbowPlanet/RainbowPlanet/Manager/ThumbnailsManager/ThumbnailsManager.swift

@@ -6,8 +6,37 @@
 //  Copyright © 2019 RainbowPlanet. All rights reserved.
 //
 
-import Foundation
+import UIKit
 
-class ThumbnailsManager {
+let kSize40x40Image = CGSize(width: 40, height: 40)
+
+let kSize60x60Image = CGSize(width: 60, height: 60)
+
+let kSize80x80Image = CGSize(width: 80, height: 80)
+
+
+class ThumbnailsManager: NSObject {
+    
+    /// 获取缩略图
+    ///
+    /// - Parameters:
+    ///   - imgStr: 图片地址
+    ///   - size: 图片大小
+    /// - Returns: 返回图片地址
+    class func thumbnails(imgStr:String,size:CGSize) -> String {
+        if imgStr.contains("*") {
+            let imgStr1 = imgStr + "?x-oss-process=image/resize,m_fill,w_\(Int(size.width*2)),h_\(Int(size.height*2))"
+            return String(imgStr1)
+        }else {
+            if imgStr.contains("?") {
+                var imgStr1 = imgStr.prefix(upTo:(imgStr.lastIndex(of: "?"))!)
+                imgStr1 = imgStr1 + "?x-oss-process=image/resize,m_fill,w_\(Int(size.width*2)),h_\(Int(size.height*2))"
+                return String(imgStr1)
+            }else {
+                let imgStr1 = imgStr + "?x-oss-process=image/resize,m_fill,w_\(Int(280 * 2 * kScaleWidth)),h_\(Int(280 * 2 * kScaleWidth))"
+                return String(imgStr1)
+            }
+        }
+    }
     
 }

RainbowPlanet/RainbowPlanet/Manager/UMManager/UMManager.swift

@@ -76,12 +76,9 @@ public extension UMManager {
         UMConfigure.setEncryptEnabled(true)
         //设置打开日志
         UMConfigure.setLogEnabled(true)
-        isNXLLog = true
         //设置Key
         UMConfigure.initWithAppkey(kUMengAppKey, channel: "App Store")
         
-        
-
         //开启Crash收集
         MobClick.setCrashReportEnabled(true)
         //默认为普通应用场景,目前还支持游戏统计场景

RainbowPlanet/RainbowPlanet/Model/ConfigModel/ConfigModel.swift

@@ -12,6 +12,7 @@ class ConfigModel : NSObject, Mappable{
     static let shared : ConfigModel = ConfigModel()
     
     var sharePostBean : Int?
+    var shareInviteBean : Int?
     var suggestImg: String?
     var findFriendImg : String?
     var orderExpiredTime : String?
@@ -30,6 +31,7 @@ class ConfigModel : NSObject, Mappable{
     func mapping(map: Map)
     {
         sharePostBean <- map["share_post_bean"]
+        shareInviteBean <- map["share_invite_bean"]
         suggestImg <- map["suggest_img"]
         findFriendImg <- map["find_friend_img"]
         orderExpiredTime <- map["order_expired_time"]

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/Banner/CommunityBannerFSPagerViewCell.swift

@@ -55,7 +55,7 @@ class CommunityBannerFSPagerViewCell: FSPagerViewCell {
     
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         didSet {
-            bgImageView.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.image ?? ""), placeholder: kImage(name: "default_pic"))
+            bgImageView.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendTypeDataModel?.image ?? "",size: self.size), placeholder: kImage(name: "default_pic"))
         }
     }
 }

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

@@ -157,7 +157,8 @@ class CardContentUserTableViewCell: UITableViewCell {
     
     var communityRecommendDataModel: CommunityRecommendDataModel? {
         didSet {
-            avatarButton.kf.setImage(with: kURLImage(name: communityRecommendDataModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: ThumbnailsManager.thumbnails(imgStr: communityRecommendDataModel?.avatar ?? "", size: avatarButton.size) ), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
+
             titleButton.setTitle(communityRecommendDataModel?.username, for: UIControl.State.normal)
             timeLabel.text = communityRecommendDataModel?.createdAt
             CommunityFollowUserViewModel.setFollowFeedType(followButton: followButton, followType: FollowType(rawValue: communityRecommendDataModel?.isFollow ?? 0))
@@ -173,7 +174,7 @@ class CardContentUserTableViewCell: UITableViewCell {
     
     var communityFollowDataModel : CommunityFollowDataModel? {
         didSet {
-            avatarButton.kf.setImage(with: kURLImage(name: communityFollowDataModel?.relateData?.avatar ?? ""), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: ThumbnailsManager.thumbnails(imgStr: communityFollowDataModel?.relateData?.avatar ?? "", size: avatarButton.size) ), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)
             timeLabel.text = communityFollowDataModel?.relateData?.createdAt
             

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

@@ -125,7 +125,7 @@ class CommunityRecommendFollowCollectionViewCell: UICollectionViewCell {
     
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         didSet {
-            avatarButton.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendTypeDataModel?.avatar ?? "",size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(communityRecommendTypeDataModel?.userName, for: UIControl.State.normal)
             CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: communityRecommendTypeDataModel?.followStatus ?? 0)!)
 

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

@@ -298,7 +298,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: kURLImage(name: self?.communityTopicDetailModel?.img ?? ""), placeholder: kImage(name: "pic_example_12"))
+            self?.bgImageView.kf.setImage(with: kURLImage(name: self?.communityTopicDetailModel?.img ?? ""), placeholder: kImage(name: "default_pic"))
             self?.navigationBar.barBackgroundImage = self?.bgImageView.image
             self?.communityFeaturedTopicsHeaderView.communityTopicDetailModel = self?.communityTopicDetailModel
             self?.tableView.tableHeaderView = self?.communityFeaturedTopicsHeaderView

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

@@ -141,8 +141,7 @@ class AccountSecurityViewController: BaseViewController {
         if userModel?.mobile == nil ||  userModel?.mobile == "" {
             Mediator.push(RegisterLoginRouterModuleType.pushBindPhoneNumber(bindPhoneNumberVCType: .accountSecuritySet, userModel: UserModel.shared().getModel()!))
         }else {
-            let vc = SetPasswordViewController()
-            self.navigationController?.pushViewController(vc, animated: true)
+            Mediator.push(MineRouterModuleType.pushSetPassword)
         }
     }
 }

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

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

RainbowPlanet/RainbowPlanet/Modules/MineModule/Set/View/SetView.swift

@@ -21,7 +21,7 @@ class SetView: BaseView {
     var didSelectRowClosure : DidSelectRowClosure?
     
     let sections = [["账号与绑定","推送通知设置"],
-                    ["用户协议","为 由你APP 评分","投诉与建议","分享 由你APP","版本号"],
+                    ["用户协议","为由你APP评分","投诉与建议","分享由你APP","版本号"],
                     ["退出登录"]]
     
     override func setupViews() {

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoCrop/View/AliyunCropThumbnailView.m

@@ -81,7 +81,7 @@
     
     _durationLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, ScreenWidth - 200, 18)];
     _durationLabel.textColor = [UIColor whiteColor];
-    _durationLabel.textAlignment = UITextAlignmentLeft;
+    _durationLabel.textAlignment = NSTextAlignmentLeft;
     _durationLabel.font = [UIFont systemFontOfSize:13];
     [self addSubview:_durationLabel];
     

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/Controller/KSMediaPickerController.swift

@@ -197,7 +197,7 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
             for (index, selItem) in _selectedAssetArray.enumerated() {
                 let itemModel = selItem as! KSMediaPickerItemModel
                 // 添加选中image
-                let image: UIImage = itemModel.thumb ?? UIImage()
+                let image: UIImage = itemModel.original ?? UIImage()
                 imageArray.append(image)
                 
                 if index == self._selectedAssetArray.count-1 {

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/Model/KSMediaPickerItemModel.swift

@@ -11,6 +11,12 @@ import Photos
 open class KSMediaPickerItemModel: NSObject {
     
     @objc public static let thumbSize = {() -> CGSize in
+        let screen = UIScreen.main
+        let width = screen.bounds.size.width*screen.scale * 0.25
+        return CGSize(width: width, height: width)
+    }()
+    
+    @objc public static let originalSize = {() -> CGSize in
         let screen = UIScreen.main
         let width = screen.bounds.size.width*screen.scale
         return CGSize(width: width, height: width)
@@ -58,6 +64,7 @@ open class KSMediaPickerItemModel: NSObject {
         }
     }
     @objc open var thumb: UIImage?
+    @objc open var original: UIImage?
     @objc public let asset: PHAsset
     
     public init(_ asset: PHAsset) {

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/View/KSMediaPickerPreviewView.swift

@@ -361,7 +361,7 @@ open class KSMediaPickerPreviewView: UIView {
                 }
                 _scrollview.set(frame: CGRect(origin: .zero, size: _changeSizeButton.isSelected ? _minScrollViewSize : _normalScrollViewSize), isNeedLayoutSubviews: true)
                 setNeedsLayout()
-                _scrollview.imageView.image = itemModel.thumb
+                _scrollview.imageView.image = itemModel.original
                 PHImageManager.default().requestImage(for: asset, targetSize: mainSize, contentMode: .aspectFit, options: KSMediaPickerItemModel.pictureOptions) {[weak self] (image, info) in
                     self?._scrollview.imageView.image = image
                 }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/View/KSMediaPickerViewImageCell.swift

@@ -95,6 +95,7 @@ open class KSMediaPickerViewImageCell: UICollectionViewCell {
         didSet {
             isLoseFocus = itemModel.isLoseFocus
             let thumb = itemModel.thumb
+            let original = itemModel.original
             if thumb == nil {
                 PHImageManager.default().requestImage(for: itemModel.asset, targetSize: KSMediaPickerItemModel.thumbSize, contentMode:.aspectFit , options: KSMediaPickerItemModel.pictureViewerOptions) {[weak self] (image, info) in
                     self?._updateThumb(image)
@@ -102,6 +103,11 @@ open class KSMediaPickerViewImageCell: UICollectionViewCell {
             } else {
                 imageView.image = thumb
             }
+            if original == nil {
+                PHImageManager.default().requestImage(for: itemModel.asset, targetSize: KSMediaPickerItemModel.originalSize, contentMode:.aspectFit , options: KSMediaPickerItemModel.pictureViewerOptions) {[weak self] (image, info) in
+                    self?.itemModel.original = image
+                }
+            }
             _indView.index = itemModel.index
             itemIsHighlight = itemModel.isHighlight
         }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishViewController.swift

@@ -11,6 +11,7 @@ import JXSegmentedView
 
 class PublishViewController: BaseViewController {
     
+    
     // 视频选择页参数配置类
     var mediaConfig: AliyunMediaConfig {
         //默认配置

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/TopicSelection/View/TopicSelectionCollectionViewCell.swift

@@ -86,7 +86,7 @@ class TopicSelectionCollectionViewCell: UICollectionViewCell {
     
     var communityTopicModel: CommunityTopicModel? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: communityTopicModel?.img ?? ""), placeholder: kImage(name: "default_pic"),options:[.fromMemoryCacheOrRefresh])
+            iconImageView.kf.setImage(with: kURLThumbnailsImage(name: communityTopicModel?.img ?? "",size: self.size), placeholder: kImage(name: "default_pic"),options:[.fromMemoryCacheOrRefresh])
             titleLabel.text = communityTopicModel?.name
             selectionButton.isSelected = communityTopicModel?.isSelected ?? false
         }

RainbowPlanet/RainbowPlanet/Modules/ShareModules/ShareCommonStr/ShareCommonStr.swift

@@ -13,7 +13,7 @@ let kCommunityPostTitle  = "向好友分享内容，各得 \(ConfigModel.shared.
 let kCommunityPostDetailTitle  = "分享越多，收获越多！"
 let kCommunityPostShareDetailTitle  = "来看看我给你挑的这篇内容怎么样！顺便给你转了 \(ConfigModel.shared.object()?.sharePostBean ?? 0) U米，可以在由你APP里换东西，记得查收哦~"
 //MARK: - 邀请好友分享
-let kInviteGoodFriendsTitle = "邀请好友当老板，送TA \(ConfigModel.shared.object()?.sharePostBean ?? 0) U米"
+let kInviteGoodFriendsTitle = "邀请好友当老板，送TA \(ConfigModel.shared.object()?.shareInviteBean ?? 0) U米"
 let kInviteGoodFriendsDetailTitle  = "入驻好友越多，收获越多！"
 let kInviteGoodFriendsShareTitle = "我想请你来由你玩儿~"
-let kInviteGoodFriendsShareDetailTitle  = "我在由你APP里当老板了，超好玩儿的~ 给你转了 \(ConfigModel.shared.object()?.sharePostBean ?? 0) U米，会员随便换，记得查收哦！"
+let kInviteGoodFriendsShareDetailTitle  = "我在由你APP里当老板了，超好玩儿的~ 给你转了 \(ConfigModel.shared.object()?.shareInviteBean ?? 0) U米，会员随便换，记得查收哦！"

RainbowPlanet/RainbowPlanet/Router/MineRouterModuleType.swift

@@ -9,13 +9,13 @@
 import UIKit
 import SwiftyMediator
 
-
 /// 我的模块路由
 ///
 /// - pushOtherPersonalCenter: 他人个人中心
 public enum MineRouterModuleType: MediatorTargetType {
     case pushOtherPersonalCenter(uid:Int)
     case pushAccountSecurity
+    case pushSetPassword
     
 }
 
@@ -29,6 +29,9 @@ extension MineRouterModuleType: MediatorSourceType {
         case .pushAccountSecurity:
             let vc = AccountSecurityViewController()
             return vc
+        case .pushSetPassword:
+            let vc = SetPasswordViewController()
+            return vc
         }
     }
 }