南鑫林写的代码bug修改完成,剩下6个bug

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -16,6 +16,10 @@ extension AppDelegate {
     func initWindow(didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) {
         window = UIWindow.init(frame: UIScreen.main.bounds)
         window?.backgroundColor = UIColor.white
+        //初始化百度地图
+        BaiduMapManager.shared.initBaiduMap()
+        //百度开始定位
+        BaiduMapManager.shared.startLocation()
         let vc = UIViewController()
         vc.view.backgroundColor = UIColor.clear
         window?.rootViewController = vc
@@ -41,10 +45,6 @@ extension AppDelegate {
             DeliveryMethodTypeModel.shared().setModel(model: deliveryMethodTypeModel)
             //网络监听
             //        AlamofireReachabilityManager.shared.reachability()
-            //初始化百度地图
-            BaiduMapManager.shared.initBaiduMap()
-            //百度开始定位
-            BaiduMapManager.shared.startLocation()
             //初始化友盟
             UMManager.shared.initUM(launchOptions: launchOptions)
             //键盘处理

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/ViewController/CommunityVideoListController.swift

@@ -102,12 +102,27 @@ class CommunityVideoListController: BaseViewController {
         }
     }
     
-    override func setupViews() {        
+    override func setupViews() {
+        navigationBar.isHidden = true
         view.backgroundColor = UIColor.black
         self.view.addSubview(collectionView)
+        view.addSubview(blurEffectView)
+        view.addSubview(placeLabel)
+        view.addSubview(navBackBtn)
+
         collectionView.snp.makeConstraints { (make) in
             make.left.top.right.bottom.equalToSuperview()
         }
+        navBackBtn.snp.makeConstraints { (make) in
+            make.left.equalTo(5)
+            make.top.equalTo(kSafeStatusBarHeight+2)
+            make.size.equalTo(40)
+        }
+        placeLabel.snp.makeConstraints { (make) in
+            make.center.equalToSuperview()
+            make.width.equalTo(120)
+            make.height.equalTo(60)
+        }
         
         // 个人中心页进入，不可滑动
         if departureVc == .personal {
@@ -117,25 +132,28 @@ class CommunityVideoListController: BaseViewController {
     }
     
     override func setupData() {
-        
+        navBackBtn.rx.tap.subscribe(onNext: {
+            [weak self] (data) in
+            self?.navigationController?.popViewController(animated: true)
+        }).disposed(by: disposeBag)
         collectionView.addHeader(withBeginRefresh: true, animation: false) {
             [weak self] (page) in
             self?.communityVideoListApi(page:page)
             self?.collectionView.mj_header.isHidden = true
         }
-//        collectionView.addAutoNormalFooter(withAutomaticallyRefresh: true) {
-//            [weak self] (page) in
-//
-//            self?.communityVideoListApi(page:page)
-//
-//        }
         collectionView.addPreloadingAutoNormalFooter(withAutomaticallyRefresh: true) {
             [weak self] (page) in
-        self?.communityVideoListApi(page:page)
-
+            self?.communityVideoListApi(page:page)
         }
     }
     
+    private lazy var navBackBtn: UIButton = {
+        let navBackBtn = UIButton(type: UIButton.ButtonType.custom)
+        navBackBtn.setImage(kImage(name: "navbar_back_white"), for: UIControl.State.normal)
+        navBackBtn.isHidden = true
+        return navBackBtn
+    }()
+    
     private lazy var collectionView: UICollectionView = {
         [unowned self] in
         let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
@@ -155,6 +173,29 @@ class CommunityVideoListController: BaseViewController {
         return collectionViewLayout
     }()
     
+    private lazy var placeLabel: UILabel = {
+        let placeLabel = UILabel()
+        placeLabel.text = "视频不见了"
+        placeLabel.textColor = UIColor.white
+        placeLabel.textAlignment = .center
+        placeLabel.cornerRadius = 8
+        placeLabel.masksToBounds = true
+        placeLabel.backgroundColor = UIColor(hexString: "000000", alpha: 0.5)
+        placeLabel.font = kRegularFont15
+        placeLabel.isHidden = true
+
+        return placeLabel
+    }()
+    
+    lazy var blurEffectView: UIVisualEffectView = {
+        let blurEffect = UIBlurEffect(style: .dark)
+        let blurEffectView = UIVisualEffectView(effect: blurEffect)
+        blurEffectView.frame = CGRect(x: CGFloat(0), y: 0, width: kScreenWidth, height: kScreenHeight)
+        blurEffectView.isHidden = true
+        return blurEffectView
+    }()
+    
+    
 }
 
 // MARK: - collectionView dataSource && delegate
@@ -350,14 +391,23 @@ extension CommunityVideoListController {
                 self?.collectionView.resetNoMoreData()
             }
             if self?.videoItemList == nil {
+                self?.navBackBtn.isHidden = false
+                self?.blurEffectView.isHidden = false
+                self?.placeLabel.isHidden = false
                 self?.videoItemList = (videoListMdl?.data)!
+                
             }else {
+                self?.navBackBtn.isHidden = true
+                self?.blurEffectView.isHidden = true
+                self?.placeLabel.isHidden = true
                 self?.videoItemList = (self?.videoItemList)! + (videoListMdl?.data)!
             }
             self?.collectionView.reloadData()
             MJRefreshManager.mjRefreshManagerHiddenFooter(collectionView: self?.collectionView, pagination: videoListMdl?.pagination)
-        }) { loadingStatus in
-            
+        }) { [weak self] loadingStatus in
+            self?.navBackBtn.isHidden = false
+            self?.blurEffectView.isHidden = false
+            self?.placeLabel.isHidden = false
         }
     }
     

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

@@ -142,7 +142,8 @@ class UserPersonalCenterViewController: BaseViewController {
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("userMemberGetTotalBean"), object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
-            self?.userMemberDetailApi()
+//            self?.userMemberDetailApi()
+            self?.userMemberDetailOnlyApi()
         })
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("PublishPostSuccess"), object: nil, queue: OperationQueue.main, using: {
@@ -310,6 +311,18 @@ extension UserPersonalCenterViewController {
             self?.reloadData()
         }
     }
