Skip to content

pidan / FuSiLive

Go to a project
Commit 817a0913 by pierce
Options

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

parents 41439625 44cb3ab6
Inline Side-by-side
Showing with 22 additions and 18 deletions
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key> <key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>78</integer> <integer>72</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>72</integer> <integer>77</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key> <key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>77</integer> <integer>75</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>74</integer> <integer>73</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FFLiveAgreementAlertView/FUSLiveAgreementAlertView.m
...@@ -100,12 +100,15 @@ ...@@ -100,12 +100,15 @@
make.centerX.offset(0); make.centerX.offset(0);
}]; }];
// 新版本不需要标题
self.titleLabel.hidden = YES;
self.headerImgView = [[UIImageView alloc] init]; self.headerImgView = [[UIImageView alloc] init];
self.headerImgView.layer.cornerRadius = 68 / 2.0f; self.headerImgView.layer.cornerRadius = 68 / 2.0f;
self.headerImgView.layer.masksToBounds = YES; self.headerImgView.layer.masksToBounds = YES;
[self.contentView addSubview:self.headerImgView]; [self.contentView addSubview:self.headerImgView];
[self.headerImgView mas_makeConstraints:^(MASConstraintMaker *make) { [self.headerImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.titleLabel.mas_bottom).offset(22); make.top./*equalTo(self.titleLabel.mas_bottom).*/offset(22);
make.centerX.offset(0); make.centerX.offset(0);
make.width.height.offset(68); make.width.height.offset(68);
}]; }];
...@@ -204,7 +207,9 @@ ...@@ -204,7 +207,9 @@
self.clickHandler(isConfirmAll ? FUSLiveAgreementClickedOK : FUSLiveAgreementClickedOKNotConfirmAll); self.clickHandler(isConfirmAll ? FUSLiveAgreementClickedOK : FUSLiveAgreementClickedOKNotConfirmAll);
} }
if (isConfirmAll) {
[self fus_dismissWithAnimate]; [self fus_dismissWithAnimate];
}
} }
#pragma mark - dismiss method #pragma mark - dismiss method
...@@ -302,7 +307,7 @@ ...@@ -302,7 +307,7 @@
for (int i = 0; i < responsibilityContentTextList.count; i++) { for (int i = 0; i < responsibilityContentTextList.count; i++) {
FUSLiveAgreementConfirmSectionView *sectionView = [[FUSLiveAgreementConfirmSectionView alloc] init]; FUSLiveAgreementConfirmSectionView *sectionView = [[FUSLiveAgreementConfirmSectionView alloc] init];
sectionView.isConfirm = YES; // sectionView.isConfirm = YES;
sectionView.messageLabel.text = [NSString stringWithFormat:@"%d、%@", i + 1, responsibilityContentTextList[i]]; sectionView.messageLabel.text = [NSString stringWithFormat:@"%d、%@", i + 1, responsibilityContentTextList[i]];
[self.responsibilityContentView addSubview:sectionView]; [self.responsibilityContentView addSubview:sectionView];
[self.confirmContentViewList addObject:sectionView]; [self.confirmContentViewList addObject:sectionView];
...@@ -314,13 +319,13 @@ ...@@ -314,13 +319,13 @@
NSString *protocolStr = [NSString stringWithFormat:@"%ld、%@%@", responsibilityContentTextList.count + 1, text1, text2]; NSString *protocolStr = [NSString stringWithFormat:@"%ld、%@%@", responsibilityContentTextList.count + 1, text1, text2];
NSMutableAttributedString *protocolAttriStr = [[NSMutableAttributedString alloc] initWithString:protocolStr]; NSMutableAttributedString *protocolAttriStr = [[NSMutableAttributedString alloc] initWithString:protocolStr];
protocolAttriStr.alignment = NSTextAlignmentLeft; protocolAttriStr.alignment = NSTextAlignmentLeft;
protocolAttriStr.font = [UIFont fus_themeFont:15]; protocolAttriStr.font = [UIFont fus_themeMediumFont:15];
protocolAttriStr.color = [UIColor fus_textColorRich]; protocolAttriStr.color = [UIColor fus_textColorMedium];
NSRange range = [protocolStr rangeOfString:text2]; NSRange range = [protocolStr rangeOfString:text2];
[protocolAttriStr setColor:[UIColor fus_themeColor] range:range]; [protocolAttriStr setColor:[UIColor fus_textColorDeep] range:range];
MJWeakSelf MJWeakSelf
[protocolAttriStr setTextHighlightRange:range color:[UIColor fus_themeColor] backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { [protocolAttriStr setTextHighlightRange:range color:[UIColor fus_textColorDeep] backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
if (weakSelf.clickHandler) { if (weakSelf.clickHandler) {
weakSelf.clickHandler(FUSLiveAgreementClickedAgreement); weakSelf.clickHandler(FUSLiveAgreementClickedAgreement);
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartContentBottomView.swift
...@@ -48,7 +48,7 @@ class FUSLiveStartContentBottomView: UIView { ...@@ -48,7 +48,7 @@ class FUSLiveStartContentBottomView: UIView {
// 设置 "直播管理条例" 的文本属性（包括颜色和下划线） // 设置 "直播管理条例" 的文本属性（包括颜色和下划线）
let policyTextAttributes: [NSAttributedString.Key: Any] = [ let policyTextAttributes: [NSAttributedString.Key: Any] = [
.foregroundColor: UIColor.fus_theme(), .foregroundColor: UIColor.white,
.underlineStyle: NSUnderlineStyle.single.rawValue .underlineStyle: NSUnderlineStyle.single.rawValue
] ]
let policyRange = NSRange(location: beginString.count + 1, length: protocalString.count) // "直播管理条例" 的范围 let policyRange = NSRange(location: beginString.count + 1, length: protocalString.count) // "直播管理条例" 的范围
...@@ -111,8 +111,7 @@ class FUSLiveStartContentBottomView: UIView { ...@@ -111,8 +111,7 @@ class FUSLiveStartContentBottomView: UIView {
guard let topVC = UIViewController.fus_top() else { return } guard let topVC = UIViewController.fus_top() else { return }
let lang = FUSLocalizationHelper.fus_currentLanguage().languageID let url = FUSShowRoomWebURLs.fus_liveAndCommunityAgreementUrl()
let url = FUSShowRoomWebURLs.fus_liveRuleAdminRuleUrl() + "?lang=" + lang
let webVC = FUSWKWebViewController() let webVC = FUSWKWebViewController()
webVC.webUrlString = url webVC.webUrlString = url
topVC.navigationController?.pushViewController(webVC, animated: true) topVC.navigationController?.pushViewController(webVC, animated: true)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPrivacyView.swift
...@@ -267,7 +267,6 @@ class FUSLiveStartSetPrivacyItemView: UIView { ...@@ -267,7 +267,6 @@ class FUSLiveStartSetPrivacyItemView: UIView {
} }
iconImageView.isUserInteractionEnabled = false iconImageView.isUserInteractionEnabled = false
iconImageView.backgroundColor = .init(hex: "#CDE9F0")
iconImageView.layer.cornerRadius = 4 iconImageView.layer.cornerRadius = 4
iconImageView.layer.masksToBounds = true iconImageView.layer.masksToBounds = true
bgTapBtn.addSubview(iconImageView) bgTapBtn.addSubview(iconImageView)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Others/FUSShowRoomURLs.m
...@@ -693,7 +693,8 @@ ...@@ -693,7 +693,8 @@
} }
/// 社区公约 /// 社区公约
+ (NSString *)fus_liveAndCommunityAgreementUrl { + (NSString *)fus_liveAndCommunityAgreementUrl {
return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/liveCommunity/index.html"]; // return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/liveCommunity/index.html"];
return [NSString stringWithFormat:@"%@?lang=%@", FUSCommonWebURLs.fus_regulation,FUSLocalizationHelper.fus_currentLanguage.languageID];
} }
/// 主播评分介绍 /// 主播评分介绍
+ (NSString *)fus_liveAnchorAssessIntroURL{ + (NSString *)fus_liveAnchorAssessIntroURL{
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key> <key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>73</integer> <integer>74</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>76</integer> <integer>78</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -392,7 +392,7 @@ ...@@ -392,7 +392,7 @@
<key>SSZipArchive.xcscheme_^#shared#^_</key> <key>SSZipArchive.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>75</integer> <integer>76</integer>
</dict> </dict>
<key>SnapKit-SnapKit_Privacy.xcscheme</key> <key>SnapKit-SnapKit_Privacy.xcscheme</key>
<dict> <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