Skip to content

pidan / FuSiLive

Go to a project
Commit ad9404a8 by pidan
Options

fixed bugs

parent c16f3ee7
Inline Side-by-side
Showing with 62 additions and 54 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/com_no_data_empty.imageset/Contents.json
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "icon_empty_view.png", "filename" : "20250704-184638.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/common_empty_default_300_300.imageset/Contents.json
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "icon_empty_view.png", "filename" : "20250704-184638.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.h
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
+(UIColor *)fus_inpuContentColor; +(UIColor *)fus_inpuContentColor;
/// 主题色 /// 主题色
+(UIColor *)fus_themeColor; +(UIColor *)fus_themeColor;
/// 在白底的主题色
+ (UIColor *)fus_themeColorOnWhiteBg;
/// 第三主题色，蓝色，一般用于验证码白底蓝色边框和字体 /// 第三主题色，蓝色，一般用于验证码白底蓝色边框和字体
+(UIColor *)fus_themeThirdColor; +(UIColor *)fus_themeThirdColor;
/// 钻石蓝色 /// 钻石蓝色
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.m
...@@ -68,6 +68,10 @@ ...@@ -68,6 +68,10 @@
return [self colorWithHex:@"#00F7FF"]; return [self colorWithHex:@"#00F7FF"];
} }
+ (UIColor *)fus_themeColorOnWhiteBg {
return [self colorWithHex:@"#01D9E0"];
}
+ (UIColor *)fus_themeThirdColor{ + (UIColor *)fus_themeThirdColor{
return [UIColor colorWithHex:@"00a0e9"]; return [UIColor colorWithHex:@"00a0e9"];
} }
......
FuSiLive.xcodeproj/project.pbxproj
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
008FEC472C296CBC00B1AF13 /* FZCustom01.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 008FEC462C296CB700B1AF13 /* FZCustom01.ttf */; }; 008FEC472C296CBC00B1AF13 /* FZCustom01.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 008FEC462C296CB700B1AF13 /* FZCustom01.ttf */; };
00A29CC22C2570C7008B9072 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 00A29CC12C2570C7008B9072 /* Launch Screen.storyboard */; }; 00A29CC22C2570C7008B9072 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 00A29CC12C2570C7008B9072 /* Launch Screen.storyboard */; };
00A29CC42C257A65008B9072 /* fus_startSplash_logo_image_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_2.png */; };
00E501FB2E0543A800579DB0 /* NotificationService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 00E501F32E0543A800579DB0 /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 00E501FB2E0543A800579DB0 /* NotificationService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 00E501F32E0543A800579DB0 /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
BE05F46C2C203D0C006A8993 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BE05F46B2C203D0C006A8993 /* Assets.xcassets */; }; BE05F46C2C203D0C006A8993 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BE05F46B2C203D0C006A8993 /* Assets.xcassets */; };
BE9743D22C3529E70061A55F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = BE9743D12C3529E70061A55F /* InfoPlist.strings */; }; BE9743D22C3529E70061A55F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = BE9743D12C3529E70061A55F /* InfoPlist.strings */; };
...@@ -26,6 +25,7 @@ ...@@ -26,6 +25,7 @@
BEDF6A2E2C805FC700F9529C /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEDF6A2D2C805FC700F9529C /* StoreKit.framework */; }; BEDF6A2E2C805FC700F9529C /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEDF6A2D2C805FC700F9529C /* StoreKit.framework */; };
C54DF48B497078D75E07553B /* Pods_NotificationService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A774940339A41CDDF5191FB7 /* Pods_NotificationService.framework */; }; C54DF48B497078D75E07553B /* Pods_NotificationService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A774940339A41CDDF5191FB7 /* Pods_NotificationService.framework */; };
CC4EC839F0D05ECFFB160A5F /* Pods_FuSiLive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDC8D3202D11EB9CA644EAA6 /* Pods_FuSiLive.framework */; }; CC4EC839F0D05ECFFB160A5F /* Pods_FuSiLive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDC8D3202D11EB9CA644EAA6 /* Pods_FuSiLive.framework */; };
D28ABA162E17E907002F303F /* fus_startSplash_logo_image_3.png in Resources */ = {isa = PBXBuildFile; fileRef = D28ABA152E17E907002F303F /* fus_startSplash_logo_image_3.png */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
...@@ -68,7 +68,6 @@ ...@@ -68,7 +68,6 @@
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
008FEC462C296CB700B1AF13 /* FZCustom01.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FZCustom01.ttf; sourceTree = "<group>"; }; 008FEC462C296CB700B1AF13 /* FZCustom01.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FZCustom01.ttf; sourceTree = "<group>"; };
00A29CC12C2570C7008B9072 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; }; 00A29CC12C2570C7008B9072 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fus_startSplash_logo_image_2.png; sourceTree = "<group>"; };
00B8649F2C2AF52B0061F6FF /* FuSiLive.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FuSiLive.entitlements; sourceTree = "<group>"; }; 00B8649F2C2AF52B0061F6FF /* FuSiLive.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FuSiLive.entitlements; sourceTree = "<group>"; };
00E501F32E0543A800579DB0 /* NotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 00E501F32E0543A800579DB0 /* NotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
6DFACA8A2DF329F3E7F7B2FF /* Pods-FuSiLive.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FuSiLive.debug.xcconfig"; path = "Target Support Files/Pods-FuSiLive/Pods-FuSiLive.debug.xcconfig"; sourceTree = "<group>"; }; 6DFACA8A2DF329F3E7F7B2FF /* Pods-FuSiLive.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FuSiLive.debug.xcconfig"; path = "Target Support Files/Pods-FuSiLive/Pods-FuSiLive.debug.xcconfig"; sourceTree = "<group>"; };
...@@ -98,11 +97,12 @@ ...@@ -98,11 +97,12 @@
BEDC668D2C09DAE700505F76 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; }; BEDC668D2C09DAE700505F76 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
BEDF6A2C2C7F67CC00F9529C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; }; BEDF6A2C2C7F67CC00F9529C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
BEDF6A2D2C805FC700F9529C /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; BEDF6A2D2C805FC700F9529C /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
D28ABA152E17E907002F303F /* fus_startSplash_logo_image_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fus_startSplash_logo_image_3.png; sourceTree = "<group>"; };
FDC8D3202D11EB9CA644EAA6 /* Pods_FuSiLive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FuSiLive.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FDC8D3202D11EB9CA644EAA6 /* Pods_FuSiLive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FuSiLive.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
00E501FF2E0543A800579DB0 /* Exceptions for "NotificationService" folder in "NotificationService" target */ = { 00E501FF2E0543A800579DB0 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
isa = PBXFileSystemSynchronizedBuildFileExceptionSet; isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
membershipExceptions = ( membershipExceptions = (
"NotificationService-Info.plist", "NotificationService-Info.plist",
...@@ -112,18 +112,7 @@ ...@@ -112,18 +112,7 @@
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
/* Begin PBXFileSystemSynchronizedRootGroup section */ /* Begin PBXFileSystemSynchronizedRootGroup section */
00E501F42E0543A800579DB0 /* NotificationService */ = { 00E501F42E0543A800579DB0 /* NotificationService */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (00E501FF2E0543A800579DB0 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = NotificationService; sourceTree = "<group>"; };
isa = PBXFileSystemSynchronizedRootGroup;
exceptions = (
00E501FF2E0543A800579DB0 /* Exceptions for "NotificationService" folder in "NotificationService" target */,
);
explicitFileTypes = {
};
explicitFolders = (
);
path = NotificationService;
sourceTree = "<group>";
};
/* End PBXFileSystemSynchronizedRootGroup section */ /* End PBXFileSystemSynchronizedRootGroup section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -208,7 +197,7 @@ ...@@ -208,7 +197,7 @@
BEDC668B2C09DAE700505F76 /* Resources */ = { BEDC668B2C09DAE700505F76 /* Resources */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_2.png */, D28ABA152E17E907002F303F /* fus_startSplash_logo_image_3.png */,
BEDC65D32C09DAE700505F76 /* Font */, BEDC65D32C09DAE700505F76 /* Font */,
BEDC66102C09DAE700505F76 /* LocalizationString */, BEDC66102C09DAE700505F76 /* LocalizationString */,
); );
...@@ -342,8 +331,8 @@ ...@@ -342,8 +331,8 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
008FEC472C296CBC00B1AF13 /* FZCustom01.ttf in Resources */, 008FEC472C296CBC00B1AF13 /* FZCustom01.ttf in Resources */,
00A29CC42C257A65008B9072 /* fus_startSplash_logo_image_2.png in Resources */,
BE9743D22C3529E70061A55F /* InfoPlist.strings in Resources */, BE9743D22C3529E70061A55F /* InfoPlist.strings in Resources */,
D28ABA162E17E907002F303F /* fus_startSplash_logo_image_3.png in Resources */,
BE05F46C2C203D0C006A8993 /* Assets.xcassets in Resources */, BE05F46C2C203D0C006A8993 /* Assets.xcassets in Resources */,
BEDC6F8C2C09DAE900505F76 /* GoogleService-Info.plist in Resources */, BEDC6F8C2C09DAE900505F76 /* GoogleService-Info.plist in Resources */,
00A29CC22C2570C7008B9072 /* Launch Screen.storyboard in Resources */, 00A29CC22C2570C7008B9072 /* Launch Screen.storyboard in Resources */,
......
FuSiLive/Launch Screen.storyboard
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fus_startSplash_logo_image_2.png" translatesAutoresizingMaskIntoConstraints="NO" id="gnB-ZF-qMi"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fus_startSplash_logo_image_3.png" translatesAutoresizingMaskIntoConstraints="NO" id="gnB-ZF-qMi">
<rect key="frame" x="10" y="219" width="373" height="278"/> <rect key="frame" x="10" y="219" width="373" height="278"/>
<constraints> <constraints>
<constraint firstAttribute="width" secondItem="gnB-ZF-qMi" secondAttribute="height" multiplier="393:293" id="lQc-ZD-oa2"/> <constraint firstAttribute="width" secondItem="gnB-ZF-qMi" secondAttribute="height" multiplier="393:293" id="lQc-ZD-oa2"/>
...@@ -47,6 +47,6 @@ ...@@ -47,6 +47,6 @@
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
<image name="fus_startSplash_logo_image_2.png" width="1298" height="857"/> <image name="fus_startSplash_logo_image_3.png" width="1298" height="857"/>
</resources> </resources>
</document> </document>
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Controller/FUSChatDetailViewController.m
...@@ -2028,9 +2028,9 @@ ...@@ -2028,9 +2028,9 @@
break; break;
case FUSMsgContentTypeGift: //礼物 case FUSMsgContentTypeGift: //礼物
{ {
[self.giftPlayView stop]; if (self.giftPlayView) {
[self.giftPlayView removeFromSuperview]; return;
self.giftPlayView = nil; }
if ([NSString isNullWithString:infoModel.giftID]) { if ([NSString isNullWithString:infoModel.giftID]) {
return; return;
...@@ -2191,12 +2191,9 @@ ...@@ -2191,12 +2191,9 @@
#pragma mark - BDAlphaPlayerMetalViewDelegate #pragma mark - BDAlphaPlayerMetalViewDelegate
- (void)metalView:(BDAlphaPlayerMetalView *)metalView didFinishPlayingWithError:(NSError *)error { - (void)metalView:(BDAlphaPlayerMetalView *)metalView didFinishPlayingWithError:(NSError *)error {
[UIView animateWithDuration:.35 animations:^{
self.giftPlayView.alpha = 0;
} completion:^(BOOL finished) {
[self.giftPlayView removeFromSuperview]; [self.giftPlayView removeFromSuperview];
self.giftPlayView = nil; self.giftPlayView = nil;
}];
} }
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMChatService.m
...@@ -838,7 +838,7 @@ typedef NS_ENUM(NSInteger, FUSIMChatMessageType) { ...@@ -838,7 +838,7 @@ typedef NS_ENUM(NSInteger, FUSIMChatMessageType) {
//数据库保存最后一条 //数据库保存最后一条
[FUSZhaiXinDBOperate fus_writeLastReceiveMessageWithTalkID:chatWithID messageModel:model]; [FUSZhaiXinDBOperate fus_writeLastReceiveMessageWithTalkID:chatWithID messageModel:model];
msg.timestamp = self.lastMessageTimestamp + 1; // msg.timestamp = self.lastMessageTimestamp + 1;
//手动生成的 系统消息 和 音视频提示消息 要手动保存,手动保存的信息要注意时间戳的问题，不能取本地时间，因为只要改动手机时区就会出错 //手动生成的 系统消息 和 音视频提示消息 要手动保存,手动保存的信息要注意时间戳的问题，不能取本地时间，因为只要改动手机时区就会出错
if (sysType != FUSSystemNoticeTypeNone || callType != FUSConversationCallTypeNone) { if (sysType != FUSSystemNoticeTypeNone || callType != FUSConversationCallTypeNone) {
...@@ -857,7 +857,7 @@ typedef NS_ENUM(NSInteger, FUSIMChatMessageType) { ...@@ -857,7 +857,7 @@ typedef NS_ENUM(NSInteger, FUSIMChatMessageType) {
//记录最后一个时间 //记录最后一个时间
// self.lastMessageTimestamp = msg.timestamp; // self.lastMessageTimestamp = msg.timestamp;
FUSLogDebug(@"记录的最后一条消息顺序%@ -- orderTime:%lld",model.nickname,self.lastMessageTimestamp); // FUSLogDebug(@"记录的最后一条消息顺序%@ -- orderTime:%lld",model.nickname,self.lastMessageTimestamp);
} }
...@@ -2225,7 +2225,7 @@ typedef NS_ENUM(NSInteger, FUSIMChatMessageType) { ...@@ -2225,7 +2225,7 @@ typedef NS_ENUM(NSInteger, FUSIMChatMessageType) {
refreshMsg.chatType = EMChatTypeChat; refreshMsg.chatType = EMChatTypeChat;
// 给那些发送失败的信息，系统消息 一个排序时间戳 // 给那些发送失败的信息，系统消息 一个排序时间戳
refreshMsg.timestamp = self.lastMessageTimestamp + 1; // refreshMsg.timestamp = self.lastMessageTimestamp + 1;
FUSChatDetailFrameModel *frameModel = nil; FUSChatDetailFrameModel *frameModel = nil;
if ([FUSRouter.userRouter fus_selectIsInBlackListWithUid:userID] == YES){ // 判断是不是拉黑了 if ([FUSRouter.userRouter fus_selectIsInBlackListWithUid:userID] == YES){ // 判断是不是拉黑了
...@@ -3575,8 +3575,10 @@ typedef NS_ENUM(NSInteger, FUSIMChatMessageType) { ...@@ -3575,8 +3575,10 @@ typedef NS_ENUM(NSInteger, FUSIMChatMessageType) {
if ([msgInfo isKindOfClass:[NSString class]]) { if ([msgInfo isKindOfClass:[NSString class]]) {
msgInfo = [(NSString *)msgInfo converToDictionary]; msgInfo = [(NSString *)msgInfo converToDictionary];
} }
NSInteger followIntimacy = [msgInfo[@"followIntimacy"] integerValue];
if (![NSDictionary isNull:msgInfo] if (![NSDictionary isNull:msgInfo]
&& [msgInfo[@"followIntimacy"] integerValue] == 0 && followIntimacy == 0
&& ![[[NSUserDefaults standardUserDefaults] objectForKey:FUSUserUDKeys.fus_UD_KEY_OPEN_STRANGER_MESSAGE] boolValue]) { && ![[[NSUserDefaults standardUserDefaults] objectForKey:FUSUserUDKeys.fus_UD_KEY_OPEN_STRANGER_MESSAGE] boolValue]) {
[talkObj deleteMessageWithId:msg.messageId error:nil]; [talkObj deleteMessageWithId:msg.messageId error:nil];
continue; continue;
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/Cell/CellContentView/FUSIMChatLiveRoomCellView.m
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
[_tipsLabel sizeToFit]; [_tipsLabel sizeToFit];
self.backgroundView.layer.cornerRadius = BORDER_IMAGE_CORNERRADIUS; self.backgroundView.layer.cornerRadius = BORDER_IMAGE_CORNERRADIUS;
self.backgroundView.layer.borderWidth = 1.0; // 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.layer.borderColor = [UIColor fus_lineColor].CGColor;
self.backgroundView.clipsToBounds = YES; self.backgroundView.clipsToBounds = YES;
// self.backgroundView.backgroundColor = [UIColor colorWithHex:@"#252736"]; // self.backgroundView.backgroundColor = [UIColor colorWithHex:@"#252736"];
self.backgroundView.backgroundColor = [UIColor fus_appBGColor]; self.backgroundView.backgroundColor = [UIColor fus_appBGColor];
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:passwordStr attributes:@{NSForegroundColorAttributeName:messageBgColor, NSFontAttributeName:tips_font}]; NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:passwordStr attributes:@{NSForegroundColorAttributeName:messageBgColor, NSFontAttributeName:tips_font}];
NSRange range = [passwordStr rangeOfString:frameModel.msgModel.liveRoomPassword]; NSRange range = [passwordStr rangeOfString:frameModel.msgModel.liveRoomPassword];
if (range.location != kCFNotFound) { if (range.location != kCFNotFound) {
[attr addAttributes:@{NSForegroundColorAttributeName:UIColor.fus_themeColor} range:range]; [attr addAttributes:@{NSForegroundColorAttributeName:UIColor.fus_themeColorOnWhiteBg} range:range];
} }
self.tipsLabel.attributedText = attr; self.tipsLabel.attributedText = attr;
...@@ -155,12 +155,12 @@ ...@@ -155,12 +155,12 @@
self.clipsToBounds = NO; self.clipsToBounds = NO;
self.layer.cornerRadius = BORDER_IMAGE_CORNERRADIUS; self.layer.cornerRadius = BORDER_IMAGE_CORNERRADIUS;
self.layer.shadowRadius = 8; self.layer.shadowRadius = 4;
self.layer.shadowPath = [UIBezierPath bezierPathWithRect:self.bounds].CGPath; 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.shadowColor = [UIColor fus_shadowColor].CGColor;
self.layer.shadowOffset = CGSizeZero; self.layer.shadowOffset = CGSizeZero;
self.layer.shadowOpacity = 0.5; self.layer.shadowOpacity = 0.3;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Model/FUSLiveBeforeReadyModel.h
...@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
/// 直播预告状态 0：未设置 1：已设置 /// 直播预告状态 0：未设置 1：已设置
@property (nonatomic, assign) NSInteger previewLive; @property (nonatomic, assign) NSInteger previewLive;
@property (nonatomic, strong) FUSRoomEncryptionData *encryptionData; @property (nonatomic, strong) FUSRoomEncryptionData *__nullable encryptionData;
@end @end
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputToolView.swift
...@@ -112,7 +112,7 @@ public class FUSLiveChatInputToolView: UIView { ...@@ -112,7 +112,7 @@ public class FUSLiveChatInputToolView: UIView {
} }
}else{ }else{
itemWith = self.width/3.0 // itemWith = self.width/3.0
// 美颜 // 美颜
liveSettingView = fus_createItemViewWithToolType(toolType: FUSLiveBottomToolTypeLiveSetting, withSize: CGSize(width: itemWith, height: buttomViewHeight)) liveSettingView = fus_createItemViewWithToolType(toolType: FUSLiveBottomToolTypeLiveSetting, withSize: CGSize(width: itemWith, height: buttomViewHeight))
liveSettingView.x = 0 liveSettingView.x = 0
...@@ -166,10 +166,11 @@ public class FUSLiveChatInputToolView: UIView { ...@@ -166,10 +166,11 @@ public class FUSLiveChatInputToolView: UIView {
var btnX = 0.0 var btnX = 0.0
// 每行最多4個 // 每行最多4個
var lineCount = Float.init(toolViews.count) let lineCount:Float = 4
if lineCount > 4 { // Float.init(toolViews.count)
lineCount = 4 // if lineCount > 4 {
} // lineCount = 4
// }
let viewW = Float.init(UIApplication.shared.keyWindow!.width) / lineCount let viewW = Float.init(UIApplication.shared.keyWindow!.width) / lineCount
var btnY = 0.0 var btnY = 0.0
for view in toolViews { for view in toolViews {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSShareView/View/FUSShareToolSheetView.swift
...@@ -115,7 +115,7 @@ var isShowShareToolSheetView = true ...@@ -115,7 +115,7 @@ var isShowShareToolSheetView = true
passwordDescLabel.isHidden = true passwordDescLabel.isHidden = true
passwordLabel.font = .fus_themeFont(12) passwordLabel.font = .fus_themeFont(12)
passwordLabel.textColor = .fus_theme() passwordLabel.textColor = .fus_themeColorOnWhiteBg()
passwordLabel.isHidden = true passwordLabel.isHidden = true
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
...@@ -5862,8 +5862,7 @@ BDAlphaPlayerMetalViewDelegate ...@@ -5862,8 +5862,7 @@ BDAlphaPlayerMetalViewDelegate
return; return;
} }
self.passwordRoomIconImageView = [[UIImageView alloc] initWithFrame:CGRectMake(12, self.popularView.bottom + 10, 49, 49)]; self.passwordRoomIconImageView = [[UIImageView alloc] initWithFrame:CGRectMake(self.popularView.x, self.popularView.bottom + 10, 49, 49)];
self.passwordRoomIconImageView.centerX = self.popularView.centerX;
self.passwordRoomIconImageView.image = [FUSShowRoomCenterBunble imageNamed:@"live_room_password_room_icon"]; self.passwordRoomIconImageView.image = [FUSShowRoomCenterBunble imageNamed:@"live_room_password_room_icon"];
[[self fus_viewWithLayer:FUSLiveFunctionLayerRoomInfos] addSubview:self.passwordRoomIconImageView]; [[self fus_viewWithLayer:FUSLiveFunctionLayerRoomInfos] addSubview:self.passwordRoomIconImageView];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ShareToChat/FUSLiveShareToChatView.m
...@@ -160,6 +160,7 @@ ...@@ -160,6 +160,7 @@
[self.userList addObject:userModel]; [self.userList addObject:userModel];
} }
self.selectedCount = self.userList.count;
[self fus_updateEmptyList]; [self fus_updateEmptyList];
[self.tableView reloadData]; [self.tableView reloadData];
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ShareToChat/FUSLiveShareToChatView.xib
<?xml version="1.0" encoding="UTF-8"?> <?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="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</constraints> </constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<state key="normal" title="分享到私信"> <state key="normal" title="分享到私信">
<color key="titleColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="calibratedRGB"/> <color key="titleColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.16862745098039217" alpha="1" colorSpace="calibratedRGB"/>
</state> </state>
<state key="disabled"> <state key="disabled">
<color key="titleColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> <color key="titleColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPasswordView.swift
...@@ -69,7 +69,7 @@ import RxSwift ...@@ -69,7 +69,7 @@ import RxSwift
} }
contentView.frame = CGRectMake(0, UIView.fus_screenH(), UIView.fus_screenW(), contentViewHeight) contentView.frame = CGRectMake(0, UIView.fus_screenH(), UIView.fus_screenW(), contentViewHeight)
contentView.backgroundColor = .fus_appBG().withAlphaComponent(0.94) contentView.backgroundColor = .fus_appBG()
contentView.addRoundedCorners(UIRectCorner(rawValue: UIRectCorner(rawValue: UIRectCorner.topRight.rawValue | UIRectCorner.topLeft.rawValue).rawValue), withRadii: CGSizeMake(14, 14)) contentView.addRoundedCorners(UIRectCorner(rawValue: UIRectCorner(rawValue: UIRectCorner.topRight.rawValue | UIRectCorner.topLeft.rawValue).rawValue), withRadii: CGSizeMake(14, 14))
tapBgView.addSubview(contentView) tapBgView.addSubview(contentView)
...@@ -111,7 +111,7 @@ import RxSwift ...@@ -111,7 +111,7 @@ import RxSwift
self.submitBtn.setTitle(.fus_localString("确定"), for: .normal) self.submitBtn.setTitle(.fus_localString("确定"), for: .normal)
let tipLabel = UILabel() let tipLabel = UILabel()
tipLabel.font = .fus_themeFont(13) tipLabel.font = .fus_themeFont(13)
tipLabel.textColor = .fus_textColorLight2() tipLabel.textColor = .init(hex: "696969")
tipLabel.text = FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData?.passwordShow ?? "" tipLabel.text = FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData?.passwordShow ?? ""
contentView.addSubview(tipLabel) contentView.addSubview(tipLabel)
tipLabel.snp.makeConstraints { make in tipLabel.snp.makeConstraints { make in
...@@ -127,7 +127,7 @@ import RxSwift ...@@ -127,7 +127,7 @@ import RxSwift
let attributedTitle = NSAttributedString( let attributedTitle = NSAttributedString(
string: .fus_localString("私信问密码"), string: .fus_localString("私信问密码"),
attributes: [ attributes: [
.foregroundColor: UIColor.fus_diamondBlue() ?? .black, .foregroundColor: UIColor.fus_themeColorOnWhiteBg() ?? .black,
.underlineStyle: NSUnderlineStyle.single.rawValue, .underlineStyle: NSUnderlineStyle.single.rawValue,
.font: UIFont.fus_themeFont(13) ?? .systemFont(ofSize: 13) .font: UIFont.fus_themeFont(13) ?? .systemFont(ofSize: 13)
] ]
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPrivacyView.swift
...@@ -33,6 +33,18 @@ import FUSCommon ...@@ -33,6 +33,18 @@ import FUSCommon
static public func fus_createInLive() { static public func fus_createInLive() {
guard let showVC = UINavigationController.fus_top() else { return } guard let showVC = UINavigationController.fus_top() else { return }
if FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData == nil {
FUSLiveHttpHelper.fus_requestLiveBeforeReady { model in
if model.encryptionData != nil {
FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData = model.encryptionData
self.fus_createInLive()
}
} failure: { msg, code in
FUSDialogView.fus_showDialog(msg)
}
} else {
let view = FUSLiveStartSetPrivacyView(frame: showVC.view.bounds) let view = FUSLiveStartSetPrivacyView(frame: showVC.view.bounds)
view.scopeType = FUSLiveHelper.shareInstance().roomScopeType view.scopeType = FUSLiveHelper.shareInstance().roomScopeType
view.requestType = 1 view.requestType = 1
...@@ -41,6 +53,7 @@ import FUSCommon ...@@ -41,6 +53,7 @@ import FUSCommon
showVC.view.addSubview(view) showVC.view.addSubview(view)
view.fus_showWithAnimation() view.fus_showWithAnimation()
} }
}
let disposeBag = DisposeBag() let disposeBag = DisposeBag()
/// 请求模式，0=返回数据，自己本身不请求改变房间类型，用于开播前。1=点确定自己内部请求，用于开播后 /// 请求模式，0=返回数据，自己本身不请求改变房间类型，用于开播前。1=点确定自己内部请求，用于开播后
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Router/FUSShowRoomRouter.m
...@@ -382,7 +382,7 @@ ...@@ -382,7 +382,7 @@
if (buttonIndex == 1) { if (buttonIndex == 1) {
[FUSLiveHelper shareInstance].roomScopeType = liveScope; [FUSLiveHelper shareInstance].roomScopeType = liveScope;
[FUSLiveHelper fus_pushLive]; [FUSLiveHelper fus_startPushLiveWithStreamModel:streamModel roomType:roomType];
} else { } else {
[FUSLiveHelper fus_endPushWithRoomType:roomType]; [FUSLiveHelper fus_endPushWithRoomType:roomType];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/View/FUSStartPageSplashView.m
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
-(void)fus_createUI{ -(void)fus_createUI{
self.backgroundColor = [UIColor whiteColor]; self.backgroundColor = [UIColor whiteColor];
NSString *imagePath = [[NSBundle mainBundle] pathForResource:@"fus_startSplash_logo_image_2" ofType:@"png"]; NSString *imagePath = [[NSBundle mainBundle] pathForResource:@"fus_startSplash_logo_image_3" ofType:@"png"];
UIImage *image = [UIImage imageWithContentsOfFile:imagePath]; UIImage *image = [UIImage imageWithContentsOfFile:imagePath];
self.logoImgView = [[UIImageView alloc] initWithImage:image]; self.logoImgView = [[UIImageView alloc] initWithImage:image];
[self addSubview:self.logoImgView]; [self addSubview:self.logoImgView];
......
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