Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/BaseVC/FUSBaseViewController.m

@@ -12,6 +12,7 @@
 #import "FUSTalkingData.h"
 #import "FUSFoundationBundle.h"
 #import "FUSFuSiLoadingView.h"
+#import "FUSFoundation/FUSFoundation-Swift.h"
 
 @interface FUSBaseViewController () <UIGestureRecognizerDelegate,UINavigationControllerDelegate>
 
@@ -31,6 +32,15 @@
     BOOL _animated;
 }
 
+//
+//- (void)loadView {
+//    if (@available(iOS 13.0, *)) {
+//        self.view = [ScreenShieldView createWithFrame:UIScreen.mainScreen.bounds];
+//    } else {
+//        [super loadView];
+//    }
+//}
+
 - (UIStatusBarStyle)preferredStatusBarStyle {
    return UIStatusBarStyleDefault;
 }
@@ -42,12 +52,18 @@
     self.navigationController.delegate = self;
     // 显示状态栏
     [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade];
-//    // 设置状态栏为白色
+    // 设置状态栏为黑
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault animated:NO];
     [self setNeedsStatusBarAppearanceUpdate];
     
     [self.navigationController.navigationBar setShadowImage:[[UIImage alloc] init]];
     
+    [self.navigationController.navigationBar.subviews.firstObject.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        if ([obj isKindOfClass:NSClassFromString(@"_UIBarBackgroundShadowView")]) {
+            obj.hidden=YES;
+        }
+    }];
+    
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_checkStateDidUpdate) name:FUSConfig.sharedInstanced.devConfigs.appStatusUpdateNotificationKey object:nil];
 }
 

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/BaseVC/ScreenShieldView.swift

