Skip to content

pidan / FuSiLive

Go to a project
Commit 08c9fd49 by pidan
Options

Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求 

* 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive:
  修复一个bug
  修复一系列bug
parents ad9404a8 56061eb5
Inline Side-by-side
Showing with 95 additions and 26 deletions
DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSUserRouterProtocol.h
......@@ -341,6 +341,10 @@ NS_ASSUME_NONNULL_BEGIN
-(UIView *)fus_showInviteRewardHalfWebAlertView:(NSDictionary *)configDict
rootView:(UIView *)rootView;
/// 跳转到邀请有奖
/// @param controller 从哪跳
-(void)fus_pushToInviteRewardControllerWithRoot:(UIViewController *)controller;
@end
NS_ASSUME_NONNULL_END
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings
......@@ -3172,6 +3172,8 @@
"请联系您的邀请人获得邀请QRCode" = "请联系您的邀请人获得邀请QRCode";
"#$1#天以上未登入#$2#的玩家，将会自动断开使者关系" = "#$1#天以上未登入#$2#的玩家，将会自动断开使者关系";
"送“%@”礼物，更容易向主播索取密码哦~" = "送“%@”礼物，更容易向主播索取密码哦~";
"已关闭窗帘，玩家输入密码打开" = "已关闭窗帘，玩家输入密码打开";
......@@ -3179,3 +3181,4 @@
"私信礼物" = "私信礼物";
"收到%@" = "收到%@";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
......@@ -3181,3 +3181,4 @@
"私信礼物" = "私信禮物";
"收到%@" = "收到%@";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings
......@@ -3080,7 +3080,7 @@
"您已切换至全部主播再次点击可恢复关注" = "You have switched to all anchors and click again to restore";
"私享屋-密码：" = "SECRET Room-password:";
"私享屋-密码：" = "Password:";
"仅公开屋可进行PK" = "Only the public room can start PK";
......@@ -3172,3 +3172,13 @@
"请联系您的邀请人获得邀请QRCode" = "Please contact your inviter to get the invitation QRCode";
"#$1#天以上未登入#$2#的玩家，将会自动断开使者关系" = "Players left #$2# over #$1# days will unbind the Emissary";
"送“%@”礼物，更容易向主播索取密码哦~" = "Send the gift '%@', it is easier to ask the anchor for the password~";
"已关闭窗帘，玩家输入密码打开" = "The curtain has been closed, the player enters the password to open";
"私信礼物" = "Private message gift";
"收到%@" = "Received %@";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Japanese.strings
......@@ -3058,7 +3058,7 @@
"您已切换至全部主播再次点击可恢复关注" = "すべてのアンカーに切り替えました。もう一度クリックして復元してください。";
"私享屋-密码：" = "SECRETルーム - パスワード：";
"私享屋-密码：" = "パスワード：";
"仅公开屋可进行PK" = "PKを開始できるのは公開ルームのみです";
......@@ -3150,3 +3150,13 @@
"请联系您的邀请人获得邀请QRCode" = "招待QRコードを取得するには、招待者に連絡してください。";
"#$1#天以上未登入#$2#的玩家，将会自动断开使者关系" = "#$2#を#$1#日以上離れたプレイヤーは使者の拘束を解除します";
"送“%@”礼物，更容易向主播索取密码哦~" = "ギフト「%@」を送ってください。アンカーにパスワードを尋ねやすくなりますよ～";
"已关闭窗帘，玩家输入密码打开" = "カーテンが閉まっています。プレイヤーはパスワードを入力して開きます";
"私信礼物" = "プライベートメッセージギフト";
"收到%@" = "%@を受け取りました";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings
......@@ -3052,7 +3052,7 @@
"您已切换至全部主播再次点击可恢复关注" = "คุณได้สลับไปยังจุดยึดทั้งหมดแล้วและคลิกอีกครั้งเพื่อคืนค่า";
"私享屋-密码：" = "รหัสผ่านห้อง SECRET:";
"私享屋-密码：" = "รหัสผ่าน:";
"仅公开屋可进行PK" = "ห้องสาธารณะเท่านั้นที่สามารถเริ่ม PK ได้";
......@@ -3144,3 +3144,13 @@
"请联系您的邀请人获得邀请QRCode" = "กรุณาติดต่อผู้เชิญของคุณเพื่อรับ QR Code คำเชิญ";
"#$1#天以上未登入#$2#的玩家，将会自动断开使者关系" = "ผู้เล่นที่ออกจาก #$2# นานกว่า #$1# วันจะยกเลิกความสัมพันธ์ผู้ส่งสาร";
"送“%@”礼物，更容易向主播索取密码哦~" = "ส่งของขวัญ '%@' ง่ายกว่าที่จะขอรหัสผ่านจากผู้ประกาศข่าว~";
"已关闭窗帘，玩家输入密码打开" = "ม่านถูกปิด ผู้เล่นป้อนรหัสผ่านเพื่อเปิด";
"私信礼物" = "ของขวัญข้อความส่วนตัว";
"收到%@" = "ได้รับ %@";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings
......@@ -3058,7 +3058,7 @@
"您已切换至全部主播再次点击可恢复关注" = "Bạn đã chuyển sang tất cả neo và nhấp lại để khôi phục";
"私享屋-密码：" = "Mật khẩu phòng BÍ MẬT:";
"私享屋-密码：" = "Mật khẩu:";
"仅公开屋可进行PK" = "Chỉ phòng công khai mới có thể bắt đầu PK";
......@@ -3150,3 +3150,13 @@
"请联系您的邀请人获得邀请QRCode" = "Vui lòng liên hệ với người mời để lấy Mã QR lời mời";
"#$1#天以上未登入#$2#的玩家，将会自动断开使者关系" = "Người chơi rời khỏi #$2# hơn #$1# ngày sẽ hủy ràng buộc Emissary";
"送“%@”礼物，更容易向主播索取密码哦~" = "Gửi quà tặng '%@', dễ hơn là hỏi neo mật khẩu~";
"已关闭窗帘，玩家输入密码打开" = "Rèm đã được đóng, người chơi nhập mật khẩu để mở";
"私信礼物" = "Quà tặng tin nhắn riêng";
"收到%@" = "Đã nhận %@";
FuSiLive.xcodeproj/project.pbxproj
......@@ -415,10 +415,14 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks.sh\"\n";
......@@ -432,10 +436,14 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources.sh\"\n";
......@@ -664,7 +672,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260015;
CURRENT_PROJECT_VERSION = 202506260017;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO;
......@@ -932,7 +940,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260015;
CURRENT_PROJECT_VERSION = 202506260017;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO;
......
FuSiLive/Launch Screen.storyboard
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -16,7 +16,7 @@
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FusiClub.com" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ifusiya.com" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
<rect key="frame" x="24" y="811.66666666666663" width="345" height="20.333333333333371"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/FUSHomeView.m
......@@ -330,14 +330,15 @@
} else {
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
wkwVC.shouldShowShareBtn = NO;
wkwVC.needShowReload = YES;
wkwVC.from = FUSFromInvitShare;
wkwVC.shouldIncludeIdentifyInfo = YES;
wkwVC.webUrlString = FUSCommonWebURLs.fus_agentInviteShare;
// 包含用户信息参数
[self.parentController.navigationController pushViewController:wkwVC animated:YES];
// FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
// wkwVC.shouldShowShareBtn = NO;
// wkwVC.needShowReload = YES;
// wkwVC.from = FUSFromInvitShare;
// wkwVC.shouldIncludeIdentifyInfo = YES;
// wkwVC.webUrlString = FUSCommonWebURLs.fus_agentInviteShare;
// // 包含用户信息参数
// [self.parentController.navigationController pushViewController:wkwVC animated:YES];
[[FUSRouter userRouter] fus_pushToInviteRewardControllerWithRoot:self.parentController];
}
}
break;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ShareToChat/FUSLiveShareToChatView.m
......@@ -69,6 +69,7 @@
_maxShareUserCount = [[[NSUserDefaults standardUserDefaults] objectForKey:FUSLiveUDKeys.fus_SHARE_SEND_TO_TOTAL_STINT] integerValue];
// 初始化View
[self fus_initView];
self.selectedCount = 0;
}
return self;
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardInviteFunctionHeader.swift
......@@ -50,7 +50,8 @@ class FUSInviteRewardInviteFunctionHeader: FUSBaseView {
self.addSubview(dotView)
dotView.snp.makeConstraints { make in
make.left.equalTo(18)
make.centerY.equalToSuperview()
// make.centerY.equalToSuperview()
make.bottom.equalToSuperview().offset(-FUSInviteRewardInviteFunctionHeader.cellHeight/2.0 + 6.0/2.0)
make.size.equalTo(CGSizeMake(6, 6))
}
......@@ -60,13 +61,13 @@ class FUSInviteRewardInviteFunctionHeader: FUSBaseView {
self.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.left.equalTo(dotView.snp.right).offset(8)
make.centerY.equalToSuperview()
make.centerY.equalTo(dotView.snp.centerY)
make.width.equalTo(50)
}
descLabel.font = .fus_themeFont(13)
descLabel.textColor = .fus_textColorMedium()
descLabel.text = .fus_localString("选择适合您的邀请方式") + "："
// descLabel.text = .fus_localString("选择适合您的邀请方式") + "："
self.addSubview(descLabel)
descLabel.snp.makeConstraints { make in
make.left.equalTo(titleLabel.snp.right).offset(6)
......@@ -79,7 +80,7 @@ class FUSInviteRewardInviteFunctionHeader: FUSBaseView {
self.addSubview(emissaryLineImageView)
emissaryLineImageView.snp.makeConstraints { make in
make.left.equalTo(titleLabel.snp.right).offset(7)
make.centerY.equalToSuperview()
make.centerY.equalTo(titleLabel.snp.centerY)
// make.right.equalTo(-10)
// make.height.equalTo(4)
}
......@@ -89,10 +90,10 @@ class FUSInviteRewardInviteFunctionHeader: FUSBaseView {
func fus_setHeaderType(type: FFInviteRewardCommonSectionHeaderType) {
switch type{
case .inviteFunction:
descLabel.isHidden = false
descLabel.isHidden = true
emissaryLineImageView.isHidden = true
titleLabel.text = .fus_localString("邀请玩家下载")
descLabel.text = .fus_localString("选择适合您的邀请方式") + "："
// descLabel.text = .fus_localString("选择适合您的邀请方式") + "："
case .emissaryReward:
descLabel.isHidden = true
emissaryLineImageView.isHidden = false
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardMyHeaderCell.swift
......@@ -249,7 +249,7 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
})
self.emissarySignBtn.isSelected = (conditionFulfilled >= model.agentFactor.conditionList.count)
self.emissarySignBtn.backgroundColor = (conditionFulfilled >= model.agentFactor.conditionList.count) ? .fus_diamondBlue() : .init(hexString: "#9F9E9E")?.withAlphaComponent(0.5)
self.emissarySignBtn.backgroundColor = (conditionFulfilled >= model.agentFactor.conditionList.count) ? .fus_appMain() : .init(hexString: "#9F9E9E")?.withAlphaComponent(0.5)
self.emissaryRewardView.contentLabel.attributedText = .sj.makeText({ make in
make.append(.fus_localString("本月")).textColor(.fus_textColorMedium())
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/FUSInviteFunctionController.swift
......@@ -216,7 +216,7 @@ extension UIView {
self.layer.shadowColor = UIColor.init(hex: "#8F8F8F").cgColor
self.layer.shadowOffset = CGSize(width: 0, height: 1)
self.layer.shadowOpacity = 0.4
self.layer.shadowRadius = 8
self.layer.shadowRadius = 6
self.layer.cornerRadius = 8
}
......@@ -231,7 +231,7 @@ extension UIView {
// 阴影衍射最大距离
let shadowDiffractionDistance: CGFloat = 12.5 * 2
// 阴影角度
let shadowRadius: CGFloat = 8
let shadowRadius: CGFloat = 6
// 创建两个layer
let shadowlayer = CAShapeLayer()
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/View/FUSInviteRewardInviteView.swift
......@@ -286,7 +286,12 @@ extension FUSInviteRewardInviteView: UITableViewDelegate, UITableViewDataSource{
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
switch sectionTypesList[section] {
case .inviteFunction:
if self.viewType == .recall {
// 召回的这个在第二行，所以跟邀请的在第一行的头部留白有点差距，因为邀请的上面那个卡片会有天然留白
return FUSInviteRewardInviteFunctionHeader.cellHeight + 4
}else {
return FUSInviteRewardInviteFunctionHeader.cellHeight
}
case .recallClansman:
return FUSInviteRewardInviteRecallClansmanHeader.fus_getCellHeight(type: .recallClansman)
case .plan:
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m
......@@ -1032,4 +1032,9 @@
return [FUSInviteConfigHalfWebAlertView fus_showWithHalfDict:configDict rootView:rootView];
}
- (void)fus_pushToInviteRewardControllerWithRoot:(UIViewController *)controller{
FUSInviteRewardController *vc = [[FUSInviteRewardController alloc] init];
[controller.navigationController pushViewController:vc animated:YES];
}
@end
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