Skip to content

pidan / FuSiLive

Go to a project
Commit b8bf393c by ludi
Options

Merge branch 'feature/修复bug和Tiktok' of http://git.yabolive.net:88/pidan/FuSiLive… 

Merge branch 'feature/修复bug和Tiktok' of http://git.yabolive.net:88/pidan/FuSiLive into feature/修复bug和Tiktok
parents d4652210 1235f998
Expand all
Inline Side-by-side
Showing with 131 additions and 40 deletions
FuSiLive.xcworkspace/xcuserdata/server.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -16,5 +16,21 @@
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "FF1F0C32-D3E1-4112-9767-E7D5777083EF"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSMyZoneViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "223"
endingLineNumber = "223"
landmarkName = "-fus_initTableView"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.m
......@@ -1085,6 +1085,10 @@ static NSInteger const kFUSPayRoomCompanionPopViewTagLeft = 90917002;
if (!strongSelf) {
return;
}
if (action == FUSLiveShowTimeAudienceEntryMainViewActionAvatar) {
[strongSelf fus_enterUserZoneWithUid:currentRoomId];
return;
}
if (action == FUSLiveShowTimeAudienceEntryMainViewActionDismiss) {
[FUSLiveHelper fus_quitLiveWithCompletion:nil];
return;
......@@ -1161,6 +1165,10 @@ static NSInteger const kFUSPayRoomCompanionPopViewTagLeft = 90917002;
if (!strongSelf) {
return;
}
if (action == FUSLiveShowTimeAudienceEntryMainViewActionAvatar) {
[strongSelf fus_enterUserZoneWithUid:currentRoomId];
return;
}
if (action == FUSLiveShowTimeAudienceEntryMainViewActionDismiss) {
[FUSLiveHelper fus_quitLiveWithCompletion:nil];
return;
......@@ -1337,6 +1345,10 @@ static NSInteger const kFUSPayRoomCompanionPopViewTagLeft = 90917002;
if (!strongSelf) {
return;
}
if (action == FUSPayRoomEntryMainViewActionAvatar) {
[strongSelf fus_enterUserZoneWithUid:uid];
return;
}
if (action == FUSPayRoomEntryMainViewActionDismiss) {
[FUSLiveHelper fus_quitLiveWithCompletion:nil];
return;
......@@ -1392,6 +1404,14 @@ static NSInteger const kFUSPayRoomCompanionPopViewTagLeft = 90917002;
return viewModel;
}
/// 统一处理直播间内“进入个人主页”跳转，避免各弹层重复拼接路由逻辑。
- (void)fus_enterUserZoneWithUid:(NSString *)uid {
if ([NSString isNull:uid]) {
return;
}
[FUSRouter.userRouter fus_enterUserZone:uid isFromLiveRoomChat:NO];
}
- (void)fus_refreshPayRoomEntryViewIfNeeded:(FUSPayRoomEntryMainView *)entryView
uid:(NSString *)uid
roomId:(NSString *)roomId {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveShowTimeCollectFrostedView.m
......@@ -335,7 +335,7 @@ static const CGFloat kFUSShowTimeTopVipHeight = 14.0;
}];
[self.ticketIconView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.vipIconView.mas_right).offset(12);
make.left.equalTo(self.levLabel.mas_right).offset(12);
make.centerY.equalTo(self.avatarView);
make.size.mas_equalTo(CGSizeMake(23, 13.5));
make.right.lessThanOrEqualTo(self.topTicketInfoContainerView);
......@@ -439,6 +439,17 @@ static const CGFloat kFUSShowTimeTopVipHeight = 14.0;
self.progressLayer.path = path.CGPath;
}
/// 根据 VIP 标识实际显示状态，动态切换票图标的左锚点，避免依赖隐藏中的中间视图导致间距偶发贴合。
- (void)fus_updateTicketIconLeadingConstraintWithVipVisible:(BOOL)vipVisible {
UIView *leadingReferenceView = (vipVisible ? self.vipIconView : self.levLabel);
[self.ticketIconView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(leadingReferenceView.mas_right).offset(12);
make.centerY.equalTo(self.avatarView);
make.size.mas_equalTo(CGSizeMake(23, 13.5));
make.right.lessThanOrEqualTo(self.topTicketInfoContainerView);
}];
}
- (void)fus_updateWithState:(FUSLiveShowTimeCollectFrostedState)state
themeText:(NSString *)themeText
progress:(CGFloat)progress
......@@ -543,6 +554,7 @@ static const CGFloat kFUSShowTimeTopVipHeight = 14.0;
[self.vipIconView mas_updateConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(0);
}];
[self fus_updateTicketIconLeadingConstraintWithVipVisible:NO];
self.lastNewTicketCount = 0;
self.ticketIconView.hidden = YES;
self.showTimeNewTicketLabel.hidden = YES;
......@@ -568,6 +580,7 @@ static const CGFloat kFUSShowTimeTopVipHeight = 14.0;
}
BOOL isSVIP = (inVip == 1);
BOOL hasVisibleVipIcon = NO;
if (isSVIP) {
NSInteger levelValue = giftUserModel.level.integerValue;
if (levelValue <= 0) {
......@@ -585,6 +598,7 @@ static const CGFloat kFUSShowTimeTopVipHeight = 14.0;
[self.vipIconView mas_updateConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(vipWidth);
}];
hasVisibleVipIcon = !self.vipIconView.hidden;
} else {
self.vipIconView.image = nil;
self.vipIconView.hidden = YES;
......@@ -592,6 +606,7 @@ static const CGFloat kFUSShowTimeTopVipHeight = 14.0;
make.width.mas_equalTo(0);
}];
}
[self fus_updateTicketIconLeadingConstraintWithVipVisible:hasVisibleVipIcon];
if (giftUserModel.face.length > 0) {
[self.avatarView setWebImageWithSubURLString:giftUserModel.face placeholder:nil];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveShowTimePopView.m
......@@ -67,10 +67,7 @@ static const NSInteger kFUSShowTimeTicketMax = 50;
- (instancetype)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
self.ticketMin = kFUSShowTimeTicketMin;
self.ticketMax = kFUSShowTimeTicketMax;
self.ticketCount = self.ticketMin;
self.bgBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.bgBtn.frame = self.bounds;
self.bgBtn.backgroundColor = [UIColor colorWithWhite:0 alpha:0.35];
......@@ -401,12 +398,7 @@ static const NSInteger kFUSShowTimeTicketMax = 50;
- (void)fus_updateWithTicketShowConfig:(nullable FUSRoomTicketShowConfig *)config {
NSInteger min = config.collectTicketMin.integerValue;
NSInteger max = config.collectTicketMax.integerValue;
if (min <= 0) {
min = kFUSShowTimeTicketMin;
}
if (max <= 0) {
max = kFUSShowTimeTicketMax;
}
if (max < min) {
max = min;
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/ShowTimeAudienceEntry/FUSLiveShowTimeAudienceEntryMainView.h
......@@ -14,6 +14,8 @@ typedef NS_ENUM(NSInteger, FUSLiveShowTimeAudienceEntryMainViewAction) {
FUSLiveShowTimeAudienceEntryMainViewActionNotice = 2,
/// 点击票券档位（仅改变选择，不直接发起业务）
FUSLiveShowTimeAudienceEntryMainViewActionSelectTicketOption = 3,
/// 点击主播头像
FUSLiveShowTimeAudienceEntryMainViewActionAvatar = 4,
};
/// 票券档位字典 Key：票数文案（示例：x1 / x10 / x5）
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/ShowTimeAudienceEntry/FUSLiveShowTimeAudienceEntryMainView.m
......@@ -512,6 +512,7 @@ NSString * const FUSLiveShowTimeAudienceEntryTicketOptionImageNameTextKey = @"im
self.anchorAvatarView.faceImageView.layer.cornerRadius = 27;
self.anchorAvatarView.faceImageView.layer.masksToBounds = YES;
self.anchorAvatarView.faceImageView.contentMode = UIViewContentModeScaleAspectFill;
self.anchorAvatarView.userInteractionEnabled = YES;
[self.cardView addSubview:self.anchorAvatarView];
self.mainTitleLabel = [[CBAutoScrollLabel alloc] initWithFrame:CGRectZero];
......@@ -610,6 +611,10 @@ NSString * const FUSLiveShowTimeAudienceEntryTicketOptionImageNameTextKey = @"im
[self.closeBtn addTarget:self action:@selector(fus_onTapClose) forControlEvents:UIControlEventTouchUpInside];
[self.enterButton addTarget:self action:@selector(fus_onTapEnter) forControlEvents:UIControlEventTouchUpInside];
[self.noticeButton addTarget:self action:@selector(fus_onTapNotice) forControlEvents:UIControlEventTouchUpInside];
/// 头像点击仅对外抛出事件，保持 View 只负责展示与交互分发。
UITapGestureRecognizer *avatarTapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(fus_onTapAvatar)];
[self.anchorAvatarView addGestureRecognizer:avatarTapGesture];
__weak typeof(self) weakSelf = self;
......@@ -659,4 +664,10 @@ NSString * const FUSLiveShowTimeAudienceEntryTicketOptionImageNameTextKey = @"im
if (self.actionHandler) self.actionHandler(FUSLiveShowTimeAudienceEntryMainViewActionNotice, self.selectedOptionIndex);
}
- (void)fus_onTapAvatar {
if (self.actionHandler) {
self.actionHandler(FUSLiveShowTimeAudienceEntryMainViewActionAvatar, self.selectedOptionIndex);
}
}
@end
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PayRoom/EntryMain/FUSPayRoomEntryMainView.h
......@@ -29,6 +29,8 @@ typedef NS_ENUM(NSInteger, FUSPayRoomEntryMainViewAction) {
FUSPayRoomEntryMainViewActionPrimary = 1,
/// 点击“试看xxS”按钮
FUSPayRoomEntryMainViewActionTrial = 2,
/// 点击主播头像
FUSPayRoomEntryMainViewActionAvatar = 3,
};
/// 付费房入口页的展示数据
......@@ -78,7 +80,7 @@ typedef NS_ENUM(NSInteger, FUSPayRoomEntryMainViewAction) {
/// 当前展示数据（更新后会自动刷新 UI）
@property (nonatomic, strong, readonly) FUSPayRoomEntryMainViewModel *viewModel;
/// 用户交互回调（主按钮/试看/关闭）
/// 用户交互回调（主按钮/试看/关闭/头像）
@property (nonatomic, copy, nullable) void (^actionHandler)(FUSPayRoomEntryMainViewAction action);
/// 在指定父视图上显示（默认带渐入动画）
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PayRoom/EntryMain/FUSPayRoomEntryMainView.m
......@@ -208,6 +208,7 @@ static NSInteger const kFUSPayRoomEntryMainViewTag = 90917003;
self.anchorAvatarView.faceImageView.layer.cornerRadius = 36;
self.anchorAvatarView.faceImageView.layer.masksToBounds = YES;
self.anchorAvatarView.faceImageView.contentMode = UIViewContentModeScaleAspectFill;
self.anchorAvatarView.userInteractionEnabled = YES;
[self.cardView addSubview:self.anchorAvatarView];
self.anchorNameLabel = [[UILabel alloc] initWithFrame:CGRectZero];
......@@ -327,6 +328,10 @@ static NSInteger const kFUSPayRoomEntryMainViewTag = 90917003;
[self.closeBtn addTarget:self action:@selector(fus_onTapClose) forControlEvents:UIControlEventTouchUpInside];
[self.primaryButton addTarget:self action:@selector(fus_onTapPrimary) forControlEvents:UIControlEventTouchUpInside];
[self.trialButton addTarget:self action:@selector(fus_onTapTrial) forControlEvents:UIControlEventTouchUpInside];
/// 头像点击只分发用户意图，具体跳转由外部统一处理，避免 View 直接耦合路由层。
UITapGestureRecognizer *avatarTapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(fus_onTapAvatar)];
[self.anchorAvatarView addGestureRecognizer:avatarTapGesture];
}
#pragma mark - Private: Data -> UI
......@@ -514,4 +519,10 @@ static NSInteger const kFUSPayRoomEntryMainViewTag = 90917003;
}
}
- (void)fus_onTapAvatar {
if (self.actionHandler) {
self.actionHandler(FUSPayRoomEntryMainViewActionAvatar);
}
}
@end
Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/NewsFeed/fus_share_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "分享@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "分享@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Controller/FUSForgetPasswordViewController.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_0" orientation="portrait" appearance="light"/>
<dependencies>
<deployment version="4096" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -48,19 +48,19 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KnH-dZ-MiC">
<rect key="frame" x="28" y="129" width="334" height="290"/>
<rect key="frame" x="28" y="176" width="334" height="290"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LGY-bo-hFu">
<rect key="frame" x="0.0" y="0.0" width="334" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="中国" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CP9-xL-T5W">
<rect key="frame" x="92.333333333333329" y="0.0" width="209.66666666666669" height="50"/>
<rect key="frame" x="90.666666666666671" y="0.0" width="211.33333333333331" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="trailing" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zcC-VD-5LX">
<rect key="frame" x="92.333333333333329" y="0.0" width="236.66666666666669" height="50"/>
<rect key="frame" x="90.666666666666671" y="0.0" width="238.33333333333331" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<inset key="titleEdgeInsets" minX="0.0" minY="0.0" maxX="30" maxY="0.0"/>
<state key="normal">
......@@ -78,7 +78,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="国家/地区" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="svJ-c3-1xh">
<rect key="frame" x="15" y="0.0" width="69.333333333333329" height="50"/>
<rect key="frame" x="15" y="0.0" width="67.666666666666671" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
......@@ -334,7 +334,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mu6-0F-Ra2" customClass="FUSStyleButton">
<rect key="frame" x="28" y="449" width="334" height="50"/>
<rect key="frame" x="28" y="496" width="334" height="50"/>
<color key="backgroundColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="CKZ-Ni-dun"/>
......@@ -350,8 +350,8 @@
<action selector="onEnterButtonAction:" destination="-1" eventType="touchUpInside" id="ew3-8z-Qg0"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bjh-BJ-PaM">
<rect key="frame" x="126" y="507" width="138" height="29"/>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bjh-BJ-PaM">
<rect key="frame" x="128" y="554" width="134" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal" title="已有账号，立即登入&gt;">
<color key="titleColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -361,7 +361,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hyN-bu-Aks">
<rect key="frame" x="10" y="57" width="66" height="50"/>
<rect key="frame" x="10" y="104" width="66" height="50"/>
<constraints>
<constraint firstAttribute="width" constant="66" id="ZdA-b4-UEc"/>
<constraint firstAttribute="height" constant="50" id="wV8-x4-hdE"/>
......@@ -372,7 +372,7 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="忘记密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WGm-3a-kXE">
<rect key="frame" x="160" y="71.666666666666671" width="70" height="21"/>
<rect key="frame" x="161.33333333333334" y="118.66666666666669" width="67.666666666666657" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Controller/FUSLoginViewController.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -36,22 +36,22 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0gm-6o-lzs">
<rect key="frame" x="28" y="153" width="358" height="50"/>
<rect key="frame" x="28" y="201" width="358" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="国家/地区" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ibF-2s-AJp">
<rect key="frame" x="16" y="16" width="69.5" height="18"/>
<rect key="frame" x="16" y="16" width="68" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1TB-7e-YB5">
<rect key="frame" x="93.5" y="0.0" width="235.5" height="50"/>
<rect key="frame" x="92" y="0.0" width="237" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="trailing" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AWU-GF-ELJ">
<rect key="frame" x="93.5" y="0.0" width="264.5" height="50"/>
<rect key="frame" x="92" y="0.0" width="266" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<inset key="titleEdgeInsets" minX="0.0" minY="0.0" maxX="30" maxY="0.0"/>
<state key="normal">
......@@ -108,7 +108,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ON5-2L-TmD" customClass="FUSStyleButton">
<rect key="frame" x="28" y="353" width="358" height="50"/>
<rect key="frame" x="28" y="401" width="358" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="vfK-3T-qRM"/>
</constraints>
......@@ -123,7 +123,7 @@
</connections>
</button>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GRW-vA-JOJ">
<rect key="frame" x="28" y="213" width="358" height="110"/>
<rect key="frame" x="28" y="261" width="358" height="110"/>
<subviews>
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Zvd-mN-7Vp" userLabel="imgHorLine0">
<rect key="frame" x="0.0" y="0.0" width="358" height="0.5"/>
......@@ -256,8 +256,8 @@
<constraint firstAttribute="trailing" secondItem="Kgh-Ne-4S9" secondAttribute="trailing" id="yVQ-cJ-rJn"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jn1-xj-R9m">
<rect key="frame" x="38" y="413" width="42" height="29"/>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jn1-xj-R9m">
<rect key="frame" x="38" y="461" width="41" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal" title="注册 &gt;">
<color key="titleColor" red="0.62745098039215685" green="0.62352941176470589" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -267,7 +267,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xU6-yF-gZR">
<rect key="frame" x="10" y="58" width="66" height="50"/>
<rect key="frame" x="10" y="106" width="66" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="CZT-ld-7cn"/>
<constraint firstAttribute="width" constant="66" id="eIH-1S-3v9"/>
......@@ -278,7 +278,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zhx-ic-ui2">
<rect key="frame" x="318" y="413" width="58" height="29"/>
<rect key="frame" x="320" y="461" width="56" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal" title="忘记密码">
<color key="titleColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
......@@ -288,7 +288,7 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="登录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qZC-7f-Gkm">
<rect key="frame" x="189.5" y="72.5" width="35" height="21"/>
<rect key="frame" x="190" y="120.5" width="34" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/FUSNewsFeedDetaiIBottomView.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -20,7 +20,7 @@
<constraints>
<constraint firstAttribute="width" secondItem="KdM-kO-zED" secondAttribute="height" multiplier="5:5" id="5JW-qm-R2I"/>
</constraints>
<state key="normal" image="fus_home_navi_share_icon"/>
<state key="normal" image="fus_share_icon"/>
<connections>
<action selector="onClickShareBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="RxD-cD-gHO"/>
</connections>
......@@ -121,7 +121,7 @@
</view>
</objects>
<resources>
<image name="fus_home_navi_share_icon" width="18.5" height="16.5"/>
<image name="fus_share_icon" width="33" height="33"/>
<image name="news_feed_big_like_black" width="24" height="24"/>
<image name="newsfeed_icon_bottom_emotion" width="26" height="26"/>
</resources>
......
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