diff --git a/xplan-ios.xcodeproj/project.pbxproj b/xplan-ios.xcodeproj/project.pbxproj index ac0e32cc..997ff296 100644 --- a/xplan-ios.xcodeproj/project.pbxproj +++ b/xplan-ios.xcodeproj/project.pbxproj @@ -1218,7 +1218,6 @@ E8F9168727EC927C00F10D8F /* XPHomeLittleGamePesenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F9168627EC927C00F10D8F /* XPHomeLittleGamePesenter.m */; }; E8F9168B27EC940E00F10D8F /* XPHomeLittleGameTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F9168A27EC940E00F10D8F /* XPHomeLittleGameTableViewCell.m */; }; E8F9168E27ECA69500F10D8F /* HomeLittleGameRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F9168D27ECA69500F10D8F /* HomeLittleGameRoomModel.m */; }; - F1152AC928E49A71007CB09A /* app_launch_screen01.png in Resources */ = {isa = PBXBuildFile; fileRef = F1152AC828E49A71007CB09A /* app_launch_screen01.png */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -3506,7 +3505,6 @@ E8F9168A27EC940E00F10D8F /* XPHomeLittleGameTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeLittleGameTableViewCell.m; sourceTree = ""; }; E8F9168C27ECA69500F10D8F /* HomeLittleGameRoomModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeLittleGameRoomModel.h; sourceTree = ""; }; E8F9168D27ECA69500F10D8F /* HomeLittleGameRoomModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeLittleGameRoomModel.m; sourceTree = ""; }; - F1152AC828E49A71007CB09A /* app_launch_screen01.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = app_launch_screen01.png; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -3753,7 +3751,6 @@ 189DD56126DE45F800AB55B1 /* Main */, E81C27AF26EF39B00031E639 /* AppDelegate */, 189DD53826DE255600AB55B1 /* Assets.xcassets */, - F1152AC828E49A71007CB09A /* app_launch_screen01.png */, E8937ACE276C99C300B2C7E1 /* Launch Screen.storyboard */, 189DD53D26DE255600AB55B1 /* Info.plist */, 189DD53E26DE255600AB55B1 /* main.m */, @@ -8979,7 +8976,6 @@ E8937AC7276C3EDE00B2C7E1 /* svga_member_in_lv40.svga in Resources */, E80EC85528ACD84000D133C5 /* emoji_118@2x.png in Resources */, E80EC8B728ACD84100D133C5 /* emoji_119@2x.png in Resources */, - F1152AC928E49A71007CB09A /* app_launch_screen01.png in Resources */, E80EC86228ACD84000D133C5 /* emoji_22@2x.png in Resources */, E8A1E461276220DA00B294CA /* candyTree.svga in Resources */, E80EC82528ACD84000D133C5 /* emoji_61@2x.png in Resources */, diff --git a/xplan-ios/Assets.xcassets/Room/Anchor/anchor_fansTeam_entrance_icon.imageset/anchor_fansTeam_entrance_icon@2x.png b/xplan-ios/Assets.xcassets/Room/Anchor/anchor_fansTeam_entrance_icon.imageset/anchor_fansTeam_entrance_icon@2x.png index 479788bc..d6ed9250 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Anchor/anchor_fansTeam_entrance_icon.imageset/anchor_fansTeam_entrance_icon@2x.png and b/xplan-ios/Assets.xcassets/Room/Anchor/anchor_fansTeam_entrance_icon.imageset/anchor_fansTeam_entrance_icon@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Anchor/anchor_fansTeam_entrance_icon.imageset/anchor_fansTeam_entrance_icon@3x.png b/xplan-ios/Assets.xcassets/Room/Anchor/anchor_fansTeam_entrance_icon.imageset/anchor_fansTeam_entrance_icon@3x.png index daad2dec..a3a18bca 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Anchor/anchor_fansTeam_entrance_icon.imageset/anchor_fansTeam_entrance_icon@3x.png and b/xplan-ios/Assets.xcassets/Room/Anchor/anchor_fansTeam_entrance_icon.imageset/anchor_fansTeam_entrance_icon@3x.png differ diff --git a/xplan-ios/Assets.xcassets/app_lanunch_new.imageset/Contents.json b/xplan-ios/Assets.xcassets/app_lanunch_new.imageset/Contents.json new file mode 100644 index 00000000..316fcbb4 --- /dev/null +++ b/xplan-ios/Assets.xcassets/app_lanunch_new.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "app_lanunch_new@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "app_lanunch_new@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/app_lanunch_new.imageset/app_lanunch_new@2x.png b/xplan-ios/Assets.xcassets/app_lanunch_new.imageset/app_lanunch_new@2x.png new file mode 100644 index 00000000..d60e547b Binary files /dev/null and b/xplan-ios/Assets.xcassets/app_lanunch_new.imageset/app_lanunch_new@2x.png differ diff --git a/xplan-ios/Assets.xcassets/app_lanunch_new.imageset/app_lanunch_new@3x.png b/xplan-ios/Assets.xcassets/app_lanunch_new.imageset/app_lanunch_new@3x.png new file mode 100644 index 00000000..08536ffc Binary files /dev/null and b/xplan-ios/Assets.xcassets/app_lanunch_new.imageset/app_lanunch_new@3x.png differ diff --git a/xplan-ios/Global/XPConstant.h b/xplan-ios/Global/XPConstant.h index 96a4705e..d3d4d76a 100644 --- a/xplan-ios/Global/XPConstant.h +++ b/xplan-ios/Global/XPConstant.h @@ -19,7 +19,6 @@ UIKIT_EXTERN NSString * const kHadShowNewUserGiftKey; UIKIT_EXTERN NSString * const kRedPacketHistory; UIKIT_EXTERN NSString * const kTeenagerStatusChange; UIKIT_EXTERN NSString * const kRoomQuickMessageCloseCount; -UIKIT_EXTERN NSString * const kRoomQuickMessageCloseTime; typedef NS_ENUM(NSUInteger, KeyType) { KeyType_PasswordEncode,///密码 des 加密的 diff --git a/xplan-ios/Global/XPConstant.m b/xplan-ios/Global/XPConstant.m index 5ef89b90..8fbfe754 100644 --- a/xplan-ios/Global/XPConstant.m +++ b/xplan-ios/Global/XPConstant.m @@ -28,7 +28,6 @@ NSString * const kTabShowAnchorCardKey = @"kTabShowAnchorCardKey"; //tab展示 NSString * const kRedPacketHistory = @"kRedPacketHistory"; NSString * const kTeenagerStatusChange = @"kTeenagerStatusChange";//青少年状态改变 NSString * const kRoomQuickMessageCloseCount = @"kTeenagerStatusChange";//房间快捷发言关闭次数 -NSString * const kRoomQuickMessageCloseTime = @"kRoomQuickMessageCloseTime"; //房间快捷发言最后关闭时间 ///在里面进行判断当前环境是什么 NSString * const KeyWithType(KeyType type) { diff --git a/xplan-ios/Launch Screen.storyboard b/xplan-ios/Launch Screen.storyboard index 94ab4b6c..0bdb6457 100644 --- a/xplan-ios/Launch Screen.storyboard +++ b/xplan-ios/Launch Screen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -16,7 +16,7 @@ - + @@ -36,6 +36,6 @@ - + diff --git a/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRankUpdateView.m b/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRankUpdateView.m index 7223f6ce..c8876565 100644 --- a/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRankUpdateView.m +++ b/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRankUpdateView.m @@ -190,6 +190,7 @@ _cycleScrollView.delegate = self; _cycleScrollView.showPageControl = NO; _cycleScrollView.autoScrollTimeInterval = 3.0; + [_cycleScrollView disableScrollGesture]; } return _cycleScrollView; } diff --git a/xplan-ios/Main/Mine/View/SubViews/NobleCenter/XPNobleCenterEntranceView.m b/xplan-ios/Main/Mine/View/SubViews/NobleCenter/XPNobleCenterEntranceView.m index 456d7b64..61cb8530 100644 --- a/xplan-ios/Main/Mine/View/SubViews/NobleCenter/XPNobleCenterEntranceView.m +++ b/xplan-ios/Main/Mine/View/SubViews/NobleCenter/XPNobleCenterEntranceView.m @@ -85,7 +85,10 @@ - (void)setVipInfo:(UserVipInfoVo *)vipInfo { _vipInfo = vipInfo; if (vipInfo) { - [self addSubview:self.nobleIconImage]; + if (!self.nobleIconImage.superview) { + [self addSubview:self.nobleIconImage]; + } + self.nobleIconImage.hidden = NO; self.nobleIconImage.imageUrl = vipInfo.vipIcon; self.titleLabel.text = vipInfo.vipName; self.bgImageView.image = [UIImage imageNamed:@"mine_noble_entrance_hadNoble"]; @@ -106,7 +109,24 @@ make.right.mas_equalTo(0); make.height.mas_equalTo(14); }]; - } + } else { + self.nobleIconImage.hidden = YES; + self.bgImageView.image = [UIImage imageNamed:@"mine_noble_entrance_noNoble"]; + self.titleLabel.text = @"贵族中心"; + self.descLabel.text = @"开通贵族立享各项特权"; + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(14); + make.left.mas_equalTo(14); + make.right.mas_equalTo(0); + make.height.mas_equalTo(22); + }]; + [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(self.titleLabel.mas_bottom); + make.left.mas_equalTo(14); + make.right.mas_equalTo(0); + make.height.mas_equalTo(14); + }]; + } } - (void)setNobleInfo:(NobleCenterModel *)nobleInfo { @@ -137,6 +157,20 @@ }]; } else { self.backProgressView.hidden = YES; + self.titleLabel.text = @"贵族中心"; + self.descLabel.text = @"开通贵族立享各项特权"; + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(14); + make.left.mas_equalTo(14); + make.right.mas_equalTo(0); + make.height.mas_equalTo(22); + }]; + [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(self.titleLabel.mas_bottom); + make.left.mas_equalTo(14); + make.right.mas_equalTo(0); + make.height.mas_equalTo(14); + }]; } } diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m index b4a55ce0..3e0dd9c8 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m +++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m @@ -641,7 +641,7 @@ - (UIButton *)anchorButton { if (!_anchorButton) { _anchorButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_anchorButton setTitle:@"个播" forState:UIControlStateNormal]; + [_anchorButton setTitle:@"人气" forState:UIControlStateNormal]; [_anchorButton setTitleColor:[ThemeColor giftSegmentSelectTitleColor] forState:UIControlStateSelected]; [_anchorButton setTitleColor:[ThemeColor giftSegmentNormalTitleColor] forState:UIControlStateNormal]; _anchorButton.titleLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightSemibold]; diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m index 11248811..52d1b8ef 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m +++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m @@ -207,6 +207,7 @@ _cycleScrollView.delegate = self; _cycleScrollView.showPageControl = NO; _cycleScrollView.autoScrollTimeInterval = 3.0; + [_cycleScrollView disableScrollGesture]; } return _cycleScrollView; } diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m index 0e56f0e0..2b067c80 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m +++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m @@ -376,7 +376,6 @@ return; } self.giftBarView.sendButtonIsEnable = NO; - NSLog(@"送礼物陈宫之前的时间：%@", [NSDate date]); ///发送消息 [self.presenter sendGift:uidString giftNum:giftNumber sendType:sendType giftId:giftId giftSource:sourceType giftType:giftInfo.giftType roomSendType:roomSendType roomUid:self.roomUid msg:@""]; } else { @@ -593,7 +592,6 @@ } - (void)sendGiftSuccess:(GiftReceiveInfoModel *)receiveInfo originDic:(NSDictionary *)originDic uidCount:(NSInteger)uidCount{ - NSLog(@"送礼物陈宫之后的时间：%@", [NSDate date]); self.giftBarView.sendButtonIsEnable = YES; if (receiveInfo.sourceType == GiftSourceType_Pack) { ///更新个数 diff --git a/xplan-ios/Main/Room/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m b/xplan-ios/Main/Room/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m index 55e3f240..0575c3a1 100644 --- a/xplan-ios/Main/Room/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m +++ b/xplan-ios/Main/Room/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m @@ -51,8 +51,8 @@ make.height.mas_equalTo(22); }]; [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self); - make.width.height.mas_equalTo(37); + make.centerY.mas_equalTo(self.bgImageView.mas_centerY); + make.width.height.mas_equalTo(22); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.bgImageView); @@ -101,11 +101,11 @@ self.titleLabel.text = @"加入我的粉丝团吧~"; self.iconImageView.image = [UIImage imageNamed:@"anchor_fansTeam_entrance_icon"]; [self.iconImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self); - make.width.height.mas_equalTo(37); + make.centerY.mas_equalTo(self.bgImageView); + make.width.height.mas_equalTo(25); }]; [self.bgImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.iconImageView.mas_right).mas_offset(-8); + make.right.mas_equalTo(self.iconImageView.mas_right).mas_offset(8); }]; } } else { @@ -123,10 +123,12 @@ - (UIImageView *)bgImageView { if (_bgImageView == nil) { _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFF1ED7), UIColorFromRGB(0xFE70DB)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(92, 22)]; + _bgImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFC37D6), UIColorFromRGB(0xFC7FDC)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(92, 22)]; _bgImageView.userInteractionEnabled = YES; _bgImageView.layer.cornerRadius = 11; _bgImageView.layer.masksToBounds = YES; + _bgImageView.layer.borderWidth = 1; + _bgImageView.layer.borderColor = [UIColor colorWithWhite:1 alpha:0.35].CGColor; } return _bgImageView; } diff --git a/xplan-ios/Main/Room/View/QuickMessageView/XPRoomQuickMessageContainView.m b/xplan-ios/Main/Room/View/QuickMessageView/XPRoomQuickMessageContainView.m index 5d0720d8..e47c3c35 100644 --- a/xplan-ios/Main/Room/View/QuickMessageView/XPRoomQuickMessageContainView.m +++ b/xplan-ios/Main/Room/View/QuickMessageView/XPRoomQuickMessageContainView.m @@ -141,10 +141,7 @@ [self mas_updateConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(0); }]; - //记录最后关闭时间 NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - long time = (long)([[NSDate date] timeIntervalSince1970]*1000); - [defaults setObject:@(time) forKey:kRoomQuickMessageCloseTime]; //记录关闭的次数 NSNumber *count = [defaults objectForKey:kRoomQuickMessageCloseCount]; [defaults setObject:@(count.intValue +1) forKey:kRoomQuickMessageCloseCount]; diff --git a/xplan-ios/Main/Room/View/XPRoomViewController.m b/xplan-ios/Main/Room/View/XPRoomViewController.m index fd3666c9..ddbc5de6 100644 --- a/xplan-ios/Main/Room/View/XPRoomViewController.m +++ b/xplan-ios/Main/Room/View/XPRoomViewController.m @@ -277,19 +277,11 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 //记录最后关闭时间 NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSNumber *closeCount = [defaults objectForKey:kRoomQuickMessageCloseCount]; - NSNumber *lastTime = [defaults objectForKey:kRoomQuickMessageCloseTime]; - NSDate *datenow = [NSDate date];//现在时间 - long time2 = (long)([datenow timeIntervalSince1970]*1000); - long aTime = (time2 - [lastTime longValue]) / 1000; - if (aTime > 24*60 *60) {//大于24小时 - if (closeCount.intValue > 3) { - quickMsgHeight = 0; - } else { - quickMsgHeight = 30; - } - } else { - quickMsgHeight = 0; - } + if (closeCount.intValue > 3) { + quickMsgHeight = 0; + } else { + quickMsgHeight = 30; + } [self.quickMessageContainerView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.menuContainerView.mas_top); make.height.mas_equalTo(quickMsgHeight); @@ -517,8 +509,18 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 make.left.mas_equalTo(self.anchorScrollView.middleImageView); make.right.mas_equalTo(self.activityContainerView.mas_left).offset(-10); }]; + + CGFloat quickMsgHeight = 30; + //记录最后关闭时间 + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + NSNumber *closeCount = [defaults objectForKey:kRoomQuickMessageCloseCount]; + if (closeCount.intValue > 3) { + quickMsgHeight = 0; + } else { + quickMsgHeight = 30; + } [self.quickMessageContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); + make.height.mas_equalTo(quickMsgHeight); make.bottom.mas_equalTo(self.backContainerView).mas_offset(-5-40-8-kSafeAreaBottomHeight); make.left.right.mas_equalTo(self.anchorScrollView.middleImageView); }]; @@ -1538,6 +1540,13 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.menuContainerView onMicroQueueUpdate:queue]; [self.functionView onRoomUpdate]; [self.functionView onMicroQueueUpdate:queue]; + for (MicroQueueModel * info in queue.allValues) { + if (info.userInfo.uid > 0 && [AccountInfoStorage instance].getUid.integerValue == info.userInfo.uid) { + self.anchorScrollView.scrollEnabled = NO; + } else { + self.anchorScrollView.scrollEnabled = YES; + } + } } - (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { diff --git a/xplan-ios/app_launch_screen01.png b/xplan-ios/app_launch_screen01.png deleted file mode 100644 index dd6e3357..00000000 Binary files a/xplan-ios/app_launch_screen01.png and /dev/null differ