+//
+//  ScreenShieldView.swift
+//  Swifty
+//
+//  Created by 王荣庆 on 2019/9/14.
+//  Copyright © 2019 RyukieSama. All rights reserved.
+//
+
+#if !os(macOS)
+
+import UIKit
+
+@available(iOS 13.0, *)
+public class ScreenShieldView: UIView {
+    @objc
+    public static func create(frame: CGRect = .zero) -> ScreenShieldView {
+        return ScreenShieldView(frame: frame)
+    }
+    
+    private override init(frame: CGRect) {
+        super.init(frame: frame)
+        safeZone = makeSecureView() ?? UIView()
+        
+        if let sf = safeZone {
+            addSubview(sf)
+            
+            let layoutDefaultLowPriority = UILayoutPriority(rawValue: UILayoutPriority.defaultLow.rawValue-1)
+            let layoutDefaultHighPriority = UILayoutPriority(rawValue: UILayoutPriority.defaultHigh.rawValue-1)
+            
+            sf.translatesAutoresizingMaskIntoConstraints = false
+            sf.setContentHuggingPriority(layoutDefaultLowPriority, for: .vertical)
+            sf.setContentHuggingPriority(layoutDefaultLowPriority, for: .horizontal)
+            sf.setContentCompressionResistancePriority(layoutDefaultHighPriority, for: .vertical)
+            sf.setContentCompressionResistancePriority(layoutDefaultHighPriority, for: .horizontal)
+            
+            let top = NSLayoutConstraint.init(item: sf, attribute: .top, relatedBy: .equal, toItem: self, attribute: .top, multiplier: 1, constant: 0)
+            let bottom = NSLayoutConstraint.init(item: sf, attribute: .bottom, relatedBy: .equal, toItem: self, attribute: .bottom, multiplier: 1, constant: 0)
+            let leading = NSLayoutConstraint.init(item: sf, attribute: .leading, relatedBy: .equal, toItem: self, attribute: .leading, multiplier: 1, constant: 0)
+            let trailing = NSLayoutConstraint.init(item: sf, attribute: .trailing, relatedBy: .equal, toItem: self, attribute: .trailing, multiplier: 1, constant: 0)
+            
+            self.addConstraints([top, bottom, leading, trailing])
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    public override func addSubview(_ view: UIView) {
+        guard
+            let safe = safeZone,
+            view != safeZone
+        else {
+            super.addSubview(view)
+            return
+        }
+        safe.addSubview(view)
+    }
+    
+    public override func insertSubview(_ view: UIView, belowSubview siblingSubview: UIView) {
+        guard
+            let safe = safeZone,
+            view != safeZone
+        else {
+            super.insertSubview(view, belowSubview: siblingSubview)
+            return
+        }
+        safe.insertSubview(view, belowSubview: siblingSubview)
+    }
+    
+    public override func insertSubview(_ view: UIView, aboveSubview siblingSubview: UIView) {
+        guard
+            let safe = safeZone,
+            view != safeZone
+        else {
+            super.insertSubview(view, aboveSubview: siblingSubview)
+            return
+        }
+        safe.insertSubview(view, aboveSubview: siblingSubview)
+    }
+    
+    public override func insertSubview(_ view: UIView, at index: Int) {
+        guard
+            let safe = safeZone,
+            view != safeZone
+        else {
+            super.insertSubview(view, at: index)
+            return
+        }
+        safe.insertSubview(view, at: index)
+    }
+    
+    public override func exchangeSubview(at index1: Int, withSubviewAt index2: Int) {
+        guard
+            let safe = safeZone
+        else {
+            super.exchangeSubview(at: index1, withSubviewAt: index2)
+            return
+        }
+        safe.exchangeSubview(at: index1, withSubviewAt: index2)
+    }
+    
+    public override func bringSubviewToFront(_ view: UIView) {
+        guard
+            let safe = safeZone,
+            view != safeZone
+        else {
+            super.bringSubviewToFront(view)
+            return
+        }
+        safe.bringSubviewToFront(view)
+    }
+    
+    public override func sendSubviewToBack(_ view: UIView) {
+        guard
+            let safe = safeZone,
+            view != safeZone
+        else {
+            super.sendSubviewToBack(view)
+            return
+        }
+        safe.sendSubviewToBack(view)
+    }
+    
+    private func makeSecureView() -> UIView? {
+        guard isOSVersionSafe else {
+            return nil
+        }
+        
+        let field = UITextField()
+        field.isSecureTextEntry = true
+        let fv = field.subviews.first
+        fv?.subviews.forEach { $0.removeFromSuperview() }
+        fv?.isUserInteractionEnabled = true
+        
+        let errorMsg = "[ScreenShieldView log] Create safeZone failed!"
+#if DEBUG
+        precondition(fv != nil, errorMsg)
+#else
+        print(errorMsg)
+#endif
+        
+        return fv
+    }
+    
+    private var safeZone: UIView?
+    
+    // Some OS version may crash, ignore them before there is a better way.
+    private var unsafeOSVersion: [String] {
+        ["15.1"]
+    }
+    
+    private var osVersion: String {
+        UIDevice.current.systemVersion
+    }
+    
+    private var isOSVersionSafe: Bool {
+        for version in unsafeOSVersion {
+            if osVersion.contains(version) {
+                return false
+            }
+        }
+        return true
+    }
+    
+}
+
+#endif

FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FunctionViews/FUSVideoChatUserInfoView.m

@@ -616,11 +616,13 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
         self.secrectBgView.hidden = NO;
         [_clearBgView addSubview:_buttomBtnBgView];
         [_clearBgView addSubview:_roomControlView];
+        _bgView.hidden = YES;
         
         [self fus_layoutSubviews];
     }else{
         _secrectBgView.hidden = YES;
         _secrectBgImgView.hidden = YES;
+        _bgView.hidden = NO;
         
         [self fus_layoutSubviews];
         model.uid = model.realUid;

FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceListView.m

@@ -135,7 +135,11 @@
 }
 
 - (void)fus_clicOpenVipAction:(UIButton *)sender {
-    //TODO:跳转到VIP: added By Pidan
+    
+    FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
+    wkwVC.shouldShowShareBtn = NO;
+    wkwVC.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.vipOpenAddress;
+    [[UIViewController fus_topViewController].navigationController pushViewController:wkwVC animated:YES];
 }
 
 #pragma mark - UITableViewDelegate, UITableViewDataSource
@@ -201,7 +205,12 @@
             NSInteger total = [dataDict[@"total"] integerValue];
             self.totalUserChangedHandler(total);
         }
-        
+        [self.tableView.mj_header endRefreshing];
+        if (users.count == 0) {
+            [self.tableView.mj_footer endRefreshingWithNoMoreData];
+        } else {
+            [self.tableView.mj_footer endRefreshing];
+        }
     } failure:^(NSDictionary * _Nullable dataDict, int code) {
         [FUSDialogView fus_showDialog:dataDict[@"msg"]];
     }];