+    
+    func userMemberDetailOnlyApi() {
+        let userModel = UserModel.shared().getModel()
+        SwiftMoyaNetWorkServiceUser.shared().userMemberDetailApi(uid: userModel?.uid ?? 0) {
+            [weak self] (userDetailModel) -> (Void) in
+            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"))
+            ImageCache.default.clearMemoryCache()
+        }
+    }
 
 }
 

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/Controller/AliyunMagicCameraViewController.m

@@ -318,7 +318,7 @@
             self.magicCameraView.progressView.videoCount--;
             [self.magicCameraView recordingPercent:self.clipManager.duration];
             self.recordingDuration = self.clipManager.duration;
-            self.magicCameraView.musicButton.enabled = ![self.clipManager partCount];
+//            self.magicCameraView.musicButton.enabled = ![self.clipManager partCount];
             
             if (self.clipManager.partCount == 0) {
                 if (self.hideSegmentBlock) {
@@ -573,7 +573,7 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     
-    _magicCameraView.musicButton.enabled = ![_clipManager partCount];
+//    _magicCameraView.musicButton.enabled = ![_clipManager partCount];
     // 音乐按钮动效设置
     [self changeMusicButtonStatus];
     
@@ -700,7 +700,6 @@
         _magicCameraView.hide = YES;
         _magicCameraView.backButton.hidden = YES;
     }else{
-        NSLog(@"---------->startRecording错误error:  code:%d",code);
         _magicCameraView.hide = NO;
         _magicCameraView.backButton.hidden = NO;
         self.magicCameraView.progressView.videoCount--;
@@ -965,7 +964,7 @@
     //[_recorder finishRecording];
     self.upVideoCount = [_clipManager partCount];
         
-    _magicCameraView.musicButton.enabled = ![_clipManager partCount];
+//    _magicCameraView.musicButton.enabled = ![_clipManager partCount];
     [_magicCameraView destroy];
     _magicCameraView.userInteractionEnabled =YES;
 }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/View/AliyunMagicCameraView.m

@@ -104,7 +104,6 @@
     self.circleBtn = [[MagicCameraPressCircleView alloc] initWithFrame:CGRectMake(ScreenWidth/2-40, ScreenHeight -68 - 80 - SafeBottom, 80, 80)];
     [self addSubview:self.circleBtn];
     [self.circleBtn addTarget:self action:@selector(recordButtonTouchUp) forControlEvents:UIControlEventTouchUpInside];
-    [self.circleBtn addTarget:self action:@selector(recordButtonTouchDown) forControlEvents:UIControlEventTouchDown];
     
     CGFloat rateViewH = 40;
     CGFloat rateViewY = ScreenHeight-SafeBottom-177-rateViewH;
@@ -152,7 +151,6 @@
 }
 
 - (void)recordButtonTouchUp {
-    NSLog(@" DD----  %f    %f  - %f", CFAbsoluteTimeGetCurrent(), _startTime, (CFAbsoluteTimeGetCurrent() - _startTime));
     switch ([AliyunIConfig config].recordType) {
         case AliyunIRecordActionTypeClick:
             if (_recording) {
@@ -176,21 +174,6 @@
 }
 
 
-- (void)recordButtonTouchDown {
-    _startTime = CFAbsoluteTimeGetCurrent();
-    
-    NSLog(@"  YY----%f---%zd", _startTime,[AliyunIConfig config].recordType);
-    
-    switch ([AliyunIConfig config].recordType) {
-        case AliyunIRecordActionTypeClick:
-            
-            break;
-        default:
-            break;
-    }
-}
-
-
 /**
  结束录制
  */

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddAddress/View/PublishAddressPOIView.swift

@@ -37,7 +37,6 @@ class PublishAddressPOIView: BaseView {
         }
     }
     
-    
     override func setupViews() {
         addSubview(disableShowBgView)
         disableShowBgView.addSubview(disableShowLabel)

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddAddress/View/SearchAddrNavigationbarView.swift

@@ -53,14 +53,23 @@ class SearchAddrNavigationbarView: BaseView {
         }
     }
     
-    private lazy var backBtn: UIButton = {
-        let backBtn = UIButton(type: UIButton.ButtonType.custom)
-        backBtn.setImage(kImage(name: "navbar_back_black"), for: .normal)
+    override func setupData() {
+        searchTextField.rx.text.orEmpty.changed.subscribe(onNext: {
+            [weak self](text) in
+            if let searchBlock = self?.searchBlock {
+                searchBlock(self?.searchTextField.text ?? "")
+            }
+        }).disposed(by: disposeBag)
         backBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
             if let cancelBlock = self?.cancelBlock {
                 cancelBlock()
             }
         }).disposed(by: disposeBag)
+    }
+    private lazy var backBtn: UIButton = {
+        let backBtn = UIButton(type: UIButton.ButtonType.custom)
+        backBtn.setImage(kImage(name: "navbar_back_black"), for: .normal)
+
         return backBtn
     }()
     
@@ -86,12 +95,7 @@ class SearchAddrNavigationbarView: BaseView {
         searchTextField.returnKeyType = .search
         searchTextField.font = kScaleRegularFont14
         searchTextField.borderStyle = .none
-        searchTextField.rx.text.orEmpty.changed.subscribe(onNext: {
-            [weak self](text) in
-            if let searchBlock = self?.searchBlock {
-                searchBlock(searchTextField.text ?? "")
-            }
-        }).disposed(by: disposeBag)
+
         return searchTextField
     }()
     

RainbowPlanet/RainbowPlanet/Tools/JXPagingView-Swift/JXPagingView.swift

@@ -90,7 +90,7 @@ import UIKit
 }
 
 open class JXPagingView: UIView {
-    public unowned let delegate: JXPagingViewDelegate
+    public weak var delegate: JXPagingViewDelegate!
     open var mainTableView: JXPagingMainTableView!
     open var listContainerView: JXPagingListContainerView!
     public var validListDict = [Int:JXPagingViewListViewDelegate]() //当前已经加载过可用的列表字典，key就是index值，value是对应的列表。