Skip to content

pidan / FuSiLive

Go to a project
Commit fff1ad7a by ludi
Options

1.调整弹出窗。 

2.增加logo。
3.调整每日签到。
4.修复选择图片。
5.调整首页追踪逻辑。
6.调整私聊一些颜色与样式。
7.重构违规下播页面。
parent fb44b850
Inline Side-by-side
Showing with 496 additions and 230 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/common_empty_default_300_300.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "common_empty_default_300_300@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/UIView/UIView+Screen.h
......@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
+ (CGSize)fus_screenSize;
+ (CGFloat)fus_screenH;
+ (CGFloat)fus_screenW;
+(BOOL)fus_isFullScreen;
+ (CGFloat)fus_SafeBottom;
+ (CGFloat)fus_SafeTop;
+ (CGFloat)fus_StatusBarHeight;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/UIView/UIView+Screen.m
......@@ -26,9 +26,18 @@
+ (CGFloat)fus_screenW {
return self.fus_screenFrame.size.width;
}
/// 是否是全面屏，判断依据为屏幕宽高比是否超过16：9
+(BOOL)fus_isFullScreen{
return ([self fus_screenH] / [self fus_screenW]) > 1.9;
}
+ (CGFloat)fus_SafeBottom {
return [UIApplication sharedApplication].keyWindow.safeAreaInsets.bottom;
CGFloat bottom = [UIApplication sharedApplication].keyWindow.safeAreaInsets.bottom;
if (bottom <= 0 && [self fus_isFullScreen]) {
bottom = 34;
}
return bottom;
// return [UIApplication sharedApplication].keyWindow.safeAreaInsets.bottom;
}
+ (CGFloat)fus_SafeTop {
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/ActionSheet/SLActionSheet.m
......@@ -99,7 +99,8 @@
_delegate = delegate;
_separatorColor = [[UIColor whiteColor] colorWithAlphaComponent:0.09];
// _separatorColor = [[UIColor whiteColor] colorWithAlphaComponent:0.09];
_separatorColor = [[UIColor blackColor] colorWithAlphaComponent:0.1];
_otherTitleColor = [UIColor colorWithHex:@"#58DBD7"];
UIView *shadowView = [[UIView alloc] initWithFrame:frame];
......@@ -144,7 +145,8 @@
[underPart addConstraint:NSLayoutAttributeHeight equalTo:nil offset:buttonHeight];
// cancel button
cancelBtn.tag = 0;
_cancelBackgroundColor = [UIColor colorWithHex:@"#191923"];
// _cancelBackgroundColor = [UIColor colorWithHex:@"#191923"];
_cancelBackgroundColor = [UIColor whiteColor];
if (_cancelBackgroundColor) {
[cancelBtn setBackgroundColor:_cancelBackgroundColor];
} else {
......@@ -315,13 +317,15 @@
[otherBtn setBackgroundColor:[UIColor whiteColor]];
[otherBtns addObject:otherBtn];
_otherTitleColor = [UIColor whiteColor];
// _otherTitleColor = [UIColor whiteColor];
_otherTitleColor = [UIColor blackColor];
if (_otherTitleColor) {
[otherBtn setTitleColor:_otherTitleColor forState:UIControlStateNormal];
} else {
[otherBtn setTitleColor:DefaultOtherBtnTextColor forState:UIControlStateNormal];
}
_otherBackgroundColor = [UIColor colorWithHex:@"#191923"];
// _otherBackgroundColor = [UIColor colorWithHex:@"#191923"];
_otherBackgroundColor = [UIColor whiteColor];
if (_otherBackgroundColor) {
[otherBtn setBackgroundColor:_otherBackgroundColor];
} else {
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSRotationImageCropper/LDImageCropperView/LDImageCropperView.m
......@@ -99,22 +99,22 @@
_cropperView = [[UIView alloc] initWithFrame:_cropRect];
_cropperView.backgroundColor = [UIColor clearColor];
_cropperView.layer.borderColor = [UIColor whiteColor].CGColor;
_cropperView.layer.borderWidth = 1.5;
_cropperView.layer.borderWidth = 1;
[self addSubview:_imgView];
[self addSubview:_cropperView];
[self setupGestureRecognizer];
_topView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, [[UIScreen mainScreen] bounds].size.width, _cropRect.origin.y)];
_topView.backgroundColor = [UIColor clearColor];
_topView.alpha = 0.7;
_topView.backgroundColor = [UIColor blackColor];
_topView.alpha = 0.3;
_topView.userInteractionEnabled = NO;
[self addSubview:_topView];
_bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, _cropRect.origin.y + _cropRect.size.height, [[UIScreen mainScreen] bounds].size.width, ([[UIScreen mainScreen] bounds].size.height - 64 - _cropRect.size.height)/2)];
_bottomView.backgroundColor = [UIColor clearColor];
_bottomView.alpha = 0.7;
_bottomView.backgroundColor = [UIColor blackColor];
_bottomView.alpha = 0.3;
_bottomView.userInteractionEnabled = NO;
[self addSubview:_bottomView];
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Bundle/FUSFoundationBundle.m
......@@ -106,7 +106,7 @@
+ (UIImage *)fus_emptyImg{
//TODO: 补上空空如也图
return [self fus_ImageNamed:@""];
return [self fus_ImageNamed:@"common_empty_default_300_300"];
}
/// 弹窗背景图
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.h
......@@ -20,6 +20,7 @@
+ (UIColor *)fus_listBGPressColor;
+ (UIColor *)fus_lineColor;
+(UIColor *)fus_separatorLineColor;
+ (UIColor *)fus_appMainColor;
+ (UIColor *)fus_appSubColor;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.m
......@@ -35,6 +35,10 @@
return [UIColor colorWithHex:@"#dddddd"];
}
+(UIColor *)fus_separatorLineColor{
return [[UIColor blackColor] colorWithAlphaComponent:0.09];
}
+ (UIColor *)fus_appMainColor {
return [UIColor colorWithHex:@"#00F7FF"];
}
......@@ -53,7 +57,7 @@
}
+ (UIColor *)fus_themeColor{
return [self colorWithHex:@"##00F7FF"];
return [self colorWithHex:@"#00F7FF"];
}
+ (UIColor *)fus_themeThirdColor{
......
FuSiLive.xcodeproj/project.pbxproj
......@@ -51,6 +51,7 @@
00A44A5D2C2BC14E003FDF44 /* FUSSingleLiveRecordV2TableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A44A5C2C2BC14E003FDF44 /* FUSSingleLiveRecordV2TableViewCell.m */; };
00A44A602C2C04FC003FDF44 /* FUSChatIntimacyV2View.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A44A5F2C2C04FC003FDF44 /* FUSChatIntimacyV2View.m */; };
00A44A632C2C4345003FDF44 /* FUSUserTradeRemindModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A44A622C2C4345003FDF44 /* FUSUserTradeRemindModel.m */; };
00A6F0982C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A6F0972C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m */; };
00B48E072C213CCD001E4872 /* FUSSettingInitDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00B48E062C213CCD001E4872 /* FUSSettingInitDataModel.m */; };
BE02D73D2C255ECA006FD462 /* FUSLiveFunctionViewHalfWebManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE02D73C2C255ECA006FD462 /* FUSLiveFunctionViewHalfWebManager.swift */; };
BE02EA292C21C3360092264C /* VELPictureInPictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE02EA282C21C3360092264C /* VELPictureInPictureController.m */; };
......@@ -1483,6 +1484,8 @@
00A44A5F2C2C04FC003FDF44 /* FUSChatIntimacyV2View.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSChatIntimacyV2View.m; sourceTree = "<group>"; };
00A44A612C2C4345003FDF44 /* FUSUserTradeRemindModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSUserTradeRemindModel.h; sourceTree = "<group>"; };
00A44A622C2C4345003FDF44 /* FUSUserTradeRemindModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSUserTradeRemindModel.m; sourceTree = "<group>"; };
00A6F0962C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSVideoOfficialEndV2View.h; sourceTree = "<group>"; };
00A6F0972C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSVideoOfficialEndV2View.m; sourceTree = "<group>"; };
00B48E052C213CCD001E4872 /* FUSSettingInitDataModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSSettingInitDataModel.h; sourceTree = "<group>"; };
00B48E062C213CCD001E4872 /* FUSSettingInitDataModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSSettingInitDataModel.m; sourceTree = "<group>"; };
00B8649F2C2AF52B0061F6FF /* FuSiLive.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FuSiLive.entitlements; sourceTree = "<group>"; };
......@@ -6031,6 +6034,8 @@
BED0F3802C0C49C80017B285 /* FUSVideoOfficialEndView.h */,
BED0F3812C0C49C80017B285 /* FUSVideoOfficialEndView.m */,
BED0F3822C0C49C80017B285 /* FUSVideoOfficialEndView.xib */,
00A6F0962C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.h */,
00A6F0972C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m */,
);
path = EndView;
sourceTree = "<group>";
......@@ -10052,6 +10057,7 @@
BED0F99C2C0C49C90017B285 /* FUSRectLayer.m in Sources */,
BED0FAAA2C0C49C90017B285 /* FUSPKMainStartView.m in Sources */,
BE5EF43C2C2019CD00C0F018 /* FUSLiveContributeSegmentView.m in Sources */,
00A6F0982C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m in Sources */,
BED0FC572C0C49CA0017B285 /* FUSMyZoneLiveTimeCell.m in Sources */,
BED0FB412C0C49CA0017B285 /* CustomIOSAlertView.m in Sources */,
BE5EF4322C1FEB7F00C0F018 /* FUSContributeListModel.m in Sources */,
......
FuSiLive/Assets.xcassets/AppIcon.appiconset/Contents.json
{
"images": [
{
"size": "20x20",
"idiom": "iphone",
"filename": "icon-20@2x.png",
"scale": "2x"
},
{
"size": "20x20",
"idiom": "iphone",
"filename": "icon-20@3x.png",
"scale": "3x"
},
{
"size": "29x29",
"idiom": "iphone",
"filename": "icon-29.png",
"scale": "1x"
},
{
"size": "29x29",
"idiom": "iphone",
"filename": "icon-29@2x.png",
"scale": "2x"
},
{
"size": "29x29",
"idiom": "iphone",
"filename": "icon-29@3x.png",
"scale": "3x"
},
{
"size": "40x40",
"idiom": "iphone",
"filename": "icon-40@2x.png",
"scale": "2x"
},
{
"size": "40x40",
"idiom": "iphone",
"filename": "icon-40@3x.png",
"scale": "3x"
},
{
"size": "60x60",
"idiom": "iphone",
"filename": "icon-60@2x.png",
"scale": "2x"
},
{
"size": "60x60",
"idiom": "iphone",
"filename": "icon-60@3x.png",
"scale": "3x"
},
{
"size": "20x20",
"idiom": "ipad",
"filename": "icon-20-ipad.png",
"scale": "1x"
},
{
"size": "20x20",
"idiom": "ipad",
"filename": "icon-20@2x-ipad.png",
"scale": "2x"
},
{
"size": "29x29",
"idiom": "ipad",
"filename": "icon-29-ipad.png",
"scale": "1x"
},
{
"size": "29x29",
"idiom": "ipad",
"filename": "icon-29@2x-ipad.png",
"scale": "2x"
},
{
"size": "40x40",
"idiom": "ipad",
"filename": "icon-40.png",
"scale": "1x"
},
{
"size": "40x40",
"idiom": "ipad",
"filename": "icon-40@2x.png",
"scale": "2x"
},
{
"size": "76x76",
"idiom": "ipad",
"filename": "icon-76.png",
"scale": "1x"
},
{
"size": "76x76",
"idiom": "ipad",
"filename": "icon-76@2x.png",
"scale": "2x"
},
{
"size": "83.5x83.5",
"idiom": "ipad",
"filename": "icon-83.5@2x.png",
"scale": "2x"
},
{
"size": "1024x1024",
"idiom": "ios-marketing",
"filename": "icon-1024.png",
"scale": "1x"
}
],
"info": {
"version": 1,
"author": "icon.wuruihong.com"
"images" : [
{
"filename" : "icon-20@2x-ipad 1.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "icon-20@3x.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
"filename" : "icon-29.png",
"idiom" : "iphone",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "icon-29@2x-ipad 1.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "icon-29@3x.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"filename" : "icon-40@2x 1.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "icon-40@3x.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
"filename" : "icon-60@2x.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"filename" : "icon-60@3x.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"filename" : "icon-20-ipad.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"filename" : "icon-20@2x-ipad.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "icon-29 1.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "icon-29@2x-ipad.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "icon-40.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
"filename" : "icon-40@2x.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "icon-76.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
"filename" : "icon-76@2x.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"filename" : "icon-83.5@2x.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"filename" : "icon-1024.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
}
\ No newline at end of file
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-1024.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-1024.png

112 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-1024.png

53.8 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-1024.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-1024.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-1024.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-1024.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png

695 Bytes | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png

1.55 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png

2.82 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png

3.4 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29.png

1.13 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29.png

1.93 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png

4.63 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png

5.01 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40.png

1.66 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40.png

2.4 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png

4.16 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png

4.58 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png

7.1 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png

7.14 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png

7.1 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png

7.14 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png

12.2 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png

11.7 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76.png

3.88 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76.png

4.35 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png

9.74 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png

9.51 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
  • 2-up
  • Swipe
  • Onion skin
FuSiLive/Classes/BaoFang/DailyCheckIn/View/FUSSingleDailyCheckInView.m
......@@ -17,6 +17,9 @@
@interface FUSSingleDailyCheckInView ()
@property (strong, nonatomic) IBOutlet UIView *checkInView;
/// 内容背景
@property (weak, nonatomic) IBOutlet UIView *contentBgView;
/// 标题
@property (strong, nonatomic) IBOutlet UILabel *titleLabel;
......@@ -52,6 +55,11 @@
self.checkInSuccessBgView.alpha = 0;
self.checkInSuccessBgView.hidden = YES;
self.titleLabel.textColor = [UIColor fus_textColorRich];
self.contentBgView.backgroundColor = [UIColor whiteColor];
self.contentBgView.layer.cornerRadius = 14;
NSMutableArray *imageArr = [NSMutableArray array];
[imageArr removeAllObjects];
for (int i = 1; i < 35; i++) {
......@@ -67,15 +75,16 @@
self.checkInSuccessAnimationImageView.animationRepeatCount = 1;
self.checkInSuccessAnimationImageView.image = [UIImage imageNamed:@"CheckInSuccessAnimation_34"];
CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"];
//默认是顺时针效果，若将fromValue和toValue的值互换，则为逆时针效果
animation.fromValue = [NSNumber numberWithFloat:0.f];
animation.toValue = [NSNumber numberWithFloat: M_PI *2];
animation.duration = 4;
animation.autoreverses = NO;
animation.fillMode = kCAFillModeForwards;
animation.repeatCount = MAXFLOAT; //如果这里想设置成一直自旋转，可以设置为MAXFLOAT，否则设置具体的数值则代表执行多少次
[self.rotationLightImageView.layer addAnimation:animation forKey:nil];
// CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"];
// //默认是顺时针效果，若将fromValue和toValue的值互换，则为逆时针效果
// animation.fromValue = [NSNumber numberWithFloat:0.f];
// animation.toValue = [NSNumber numberWithFloat: M_PI *2];
// animation.duration = 4;
// animation.autoreverses = NO;
// animation.fillMode = kCAFillModeForwards;
// animation.repeatCount = MAXFLOAT; //如果这里想设置成一直自旋转，可以设置为MAXFLOAT，否则设置具体的数值则代表执行多少次
// [self.rotationLightImageView.layer addAnimation:animation forKey:nil];
self.rotationLightImageView.hidden = YES;
}
// 构造方法
......@@ -93,12 +102,12 @@
NSString *count = [NSString stringWithFormat:@"+%@",checkInModel.award];
subtitle = [subtitle stringByReplacingOccurrencesOfString:@"{0}" withString:count];
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:subtitle attributes:@{NSFontAttributeName:[UIFont fus_themeFont:14],NSForegroundColorAttributeName:[UIColor whiteColor]}];
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:subtitle attributes:@{NSFontAttributeName:[UIFont fus_themeFont:14],NSForegroundColorAttributeName:[UIColor fus_textColorMedium]}];
NSRange countRange = [subtitle rangeOfString:count];
[attr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHex:@"#02F2F2"] range:countRange];
self.subtitleLabel.attributedText = attr;
self.checkInBtn.style = FUSButtonStyleBlueBorder;
self.checkInBtn.style = FUSButtonStyleBlue;
[self.iconImageView setWebImageWithSubURLString:checkInModel.icon placeholder:[UIImage imageNamed:@"checkIn_placeholder"]];
if (checkInModel.toDayState.integerValue) {
......
FuSiLive/Classes/BaoFang/DailyCheckIn/View/FUSSingleDailyCheckInView.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -62,7 +62,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6ga-LE-F7L">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="daily_check_in_bg" translatesAutoresizingMaskIntoConstraints="NO" id="SQ8-aL-IkM">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="SQ8-aL-IkM">
<rect key="frame" x="61" y="274.5" width="292" height="347"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="B2Q-Kv-Z7j">
......@@ -141,9 +141,11 @@
<constraints>
<constraint firstItem="SQ8-aL-IkM" firstAttribute="centerY" secondItem="6ga-LE-F7L" secondAttribute="centerY" id="8sN-wd-hOD"/>
<constraint firstItem="B2Q-Kv-Z7j" firstAttribute="centerY" secondItem="6ga-LE-F7L" secondAttribute="centerY" id="FOk-Ts-UgB"/>
<constraint firstItem="SQ8-aL-IkM" firstAttribute="height" secondItem="B2Q-Kv-Z7j" secondAttribute="height" multiplier="1.06769" id="Rpw-PV-PUM"/>
<constraint firstItem="ZKw-mW-Goa" firstAttribute="top" secondItem="SQ8-aL-IkM" secondAttribute="bottom" constant="32" id="bGo-eB-8nm"/>
<constraint firstItem="ZKw-mW-Goa" firstAttribute="centerX" secondItem="6ga-LE-F7L" secondAttribute="centerX" id="kxb-c9-Ddj"/>
<constraint firstItem="SQ8-aL-IkM" firstAttribute="centerX" secondItem="6ga-LE-F7L" secondAttribute="centerX" id="op1-k5-uAU"/>
<constraint firstItem="SQ8-aL-IkM" firstAttribute="width" secondItem="B2Q-Kv-Z7j" secondAttribute="width" multiplier="1.08148" id="t5Q-2E-hvt"/>
<constraint firstItem="B2Q-Kv-Z7j" firstAttribute="centerX" secondItem="6ga-LE-F7L" secondAttribute="centerX" id="wyf-xl-Rmw"/>
</constraints>
</view>
......@@ -165,6 +167,7 @@
<outlet property="checkInSuccessAnimationImageView" destination="hUu-Be-4aY" id="uev-wC-oW1"/>
<outlet property="checkInSuccessBgView" destination="lmg-0l-jri" id="nRJ-V0-NBH"/>
<outlet property="checkInView" destination="6ga-LE-F7L" id="w3Z-JH-07V"/>
<outlet property="contentBgView" destination="B2Q-Kv-Z7j" id="pVQ-l8-Dwe"/>
<outlet property="getAwardDesLabel" destination="65T-h4-B1H" id="OBf-xm-lpg"/>
<outlet property="getAwardImageView" destination="llF-5Q-IPF" id="iXP-hX-5aT"/>
<outlet property="iconImageView" destination="xBB-gf-vw2" id="kAK-xO-Hns"/>
......@@ -178,7 +181,6 @@
<resources>
<image name="OBS_close" width="26" height="26"/>
<image name="checkIn_placeholder" width="27" height="27"/>
<image name="daily_check_in_bg" width="292" height="347"/>
<image name="daily_check_inrotation_lightimg" width="186.66667175292969" height="186.66667175292969"/>
</resources>
</document>
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangHttpHelper.m
......@@ -49,7 +49,7 @@
[params setObject:@(pageSize) forKey:@"pageSize"];
[params setObject:@(page) forKey:@"page"];
if (ENABLE_HTTP_DEBUG) {
if ([FUSConfig sharedInstanced].devConfigs.enableHttpDebug) {
FUSLogInfo(@"请求参数%@",params);
}
......@@ -120,7 +120,7 @@
params[@"cityCode"] = 0;
params[@"sex"] = @(sex);
if (ENABLE_HTTP_DEBUG) {
if ([FUSConfig sharedInstanced].devConfigs.enableHttpDebug) {
FUSLogInfo(@"请求参数%@",params);
}
......@@ -176,7 +176,7 @@
[params setObject:@(page) forKey:@"page"];
[params setObject:uid forKey:@"userId"];
if (ENABLE_HTTP_DEBUG) {
if ([FUSConfig sharedInstanced].devConfigs.enableHttpDebug) {
FUSLogInfo(@"请求参数%@",params);
}
......@@ -229,7 +229,7 @@
params[@"page"] = @(page);
params[@"dataKey"] = dataKey;
if (ENABLE_HTTP_DEBUG) {
if ([FUSConfig sharedInstanced].devConfigs.enableHttpDebug) {
FUSLogInfo(@"=====>>>请求参数：%@",params);
}
......@@ -348,7 +348,7 @@
params[@"page"] = @(page);
params[@"countryCode"] = countryCode;
if (ENABLE_HTTP_DEBUG) {
if ([FUSConfig sharedInstanced].devConfigs.enableHttpDebug) {
FUSLogInfo(@"=====>>>请求参数：%@",params);
}
......@@ -404,7 +404,7 @@
params[@"locat"] = location;
params[@"filterSex"] = @(sex);
if (ENABLE_HTTP_DEBUG) {
if ([FUSConfig sharedInstanced].devConfigs.enableHttpDebug) {
FUSLogInfo(@"=====>>>请求参数：%@",params);
}
......
FuSiLive/Classes/FUSDefine.h
......@@ -32,10 +32,6 @@
// 是否打开测试代码
#define TEST_CODE 1
// 关闭/打开打印信息
#define ENABLE_SOCKET_DEBUG 0
#define ENABLE_HTTP_DEBUG 1
// 是否允许进行方法交换避免崩溃
#define ENABLE_CRASH 0
......
FuSiLive/Classes/Foundation/Controller/FUSImagePicker/Controller/FUSPhotoViewController.m
......@@ -264,12 +264,13 @@
confirmBtn.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
[confirmBtn addTarget:self action:@selector(onClickConfirmButton:) forControlEvents:UIControlEventTouchUpInside];
[confirmBtn setTitle:self.confirmBtnTitle forState:UIControlStateNormal];
[confirmBtn setTitle:self.confirmBtnTitle forState:UIControlStateDisabled];
confirmBtn.titleLabel.font = [UIFont fus_themeFont:15];
[confirmBtn sizeToFit];
confirmBtn.width = confirmBtn.width + 50;
confirmBtn.frame = CGRectMake(0, 0, confirmBtn.width, confirmBtn.frame.size.height + 4);
[confirmBtn setTitleColor:self.confirmBtnColor forState:UIControlStateNormal];
[confirmBtn setTitleColor:[self.confirmBtnColor colorWithAlphaComponent:.3] forState:UIControlStateDisabled];
// [confirmBtn setTitleColor:[self.confirmBtnColor colorWithAlphaComponent:.3] forState:UIControlStateDisabled];
self.confirmBtn = confirmBtn;
confirmBtn.style = FUSButtonStyleBlue;
UIBarButtonItem *confirmBarItem = [[UIBarButtonItem alloc] initWithCustomView:confirmBtn];
......@@ -387,7 +388,7 @@
confirmBtn.frame = CGRectMake(bottomView.bounds.size.width - 12 - confirmBtn.width, 0, confirmBtn.width, confirmBtn.frame.size.height + 4);
confirmBtn.center = CGPointMake(confirmBtn.center.x, BOTTOM_VIEW_HEIGHT / 2.0);
[confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[confirmBtn setTitleColor:[[UIColor whiteColor] colorWithAlphaComponent:.3] forState:UIControlStateDisabled];
// [confirmBtn setTitleColor:[[UIColor whiteColor] colorWithAlphaComponent:.6] forState:UIControlStateDisabled];
self.confirmBtn = confirmBtn;
confirmBtn.style = FUSButtonStyleBlue;
[bottomView addSubview:confirmBtn];
......
FuSiLive/Classes/Foundation/Controller/FUSImagePicker/Controller/NEW_FUSFullImageViewController.m
......@@ -162,7 +162,7 @@
if (@available(iOS 11.0, *)) {
bottomHeight += UIView.fus_SafeBottom;
}
self.bottomView.frame = CGRectMake(0, self.view.height - BOTTOM_VIEW_HEIGHT, self.view.width, BOTTOM_VIEW_HEIGHT);
self.bottomView.frame = CGRectMake(0, self.view.height - bottomHeight, self.view.width, bottomHeight);
}
}
......@@ -278,14 +278,14 @@
// 确认按钮
UIButton *confirmTilteBtn = [UIButton buttonWithType:UIButtonTypeCustom];
confirmTilteBtn.frame = CGRectMake(bottomView.bounds.size.width - 12 - 60, 0, 60, 30);
confirmTilteBtn.frame = CGRectMake(bottomView.bounds.size.width - 12 - 60, 0, 60, bottomView.height);
confirmTilteBtn.center = CGPointMake(confirmTilteBtn.center.x, BOTTOM_VIEW_HEIGHT / 2.0);
confirmTilteBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
confirmTilteBtn.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
[confirmTilteBtn addTarget:self action:@selector(onClickConfirmButton:) forControlEvents:UIControlEventTouchUpInside];
[confirmTilteBtn setTitle:self.confirmBtnTitle forState:UIControlStateNormal];
[confirmTilteBtn setTitleColor:self.confirmBtnColor forState:UIControlStateNormal];
[confirmTilteBtn setTitleColor:[self.confirmBtnColor colorWithAlphaComponent:0.3] forState:UIControlStateDisabled];
// [confirmTilteBtn setTitleColor:[self.confirmBtnColor colorWithAlphaComponent:0.3] forState:UIControlStateDisabled];
confirmTilteBtn.titleLabel.font = [UIFont fus_themeFont:16];
[bottomView addSubview:confirmTilteBtn];
[confirmTilteBtn sizeToFit];
......@@ -704,7 +704,7 @@
}];
}else{
[UIView animateWithDuration:.35 animations:^{
self.bottomView.frame = CGRectMake(_bottomView.frame.origin.x, [[UIScreen mainScreen]bounds].size.height - BOTTOM_VIEW_HEIGHT, _bottomView.frame.size.width, _bottomView.frame.size.height);
self.bottomView.frame = CGRectMake(_bottomView.frame.origin.x, [[UIScreen mainScreen]bounds].size.height - _bottomView.frame.size.height, _bottomView.frame.size.width, _bottomView.frame.size.height);
}];
}
......
FuSiLive/Classes/Foundation/Socket/SocketMessage/FUSSocketMessageCenter.m
......@@ -304,7 +304,7 @@ typedef void(^ConnectBlock)(BOOL isSuccess); // 连接回调
}
// 打印消息
if (ENABLE_SOCKET_DEBUG && messageModel.cid) FUSLogInfo(@"--->发送消息:\n%@", [messageModel fus_getDictionary]);
if ([FUSConfig sharedInstanced].devConfigs.enableSocketDebug && messageModel.cid) FUSLogInfo(@"--->发送消息:\n%@", [messageModel fus_getDictionary]);
// 将消息添加到消息队列中
[mSocketQueue fus_addSendMessageWithModel:messageModel];
......@@ -368,7 +368,7 @@ typedef void(^ConnectBlock)(BOOL isSuccess); // 连接回调
{
// 将消息添加到消息队列
[mSocketQueue fus_addAcceptMessageWithData:data];
if (ENABLE_SOCKET_DEBUG) FUSLogInfo(@"--->收到消息:socketAcceptMessageWithData\n");
if ([FUSConfig sharedInstanced].devConfigs.enableSocketDebug) FUSLogInfo(@"--->收到消息:socketAcceptMessageWithData\n");
// 检测包的完整性
if (![mSocketQueue fus_checkDataAvailable]) {
......@@ -385,7 +385,7 @@ typedef void(^ConnectBlock)(BOOL isSuccess); // 连接回调
FUSSocketMessageModel *messageModel = [mSocketQueue readAcceptMessage];
// 打印收到的消息
if (ENABLE_SOCKET_DEBUG && messageModel.cid) FUSLogInfo(@"--->收到消息:\n%@", [messageModel fus_getDictionary]);
if ([FUSConfig sharedInstanced].devConfigs.enableSocketDebug && messageModel.cid) FUSLogInfo(@"--->收到消息:\n%@", [messageModel fus_getDictionary]);
// 判断消息是否为空
if ([NSObject isNullWithObject:messageModel]) {
......@@ -412,7 +412,7 @@ typedef void(^ConnectBlock)(BOOL isSuccess); // 连接回调
// 发送消息回执
[FUSSocketMessageHelper fus_sendMessageRecept:messageModel];
if (ENABLE_SOCKET_DEBUG) FUSLogInfo(@"--->postNotificationName:%@\n",STR(messageModel.cid));
if ([FUSConfig sharedInstanced].devConfigs.enableSocketDebug) FUSLogInfo(@"--->postNotificationName:%@\n",STR(messageModel.cid));
// 发送cid通知
[[NSNotificationCenter defaultCenter] postNotificationName:STR(messageModel.cid) object:messageModel];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ShowbroadcastGuide/FUSShowBroadcastGuideAlertView.h
......@@ -13,7 +13,12 @@ NS_ASSUME_NONNULL_BEGIN
@interface FUSShowBroadcastGuideAlertView : UIView
+(void)fus_showOn:(UIView * _Nullable )onView broadcast:(FUSBaoFangAnchorModel *)model clickHandler:(void(^)(void))clickHandler;
/// 显示
/// - Parameters:
/// - onView: 显示在哪
/// - model: 传入模型
/// - clickHandler: clickType 1=确定。2=点击头像。
+(void)fus_showOn:(UIView * _Nullable )onView broadcast:(FUSBaoFangAnchorModel *)model clickHandler:(void(^)(NSInteger clickType))clickHandler;
@end
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ShowbroadcastGuide/FUSShowBroadcastGuideAlertView.m
......@@ -12,11 +12,11 @@
@interface FUSShowBroadcastGuideAlertView ()
@property (nonatomic, copy) void(^clickHandler)(void);
@property (nonatomic, copy) void(^clickHandler)(NSInteger clickType);
@property (nonatomic, strong) UIButton *tapBgbtn;
@property (nonatomic, strong) UIView *contentView;
@property (nonatomic, strong) UIImageView *avatorImageView;
@property (nonatomic, strong) UIButton *avatorImageBtn;
@property (nonatomic, strong) UILabel *nameLabel;
@property (nonatomic, strong) FUSLiveStateAnimationView *liveStateView;
......@@ -25,8 +25,7 @@
@end
@implementation FUSShowBroadcastGuideAlertView
+ (void)fus_showOn:(UIView *)onView broadcast:(FUSBaoFangAnchorModel *)model clickHandler:(void (^)(void))clickHandler{
+ (void)fus_showOn:(UIView *)onView broadcast:(FUSBaoFangAnchorModel *)model clickHandler:(void (^)(NSInteger))clickHandler{
UIView *showView = [UINavigationController fus_topViewController].view;
if (onView) {
showView = onView;
......@@ -84,18 +83,19 @@
guessDesLabel.top = logoImageView.bottom + 15;
guessDesLabel.centerX = self.contentView.width / 2.0f;
self.avatorImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, guessDesLabel.bottom + 20, 102, 102)];
self.avatorImageView.centerX = self.contentView.width / 2.0f;
self.avatorImageView.layer.cornerRadius = 102 / 2.0f;
self.avatorImageView.layer.masksToBounds = YES;
self.avatorImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.contentView addSubview:self.avatorImageView];
self.avatorImageBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.avatorImageBtn.frame = CGRectMake(0, guessDesLabel.bottom + 20, 102, 102);
self.avatorImageBtn.centerX = self.contentView.width / 2.0f;
self.avatorImageBtn.layer.cornerRadius = 102 / 2.0f;
self.avatorImageBtn.layer.masksToBounds = YES;
self.avatorImageBtn.contentMode = UIViewContentModeScaleAspectFit;
[self.contentView addSubview:self.avatorImageBtn];
self.liveStateView = [[FUSLiveStateAnimationView alloc] initWithFrame:CGRectMake(0, self.avatorImageView.top - 6, 18, 18)];
self.liveStateView = [[FUSLiveStateAnimationView alloc] initWithFrame:CGRectMake(0, self.avatorImageBtn.top - 6, 18, 18)];
[self.contentView addSubview:self.liveStateView];
self.liveStateView.right = self.avatorImageView.right;
self.liveStateView.right = self.avatorImageBtn.right;
self.nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, self.avatorImageView.bottom + 12, self.contentView.width - 20, 22)];
self.nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, self.avatorImageBtn.bottom + 12, self.contentView.width - 20, 22)];
self.nameLabel.textAlignment = NSTextAlignmentCenter;
self.nameLabel.font = [UIFont fus_themeBoldFont:20];
self.nameLabel.textColor = [UIColor fus_textColorRich];
......@@ -127,14 +127,20 @@
make.size.mas_equalTo(CGSizeMake(128, 50));
}];
[self.avatorImageBtn addTarget:self action:@selector(fus_avatorBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[okBtn addTarget:self action:@selector(fus_okButtonDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[cancelBtn addTarget:self action:@selector(fus_dismissWithAnimate) forControlEvents:UIControlEventTouchUpInside];
}
#pragma mark --- method
-(void)fus_avatorBtnDidClicked:(UIButton *)btn{
if (self.clickHandler) {
self.clickHandler(2);
}
}
-(void)fus_okButtonDidClicked:(UIButton *)btn{
if (self.clickHandler) {
self.clickHandler();
self.clickHandler(1);
}
[self fus_dismissWithAnimate];
}
......@@ -156,7 +162,7 @@
- (void)setModel:(FUSBaoFangAnchorModel *)model{
_model = model;
self.nameLabel.text = model.nickname;
[self.avatorImageView setWebImageWithSubURLString:model.face placeholder:[UIImage fus_defaultIcon]];
[self.avatorImageBtn setWebImageWithSubURLString:model.face placeholder:[UIImage fus_defaultIcon]];
if ([model.haveMC integerValue] == 1) {
self.liveStateView.hidden = NO;
[self.liveStateView startAnimating];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/FUSHomePageViewController.m
......@@ -12,6 +12,8 @@
#import "FUSMessageView.h"
#import "FUSMyView.h"
#import "FUSDefine.h"
#import "FUSBaoFangHttpHelper.h"
#import "FUSSingleDailyCheckInView.h"
// 导入通知框架
#import <UserNotifications/UserNotifications.h>
......@@ -49,6 +51,7 @@
[self fus_createHomeScrollView];
[self.view bringSubviewToFront:self.tabbarView];
[self fus_getDailyCheckInData];
}
-(void)fus_setupProperties{
......@@ -110,6 +113,41 @@
[self.contentViewList[self.tabbarView.currentIndex] fus_viewDidDisappear];
}
#pragma mark - 每日签到相关
- (void)fus_getDailyCheckInData {
if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
return;
}
[FUSBaoFangHttpHelper fus_requestTodayTaskCheckInSuccess:^(FUSCheckInModel *model) {
if (model) {
[self fus_showDailyCheckInView:model];
}
} failure:^(NSString *msg, int code) {
}];
}
- (void)fus_showDailyCheckInView:(FUSCheckInModel *)model {
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:IS_SHOWED_DAILY_CHECK];
[FUSTalkingData fus_trackEvent:EVENT_DAILY_CHECKIN label:nil parameters:nil];
FUSSingleDailyCheckInView *dailyView = [FUSSingleDailyCheckInView fus_dailyCheckInView];
dailyView.frame = UIView.fus_screenFrame;
dailyView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.66];
dailyView.checkInModel = model;
[[UIApplication sharedApplication].delegate.window.rootViewController.view addSubview:dailyView];
dailyView.dismissBlock = ^{
[[NSUserDefaults standardUserDefaults] setObject:@(NO) forKey:IS_SHOW_DAILY_CHECK];
[FUSBaoFangHttpHelper fus_updateCheckInStateSuccess:^{
} failure:^(NSString *msg, int code) {
[FUSDialogView fus_showDialog:msg];
}];
};
}
#pragma mark --- observer
-(void)fus_applicationDidBecomeActiveNotification:(NSNotification *)noti{
[self.contentViewList enumerateObjectsUsingBlock:^(FUSHomePageBaseView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
......@@ -287,16 +287,27 @@
if ([self.collectionView.mj_header isRefreshing]) {
[self.collectionView.mj_header endRefreshing];
}
BOOL isLastSelected = [self.naviView fus_isButtonSelected:FUSHomeNaviViewClickTypeFollow];
[self.naviView fus_setButton:FUSHomeNaviViewClickTypeFollow selected:type == FUSHomeViewAnchorListTypeFollow ? YES : NO];
[self.collectionView reloadData];
if (type == FUSHomeViewAnchorListTypeFollow && [NSArray isNull:self.viewModel.dataList]) {
[self.viewModel fus_switchToList:FUSHomeViewAnchorListTypeNormal];
if (self.viewModel.recommendModel != nil) {
FUSWeakSelf(weakself);
[FUSShowBroadcastGuideAlertView fus_showOn:self.parentController.view broadcast:self.viewModel.recommendModel clickHandler:^{
[weakself fus_enterRoom:weakself.viewModel.recommendModel index:0];
}];
if (isLastSelected == NO) {
//上一次是普通，然后点了追踪，发现没追踪，则先还原回普通，再弹出这个
if (self.viewModel.recommendModel != nil) {
FUSWeakSelf(weakself);
[FUSShowBroadcastGuideAlertView fus_showOn:self.parentController.view broadcast:self.viewModel.recommendModel clickHandler:^(NSInteger clickType) {
if (clickType == 1) {
[weakself fus_enterRoom:weakself.viewModel.recommendModel index:0];
}else if (clickType == 2) {
FUSMyZoneViewController *myZoneVC = [[FUSMyZoneViewController alloc] init];
myZoneVC.zoneUid = weakself.viewModel.recommendModel.uid;
myZoneVC.isFromLiveRoomChat = NO;
[weakself.parentController.navigationController pushViewController:myZoneVC animated:YES];
}
}];
}
}
}
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyHeaderView.m
......@@ -91,11 +91,13 @@
self.levelLabel.backgroundColor = [UIColor colorWithHex:@"#87878A" alpha:0.32];
self.levelLabel.layer.cornerRadius = 14 / 2.0f;
self.levelLabel.layer.masksToBounds = YES;
self.levelLabel.textAlignment = NSTextAlignmentCenter;
[nickNameBgView addSubview:self.levelLabel];
[self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.offset(14);
make.left.equalTo(self.nickNameLabel.mas_right).offset(6);
make.centerY.equalTo(nickNameBgView.mas_centerY);
make.width.offset(14);
}];
self.vipMarkImgView = [[UIImageView alloc] init];
......@@ -305,7 +307,11 @@
}
// 等级
NSString *levelString = [NSString isNull:model.lev] ? @"0" : model.lev;
self.levelLabel.text = [NSString stringWithFormat:@" %@ ",levelString];
self.levelLabel.text = [NSString stringWithFormat:@"%@",levelString];
CGSize levelSize = [self.levelLabel.text sizeWithFont:self.levelLabel.font maxWidth:MAXFLOAT];
[self.levelLabel mas_updateConstraints:^(MASConstraintMaker *make) {
make.width.offset(levelSize.width < 14 ? 14 : levelSize.width + 10);
}];
//baoshi
self.dewNumLabel.text = [NSString isNull:model.chip] ? @"0" : model.chip;
self.jewNumLabel.text = [NSString isNull:model.diamond] ? @"0" : model.diamond;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyView.m
......@@ -26,6 +26,7 @@
#import "FUSMotoringWareHouseViewController.h"
#import "FUSBoundAgentInfoView.h"
#import "FUSZoneCanSendNewsFeedTipView.h"
#import "FUSCustomSettingCell.h"
typedef NS_ENUM(NSInteger, FUSMySettingItemType){
FUSMySettingItemTypeImAnchor = 0,
......@@ -200,7 +201,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
break;
case FUSMySettingItemTypeIntitationReward:
itemModel.rightShowTextColor = [UIColor fus_fireGreen];
itemModel.rightShowImage = [UIImage fus_fireIcon];
// itemModel.rightShowImage = [UIImage fus_fireIcon];
break;
case FUSMySettingItemTypeGiveAwayDiamond:
itemModel.rightShowTextColor = [UIColor fus_diamondBlue];
......@@ -295,6 +296,9 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
case FUSMySettingItemTypeSetIntitationCode:{
BOOL isClick = [[[NSUserDefaults standardUserDefaults] objectForKey:ZONE_BOUND_AGENT_RED_CLICK] boolValue];
itemModel.isShowRedCirclePoint = !isClick;
// if (self.leftTime > 0) {
// itemModel.rightShowText = [self changeTimeFormatteWithLeftTime:[NSString stringWithFormat:@"%f",_leftTime]];
// }
itemModel.rightShowText = @"";
}
break;
......@@ -339,6 +343,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
[self changeTimeFormatteWithLeftTime:nil];
self.inputInviteCodeTimer = [NSTimer scheduledTimerWithTimeInterval:1 target:[YYWeakProxy proxyWithTarget:self] selector:@selector(fus_inputInviteCodeTimerRun:) userInfo:nil repeats:YES];
[[NSRunLoop currentRunLoop] addTimer:self.inputInviteCodeTimer forMode:NSRunLoopCommonModes];
}
-(void)fus_inputInviteCodeTimerRun:(NSTimer *)timer{
......@@ -348,7 +353,16 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
if (self.leftTime <= 0) {
[self receiveBoundAgentResult:nil];
}
[self.tableView reloadRowAtIndexPath:self.inputInviteCodeIndexPath withRowAnimation:UITableViewRowAnimationNone];
// 单独刷新某个cell会导致残影问题，应该是动画的原因
NSArray<NSIndexPath *> *visibleIndexPaths = [self.tableView indexPathsForVisibleRows];
if ([visibleIndexPaths containsObject:self.inputInviteCodeIndexPath]) {
UITableViewCell *tempCell = [self.tableView cellForRowAtIndexPath:self.inputInviteCodeIndexPath];
if ([tempCell isKindOfClass:[FUSCustomSettingCell class]]) {
[(FUSCustomSettingCell *)tempCell setItem:self.inputInviteCodeItem];
}
}
// [self.tableView reloadRowAtIndexPath:self.inputInviteCodeIndexPath withRowAnimation:UITableViewRowAnimationNone];
// [self.tableView reloadData];
}
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomeViewViewModel.m
......@@ -182,7 +182,7 @@
return YES;
}
}else {
if ([NSArray isNull:self.followAnchorOriginalList] && self.recommendModel == nil) {
if ([NSArray isNull:self.followAnchorOriginalList]) {
return NO;
}else {
self.anchorListType = anchorListType;
......
FuSiLive/Classes/InstantMessaging/Model/FUSChatDetailFrameModel.h
......@@ -35,7 +35,8 @@
#define conversationFont [UIFont fus_themeFont:15]
#define systemNoticeFont [UIFont fus_themeFont:13]
#define messageBgColor [UIColor colorWithHex:@"#18D9C4"]
//#define messageBgColor [UIColor colorWithHex:@"#18D9C4"]
#define messageBgColor [UIColor fus_textColorMedium]
@interface FUSChatDetailFrameModel : FUSBaseModel
......
FuSiLive/Classes/InstantMessaging/View/Cell/CellContentView/FUSIMChatGiftCellView.m
......@@ -37,7 +37,8 @@
_giftImageView.clipsToBounds = YES;
_giftTitleLb.text = FUSLocalizationHelper.localString(@"送了一个");
_giftTitleLb.textColor = [UIColor colorWithHex:@"#CCCCCC"];
// _giftTitleLb.textColor = [UIColor colorWithHex:@"#CCCCCC"];
_giftTitleLb.textColor = [UIColor fus_textColorRich];
_giftTitleLb.font = nickName_font;
_giftNameLb.font = viewName_font;
......@@ -65,7 +66,8 @@
// self.frame = CGRectMake(10, 0, UIView.fus_screenW*0.50, 70);
// self.backgroundView.frame = self.bounds;
self.backgroundColor = [UIColor colorWithHex:@"#242431"];
// self.backgroundColor = [UIColor colorWithHex:@"#242431"];
self.backgroundColor = [UIColor fus_textInputBackgroundGrayColor];
_clickBtn.frame = self.bounds;
......
FuSiLive/Classes/InstantMessaging/View/Cell/CellContentView/FUSIMChatLiveRoomCellView.m
......@@ -55,12 +55,12 @@
_roomIconImageView.clipsToBounds = YES;
_roomTitleLabel = [[UILabel alloc] init];
_roomTitleLabel.textColor = [UIColor whiteColor];
_roomTitleLabel.textColor = [UIColor fus_textColorRich];
_roomTitleLabel.font = title_font;
_roomDetailLabel = [[UILabel alloc] init];
_roomDetailLabel.numberOfLines = 0;
_roomDetailLabel.textColor = [UIColor colorWithHex:@"#CCCCCC"];
_roomDetailLabel.textColor = [UIColor fus_textColorMedium];
_roomDetailLabel.font = detail_font;
_separatorLine = [[UILabel alloc] init];
......@@ -74,9 +74,11 @@
self.backgroundView.layer.cornerRadius = BORDER_IMAGE_CORNERRADIUS;
self.backgroundView.layer.borderWidth = 1.0;
self.backgroundView.layer.borderColor = [UIColor colorWithHex:@"#48EDF7"].CGColor;
// self.backgroundView.layer.borderColor = [UIColor colorWithHex:@"#48EDF7"].CGColor;
self.backgroundView.layer.borderColor = [UIColor fus_lineColor].CGColor;
self.backgroundView.clipsToBounds = YES;
self.backgroundView.backgroundColor = [UIColor colorWithHex:@"#252736"];
// self.backgroundView.backgroundColor = [UIColor colorWithHex:@"#252736"];
self.backgroundView.backgroundColor = [UIColor fus_appBGColor];
_clickBtn = [FUSIMChatCellCoverButton buttonWithType:UIButtonTypeCustom];
_clickBtn.isNeedCopy = NO;
......@@ -120,7 +122,8 @@
self.layer.cornerRadius = BORDER_IMAGE_CORNERRADIUS;
self.layer.shadowRadius = 8;
self.layer.shadowPath = [UIBezierPath bezierPathWithRect:self.bounds].CGPath;
self.layer.shadowColor = [UIColor colorWithHex:@"#48EDF7"].CGColor;
// self.layer.shadowColor = [UIColor colorWithHex:@"#48EDF7"].CGColor;
self.layer.shadowColor = [UIColor fus_shadowColor].CGColor;
self.layer.shadowOffset = CGSizeZero;
self.layer.shadowOpacity = 0.5;
......
FuSiLive/Classes/InstantMessaging/View/Cell/CellContentView/FUSIMChatSystemNoticeCellView.m
......@@ -52,7 +52,8 @@
[super fus_layoutSubviewsWithModel:frameModel];
self.backgroundColor = [UIColor colorWithHex:@"#181A24"];
// self.backgroundColor = [UIColor colorWithHex:@"#181A24"];
self.backgroundColor = [UIColor fus_textInputBackgroundGrayColor];
_noticeLb.frame = CGRectMake(10, 5, self.width - 20, self.height - 10);
_attrStrDic = [FUSIMChatCellHelper shareInstance].attrStrDic;
......
FuSiLive/Classes/Login/Controller/FUSLoginViewController.m
......@@ -81,6 +81,7 @@
if ([NSString isNull:_phone] || [NSDictionary isNull:_countryInfoDict]) {
return;
}else {
_phoneTextField.text = _phone;
[_passwordTextField becomeFirstResponder];
}
}
......
FuSiLive/Classes/NewLive/Main/Controller/FUSLiveMainViewController.m
......@@ -33,7 +33,7 @@
// 结束画面
#import "FUSVideoEndView.h"
#import "FUSVideoEndedView.h"
#import "FUSVideoOfficialEndView.h"
#import "FUSVideoOfficialEndV2View.h"
#import "FUSPKBottomUserHeaderView.h"
#import "FUSGiftCenter.h"
......@@ -108,7 +108,7 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
/**
官方结束 View
*/
@property (nonatomic, strong) FUSVideoOfficialEndView *officialEndView;
@property (nonatomic, strong) FUSVideoOfficialEndV2View *officialEndView;
/**
结束 View
......@@ -1573,7 +1573,7 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
// 官方控制违规下播
if ([infoDict[@"cause"] intValue] == 1) {
[self.officialEndView removeFromSuperview];
self.officialEndView = [[FUSVideoOfficialEndView alloc] initWithFrame:UIView.fus_screenFrame];
self.officialEndView = [[FUSVideoOfficialEndV2View alloc] initWithFrame:UIView.fus_screenFrame];
[self.contentView addSubview:_officialEndView];
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
paragraphStyle.alignment = NSTextAlignmentCenter;
......@@ -1584,7 +1584,7 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
infoMsg = @"";
}
NSAttributedString *str = [[NSAttributedString alloc] initWithString:infoMsg attributes:@{NSParagraphStyleAttributeName: paragraphStyle}];
NSAttributedString *str = [[NSAttributedString alloc] initWithString:infoMsg attributes:@{NSParagraphStyleAttributeName: paragraphStyle,NSForegroundColorAttributeName: [UIColor whiteColor]}];
_officialEndView.contentLabel.attributedText = str;
_officialEndView.closeClickBlock = ^() {
......
FuSiLive/Classes/NewLive/Main/Other/FUSLiveHelper.m
......@@ -13,7 +13,7 @@
#import "FUSSocketMessageHelper.h"
#import "FUSCacheDataShare.h"
#import "FUSUserDefaultsStore.h"
#import "FUSVideoOfficialEndView.h"
#import "FUSVideoOfficialEndV2View.h"
#import "UIImageView+WebImage.h"
#import "FUSIMChatService.h"
#import "FUSRoomInfoModel.h"
......@@ -653,7 +653,7 @@
[[FUSLiveHelper shareInstance].liveVC.playView fus_stopALLPlayer];
// 官方控制违规下播
if ([errorDict[@"cause"] intValue] == 1) {
FUSVideoOfficialEndView *officialEndView = [[FUSVideoOfficialEndView alloc] initWithFrame:UIView.fus_screenFrame];
FUSVideoOfficialEndV2View *officialEndView = [[FUSVideoOfficialEndV2View alloc] initWithFrame:UIView.fus_screenFrame];
[[[FUSLiveHelper shareInstance] liveVC].view addSubview:officialEndView];
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
paragraphStyle.alignment = NSTextAlignmentCenter;
......@@ -665,7 +665,7 @@
errMsg = @"";
}
NSAttributedString *str = [[NSAttributedString alloc] initWithString:errMsg attributes:@{NSParagraphStyleAttributeName: paragraphStyle}];
NSAttributedString *str = [[NSAttributedString alloc] initWithString:errMsg attributes:@{NSParagraphStyleAttributeName: paragraphStyle,NSForegroundColorAttributeName: [UIColor whiteColor]}];
officialEndView.contentLabel.attributedText = str;
officialEndView.closeClickBlock = ^() {
......@@ -1148,7 +1148,7 @@
// 官方控制违规下播
if ([errorDict[@"cause"] intValue] == 1) {
FUSVideoOfficialEndView *officialEndView = [[FUSVideoOfficialEndView alloc] initWithFrame:UIView.fus_screenFrame];
FUSVideoOfficialEndV2View *officialEndView = [[FUSVideoOfficialEndV2View alloc] initWithFrame:UIView.fus_screenFrame];
[[[FUSLiveHelper shareInstance] liveVC].view addSubview:officialEndView];
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
paragraphStyle.alignment = NSTextAlignmentCenter;
......@@ -1160,7 +1160,7 @@
errMsg = @"";
}
NSAttributedString *str = [[NSAttributedString alloc] initWithString:errMsg attributes:@{NSParagraphStyleAttributeName: paragraphStyle}];
NSAttributedString *str = [[NSAttributedString alloc] initWithString:errMsg attributes:@{NSParagraphStyleAttributeName: paragraphStyle,NSForegroundColorAttributeName: [UIColor whiteColor]}];
officialEndView.contentLabel.attributedText = str;
officialEndView.closeClickBlock = ^() {
......
FuSiLive/Classes/NewLive/Main/View/EndView/FUSVideoOfficialEndV2View.h 0 → 100644
//
// FUSVideoOfficialEndV2View.h
// FuSiLive
//
// Created by aaa on 2024/6/28.
//
#import <UIKit/UIKit.h>
#import "FUSDefine.h"
NS_ASSUME_NONNULL_BEGIN
@interface FUSVideoOfficialEndV2View : UIView
@property (strong, nonatomic) UILabel *contentLabel;
@property (strong, nonatomic) FUSStyleButton *closeBtn;
@property (nonatomic, copy) void(^closeClickBlock)(void);
@end
NS_ASSUME_NONNULL_END
FuSiLive/Classes/NewLive/Main/View/EndView/FUSVideoOfficialEndV2View.m 0 → 100644
//
// FUSVideoOfficialEndV2View.m
// FuSiLive
//
// Created by aaa on 2024/6/28.
//
#import "FUSVideoOfficialEndV2View.h"
#import "FUSLiveHelper.h"
@implementation FUSVideoOfficialEndV2View
- (instancetype)initWithFrame:(CGRect)frame
{
self = [super initWithFrame:frame];
if (self) {
[self fus_createUI];
}
return self;
}
-(void)fus_createUI{
self.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.6];
FUSBlurImageView *bgImgView = [[FUSBlurImageView alloc] init];
bgImgView.userInteractionEnabled = YES;
[bgImgView fus_setWebImageWithSubURLString:[FUSLiveHelper shareInstance].roomInfoModel.face placeholder:nil];
[self addSubview:bgImgView];
[bgImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self);
}];
UIView *bgView = [[UIView alloc] init];
bgView.backgroundColor = [UIColor blackColor];
bgView.alpha = 0.7;
[bgImgView addSubview:bgView];
[bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(bgImgView);
}];
UIView *contentView = [[UIView alloc] init];
contentView.layer.cornerRadius = 17;
contentView.layer.masksToBounds = YES;
contentView.backgroundColor = [[UIColor whiteColor] colorWithAlphaComponent:0.1];
[bgView addSubview:contentView];
[contentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.offset(0);
make.centerY.offset(-60);
make.width.offset(324);
}];
UIImageView *faceImgView = [[UIImageView alloc] init];
faceImgView.layer.cornerRadius = 74 / 2.0f;
faceImgView.layer.masksToBounds = YES;
[faceImgView setWebImageWithSubURLString:[FUSLiveHelper shareInstance].roomInfoModel.face placeholder:nil];
[self addSubview:faceImgView];
[faceImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.offset(0);
make.centerY.equalTo(contentView.mas_top);
make.size.mas_equalTo(CGSizeMake(74, 74));
}];
NSMutableAttributedString *textString = [[NSMutableAttributedString alloc] initWithString:[NSString fus_versionLocalString:@"由於直播內容涉及違規\n本直播已中斷"] attributes:@{NSFontAttributeName: [UIFont fus_themeFont:19],NSForegroundColorAttributeName: [UIColor whiteColor]}];
self.contentLabel = [[UILabel alloc] init];
self.contentLabel.numberOfLines = 0;
self.contentLabel.attributedText = textString;
self.contentLabel.textAlignment = NSTextAlignmentCenter;
self.contentLabel.font = [UIFont fus_themeFont:19];
[contentView addSubview:self.contentLabel];
[self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.inset(20);
make.top.offset(60);
make.bottom.offset(-50);
}];
UIView *closeCenterView = [[UIView alloc] init];
[bgView addSubview:closeCenterView];
[closeCenterView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.offset(0);
make.top.equalTo(contentView.mas_bottom);
}];
self.closeBtn = [FUSStyleButton buttonWithType:UIButtonTypeCustom];
_closeBtn.style = FUSButtonStyleBlue;
_closeBtn.layer.masksToBounds = YES;
_closeBtn.layer.cornerRadius = 44 / 2.0;
self.closeBtn.titleLabel.font = [UIFont fus_themeMediumFont:17];
[self.closeBtn setTitle:[NSString fus_versionLocalString:@"返回"] forState:UIControlStateNormal];
[closeCenterView addSubview:self.closeBtn];
[self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.equalTo(closeCenterView);
make.size.mas_equalTo(CGSizeMake(256, 44));
}];
[self.closeBtn addTarget:self action:@selector(fus_closeBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
}
-(void)fus_closeBtnDidClicked:(UIButton *)btn{
if (_closeClickBlock) _closeClickBlock();
}
@end
FuSiLive/Classes/NewLive/Main/View/EndView/FUSVideoOfficialEndView.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -31,10 +29,10 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c3G-nR-iNN">
<rect key="frame" x="35.5" y="120" width="305" height="286"/>
<rect key="frame" x="35" y="120" width="305" height="286"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_end_official_bg_image" translatesAutoresizingMaskIntoConstraints="NO" id="8jG-tE-Nqj">
<rect key="frame" x="-0.5" y="0.0" width="305" height="286"/>
<rect key="frame" x="0.0" y="0.0" width="305" height="286"/>
<rect key="contentStretch" x="1" y="0.34999999999999998" width="1" height="0.5"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7SF-bC-c4T">
......@@ -43,7 +41,7 @@
<fragment content="由于出现违规内容, 本用户已被官方由于出现违规内容,">
<attributes>
<color key="NSColor" red="0.39756000000000002" green="1" blue="0.80110000000000003" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
<font key="NSFont" size="19" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="19"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="10" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
</attributes>
</fragment>
......@@ -51,7 +49,7 @@
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_official_prohibit_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Joa-BW-cnt">
<rect key="frame" x="81" y="187.5" width="142.5" height="23.5"/>
<rect key="frame" x="81.5" y="187.5" width="142.5" height="23.5"/>
<constraints>
<constraint firstAttribute="height" constant="23.5" id="tvW-6k-gk8"/>
<constraint firstAttribute="width" constant="142.5" id="xRI-BM-Eil"/>
......@@ -89,12 +87,12 @@
<outlet property="closeBtn" destination="Tki-mv-FJb" id="bA9-Su-nSL"/>
<outlet property="contentLabel" destination="7SF-bC-c4T" id="ZYN-Kl-fGt"/>
</connections>
<point key="canvasLocation" x="-35.5" y="-13.5"/>
<point key="canvasLocation" x="-56.799999999999997" y="-12.143928035982009"/>
</view>
</objects>
<resources>
<image name="Live_Official_End_Bg" width="375" height="667"/>
<image name="live_end_official_bg_image" width="305" height="286"/>
<image name="live_official_prohibit_icon" width="142" height="23"/>
<image name="live_end_official_bg_image" width="305" height="286.5"/>
<image name="live_official_prohibit_icon" width="142.5" height="23.5"/>
</resources>
</document>
FuSiLive/Classes/NewsFeed/Other/FUSNewsFeedHttpHelper.m
......@@ -76,7 +76,7 @@
zoneId = [FUSCacheDataShare shareStore].userDetailInfo.uid;
}
if (ENABLE_HTTP_DEBUG) {
if ([FUSConfig sharedInstanced].devConfigs.enableHttpDebug) {
FUSLogInfo(@"请求参数：%@",param);
}
......
FuSiLive/Classes/Search/Controller/FUSSearchViewController.swift
......@@ -174,7 +174,7 @@ class FUSSearchViewController: FUSBaseViewController, UITableViewDelegate, UITab
lazy var emptyView:FUSEmptyView = {()->FUSEmptyView in
var tempEmptyView:FUSEmptyView = FUSEmptyView(frame: CGRect(x: 0,y: 0,width: UIScreen.main.bounds.width,height: self.searchTextFieldBgView.height))
tempEmptyView.backgroundColor = UIColor(hex: "#11121A")
tempEmptyView.backgroundColor = .fus_appBG()
weak var weakSelf = self
tempEmptyView.fus_setEmptyViewIcon(UIImage.init(named: "com_icon_hot_no_data_empty"), title: FUSLocalizationHelper.localString("输入FuSi用户的昵称或ID进行搜索"), buttonTittle:nil) { (view, attrString, range, rect) in
......
FuSiLive/Classes/Search/Controller/FUSSearchViewController.xib
......@@ -39,7 +39,7 @@
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" placeholder="输入FuSi ID或昵称" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="pRN-Ye-p5q">
<rect key="frame" x="30" y="0.0" width="309" height="32"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" returnKeyType="search"/>
</textField>
......
FuSiLive/Classes/ZhaiXin/Main/Controller/FUSSingleLiveRecordViewController.m
......@@ -102,7 +102,7 @@
#pragma mark - UI
- (void)setNavBarItem
{
self.navigationItem.title = FUSLocalizationHelper.localString(@"约会信用通话记录");
self.navigationItem.title = [NSString fus_versionLocalString:@"視訊/聲訊通話記錄"];
FUSButton *backButton = [FUSButton buttonWithType:UIButtonTypeCustom];
backButton.frame = CGRectMake(0, 0, 44, 44);
......
FuSiLive/Classes/ZhaiXin/Recommend/View/FUSZhaiXinSettingPopView.m
......@@ -60,7 +60,7 @@
self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4];
self.bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, 252)];
self.bottomView.backgroundColor = [UIColor colorWithHex:@"#191923" alpha:0.9];
self.bottomView.backgroundColor = [UIColor whiteColor];
CGRect tableFrame = CGRectMake(0, 20, UIView.fus_screenW, 212);
self.tableView = [[FUSSettingTableView alloc] initWithFrame:tableFrame style:UITableViewStylePlain];
......@@ -145,6 +145,7 @@
chatSettingGroup.items = @[messageSoundItem, meesageShockItem, _strangerMessageItem,clearAllUnreadItem];
chatSettingGroup.itemsBgColor = [UIColor clearColor];
[self.tableView.allGroups addObject:chatSettingGroup];
self.tableView.separatorColor = [UIColor fus_separatorLineColor];
[self.tableView reloadData];
}
......
FuSiLive/Classes/Zone/Controller/FUSMotoringWareHouseViewController.m
......@@ -144,7 +144,7 @@
[FUSZoneHttpRequest fus_requestMotoringWareHouseWithSuccess:^(NSArray *motoringArr,BOOL motoringEnable) {
if (motoringArr.count==0) {
FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH-UIView.fus_StatusBarAndNavgationBarHeight)];
[emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"fireFly_my_zone_edit_motor_place_holder"] title:FUSLocalizationHelper.localString(@"暂无座驾以供选择") buttonTittle:nil];
[emptyView fus_setEmptyViewIcon:[UIImage fus_emptyImg] title:FUSLocalizationHelper.localString(@"暂无座驾以供选择") buttonTittle:nil];
[self.view addSubview:emptyView];
}
[self.tableView.mj_header endRefreshing];
......
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSZoneCanSendNewsFeedTipView.m
......@@ -109,7 +109,8 @@
- (void)customInit {
self.tipLabel.text = FUSLocalizationHelper.localString(@"可以在这里分享內容哦~");
// self.tipLabel.text = FUSLocalizationHelper.localString(@"可以在这里分享內容哦~");
self.tipLabel.text = [NSString fus_versionLocalString:@"發帖文"];
self.tipBGImageView.image = [UIImage imageNamed:[FUSRTL RTLImageName:@"zone_pop_tip_bg"]];
}
......
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