Skip to content

pidan / FuSiLive

Go to a project
Commit 5df38f0e by pierce
Options

Merge branch 'feature/私讯+座驾体系' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私讯+座驾体系

parents aebc6e3b 54c23329
Expand all
Inline Side-by-side
Showing with 203 additions and 33 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/UIButton/UIButtonSwiftExt.swift 0 → 100644
//
// UIButtonSwiftExt.swift
// FUSFoundation
//
// Created by aaa on 2025/1/17.
//
import UIKit
public extension UIButton {
@objc func fus_alignHorizontal(spacing: CGFloat, imageFirst: Bool,padding:CGFloat) {
let edgeOffset = spacing / 2
if #available(iOS 15.0, *) {
var config = UIButton.Configuration.filled()
config.imagePadding = spacing
config.imagePlacement = imageFirst ? .leading :.trailing
config.contentInsets = NSDirectionalEdgeInsets(top:padding, leading: padding, bottom: padding, trailing: padding)
self.configuration = config
return
}
if imageFirst {
imageEdgeInsets = UIEdgeInsets(top: 0,
left: -edgeOffset,
bottom: 0,
right: edgeOffset)
titleEdgeInsets = UIEdgeInsets(top: 0,
left: edgeOffset,
bottom: 0,
right: -edgeOffset)
} else {
guard let imageSize = self.imageView?.image?.size,
let text = self.titleLabel?.text,
let font = self.titleLabel?.font
else {
return
}
let labelString = NSString(string: text)
let titleSize = labelString.size(withAttributes: [NSAttributedString.Key.font: font])
imageEdgeInsets = UIEdgeInsets(top: 0,
left: titleSize.width + edgeOffset,
bottom: 0,
right: -titleSize.width - edgeOffset)
titleEdgeInsets = UIEdgeInsets(top: 0,
left: -imageSize.width - edgeOffset,
bottom: 0,
right: imageSize.width + edgeOffset)
}
self.titleLabel?.numberOfLines = 2
// increase content width to avoid clipping
contentEdgeInsets = UIEdgeInsets(top: 0-padding, left: edgeOffset-padding, bottom: 0-padding, right: edgeOffset-padding)
}
@objc func fus_alignVertical(spacing: CGFloat, imageTop: Bool) {
if #available(iOS 15.0, *) {
var config = UIButton.Configuration.filled()
config.imagePadding = spacing
config.imagePlacement = imageTop ? .top :.bottom
let padding = 0.0
config.contentInsets = NSDirectionalEdgeInsets(top:padding, leading: padding, bottom: padding, trailing: padding)
self.configuration = config
return
}
guard let imageSize = self.imageView?.image?.size,
let text = self.titleLabel?.text,
let font = self.titleLabel?.font
else {
return
}
let labelString = NSString(string: text)
let titleSize = labelString.size(withAttributes: [NSAttributedString.Key.font: font])
let imageVerticalOffset = (titleSize.height + spacing)/2
let titleVerticalOffset = (imageSize.height + spacing)/2
let imageHorizontalOffset = (titleSize.width)/2
let titleHorizontalOffset = (imageSize.width)/2
let sign: CGFloat = imageTop ? 1 : -1
imageEdgeInsets = UIEdgeInsets(top: -imageVerticalOffset * sign,
left: imageHorizontalOffset,
bottom: imageVerticalOffset * sign,
right: -imageHorizontalOffset)
titleEdgeInsets = UIEdgeInsets(top: titleVerticalOffset * sign,
left: -titleHorizontalOffset,
bottom: -titleVerticalOffset * sign,
right: titleHorizontalOffset)
self.titleLabel?.numberOfLines = 2
// increase content height to avoid clipping
let edgeOffset = (min(imageSize.height, titleSize.height) + spacing)/2
contentEdgeInsets = UIEdgeInsets(top: edgeOffset, left: 0, bottom: edgeOffset, right: 0)
}
}
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>78</integer>
<integer>73</integer>
</dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>72</integer>
<integer>77</integer>
</dict>
</dict>
</dict>
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/CallView/FUSChatCallView.swift
......@@ -547,8 +547,8 @@ extension UILabel {
func fus_setCallViewShadow(){
self.layer.shadowColor = UIColor.init(hex: "#415E5E", alpha: 148.0/255.0).cgColor
self.layer.shadowOffset = CGSize(width: 1, height: 0)
self.layer.shadowOpacity = 1
self.layer.shadowRadius = 2.0
self.layer.shadowOpacity = 0.8
self.layer.shadowRadius = 1.6
}
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -12,7 +12,7 @@
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>77</integer>
<integer>76</integer>
</dict>
</dict>
</dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/LiveRecords/View/FUSLiveRecordsHeaderView.swift
......@@ -13,8 +13,10 @@ class FUSLiveRecordsHeaderView: FUSBaseView {
var buttonClicked: ((Bool) -> Void)?
let contentView = UIView()
let lastMonthBtn = SPButton(imagePosition: .left)
let nextMonthBtn = SPButton(imagePosition: .right)
// let lastMonthBtn = SPButton(imagePosition: .left)
// let nextMonthBtn = SPButton(imagePosition: .right)
let lastMonthBtn = UIButton(type: .custom)
let nextMonthBtn = FUSLiveRecordsNextMonthButton(type: .custom)
let titleLabel = UILabel()
let nameView = FFImAnchorHeaderLabelBoxView(frame: CGRectZero)
/// 得分的view
......@@ -43,21 +45,29 @@ class FUSLiveRecordsHeaderView: FUSBaseView {
lastMonthBtn.setTitle(" " + .fus_localString("上一月"), for: .normal)
lastMonthBtn.setTitleColor(.fus_textColorDeep(), for: .normal)
contentView.addSubview(lastMonthBtn)
let lastMonthBtnSize = (" " + .fus_localString("上一月")).size(with: .fus_themeFont(14), maxWidth: 414)
lastMonthBtn.snp.makeConstraints { make in
make.left.equalToSuperview().offset(10)
make.top.equalToSuperview()
make.height.equalTo(46)
make.width.equalTo(lastMonthBtnSize.width + 30)
}
nextMonthBtn.titleLabel?.font = .fus_themeFont(14)
nextMonthBtn.setImage(FUSShowRoomCenterBunble.imageNamed("im_anchor_nextMonth_icon"), for: .normal)
nextMonthBtn.setTitle(.fus_localString("下一月") + " ", for: .normal)
nextMonthBtn.setTitleColor(.fus_textColorDeep(), for: .normal)
// nextMonthBtn.titleLabel?.font = .fus_themeFont(14)
// nextMonthBtn.setImage(FUSShowRoomCenterBunble.imageNamed("im_anchor_nextMonth_icon"), for: .normal)
// nextMonthBtn.setTitle(.fus_localString("下一月") + " ", for: .normal)
// nextMonthBtn.setTitleColor(.fus_textColorDeep(), for: .normal)
nextMonthBtn.btnTitle.font = .fus_themeFont(14)
nextMonthBtn.btnTitle.textColor = .fus_textColorDeep()
nextMonthBtn.btnTitle.text = .fus_localString("下一月") + " "
nextMonthBtn.btnImage.image = FUSShowRoomCenterBunble.imageNamed("im_anchor_nextMonth_icon")
contentView.addSubview(nextMonthBtn)
let nextMonthBtnSize = (String.fus_localString("下一月") + " ").size(with: .fus_themeFont(14), maxWidth: 414)
nextMonthBtn.snp.makeConstraints { make in
make.right.equalToSuperview().offset(-10)
make.top.equalToSuperview()
make.height.equalTo(46)
make.width.equalTo(nextMonthBtnSize.width + 30)
}
titleLabel.font = .fus_themeMediumFont(19)
......@@ -194,3 +204,42 @@ class FFImAnchorHeaderLabelBoxView: UIView {
}
}
}
class FUSLiveRecordsNextMonthButton: UIButton{
public let btnTitle = UILabel()
public let btnImage = UIImageView()
override init(frame: CGRect) {
super.init(frame: frame)
makeUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
func makeUI(){
let centerView = UIView()
self.addSubview(centerView)
centerView.snp.makeConstraints { make in
make.center.equalToSuperview()
}
btnImage.isUserInteractionEnabled = false
centerView.addSubview(btnImage)
centerView.addSubview(btnTitle)
btnImage.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.right.equalToSuperview()
}
btnTitle.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.left.equalToSuperview()
make.right.equalTo(btnImage.snp.left)
}
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FUSVideoEndView/FUSVideoEndV2View.swift
......@@ -62,7 +62,6 @@ import UIKit
/// sh模式不要露水
if FUSConfig.sharedInstanced().devConfigs.appStatus == true {
sectionList = [[.allPopularity, .giftSenderNum, .newFollow],
[.liveReward],
[.liveScore]]
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>75</integer>
<integer>78</integer>
</dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>73</integer>
<integer>75</integer>
</dict>
</dict>
</dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/LiveSetting/FUSLiveAnchorSettingViewController.m
......@@ -106,7 +106,12 @@
group.itemsBgColor = [UIColor fus_appBGColor];
group.itemsPressBgColor = [UIColor fus_listBGPressColor];
if ([FUSConfig sharedInstanced].devConfigs.appStatus == YES) {
// sh状态隐藏
group.items = @[folderMsgItem, _micTakeDivideItem];
}else {
group.items = @[folderMsgItem, _micTakeDivideItem, vchatSetting];
}
[self.allGroups addObject:group];
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSMyZoneViewController.m
......@@ -512,18 +512,26 @@
- (void)fus_callVoiceChat {
if (self.zoneModel.liveState.integerValue != 0 && FUSConfig.sharedInstanced.devConfigs.appStatus) {
if (self.zoneModel.liveState.integerValue != 0) {
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"对方正在直播中，请勿打扰，可以先去撩其他人喔"] message:nil cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:nil clickBlock:^(NSInteger buttonIndex) {}];
return;
}
if ((self.zoneModel.liveState.integerValue == 0
&& self.zoneModel.videoState.integerValue == 2)
|| FUSConfig.sharedInstanced.devConfigs.appStatus) {
&& self.zoneModel.videoState.integerValue == 2)) {
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"对方正在通话中，请勿打扰，可以先去撩其他人喔"] message:nil cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:nil clickBlock:^(NSInteger buttonIndex) {}];
return;
}
if (self.zoneModel.chatWith) {
if ([self.zoneModel.chatWith[@"callPrice"] integerValue] > 0
&& [FUSConfig sharedInstanced].devConfigs.appStatus == YES) {
// Sh状态不给打
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"对方正在通话中，请勿打扰，可以先去撩其他人喔"] message:nil cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:nil clickBlock:^(NSInteger buttonIndex) {}];
return;
}
}
NSString *name = @"";
if ([NSString isNull:_zoneModel.markName]) {
name = _zoneModel.nickname;
......@@ -537,18 +545,26 @@
- (void)fus_callVideoChat {
if (self.zoneModel.liveState.integerValue != 0 && FUSConfig.sharedInstanced.devConfigs.appStatus) {
if (self.zoneModel.liveState.integerValue != 0) {
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"对方正在直播中，请勿打扰，可以先去撩其他人喔"] message:nil cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:nil clickBlock:^(NSInteger buttonIndex) {}];
return;
}
if ((self.zoneModel.liveState.integerValue == 0
&& self.zoneModel.videoState.integerValue == 2)
|| FUSConfig.sharedInstanced.devConfigs.appStatus) {
&& self.zoneModel.videoState.integerValue == 2)) {
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"对方正在通话中，请勿打扰，可以先去撩其他人喔"] message:nil cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:nil clickBlock:^(NSInteger buttonIndex) {}];
return;
}
if (self.zoneModel.chatWith) {
if ([self.zoneModel.chatWith[@"callPrice"] integerValue] > 0
&& [FUSConfig sharedInstanced].devConfigs.appStatus == YES) {
// Sh状态不给打
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"对方正在通话中，请勿打扰，可以先去撩其他人喔"] message:nil cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:nil clickBlock:^(NSInteger buttonIndex) {}];
return;
}
}
NSString *name = @"";
if ([NSString isNull:_zoneModel.markName]) {
name = _zoneModel.nickname;
......
Podfile.lock
......@@ -426,4 +426,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 0087139e98434188881e3a26f8dd1dcc9daab53d
COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
Pods/Manifest.lock
......@@ -426,4 +426,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 0087139e98434188881e3a26f8dd1dcc9daab53d
COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
Pods/Pods.xcodeproj/project.pbxproj
This source diff could not be displayed because it is too large. You can view the blob instead.
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -389,10 +389,12 @@
<key>orderHint</key>
<integer>60</integer>
</dict>
<key>SSZipArchive.xcscheme_^#shared#^_</key>
<key>SSZipArchive.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>76</integer>
<integer>63</integer>
</dict>
<key>SnapKit-SnapKit_Privacy.xcscheme</key>
<dict>
......@@ -413,63 +415,63 @@
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>64</integer>
<integer>65</integer>
</dict>
<key>TTTAttributedLabel.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>65</integer>
<integer>66</integer>
</dict>
<key>TenjinSDK.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>63</integer>
<integer>64</integer>
</dict>
<key>TwitterCore.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>66</integer>
<integer>67</integer>
</dict>
<key>TwitterKit5.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>67</integer>
<integer>68</integer>
</dict>
<key>UIImage+BlurredFrame.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>68</integer>
<integer>69</integer>
</dict>
<key>YYKit.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>69</integer>
<integer>70</integer>
</dict>
<key>ZXSDK.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>71</integer>
<integer>72</integer>
</dict>
<key>ZipArchive.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>70</integer>
<integer>71</integer>
</dict>
<key>libPhoneNumber-iOS.xcscheme</key>
<dict>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment